m8chaa commited on
Commit
957c02a
·
verified ·
1 Parent(s): ee04222

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +15 -24
app.py CHANGED
@@ -906,7 +906,6 @@ async def sync_data(data_json: str = Form(...), user_id: str = Form(...)):
906
 
907
 
908
 
909
-
910
  class DriveWatcher:
911
  def __init__(self):
912
  self.watch_list: Dict[str, str] = {}
@@ -922,26 +921,29 @@ class DriveWatcher:
922
  return response
923
 
924
  def close_channel(self, channel_id: str, resource_id: str):
925
- app.state.drive_service.channels().stop(body={
926
- 'id': channel_id,
927
- 'resourceId': resource_id,
928
- }).execute()
 
 
 
 
929
 
930
  def update_watch_list(self):
931
- for channel_id, channel_info in self.channels.items():
932
  self.close_channel(channel_id, channel_info['resourceId'])
933
-
934
- self.channels.clear()
935
 
936
  for user_id, folder_id in self.watch_list.items():
937
  try:
938
  response = self.create_channel(folder_id)
939
- logging.info(response)
940
  self.channels[response['id']] = {
941
  'resourceId': response['resourceId'],
942
  'user_id': user_id,
943
  'folder_id': folder_id
944
  }
 
945
  except Exception as e:
946
  logging.error(f"Error creating channel for user {user_id}: {str(e)}")
947
 
@@ -954,24 +956,13 @@ class DriveWatcher:
954
  if 'gDrive_metadata' in user_data and 'uploaded' in user_data['gDrive_metadata']:
955
  folder_id = user_data['gDrive_metadata']['uploaded']
956
  self.watch_list[user_id] = folder_id
957
- try:
958
- response = self.create_channel(folder_id)
959
- self.channels[response['id']] = {
960
- 'resourceId': response['resourceId'],
961
- 'user_id': user_id,
962
- 'folder_id': folder_id
963
- }
964
- except Exception as e:
965
- logging.error(f"Error creating channel for user {user_id}: {str(e)}")
966
 
967
  elif change.type.name == 'REMOVED':
968
  if user_id in self.watch_list:
969
- folder_id = self.watch_list.pop(user_id)
970
- for channel_id, channel_info in list(self.channels.items()):
971
- if channel_info['user_id'] == user_id:
972
- self.close_channel(channel_id, channel_info['resourceId'])
973
- del self.channels[channel_id]
974
- break
975
  @app.on_event("startup")
976
  def startup_event():
977
  app.state.drive_watcher = DriveWatcher()
 
906
 
907
 
908
 
 
909
  class DriveWatcher:
910
  def __init__(self):
911
  self.watch_list: Dict[str, str] = {}
 
921
  return response
922
 
923
  def close_channel(self, channel_id: str, resource_id: str):
924
+ try:
925
+ app.state.drive_service.channels().stop(body={
926
+ 'id': channel_id,
927
+ 'resourceId': resource_id,
928
+ }).execute()
929
+ logging.info(f"Closed channel: {channel_id}")
930
+ except Exception as e:
931
+ logging.error(f"Error closing channel {channel_id}: {str(e)}")
932
 
933
  def update_watch_list(self):
934
+ for channel_id, channel_info in list(self.channels.items()):
935
  self.close_channel(channel_id, channel_info['resourceId'])
936
+ del self.channels[channel_id]
 
937
 
938
  for user_id, folder_id in self.watch_list.items():
939
  try:
940
  response = self.create_channel(folder_id)
 
941
  self.channels[response['id']] = {
942
  'resourceId': response['resourceId'],
943
  'user_id': user_id,
944
  'folder_id': folder_id
945
  }
946
+ logging.info(f"Created new channel for user {user_id}, folder {folder_id}")
947
  except Exception as e:
948
  logging.error(f"Error creating channel for user {user_id}: {str(e)}")
949
 
 
956
  if 'gDrive_metadata' in user_data and 'uploaded' in user_data['gDrive_metadata']:
957
  folder_id = user_data['gDrive_metadata']['uploaded']
958
  self.watch_list[user_id] = folder_id
959
+ self.update_watch_list()
 
 
 
 
 
 
 
 
960
 
961
  elif change.type.name == 'REMOVED':
962
  if user_id in self.watch_list:
963
+ del self.watch_list[user_id]
964
+ self.update_watch_list()
965
+
 
 
 
966
  @app.on_event("startup")
967
  def startup_event():
968
  app.state.drive_watcher = DriveWatcher()