oh-my-batch 0.6.1__py3-none-any.whl → 0.6.2__py3-none-any.whl

oh_my_batch/batch.py

@@ -1,5 +1,5 @@
-from typing import Optional
 import shlex
+import glob
 import os
 
 from .util import split_list, ensure_dir, expand_globs, mode_translate
@@ -101,22 +101,28 @@ class BatchMaker:
         self._command.extend(cmd)
         return self
 
-    def make(self, path: str, concurrency=0, encoding='utf-8', mode='755'):
+    def make(self, path: str, concurrency=0, encoding='utf-8', mode='755', purge=False):
         """
         Make batch script files from the previous setup
 
         :param path: Path to save batch script files, use {i} to represent index
         :param concurrency: Number of scripts to to make, default is 0, which means make one script for each working directory
+        :param purge: Whether to purge existing files of the same pattern before making new ones
         :param encoding: File encoding
         :param mode: File mode, default is 755
         """
-
         header = '\n'.join(self._script_header)
         bottom = '\n'.join(self._script_bottom)
 
         if concurrency < 1:
             concurrency = len(self._work_dirs)
 
+        if purge:
+            legacy_files = glob.glob(path.format(i='*'))
+            for f in legacy_files:
+                print(f'Removing existing file {f}')
+                os.remove(f)
+
         for i, work_dirs in enumerate(split_list(self._work_dirs, concurrency)):
             body = []
             work_dirs_arr = "\n".join(shlex.quote(w) for w in work_dirs)

oh_my_batch/combo.py

@@ -231,6 +231,24 @@ class ComboMaker:
                     raise e
         return self
 
+    def dump_combos(self, file: str, encoding='utf-8', indent=2):
+        """
+        dump each combo to a json file
+
+        This is useful for debugging or use with `--extra-vars-from-file` in `make_files`
+
+        :param file: path pattern to json file, can include format style variables, e.g. {i}, {i:03d}, {TEMP}
+        :param encoding: File encoding
+        :param indent: Indentation for json file
+        """
+        combos = self._make_combos()
+        for i, combo in enumerate(combos):
+            out_path = file.format(i=i, **combo)
+            ensure_dir(out_path)
+            with open(out_path, 'w', encoding=encoding) as f:
+                json.dump(combo, f, indent=indent)
+        return self
+
     def print(self, *line: str, file: str = '', mode=None, encoding='utf-8'):
         """
         Print lines to a file against each combo

{oh_my_batch-0.6.1.dist-info → oh_my_batch-0.6.2.dist-info}/METADATA

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

{oh_my_batch-0.6.1.dist-info → oh_my_batch-0.6.2.dist-info}/RECORD

@@ -2,14 +2,14 @@ oh_my_batch/__init__.py,sha256=BsRNxZbqDWfaIZJGxzIDqCubRWztMGFDceW08TECuFs,98
 oh_my_batch/__main__.py,sha256=sWyFZMwWNvhkanwZSJRGfBBDoIevhC028dTSB67i6yI,61
 oh_my_batch/assets/__init__.py,sha256=Exub46UbQaz2V2eXpQeiVfnThQpXaNeuyjlGY6gBSZc,130
 oh_my_batch/assets/functions.sh,sha256=LaiavZBu84D7C1r-dWhf91vPTuHXCMV1DQZUIPVQnjE,1001
-oh_my_batch/batch.py,sha256=nQUrKULULYUPtkibrU4SJlJQM9D63TsC1VajHcxZulQ,4723
+oh_my_batch/batch.py,sha256=M48sEjUF19Th0H830qvBuKmBVNU4OYLdWaQHGIGk2bY,5009
 oh_my_batch/cli.py,sha256=Jyz8q2pUYke3mfJS6F_G9S9hApddgXxQw1BsN6Kfkjc,553
-oh_my_batch/combo.py,sha256=Twtzbv3hQUCNzwLjtbhmXJ_De5YNlL1mSzK-Zqejh7Y,11423
+oh_my_batch/combo.py,sha256=994SbcTLcUqMowRD1S6p_pInfAyqFdpDoQQyAAIPc0M,12138
 oh_my_batch/job.py,sha256=fFoyLd0rKilV979ovEf0Y3iXgpyyDmHIfkMSZBaAX4Q,7446
 oh_my_batch/misc.py,sha256=G_iOovRCrShBJJCc82QLN0CvMqW4adOefEoY1GedEiw,452
 oh_my_batch/util.py,sha256=5ve2QcviuF0UHFLrsXmjMTj0ogXJ4g05q1y-yWCFuOk,2409
-oh_my_batch-0.6.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-oh_my_batch-0.6.1.dist-info/METADATA,sha256=ETV1q0arbSp8Xj-PFTKGj3rO6bbus8nX-XrtKQH1elI,5468
-oh_my_batch-0.6.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oh_my_batch-0.6.1.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
-oh_my_batch-0.6.1.dist-info/RECORD,,
+oh_my_batch-0.6.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+oh_my_batch-0.6.2.dist-info/METADATA,sha256=N6O8Wb_OeYxxZ03ncr2IdH5cruANsZafWC1j6Y7FEQI,5468
+oh_my_batch-0.6.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oh_my_batch-0.6.2.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
+oh_my_batch-0.6.2.dist-info/RECORD,,