oh-my-batch 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

oh_my_batch/combo.py

@@ -92,7 +92,7 @@ class ComboMaker:
         return self
 
     def add_file_set(self, key: str, *path: str, format=None,
-                         sep=' ', abs=False, raise_invalid=False):
+                     sep=' ', abs=False, raise_invalid=False):
         """
         Add a variable with files by glob pattern as one string
         Unlike add_files, this function joins the files with a delimiter.
@@ -163,7 +163,8 @@ class ComboMaker:
             self._broadcast_keys.append(key)
         return self
 
-    def make_files(self, file: str, template: str, delimiter='@', mode=None, encoding='utf-8'):
+    def make_files(self, file: str, template: str, delimiter='@', mode=None, encoding='utf-8',
+                   extra_vars_from_file=None):
         """
         Make files from template against each combo
         The template file can include variables with delimiter.
@@ -179,6 +180,7 @@ class ComboMaker:
         can be changed to other character, e.g $, $$, ...
         :param mode: File mode, e.g. 755, 644, ...
         :param encoding: File encoding
+        :param extra_vars_from_file: Load extra variables from json file, which can be used in template
         """
         _delimiter = delimiter
 
@@ -190,9 +192,17 @@ class ComboMaker:
             _template = template.format(i=i, **combo)
             with open(_template, 'r') as f:
                 template_text = f.read()
-            text = _Template(template_text).safe_substitute(combo)
+
+            if extra_vars_from_file is not None:
+                _vars_file = extra_vars_from_file.format(i=i, **combo)
+                with open(_vars_file, 'r') as f:
+                    extra_vars = json.load(f)
+            else:
+                extra_vars = {}
+            text = _Template(template_text).safe_substitute(combo, **extra_vars)
             _file = file.format(i=i, **combo)
             ensure_dir(_file)
+
             with open(_file, 'w', encoding=encoding) as f:
                 f.write(text)
             if mode is not None:

{oh_my_batch-0.5.0.dist-info → oh_my_batch-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oh-my-batch
-Version: 0.5.0
+Version: 0.5.1
 Summary: 
 License: GPL
 Author: weihong.xu

{oh_my_batch-0.5.0.dist-info → oh_my_batch-0.5.1.dist-info}/RECORD

@@ -4,12 +4,12 @@ oh_my_batch/assets/__init__.py,sha256=Exub46UbQaz2V2eXpQeiVfnThQpXaNeuyjlGY6gBSZ
 oh_my_batch/assets/functions.sh,sha256=LaiavZBu84D7C1r-dWhf91vPTuHXCMV1DQZUIPVQnjE,1001
 oh_my_batch/batch.py,sha256=1aVLP2KAbfNo0Asw7khh5HGCrh1PbYLNXLmiR-sWWcs,3988
 oh_my_batch/cli.py,sha256=Jyz8q2pUYke3mfJS6F_G9S9hApddgXxQw1BsN6Kfkjc,553
-oh_my_batch/combo.py,sha256=A5flYsjugcelj105P6Nq4M3kNGtdqh3c7QaSIL3hUcg,9954
+oh_my_batch/combo.py,sha256=umbm85W_5zefUn6CwU_hf6fBEJTWgGbpKfAjSgpiEHE,10381
 oh_my_batch/job.py,sha256=8qFYscHGzIQhX-HrAGxCCv7h2T8Ls1Fj0gmNEBdP5Go,7227
 oh_my_batch/misc.py,sha256=G_iOovRCrShBJJCc82QLN0CvMqW4adOefEoY1GedEiw,452
 oh_my_batch/util.py,sha256=5ve2QcviuF0UHFLrsXmjMTj0ogXJ4g05q1y-yWCFuOk,2409
-oh_my_batch-0.5.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-oh_my_batch-0.5.0.dist-info/METADATA,sha256=PnmjPUSjhK9CocNBQDYqRGNsy9KITN0Hr93H-V9onTA,5174
-oh_my_batch-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oh_my_batch-0.5.0.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
-oh_my_batch-0.5.0.dist-info/RECORD,,
+oh_my_batch-0.5.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+oh_my_batch-0.5.1.dist-info/METADATA,sha256=z8wggFpwrZ1vdM-opqc3jj0bQU3MMdDK4CcT9wRgAso,5174
+oh_my_batch-0.5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oh_my_batch-0.5.1.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
+oh_my_batch-0.5.1.dist-info/RECORD,,