Archives
/
calibre-web
mirror of https://github.com/janeczku/calibre-web
2
0
Fork 0
Code Issues Releases Wiki Activity

Mass rename author before last stage

Browse Source
pull/2320/head
Ozzie Isaacs 2 years ago
parent 1ce45f3253
commit 26a8ac1425
4 changed files with 103 additions and 105 deletions
Show Stats Download Patch File Download Diff File

24
cps/editbooks.py
Unescape Escape View File

@ -82,7 +82,6 @@ def search_objects_remove(db_book_object, db_type, input_elements):
type_elements = c_elements.name type_elements = c_elements.name
for inp_element in input_elements: for inp_element in input_elements:
if inp_element.lower() == type_elements.lower(): if inp_element.lower() == type_elements.lower():
# if inp_element == type_elements:
found = True found = True
break break
# if the element was not found in the new list, add it to remove list # if the element was not found in the new list, add it to remove list
@ -132,7 +131,6 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
# check if a element with that name exists # check if a element with that name exists
db_element = db_session.query(db_object).filter(db_filter == add_element).first() db_element = db_session.query(db_object).filter(db_filter == add_element).first()
# if no element is found add it # if no element is found add it
# if new_element is None:
if db_type == 'author': if db_type == 'author':
new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')), "") new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')), "")
elif db_type == 'series': elif db_type == 'series':
@ -1067,12 +1065,22 @@ def upload():
book_id = db_book.id book_id = db_book.id
title = db_book.title title = db_book.title
# ToDo this currently doesn't work -> integrate in update_dir_structure_gdrive # ToDo this currently doesn't work -> integrate in update_dir_structure_gdrive
error = helper.update_dir_structure_file(book_id, if config.config_use_google_drive:
config.config_calibre_dir, file_name = helper.get_valid_filename(title, chars=42) + \
input_authors[0], ' - ' + helper.get_valid_filename(input_authors[0], chars=42) +\
meta.file_path, meta.extension.lower()
title_dir + meta.extension.lower(),
renamed_author=renamed_authors) gdrive_path = os.path.join(helper.get_valid_filename(input_authors[0], chars=96),
title_dir + " (" + str(book_id) + ")",
file_name)
gdriveutils.uploadFileToEbooksFolder(gdrive_path.replace("\\", "/"), meta.file_path)
else:
error = helper.update_dir_structure(book_id,
config.config_calibre_dir,
input_authors[0],
meta.file_path,
title_dir + meta.extension.lower(),
renamed_author=renamed_authors)
move_coverfile(meta, db_book) move_coverfile(meta, db_book)

46
cps/gdriveutils.py
Unescape Escape View File

@ -35,10 +35,10 @@ except ImportError:
from sqlalchemy.exc import OperationalError, InvalidRequestError from sqlalchemy.exc import OperationalError, InvalidRequestError
from sqlalchemy.sql.expression import text from sqlalchemy.sql.expression import text
try: #try:
from six import __version__ as six_version # from six import __version__ as six_version
except ImportError: #except ImportError:
six_version = "not installed" # six_version = "not installed"
try: try:
from httplib2 import __version__ as httplib2_version from httplib2 import __version__ as httplib2_version
except ImportError: except ImportError:
@ -355,30 +355,6 @@ def downloadFile(path, filename, output):
f = getFileFromEbooksFolder(path, filename) f = getFileFromEbooksFolder(path, filename)
f.GetContentFile(output) f.GetContentFile(output)
'''def renameGdriveFolderRemote(origin_file, target_folder):
drive = getDrive(Gdrive.Instance().drive)
previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
children = drive.auth.service.children().list(folderId=previous_parents).execute()
gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
# Folder is not existing, rename folder
drive.auth.service.files().patch(fileId=origin_file['id'],
body={'title': target_folder},
fields='title').execute()
# gFileTargetDir = drive.CreateFile(
# {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
# "mimeType": "application/vnd.google-apps.folder"})
# gFileTargetDir.Upload()
else:
# Move the file to the new folder
drive.auth.service.files().update(fileId=origin_file['id'],
addParents=gFileTargetDir['id'],
removeParents=previous_parents,
fields='id, parents').execute()
# if previous_parents has no children anymore, delete original fileparent
if len(children['items']) == 1:
deleteDatabaseEntry(previous_parents)
drive.auth.service.files().delete(fileId=previous_parents).execute()'''
def moveGdriveFolderRemote(origin_file, target_folder): def moveGdriveFolderRemote(origin_file, target_folder):
drive = getDrive(Gdrive.Instance().drive) drive = getDrive(Gdrive.Instance().drive)
@ -454,24 +430,24 @@ def uploadFileToEbooksFolder(destFile, f):
splitDir = destFile.split('/') splitDir = destFile.split('/')
for i, x in enumerate(splitDir): for i, x in enumerate(splitDir):
if i == len(splitDir)-1: if i == len(splitDir)-1:
existingFiles = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" % existing_Files = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
(x.replace("'", r"\'"), parent['id'])}).GetList() (x.replace("'", r"\'"), parent['id'])}).GetList()
if len(existingFiles) > 0: if len(existing_Files) > 0:
driveFile = existingFiles[0] driveFile = existing_Files[0]
else: else:
driveFile = drive.CreateFile({'title': x, driveFile = drive.CreateFile({'title': x,
'parents': [{"kind": "drive#fileLink", 'id': parent['id']}], }) 'parents': [{"kind": "drive#fileLink", 'id': parent['id']}], })
driveFile.SetContentFile(f) driveFile.SetContentFile(f)
driveFile.Upload() driveFile.Upload()
else: else:
existingFolder = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" % existing_Folder = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
(x.replace("'", r"\'"), parent['id'])}).GetList() (x.replace("'", r"\'"), parent['id'])}).GetList()
if len(existingFolder) == 0: if len(existing_Folder) == 0:
parent = drive.CreateFile({'title': x, 'parents': [{"kind": "drive#fileLink", 'id': parent['id']}], parent = drive.CreateFile({'title': x, 'parents': [{"kind": "drive#fileLink", 'id': parent['id']}],
"mimeType": "application/vnd.google-apps.folder"}) "mimeType": "application/vnd.google-apps.folder"})
parent.Upload() parent.Upload()
else: else:
parent = existingFolder[0] parent = existing_Folder[0]
def watchChange(drive, channel_id, channel_type, channel_address, def watchChange(drive, channel_id, channel_type, channel_address,
@ -713,5 +689,5 @@ def get_error_text(client_secrets=None):
def get_versions(): def get_versions():
return {'six': six_version, return { # 'six': six_version,
'httplib2': httplib2_version} 'httplib2': httplib2_version}

136
cps/helper.py
Unescape Escape View File

@ -369,13 +369,13 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
# Moves files in file storage during author/title rename, or from temp dir to file storage # Moves files in file storage during author/title rename, or from temp dir to file storage
def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepath, db_filename, renamed_author): def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
# get book database entry from id, if original path overwrite source with original_filepath # get book database entry from id, if original path overwrite source with original_filepath
localbook = calibre_db.get_book(book_id) localbook = calibre_db.get_book(book_id)
if orignal_filepath: if original_filepath:
path = orignal_filepath path = original_filepath
else: else:
path = os.path.join(calibrepath, localbook.path) path = os.path.join(calibre_path, localbook.path)
# Create (current) authordir and titledir from database # Create (current) authordir and titledir from database
authordir = localbook.path.split('/')[0] authordir = localbook.path.split('/')[0]
@ -389,10 +389,10 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first() new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
old_author_dir = get_valid_filename(r, chars=96) old_author_dir = get_valid_filename(r, chars=96)
new_author_rename_dir = get_valid_filename(new_author.name, chars=96) new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
if os.path.isdir(os.path.join(calibrepath, old_author_dir)): if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
try: try:
old_author_path = os.path.join(calibrepath, old_author_dir) old_author_path = os.path.join(calibre_path, old_author_dir)
new_author_path = os.path.join(calibrepath, new_author_rename_dir) new_author_path = os.path.join(calibre_path, new_author_rename_dir)
shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path)) shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
except (OSError) as ex: except (OSError) as ex:
log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex) log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
@ -400,48 +400,72 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s", return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
src=old_author_path, dest=new_author_path, error=str(ex)) src=old_author_path, dest=new_author_path, error=str(ex))
if first_author.lower() in [r.lower() for r in renamed_author]: if first_author.lower() in [r.lower() for r in renamed_author]:
if os.path.isdir(os.path.join(calibrepath, new_authordir)): if os.path.isdir(os.path.join(calibre_path, new_authordir)):
path = os.path.join(calibrepath, new_authordir, titledir) path = os.path.join(calibre_path, new_authordir, titledir)
else: else:
new_authordir = get_valid_filename(localbook.authors[0].name, chars=96) new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")" new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
if titledir != new_titledir or authordir != new_authordir or orignal_filepath: if titledir != new_titledir or authordir != new_authordir or original_filepath:
new_path = os.path.join(calibrepath, new_authordir, new_titledir) error = move_files_on_change(calibre_path,
new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir new_authordir,
try: new_titledir,
if orignal_filepath: localbook,
if not os.path.isdir(new_path): db_filename,
os.makedirs(new_path) original_filepath,
shutil.move(os.path.normcase(orignal_filepath), os.path.normcase(os.path.join(new_path, db_filename))) path)
log.debug("Moving title: %s to %s/%s", orignal_filepath, new_path, new_name) if error:
else: return error
# Check new path is not valid path
if not os.path.exists(new_path): # Rename all files from old names to new names
# move original path to new path return rename_files_on_change(first_author, renamed_author, localbook, original_filepath, path, calibre_path)
log.debug("Moving title: %s to %s", path, new_path)
shutil.move(os.path.normcase(path), os.path.normcase(new_path))
else: # path is valid copy only files to new location (merge) def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, db_filename, original_filepath, path):
log.info("Moving title: %s into existing: %s", path, new_path) new_path = os.path.join(calibre_path, new_authordir, new_titledir)
# Take all files and subfolder from old path (strange command) new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir
for dir_name, __, file_list in os.walk(path): try:
for file in file_list: if original_filepath:
shutil.move(os.path.normcase(os.path.join(dir_name, file)), if not os.path.isdir(new_path):
os.path.normcase(os.path.join(new_path + dir_name[len(path):], file))) os.makedirs(new_path)
# change location in database to new author/title path shutil.move(os.path.normcase(original_filepath), os.path.normcase(os.path.join(new_path, db_filename)))
localbook.path = os.path.join(new_authordir, new_titledir).replace('\\','/') log.debug("Moving title: %s to %s/%s", original_filepath, new_path, new_name)
except (OSError) as ex: else:
log.error("Rename title from: %s to %s: %s", path, new_path, ex) # Check new path is not valid path
log.debug(ex, exc_info=True) if not os.path.exists(new_path):
return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s", # move original path to new path
src=path, dest=new_path, error=str(ex)) log.debug("Moving title: %s to %s", path, new_path)
shutil.move(os.path.normcase(path), os.path.normcase(new_path))
else: # path is valid copy only files to new location (merge)
log.info("Moving title: %s into existing: %s", path, new_path)
# Take all files and subfolder from old path (strange command)
for dir_name, __, file_list in os.walk(path):
for file in file_list:
shutil.move(os.path.normcase(os.path.join(dir_name, file)),
os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
# change location in database to new author/title path
localbook.path = os.path.join(new_authordir, new_titledir).replace('\\','/')
except OSError as ex:
log.error("Rename title from: %s to %s: %s", path, new_path, ex)
log.debug(ex, exc_info=True)
return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
src=path, dest=new_path, error=str(ex))
return False
def rename_files_on_change(first_author,
renamed_author,
localbook,
orignal_filepath="",
path="",
calibre_path="",
gdrive=False):
# Rename all files from old names to new names # Rename all files from old names to new names
try: try:
clean_author_database(renamed_author, calibrepath) clean_author_database(renamed_author, calibre_path, gdrive)
if first_author and first_author not in renamed_author: if first_author and first_author not in renamed_author:
clean_author_database([first_author], calibrepath, localbook) clean_author_database([first_author], calibre_path, localbook, gdrive)
if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0: if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
shutil.rmtree(os.path.dirname(path)) shutil.rmtree(os.path.dirname(path))
except (OSError, FileNotFoundError) as ex: except (OSError, FileNotFoundError) as ex:
log.error("Error in rename file in path %s", ex) log.error("Error in rename file in path %s", ex)
@ -449,6 +473,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
return _("Error in rename file in path: %(error)s", error=str(ex)) return _("Error in rename file in path: %(error)s", error=str(ex))
return False return False
def update_dir_structure_gdrive(book_id, first_author, renamed_author): def update_dir_structure_gdrive(book_id, first_author, renamed_author):
error = False error = False
book = calibre_db.get_book(book_id) book = calibre_db.get_book(book_id)
@ -457,16 +482,12 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
if first_author: if first_author:
new_authordir = get_valid_filename(first_author, chars=96) new_authordir = get_valid_filename(first_author, chars=96)
for r in renamed_author: for r in renamed_author:
# Todo: Rename all authors on gdrive
new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first() new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
old_author_dir = get_valid_filename(r, chars=96) old_author_dir = get_valid_filename(r, chars=96)
new_author_rename_dir = get_valid_filename(new_author.name, chars=96) new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
gFile = gd.getFileFromEbooksFolder(None, old_author_dir) gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
if gFile: if gFile:
gd.moveGdriveFolderRemote(gFile, new_author_rename_dir) gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
# author is always co-author and has is never author, no folder is okay
#else:
# error = _(u'File %(file)s not found on Google Drive', file=authordir) # file not found
else: else:
new_authordir = get_valid_filename(book.authors[0].name, chars=96) new_authordir = get_valid_filename(book.authors[0].name, chars=96)
@ -476,8 +497,7 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
if titledir != new_titledir: if titledir != new_titledir:
gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir) gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
if gFile: if gFile:
gFile['title'] = new_titledir gd.moveGdriveFileRemote(gFile, new_titledir)
gFile.Upload()
book.path = book.path.split('/')[0] + u'/' + new_titledir book.path = book.path.split('/')[0] + u'/' + new_titledir
gd.updateDatabaseOnEdit(gFile['id'], book.path) # only child folder affected gd.updateDatabaseOnEdit(gFile['id'], book.path) # only child folder affected
else: else:
@ -494,15 +514,9 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
# change location in database to new author/title path # change location in database to new author/title path
book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/') book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
# Rename all files from old names to new names
clean_author_database(renamed_author, "", gdrive=True)
if first_author not in renamed_author:
clean_author_database([first_author], "", book, gdrive=True)
return error return error
def delete_book_gdrive(book, book_format): def delete_book_gdrive(book, book_format):
error = None error = None
if book_format: if book_format:
@ -582,19 +596,19 @@ def valid_email(email):
def update_dir_structure(book_id, def update_dir_structure(book_id,
calibrepath, calibre_path,
first_author=None, first_author=None, # change author of book to this author
orignal_filepath=None, original_filepath=None,
db_filename=None, db_filename=None,
renamed_author=None): renamed_author=None):
renamed_author = renamed_author or [] renamed_author = renamed_author or []
if config.config_use_google_drive: if config.config_use_google_drive:
return update_dir_structure_gdrive(book_id, first_author, renamed_author) return update_dir_structure_gdrive(book_id, first_author, renamed_author)
else: else:
return update_dir_structure_file(book_id, return update_dir_structure_file(book_id,
calibrepath, calibre_path,
first_author, first_author,
orignal_filepath, original_filepath,
db_filename, renamed_author) db_filename, renamed_author)

2
optional-requirements.txt
Unescape Escape View File

@ -10,7 +10,7 @@ pyasn1>=0.1.9,<0.5.0
PyDrive2>=1.3.1,<1.11.0 PyDrive2>=1.3.1,<1.11.0
PyYAML>=3.12 PyYAML>=3.12
rsa>=3.4.2,<4.9.0 rsa>=3.4.2,<4.9.0
six>=1.10.0,<1.17.0 # six>=1.10.0,<1.17.0
# Gmail # Gmail
google-auth-oauthlib>=0.4.3,<0.5.0 google-auth-oauthlib>=0.4.3,<0.5.0

Write Preview
Loading…
Cancel
Save