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

Merge remote-tracking branch 'custom-dbpath'

Browse Source
This commit is contained in:
OzzieIsaacs 2017-04-02 08:45:47 +02:00
commit 66181daf6d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cps/gdriveutils.py
View File

@ -207,6 +207,7 @@ def backupCalibreDbAndOptionalDownload(drive, f=None):
if f: if f:
databaseFile.GetContentFile(f) databaseFile.GetContentFile(f)
def copyToDrive(drive, uploadFile, createRoot, replaceFiles, def copyToDrive(drive, uploadFile, createRoot, replaceFiles,
ignoreFiles=[], ignoreFiles=[],
parent=None, prevDir=''): parent=None, prevDir=''):

2
cps/ub.py
View File

@ -13,7 +13,7 @@ from flask_babel import gettext as _
import json import json
#from builtins import str #from builtins import str
dbpath = os.path.join(os.path.normpath(os.path.dirname(os.path.realpath(__file__)) + os.sep + ".." + os.sep), "app.db") dbpath = os.path.join(os.path.normpath(os.getenv("CALIBRE_DBPATH", os.path.dirname(os.path.realpath(__file__)) + os.sep + ".." + os.sep)), "app.db")
engine = create_engine('sqlite:///{0}'.format(dbpath), echo=False) engine = create_engine('sqlite:///{0}'.format(dbpath), echo=False)
Base = declarative_base() Base = declarative_base()