python-table-converter 0.2.6__tar.gz → 0.2.8__tar.gz

{python_table_converter-0.2.6 → python_table_converter-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-table-converter
-Version: 0.2.6
+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.6 → python_table_converter-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-table-converter"
-version = "0.2.6"
+version = "0.2.8"
 description = "A table data converter"
 authors = ["Akiva Miura <akiva.miura@gmail.com>"]
 license = "MIT"

python_table_converter-0.2.8/table_converter/__init__.py

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

{python_table_converter-0.2.6 → python_table_converter-0.2.8}/table_converter/cli.py

@@ -39,8 +39,17 @@ def command_convert_tables(
     if parser is None:
         parse_and_run(command_parser)
 
+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')
 
@@ -48,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)

{python_table_converter-0.2.6 → python_table_converter-0.2.8}/table_converter/commands/convert_tables.py

@@ -24,10 +24,6 @@ def run(
 def setup_parser(
     parser: argparse.ArgumentParser,
 ):
-    parser.add_argument(
-        '--verbose', '-v',
-        action='store_true',
-    )
     parser.add_argument(
         'input_files',
         metavar='INPUT_FILE',

{python_table_converter-0.2.6 → python_table_converter-0.2.8}/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:

python_table_converter-0.2.6/table_converter/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.2.6"
-__version_tuple__ = (0, 2, 6)