python-table-converter 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

{python_table_converter-0.2.7.dist-info → python_table_converter-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-table-converter
-Version: 0.2.7
+Version: 0.2.8
 Summary: A table data converter
 Home-page: https://github.com/akivajp/python-table-converter
 License: MIT

{python_table_converter-0.2.7.dist-info → python_table_converter-0.2.8.dist-info}/RECORD

@@ -1,15 +1,15 @@
-table_converter/__init__.py,sha256=SLb61XorOudvmaWt55Q08QoztDikRByjEl0f1FMYhJc,52
-table_converter/cli.py,sha256=1FgsLhNklZ5zqpID9biSv1usb_4EQyt6sIIFe8Aqa-0,1435
+table_converter/__init__.py,sha256=xtSl1VA5f2JfJ1D68lJn8bt4geoi449yVJGm_rA3by4,52
+table_converter/cli.py,sha256=Q5eshXdgfeoiyJkFlQOCX695_6xi1dcibin0kUKOMX0,1574
 table_converter/commands/convert_tables.py,sha256=CaetweEy8EEpHzJi7VSlvoheeAgiNTGqqY4ab1KxrVg,1795
 table_converter/core/config.py,sha256=7CwaMnip0Zhigh1GAifhJsCEICRQrP9MoQxaamKtQM0,4214
 table_converter/core/constants.py,sha256=7oJ53ue4dHiDoSxSlFQK7dnrG6fSbJIAqCStv1Vf9J8,80
-table_converter/core/convert.py,sha256=u2jlKGnIo31RmdeGLndhvcUKXwVHoBoi-2J-YgYJ4Hk,8852
+table_converter/core/convert.py,sha256=TzxQOpRydian-LkRhUvvags7gtklLyaNxFS9hTFgh9M,9078
 table_converter/core/functions/assign_id.py,sha256=pdd5YxXjwd7cowD6YFeGSJsTx_A0DZsqUf2t0wBTl-k,3287
 table_converter/core/functions/get_field_value.py,sha256=zKTnj5GEC0YuOd5rtn6GuzxCXn2k-Apwv6P5jSKTh6Y,379
 table_converter/core/functions/search_column_value.py,sha256=QjKbhjbHbB0k1QCYzCpdiVe6fyRXIuMASUMAuM411-E,1052
 table_converter/core/functions/set_field_value.py,sha256=mw9C6meIwvK0weswIJFCqAPNyKVgJ4nDJYEj8oQXQF0,395
-python_table_converter-0.2.7.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
-python_table_converter-0.2.7.dist-info/METADATA,sha256=7FpwpTKzeIXCZj6gxmNe4OGykERSWg02RcWWvY1MFN0,1055
-python_table_converter-0.2.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_table_converter-0.2.7.dist-info/entry_points.txt,sha256=VL9tNIWL31AGIvJnHetcJGH7G1i_WNcOknDpYq6JRac,117
-python_table_converter-0.2.7.dist-info/RECORD,,
+python_table_converter-0.2.8.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
+python_table_converter-0.2.8.dist-info/METADATA,sha256=Kl1OoA9CXqKyHAHvwrkyp1cb5S6P9drjSy0kqHEdxEc,1055
+python_table_converter-0.2.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_table_converter-0.2.8.dist-info/entry_points.txt,sha256=VL9tNIWL31AGIvJnHetcJGH7G1i_WNcOknDpYq6JRac,117
+python_table_converter-0.2.8.dist-info/RECORD,,

table_converter/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.2.7"
-__version_tuple__ = (0, 2, 7)
+__version__ = "0.2.8"
+__version_tuple__ = (0, 2, 8)

table_converter/cli.py

@@ -39,12 +39,17 @@ def command_convert_tables(
     if parser is None:
         parse_and_run(command_parser)
 
-def main():
-    parser = argparse.ArgumentParser(description='Table Data Converter')
+def setup_common_args(
+    parser: argparse.ArgumentParser,
+):
     parser.add_argument(
         '--verbose', '-v',
         action='store_true',
     )
+
+def main():
+    parser = argparse.ArgumentParser(description='Table Data Converter')
+    setup_common_args(parser)
     parser.set_defaults(handler=None)
     subparsers = parser.add_subparsers(dest='command')
 
@@ -52,6 +57,7 @@ def main():
         'convert',
         help='Convert a table to a different format.'
     )
+    setup_common_args(parser_convert_tables)
     command_convert_tables(parser_convert_tables)
 
     parse_and_run(parser)

table_converter/core/convert.py

@@ -52,6 +52,15 @@ def load_excel(
     df = pd.read_excel(input_file)
     return df
 
+@register_loader('.json')
+def load_json(
+    input_file: str,
+):
+    with open(input_file, 'r') as f:
+        data = json.load(f)
+    df = pd.DataFrame(data)
+    return df
+
 @register_saver('.json')
 def save_json(
     df: pd.DataFrame,
@@ -261,8 +270,9 @@ def convert(
         for index, row in df.iterrows():
             orig = OrderedDict(row)
             new_row = OrderedDict(row)
-            set_field_value(new_row, f'{STAGING_FIELD}.{INPUT_FIELD}', orig)
-            set_field_value(new_row, f'{STAGING_FIELD}.{FILE_FIELD}', input_file)
+            if STAGING_FIELD not in new_row:
+                set_field_value(new_row, f'{STAGING_FIELD}.{INPUT_FIELD}', orig)
+                set_field_value(new_row, f'{STAGING_FIELD}.{FILE_FIELD}', input_file)
             if config.process.assign_constants:
                 new_row = map_constants(new_row, config.process.assign_constants)
             if config.map: