Bugfixes for uploading books to GDrive with new worker

cps/editbooks.py

@@ -848,7 +848,7 @@ def upload():
                 book_id = db_book.id
                 title = db_book.title
 
-                error = helper.update_dir_stucture(book_id,
+                error = helper.update_dir_structure_file(book_id,
                                                    config.config_calibre_dir,
                                                    input_authors[0],
                                                    meta.file_path,
@@ -872,10 +872,7 @@ def upload():
 
                 # save data to database, reread data
                 calibre_db.session.commit()
-                #calibre_db.setup_db(config, ub.app_DB_path)
+
-                # Reread book. It's important not to filter the result, as it could have language which hide it from
-                # current users view (tags are not stored/extracted from metadata and could also be limited)
-                #book = calibre_db.get_book(book_id)
                 if config.config_use_google_drive:
                     gdriveutils.updateGdriveCalibreFromLocal()
                 if error:

cps/gdriveutils.py

@@ -213,7 +213,7 @@ def listRootFolders():
 
 
 def getEbooksFolder(drive):
-    return getFolderInFolder('root',config.config_google_drive_folder,drive)
+    return getFolderInFolder('root', config.config_google_drive_folder, drive)
 
 
 def getFolderInFolder(parentId, folderName, drive):
@@ -243,7 +243,7 @@ def getEbooksFolderId(drive=None):
         gDriveId.path = '/'
         session.merge(gDriveId)
         session.commit()
-        return
+        return gDriveId.gdrive_id
 
 
 def getFile(pathId, fileName, drive):

cps/helper.py

@@ -414,7 +414,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                      src=new_path, dest=new_name, error=str(ex))
     return False
 
-def update_dir_structure_gdrive(book_id, first_author, original_filepath):
+def update_dir_structure_gdrive(book_id, first_author):
     error = False
     book = calibre_db.get_book(book_id)
     path = book.path
@@ -518,7 +518,7 @@ def uniq(inpt):
 
 def update_dir_stucture(book_id, calibrepath, first_author=None, orignal_filepath=None, db_filename=None):
     if config.config_use_google_drive:
-        return update_dir_structure_gdrive(book_id, first_author, orignal_filepath, db_filename)
+        return update_dir_structure_gdrive(book_id, first_author)
     else:
         return update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepath, db_filename)