dbname

services/drive_service.py

@@ -94,8 +94,8 @@ class DriveService:
         if not self.service and not self.authenticate():
             return False
 
-        if not os.path.exists(self.DB_FILENAME):
-            logger.warning(f"Database file {self.DB_FILENAME} not found for upload.")
+        if not os.path.exists(DB_FILENAME):
+            logger.warning(f"Database file {DB_FILENAME} not found for upload.")
             return False
 
         folder_id = self._get_folder_id()
@@ -104,25 +104,25 @@ class DriveService:
 
         try:
             # Check if file already exists in folder
-            query = f"name='{self.DB_FILENAME}' and '{folder_id}' in parents and trashed=false"
+            query = f"name='{DB_FILENAME}' and '{folder_id}' in parents and trashed=false"
             results = self.service.files().list(q=query, spaces='drive', fields='files(id)').execute()
             files = results.get('files', [])
 
-            media = MediaFileUpload(self.DB_FILENAME, mimetype='application/x-sqlite3', resumable=True)
+            media = MediaFileUpload(DB_FILENAME, mimetype='application/x-sqlite3', resumable=True)
 
             if files:
                 # Update existing file
                 file_id = files[0]['id']
                 self.service.files().update(fileId=file_id, media_body=media).execute()
-                logger.info(f"Updated database file {self.DB_FILENAME} in Drive (ID: {file_id})")
+                logger.info(f"Updated database file {DB_FILENAME} in Drive (ID: {file_id})")
             else:
                 # Create new file
                 file_metadata = {
-                    'name': self.DB_FILENAME,
+                    'name': DB_FILENAME,
                     'parents': [folder_id]
                 }
                 self.service.files().create(body=file_metadata, media_body=media, fields='id').execute()
-                logger.info(f"Uploaded new database file {self.DB_FILENAME} to Drive")
+                logger.info(f"Uploaded new database file {DB_FILENAME} to Drive")
             
             return True
         except HttpError as error:
@@ -143,24 +143,24 @@ class DriveService:
             return False
 
         try:
-            query = f"name='{self.DB_FILENAME}' and '{folder_id}' in parents and trashed=false"
+            query = f"name='{DB_FILENAME}' and '{folder_id}' in parents and trashed=false"
             results = self.service.files().list(q=query, spaces='drive', fields='files(id)').execute()
             files = results.get('files', [])
 
             if not files:
-                logger.info(f"No {self.DB_FILENAME} found in Drive folder. Starting with fresh DB.")
+                logger.info(f"No {DB_FILENAME} found in Drive folder. Starting with fresh DB.")
                 return False
 
             file_id = files[0]['id']
             request = self.service.files().get_media(fileId=file_id)
-            fh = io.FileIO(self.DB_FILENAME, 'wb')
+            fh = io.FileIO(DB_FILENAME, 'wb')
             downloader = MediaIoBaseDownload(fh, request)
             done = False
             while done is False:
                 status, done = downloader.next_chunk()
                 # logger.info(f"Download {int(status.progress() * 100)}%.")
             
-            logger.info(f"Successfully downloaded {self.DB_FILENAME} from Drive.")
+            logger.info(f"Successfully downloaded {DB_FILENAME} from Drive.")
             return True
         except HttpError as error:
             logger.error(f"An error occurred downloading DB: {error}")