Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1947308 [Verbose PermissionError when trying to modify author sort](https://bugs.launchpad.net/calibre/+bug/1947308)

Browse Source
This commit is contained in:
Kovid Goyal 2021-10-19 11:49:49 +05:30
parent 1796df09b4
commit db074fd8f3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/gui2/metadata/basic_widgets.py
View File

@ -53,6 +53,16 @@ from calibre.utils.icu import sort_key, strcmp
from polyglot.builtins import iteritems, range, unicode_type from polyglot.builtins import iteritems, range, unicode_type
def show_locked_file_error(parent, err):
import traceback
fname = getattr(err, 'filename', None)
p = 'Locked file: %s\n\n'%fname if fname else ''
error_dialog(parent, _('Permission denied'),
_('Could not change the on disk location of this'
' book. Is it open in another program?'),
det_msg=p+traceback.format_exc(), show=True)
def save_dialog(parent, title, msg, det_msg=''): def save_dialog(parent, title, msg, det_msg=''):
d = QMessageBox(parent) d = QMessageBox(parent)
d.setWindowTitle(title) d.setWindowTitle(title)
@ -374,7 +384,11 @@ class AuthorsEdit(EditWithComplete, ToMetadataMixin):
if d == QMessageBox.StandardButton.Cancel: if d == QMessageBox.StandardButton.Cancel:
return return
if d == QMessageBox.StandardButton.Yes: if d == QMessageBox.StandardButton.Yes:
self.commit(self.db, self.id_) try:
self.commit(self.db, self.id_)
except PermissionError as err:
show_locked_file_error(self, err)
return
self.db.commit() self.db.commit()
self.original_val = self.current_val self.original_val = self.current_val
else: else:

48
src/calibre/gui2/metadata/single.py
View File

@ -6,31 +6,35 @@ __license__ = 'GPL v3'
__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os, errno import errno
import os
from datetime import datetime from datetime import datetime
from functools import partial from functools import partial
from qt.core import (
from qt.core import (Qt, QVBoxLayout, QHBoxLayout, QWidget, QPushButton, QApplication, QApplication, QCoreApplication, QDialog, QDialogButtonBox, QFont, QFrame,
QGridLayout, pyqtSignal, QDialogButtonBox, QScrollArea, QFont, QCoreApplication, QGridLayout, QGroupBox, QHBoxLayout, QIcon, QInputDialog, QKeySequence, QMenu,
QTabWidget, QIcon, QToolButton, QSplitter, QGroupBox, QSpacerItem, QInputDialog, QPushButton, QScrollArea, QShortcut, QSize, QSizePolicy, QSpacerItem, QSplitter,
QSizePolicy, QFrame, QSize, QKeySequence, QMenu, QShortcut, QDialog) Qt, QTabWidget, QToolButton, QVBoxLayout, QWidget, pyqtSignal
)
from calibre.constants import ismacos from calibre.constants import ismacos
from calibre.gui2.dialogs.confirm_delete import confirm
from calibre.ebooks.metadata import authors_to_string, string_to_authors from calibre.ebooks.metadata import authors_to_string, string_to_authors
from calibre.gui2 import error_dialog, gprefs, pixmap_to_data
from calibre.gui2.metadata.basic_widgets import (TitleEdit, AuthorsEdit,
AuthorSortEdit, TitleSortEdit, SeriesEdit, SeriesIndexEdit, IdentifiersEdit,
RatingEdit, PublisherEdit, TagsEdit, FormatsManager, Cover, CommentsEdit,
BuddyLabel, DateEdit, PubdateEdit, LanguagesEdit, RightClickButton)
from calibre.gui2.metadata.single_download import FullFetch
from calibre.gui2.custom_column_widgets import populate_metadata_page, Comments
from calibre.utils.config import tweaks
from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.metadata.book.base import Metadata
from calibre.utils.localization import canonicalize_lang from calibre.gui2 import error_dialog, gprefs, pixmap_to_data
from calibre.utils.date import local_tz from calibre.gui2.custom_column_widgets import Comments, populate_metadata_page
from calibre.gui2.dialogs.confirm_delete import confirm
from calibre.gui2.metadata.basic_widgets import (
AuthorsEdit, AuthorSortEdit, BuddyLabel, CommentsEdit, Cover, DateEdit,
FormatsManager, IdentifiersEdit, LanguagesEdit, PubdateEdit, PublisherEdit,
RatingEdit, RightClickButton, SeriesEdit, SeriesIndexEdit, TagsEdit, TitleEdit,
TitleSortEdit, show_locked_file_error
)
from calibre.gui2.metadata.single_download import FullFetch
from calibre.library.comments import merge_comments as merge_two_comments from calibre.library.comments import merge_comments as merge_two_comments
from polyglot.builtins import iteritems, unicode_type, filter from calibre.utils.config import tweaks
from calibre.utils.date import local_tz
from calibre.utils.localization import canonicalize_lang
from polyglot.builtins import filter, iteritems, unicode_type
BASE_TITLE = _('Edit metadata') BASE_TITLE = _('Edit metadata')
fetched_fields = ('title', 'title_sort', 'authors', 'author_sort', 'series', fetched_fields = ('title', 'title_sort', 'authors', 'author_sort', 'series',
@ -616,13 +620,7 @@ class MetadataSingleDialogBase(QDialog):
self.books_to_refresh |= getattr(widget, 'books_to_refresh', set()) self.books_to_refresh |= getattr(widget, 'books_to_refresh', set())
except (IOError, OSError) as err: except (IOError, OSError) as err:
if getattr(err, 'errno', None) == errno.EACCES: # Permission denied if getattr(err, 'errno', None) == errno.EACCES: # Permission denied
import traceback show_locked_file_error(self, err)
fname = getattr(err, 'filename', None)
p = 'Locked file: %s\n\n'%fname if fname else ''
error_dialog(self, _('Permission denied'),
_('Could not change the on disk location of this'
' book. Is it open in another program?'),
det_msg=p+traceback.format_exc(), show=True)
return False return False
raise raise
for widget in getattr(self, 'custom_metadata_widgets', []): for widget in getattr(self, 'custom_metadata_widgets', []):