Merge remote-tracking branch 'github/master'

Improvement for #814
2019-02-16 08:03:42 +01:00
parent 3593f904dc 7f3e98b477
commit 0fa45f5800
13 changed files with 283 additions and 434 deletions
@@ -61,7 +61,14 @@ MATURE_CONTENT = 2048
 SIDEBAR_PUBLISHER = 4096

 DEFAULT_PASS = "admin123"
-DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083))
+try:
+    DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083))
+except ValueError:
+    '''value = re.findall('.*?(\d+)$',os.environ.get("CALIBRE_PORT"))
+    if len(value):
+        DEFAULT_PORT = int(value[0])
+    else:'''
+    DEFAULT_PORT = 8083

 UPDATE_STABLE = 0
 AUTO_UPDATE_STABLE = 1