catocli 2.1.3__py3-none-any.whl → 2.1.6__py3-none-any.whl

catocli/parsers/custom/export_rules/__init__.py

@@ -19,8 +19,6 @@ def export_rules_parse(subparsers):
     )
     
     if_rules_parser.add_argument('-accountID', help='Account ID to export rules from (uses CATO_ACCOUNT_ID environment variable if not specified)', required=False)
-    if_rules_parser.add_argument('--output-file-path', help='Full path including filename and extension for output file. If not specified, uses default: config_data/all_ifw_rules_and_sections_{account_id}.json')
-    if_rules_parser.add_argument('--append-timestamp', action='store_true', help='Append timestamp to the filename after account ID (format: YYYY-MM-DD_HH-MM-SS)')
     if_rules_parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
     
     if_rules_parser.set_defaults(func=export_rules.export_if_rules_to_json)
@@ -33,8 +31,6 @@ def export_rules_parse(subparsers):
     )
     
     wf_rules_parser.add_argument('-accountID', help='Account ID to export rules from (uses CATO_ACCOUNT_ID environment variable if not specified)', required=False)
-    wf_rules_parser.add_argument('--output-file-path', help='Full path including filename and extension for output file. If not specified, uses default: config_data/all_wf_rules_and_sections_{account_id}.json')
-    wf_rules_parser.add_argument('--append-timestamp', action='store_true', help='Append timestamp to the filename after account ID (format: YYYY-MM-DD_HH-MM-SS)')
     wf_rules_parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
     
     wf_rules_parser.set_defaults(func=export_rules.export_wf_rules_to_json)

catocli/parsers/custom/export_sites/__init__.py

@@ -6,16 +6,28 @@ def export_sites_parse(subparsers):
     # Create the socket_sites parser (direct command, no subparsers)
     socket_sites_parser = subparsers.add_parser(
         'socket_sites', 
-        help='Export consolidated site and socket data to JSON format',
+        help='Export consolidated site and socket data to JSON or CSV format',
         usage='catocli export socket_sites [-accountID <account_id>] [options]'
     )
     
     socket_sites_parser.add_argument('-accountID', help='Account ID to export data from (uses CATO_ACCOUNT_ID environment variable if not specified)', required=False)
-    socket_sites_parser.add_argument('-siteIDs', help='Comma-separated list of site IDs to export (e.g., "132606,132964,133511")', required=False)
-    socket_sites_parser.add_argument('--output-file-path', help='Full path including filename and extension for output file. If not specified, uses default: config_data/socket_site_data_{account_id}.json')
-    socket_sites_parser.add_argument('--append-timestamp', action='store_true', help='Append timestamp to the filename after account ID (format: YYYY-MM-DD_HH-MM-SS)')
+    socket_sites_parser.add_argument('--site-ids', '-siteIDs', dest='siteIDs', help='Comma-separated list of site IDs to filter and export (e.g., "1234,1235,1236"). If not specified, exports all sites.', required=False)
+    socket_sites_parser.add_argument('-clip', '--calculate-local-ip', action='store_true', help='Calculate local IP addresses from subnet ranges (first usable IP)')
+    
+    # Format selection
+    socket_sites_parser.add_argument('-f', '--format', dest='export_format', choices=['json', 'csv'], default='json', 
+                                    help='Export format: json (default) or csv')
+    
+    # Filename arguments (updated for both formats)
+    socket_sites_parser.add_argument('--json-filename', dest='json_filename', help='Override JSON file name (default: socket_sites_{account_id}.json)')
+    socket_sites_parser.add_argument('--csv-filename', dest='csv_filename', help='Override CSV file name (default: socket_sites_{account_id}.csv)')
+    socket_sites_parser.add_argument('--append-timestamp', dest='append_timestamp', action='store_true', help='Append timestamp to file names')
+    socket_sites_parser.add_argument('--output-directory', dest='output_directory', help='Output directory for exported files (default: config_data)')
+    
     socket_sites_parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
     
-    socket_sites_parser.set_defaults(func=export_sites.export_socket_site_to_json)
+    socket_sites_parser.set_defaults(func=export_sites.export_socket_sites_dispatcher)
     
     return socket_sites_parser
+
+