NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #49 from OzzieIsaacs/patch-2

Browse Source 
Fix for non Ascii Characters in database paths #46
This commit is contained in:
cervinko 2016-08-07 22:38:10 +02:00 committed by GitHub
commit 79f373d4e6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cps/config.py
View File

@ -8,6 +8,7 @@ from configobj import ConfigObj
CONFIG_FILE= os.path.join(os.getcwd(), "config.ini") CONFIG_FILE= os.path.join(os.getcwd(), "config.ini")
CFG = ConfigObj(CONFIG_FILE) CFG = ConfigObj(CONFIG_FILE)
CFG.encoding='UTF-8'
def CheckSection(sec): def CheckSection(sec):
""" Check if INI section exists, if not create it """ """ Check if INI section exists, if not create it """
@ -20,8 +21,8 @@ def CheckSection(sec):
def check_setting_str(config, cfg_name, item_name, def_val, log=True): def check_setting_str(config, cfg_name, item_name, def_val, log=True):
try: try:
my_val = config[cfg_name][item_name] my_val = config[cfg_name][item_name].decode('UTF-8')
if my_val == "": if my_val == u"":
my_val = def_val my_val = def_val
config[cfg_name][item_name] = my_val config[cfg_name][item_name] = my_val
except: except:
@ -82,7 +83,7 @@ configval["UPLOADING"] = UPLOADING
configval["ANON_BROWSE"] = ANON_BROWSE configval["ANON_BROWSE"] = ANON_BROWSE
def save_config(configval): def save_config(configval):
new_config = ConfigObj() new_config = ConfigObj(encoding='UTF-8')
new_config.filename = CONFIG_FILE new_config.filename = CONFIG_FILE
new_config['General'] = {} new_config['General'] = {}
new_config['General']['DB_ROOT'] = configval["DB_ROOT"] new_config['General']['DB_ROOT'] = configval["DB_ROOT"]

2
cps/db.py
View File

@ -20,7 +20,7 @@ def title_sort(title):
dbpath = os.path.join(config.DB_ROOT, "metadata.db") dbpath = os.path.join(config.DB_ROOT, "metadata.db")
engine = create_engine('sqlite:///{0}'.format(dbpath), echo=False) engine = create_engine('sqlite:///{0}'.format(dbpath.encode('utf-8')), echo=False)
conn = engine.connect() conn = engine.connect()
conn.connection.create_function('title_sort', 1, title_sort) conn.connection.create_function('title_sort', 1, title_sort)
Base = declarative_base() Base = declarative_base()