code: outfile name to envvars

matiusz · May 20, 2024 · ef2ab7c · ef2ab7c
1 parent a751368
commit ef2ab7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,6 +12,7 @@ jobs:
           command: python3 -m songbook.apps.create_pdf
           environment:
             SONGBOOK_DATA_DIR: hk-songbook
+            SONGBOOK_TITLE: hk-songbook
       - store_artifacts:
           path: songbook.pdf
           destination: hk-songbook.pdf
@@ -23,6 +24,7 @@ jobs:
           command: python3 -m songbook.apps.create_pdf
           environment:
             SONGBOOK_DATA_DIR: spiewnik111adh
+            SONGBOOK_TITLE: spiewnik111adh
       - store_artifacts:
           path: songbook.pdf
           destination: spiewnik111adh.pdf

diff --git a/config.json b/config.json
@@ -3,7 +3,6 @@
         {
             "categoriesFile": "categories.json",
             "imageFolder": ".images",
-            "outputFile": "songbook",
             "appLogo": "songbook/data/global/images/guitar.ico"
         },
     "pdfSettings": 

diff --git a/songbook/src/obj/Config.py b/songbook/src/obj/Config.py
@@ -35,9 +35,13 @@ def loadFromDict(self, config):
             self.dataFolder = "songbook/data/" + os.environ['SONGBOOK_DATA_DIR']
         except KeyError:
             self.dataFolder = 'songbook/data/hk-songbook'
+        try:
+            self.outputFile = os.environ['SONGBOOK_TITLE']
+        except KeyError:
+            self.outputFile = 'songbook'
+
         self.categoriesFile = filePathConfig['categoriesFile']
         self.imageFolder = filePathConfig['imageFolder']
-        self.outputFile = filePathConfig['outputFile']
         self.appLogo = filePathConfig['appLogo']
 
         pdfSettings = config['pdfSettings']