Allow STYLE to refer to an absolute path of a CSS file, rather than j…

…ust a shortcut style name. #20
proycon · Mar 10, 2017 · bb38e7e · bb38e7e
1 parent 351a7d6
commit bb38e7e
Show file tree

Hide file tree

Showing 5 changed files with 155 additions and 151 deletions.
diff --git a/clam/clamservice.py b/clam/clamservice.py
@@ -1953,7 +1953,7 @@ def errorresponse(msg, code=403):
                         printdebug('(Invoking converter)')
                         try:
                             success = converter.convertforinput(Project.path(project, user) + 'input/' + filename, metadata)
-                        except: #pylint: disable=bare-except 
+                        except: #pylint: disable=bare-except
                             success = False
                         if not success:
                             conversionerror = True
@@ -2044,7 +2044,10 @@ def foliaxsl():
 
 
 def styledata():
-    return withheaders(flask.make_response(io.open(settings.CLAMDIR + '/style/' + settings.STYLE + '.css','r',encoding='utf-8').read()),'text/css')
+    if settings.STYLE[0] == '/':
+        return withheaders(flask.make_response(io.open(settings.STYLE,'r',encoding='utf-8').read()),'text/css')
+    else:
+        return withheaders(flask.make_response(io.open(settings.CLAMDIR + '/style/' + settings.STYLE + '.css','r',encoding='utf-8').read()),'text/css')
 
 
 def uploader(project, credentials=None):

diff --git a/clam/common/data.py b/clam/common/data.py
@@ -35,7 +35,7 @@
 import clam.common.util
 import clam.common.viewers
 
-VERSION = '2.1.8'
+VERSION = '2.1.9'
 
 #dirs for services shipped with CLAM itself
 CONFIGDIR = os.path.abspath(os.path.dirname(__file__) + '/../config/')

diff --git a/docs/clam_manual.pdf b/docs/clam_manual.pdf