m8chaa commited on
Commit
efc2807
·
verified ·
1 Parent(s): d2b5bde

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +13 -13
app.py CHANGED
@@ -912,30 +912,30 @@ class DriveWatcher:
912
  self.watch_list: Dict[str, str] = {}
913
  self.channels: Dict[str, Dict[str, Any]] = {}
914
 
915
- async def create_channel(self, folder_id: str) -> Dict[str, Any]:
916
  body = {
917
  'id': f'channel-{folder_id}-{int(time.time())}',
918
  'type': 'web_hook',
919
  'address': 'https://m8chaa-re-sheet-develop.hf.space/notifications',
920
  }
921
- response = await app.state.drive_service.files().watch(fileId=folder_id, body=body).__await__()
922
  return response
923
 
924
- async def close_channel(self, channel_id: str, resource_id: str):
925
- await app.state.drive_service.channels().stop(body={
926
  'id': channel_id,
927
  'resourceId': resource_id,
928
  }).execute()
929
 
930
- async def update_watch_list(self):
931
  for channel_id, channel_info in self.channels.items():
932
- await 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 = await self.create_channel(folder_id)
939
  logging.info(response)
940
  self.channels[response['id']] = {
941
  'resourceId': response['resourceId'],
@@ -945,17 +945,17 @@ class DriveWatcher:
945
  except Exception as e:
946
  logging.error(f"Error creating channel for user {user_id}: {str(e)}")
947
 
948
- async def on_user_change(self, snapshot, changes, read_time):
949
  for change in changes:
950
  user_id = change.document.id
951
  user_data = change.document.to_dict()
952
-
953
  if change.type.name in ['ADDED', 'MODIFIED']:
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 = await self.create_channel(folder_id)
959
  self.channels[response['id']] = {
960
  'resourceId': response['resourceId'],
961
  'user_id': user_id,
@@ -969,11 +969,11 @@ class DriveWatcher:
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
- await self.close_channel(channel_id, channel_info['resourceId'])
973
  del self.channels[channel_id]
974
  break
975
  @app.on_event("startup")
976
- async def startup_event():
977
  app.state.drive_watcher = DriveWatcher()
978
  app.state.drive_service = build('drive', 'v3', credentials=APICredential)
979
  # Fetch all users and initialize the watch list
@@ -984,7 +984,7 @@ async def startup_event():
984
  app.state.drive_watcher.watch_list[user.id] = user_data['gDrive_metadata']['uploaded']
985
 
986
  # Initial update of watch list channels
987
- await app.state.drive_watcher.update_watch_list()
988
 
989
  # Set up the Firebase listener
990
  app.state.users_watch = users_collection_ref.on_snapshot(app.state.drive_watcher.on_user_change)
 
912
  self.watch_list: Dict[str, str] = {}
913
  self.channels: Dict[str, Dict[str, Any]] = {}
914
 
915
+ def create_channel(self, folder_id: str) -> Dict[str, Any]:
916
  body = {
917
  'id': f'channel-{folder_id}-{int(time.time())}',
918
  'type': 'web_hook',
919
  'address': 'https://m8chaa-re-sheet-develop.hf.space/notifications',
920
  }
921
+ response = app.state.drive_service.files().watch(fileId=folder_id, body=body).execute()
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'],
 
945
  except Exception as e:
946
  logging.error(f"Error creating channel for user {user_id}: {str(e)}")
947
 
948
+ def on_user_change(self, snapshot, changes, read_time):
949
  for change in changes:
950
  user_id = change.document.id
951
  user_data = change.document.to_dict()
952
+
953
  if change.type.name in ['ADDED', 'MODIFIED']:
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,
 
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()
978
  app.state.drive_service = build('drive', 'v3', credentials=APICredential)
979
  # Fetch all users and initialize the watch list
 
984
  app.state.drive_watcher.watch_list[user.id] = user_data['gDrive_metadata']['uploaded']
985
 
986
  # Initial update of watch list channels
987
+ app.state.drive_watcher.update_watch_list()
988
 
989
  # Set up the Firebase listener
990
  app.state.users_watch = users_collection_ref.on_snapshot(app.state.drive_watcher.on_user_change)