Merge pull request #20 from dirkpetersen/dirk

archive --newer option

Author: dirkpetersen

Diff for: README.md

@@ -500,6 +500,8 @@ froster archive \
 Total space to archive: 54,142 GiB
 ```
 
+Note: you can also use `--newer xxx --larger yyy to identify files that have only been added recently`
+
 ### Special use cases
 
 #### Recursive operations

Diff for: froster.py

@@ -452,11 +452,11 @@ def subcmd_archive(args,cfg,arch,aws):
             SELECTEDFILE = os.path.join(hsfolder, retline[0])
         else:
             SELECTEDFILE = os.path.join(hsfolder, csv_files[0])
-        if args.larger > 0 and args.older > 0:
+        if args.larger > 0 and (args.older > 0 or args.newer > 0):
             # implement archiving batchmode    
             arch.archive_batch() 
             return
-        elif args.larger > 0 or args.older > 0:
+        elif args.larger > 0 or args.older > 0 or args.newer > 0:
             print('You need to combine both "--older <days> and --larger <GiB> options')
             return
 
@@ -1211,7 +1211,14 @@ def archive_batch(self):
         conn.execute(f"CREATE TABLE hs AS SELECT * FROM read_csv_auto('{SELECTEDFILE}')")
 
         # Now, you can run SQL queries on this virtual table
-        rows = conn.execute(f"SELECT * FROM hs WHERE {agefld} > {args.older} and GiB > {args.larger} ").fetchall()
+        if args.older > 0:
+            rows = conn.execute(f"SELECT * FROM hs WHERE {agefld} > {args.older} and GiB > {args.larger} ").fetchall()
+        elif args.newer > 0:
+            rows = conn.execute(f"SELECT * FROM hs WHERE {agefld} < {args.newer} and GiB > {args.larger} ").fetchall()
+        else:
+            print('You must either specify --older or --newer')
+            conn.close()
+            return False
 
         totalspace = 0
         cmdline = ""
@@ -5443,6 +5450,15 @@ def parse_arguments():
             options are set froster will print a command that 
             allows you to archive all matching folders at once.
         '''))
+    parser_archive.add_argument('--newer', '-w', dest='newer', type=int, action='store', default=0, 
+         help=textwrap.dedent(f'''
+            Archive folders that have been accessed within the last 
+            <days>. (optionally set --mtime to select folders that
+            have not been modified more than <days>). This option
+            works in conjunction with --larger <GiB>. If both 
+            options are set froster will print a command that 
+            allows you to archive all matching folders at once.
+        '''))
     parser_archive.add_argument( '--mtime', '-m', dest='agemtime', action='store_true', default=False,
         help="Use modified file time (mtime) instead of accessed time (atime)")
     parser_archive.add_argument( '--recursive', '-r', dest='recursive', action='store_true', default=False,

Diff for: tests.sh

@@ -75,7 +75,7 @@ generate_test_data() {
 
 # Execute the function and capture the returned folder path
 created_folder=$(generate_test_data)
-
+echo "Test data folder: $created_folder"
 
 script_dir=~/.local/bin