Improved error handling for renaming authors and titles (changes related to filesystem and not only to database)

This commit is contained in:
OzzieIsaacs
2017-11-30 16:49:46 +01:00
parent b4aede78bc
commit f1fac28203
18 changed files with 1249 additions and 1124 deletions
+11 -11
View File
@@ -47,12 +47,9 @@ DEFAULT_PASS = "admin123"
DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083))
DEVELOPMENT = False
class UserBase:
@property
def is_authenticated(self):
@@ -203,6 +200,7 @@ class Anonymous(AnonymousUserMixin, UserBase):
def is_authenticated(self):
return False
# Baseclass representing Shelfs in calibre-web inapp.db
class Shelf(Base):
__tablename__ = 'shelf'
@@ -290,7 +288,7 @@ class Settings(Base):
config_google_drive_folder = Column(String)
config_google_drive_calibre_url_base = Column(String)
config_google_drive_watch_changes_response = Column(String)
config_columns_to_ignore = Column(String)
#config_columns_to_ignore = Column(String)
config_remote_login = Column(Boolean)
config_use_goodreads = Column(Boolean)
config_goodreads_api_key = Column(String)
@@ -403,22 +401,22 @@ class Config:
(self.config_default_role & ROLE_DELETE_BOOKS == ROLE_DELETE_BOOKS))
def mature_content_tags(self):
if (sys.version_info > (3, 0)): #Python3 str, Python2 unicode
if sys.version_info > (3, 0): # Python3 str, Python2 unicode
lstrip = str.lstrip
else:
lstrip = unicode.lstrip
return list(map(lstrip, self.config_mature_content_tags.split(",")))
def get_Log_Level(self):
ret_value=""
ret_value = ""
if self.config_log_level == logging.INFO:
ret_value='INFO'
ret_value = 'INFO'
elif self.config_log_level == logging.DEBUG:
ret_value='DEBUG'
ret_value = 'DEBUG'
elif self.config_log_level == logging.WARNING:
ret_value='WARNING'
ret_value = 'WARNING'
elif self.config_log_level == logging.ERROR:
ret_value='ERROR'
ret_value = 'ERROR'
return ret_value
@@ -495,7 +493,7 @@ def migrate_Database():
conn = engine.connect()
conn.execute("ALTER TABLE user ADD column `sidebar_view` Integer DEFAULT 1")
session.commit()
create=True
create = True
try:
if create:
conn = engine.connect()
@@ -535,11 +533,13 @@ def migrate_Database():
conn = engine.connect()
conn.execute("ALTER TABLE Settings ADD column `config_mature_content_tags` String DEFAULT ''")
def clean_database():
# Remove expired remote login tokens
now = datetime.datetime.now()
session.query(RemoteAuthToken).filter(now > RemoteAuthToken.expiration).delete()
def create_default_config():
settings = Settings()
settings.mail_server = "mail.example.com"