+custom-csv-path

Author: bitdruid

pywaybackup/archive.py

@@ -256,15 +256,15 @@ def parse_response_code(response_code: int):
         return RESPONSE_CODE_DICT[response_code]
     return "Unknown response code"
 
-def save_csv(output: str):
+def save_csv(csv_path: str):
     """
     Write a CSV file with the list of snapshots.
     """
     import csv
     if sc.count_list() > 0:
         v.write("\nSaving CSV file...")
-        os.makedirs(os.path.abspath(output), exist_ok=True)
-        with open(os.path.join(output, "waybackup.csv"), mode='w') as file:
+        os.makedirs(os.path.abspath(csv_path), exist_ok=True)
+        with open(os.path.join(csv_path, "waybackup.csv"), mode='w') as file:
             row = csv.DictWriter(file, sc.SNAPSHOT_COLLECTION[0].keys())
             row.writeheader()
             for snapshot in sc.SNAPSHOT_COLLECTION:

pywaybackup/arguments.py

@@ -16,13 +16,13 @@ def parse():
     optional = parser.add_argument_group('optional')
     optional.add_argument('-l', '--list', action='store_true', help='Only print snapshots (opt range in y)')
     optional.add_argument('-e', '--explicit', action='store_true', help='Search only for the explicit given url')
-    optional.add_argument('-o', '--output', type=str, help='Output folder')
+    optional.add_argument('-o', '--output', type=str, help='Output folder defaults to current directory')
     optional.add_argument('-r', '--range', type=int, help='Range in years to search')
     optional.add_argument('--start', type=int, help='Start timestamp format: YYYYMMDDhhmmss')
     optional.add_argument('--end', type=int, help='End timestamp format: YYYYMMDDhhmmss')
 
     special = parser.add_argument_group('special')
-    special.add_argument('--csv', action='store_true', help='Save a csv file with the list of snapshots inside the output folder')
+    special.add_argument('--csv', type=str, nargs='?', const=True, help='Save a csv file on a given path or defaults to the output folder')
     special.add_argument('--no-redirect', action='store_true', help='Do not follow redirects by archive.org')
     special.add_argument('--verbosity', type=str, default="standard", choices=["standard", "progress", "json"], help='Verbosity level')
     special.add_argument('--retry', type=int, default=0, metavar="X-TIMES", help='Retry failed downloads (opt tries as int, else infinite)')

pywaybackup/main.py

@@ -15,6 +15,8 @@ def main():
 
     if args.output is None:
         args.output = os.path.join(os.getcwd(), "waybackup_snapshots")
+    if args.csv is True:
+        args.csv = args.output
 
     if args.save:
         archive.save_page(args.url)
@@ -25,7 +27,7 @@ def main():
         else:
             archive.download_list(args.output, args.retry, args.no_redirect, args.worker)
         if args.csv:
-            archive.save_csv(args.output)
+            archive.save_csv(args.csv)
     v.close()
 
 if __name__ == "__main__":