encoder: invenio.config deprecation

* Replaces usage of invenio.config with invenio.base.globals:cfg. (addresses inveniosoftware#3106) Signed-off-by: Leonardo Rossi <[email protected]>
hachreak · Jul 23, 2015 · 6241def · 6241def
1 parent 294bdf9
commit 6241def
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/invenio/modules/encoder/encode.py b/invenio/modules/encoder/encode.py
@@ -21,6 +21,7 @@
 
 from six import iteritems
 
+from invenio.base.globals import cfg
 from invenio.legacy.bibsched.bibtask import (
                              write_message,
                              task_update_progress,
@@ -43,7 +44,6 @@
                                         ffprobe_metadata,
                                         mediainfo_metadata
                                         )
-from invenio.config import CFG_PATH_FFMPEG
 import time
 import os
 import subprocess
@@ -371,14 +371,14 @@ def insert(key, value):
         ## Determine base command arguments from the pass to run
         base_args = None
         if passes == 1:
-            base_args = [CFG_PATH_FFMPEG, '-y', '-i', input_file, output_file]
+            base_args = [cfg['CFG_PATH_FFMPEG'], '-y', '-i', input_file, output_file]
         elif passes == 2:
             if nofpass == 1:
-                base_args = [CFG_PATH_FFMPEG, '-y', '-i', input_file,
+                base_args = [cfg['CFG_PATH_FFMPEG'], '-y', '-i', input_file,
                              '-pass', '1', '-passlogfile', pass_log_file,
                              '-an', '-f', 'rawvideo', '/dev/null']
             elif nofpass == 2:
-                base_args = [CFG_PATH_FFMPEG, '-y', '-i', input_file,
+                base_args = [cfg['CFG_PATH_FFMPEG'], '-y', '-i', input_file,
                              '-pass', '2', '-passlogfile',
                              pass_log_file, output_file]
         ## Insert additional arguments

diff --git a/invenio/modules/encoder/utils.py b/invenio/modules/encoder/utils.py
@@ -43,7 +43,7 @@ def uuid4():
                     CFG_BIBENCODE_FFMPEG_CONFIGURATION_REQUIRED,
                     CFG_BIBENCODE_MEDIAINFO_COMMAND
                     )
-from invenio.config import CFG_PATH_FFPROBE
+from invenio.base.globals import cfg
 
 # The timestamp for the process. Used to identify Logfiles.
 def generate_timestamp():
@@ -242,7 +242,7 @@ def check_ffmpeg_configuration():
     """
     ## Use ffprobe to get the current ffmpeg configuration
     try:
-        process = subprocess.Popen(CFG_PATH_FFPROBE, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+        process = subprocess.Popen(cfg['CFG_PATH_FFPROBE'], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
     except OSError:
         return ["FFMPEG/FFPROBE does not seem to be installed!"]
     returncode = process.wait()

diff --git a/invenio/modules/encoder/websubmit.py b/invenio/modules/encoder/websubmit.py
@@ -34,11 +34,11 @@
 import os
 import pkg_resources
 
+from invenio.base.globals import cfg
 from invenio.modules.encoder.config import (
                     CFG_BIBENCODE_WEBSUBMIT_ASPECT_SAMPLE_DIR,
                     CFG_BIBENCODE_WEBSUBMIT_ASPECT_SAMPLE_FNAME
                     )
-from invenio.config import CFG_SITE_URL, CFG_PYLIBDIR
 
 def gcd(a,b):
     """ the euclidean algorithm """
@@ -95,11 +95,11 @@ def websubmit_singlepage(curdir, doctype, uid, access, session_id):
     else:
         resume = "false"
     body = form_body() % {
-               'CFG_SITE_URL' : CFG_SITE_URL,
+               'CFG_SITE_URL' : cfg['CFG_SITE_URL'],
                'guidelines_url': "localhost"
                }
     javascript = form_javascript() % {
-               'CFG_SITE_URL' : CFG_SITE_URL,
+               'CFG_SITE_URL' : cfg['CFG_SITE_URL'],
                'indir': indir,
                'doctype': doctype,
                'access': access,