skilleter-thingy 0.0.48__tar.gz → 0.0.49__tar.gz

{skilleter_thingy-0.0.48/skilleter_thingy.egg-info → skilleter_thingy-0.0.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.48
+Version: 0.0.49
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.0.48 → skilleter_thingy-0.0.49}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.48"
+version = "0.0.49"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.0.48 → skilleter_thingy-0.0.49}/skilleter_thingy/gphotosync.py

@@ -120,6 +120,7 @@ def parse_command_line():
     parser.add_argument('--rclone', '-r', action='store', default=DEFAULT_RCLONE_REMOTE, help=f'rclone remote name for Google photos (defaults to {DEFAULT_RCLONE_REMOTE})')
     parser.add_argument('--no-update', '-N', action='store_true', help='Do not update local cache')
     parser.add_argument('--keep', '-k', action='store', type=int, default=DEFAULT_KEEP, help=f'Keep this number of months before the start date in the cache (defaults to {DEFAULT_KEEP})')
+    parser.add_argument('--skip-no-day', '-z', action='store_true', help='Don\'t sync files where the day of the month could not be determined')
     parser.add_argument('action', nargs='*', help='Actions to perform (report or sync)')
 
     args = parser.parse_args()
@@ -319,7 +320,7 @@ def get_media_date(name, info):
 
 ################################################################################
 
-def sync_media_local(dryrun, media_files, destination_dir):
+def sync_media_local(dryrun, skip_no_day, media_files, destination_dir):
     """Sync files from the cache to local storage"""
 
     # Iterate through the list of remote media_files to try work out the date and
@@ -328,6 +329,11 @@ def sync_media_local(dryrun, media_files, destination_dir):
     for media_file in media_files:
         year, month, day = get_media_date(media_file, media_files[media_file])
 
+        # If specified, skip files where the day of the month could not be determined
+
+        if skip_no_day and day == '00':
+            day = None
+
         if year and month and day:
             destination_media_file_path = os.path.join(destination_dir, year, f'{year}-{month}-{day}', os.path.basename(media_file))
 
@@ -385,7 +391,7 @@ def update_cache(args, year, month):
 
 ################################################################################
 
-def media_sync(dryrun, media, media_files, local_dir):
+def media_sync(dryrun, skip_no_day, media, media_files, local_dir):
     """Given a media type and list of local and remote files of the type, check
        for out-of-sync files and sync any missing remote files to local storage"""
 
@@ -422,7 +428,7 @@ def media_sync(dryrun, media, media_files, local_dir):
 
     if media_files['remote']:
         colour.write(f'    [BOLD:{len(media_files["remote"])} remote {media} files are out of sync]')
-        sync_media_local(dryrun, media_files['remote'], local_dir)
+        sync_media_local(dryrun, skip_no_day, media_files['remote'], local_dir)
     else:
         colour.write(f'    [BOLD:No remote {media} files are out of sync]')
 
@@ -542,7 +548,7 @@ def gphoto_sync(args, year, month):
     colour.write(f'[BOLD:Syncing files for {month:02}/{year}]')
 
     for media in ('photo', 'video'):
-        media_sync(args.dryrun, media, media_files[media], args.local_dir[media])
+        media_sync(args.dryrun, args.skip_no_day, media, media_files[media], args.local_dir[media])
 
 ################################################################################
 

{skilleter_thingy-0.0.48 → skilleter_thingy-0.0.49/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.48
+Version: 0.0.49
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.0.48 → skilleter_thingy-0.0.49}/skilleter_thingy.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ pyproject.toml
 skilleter_thingy/__init__.py
 skilleter_thingy/addpath.py
 skilleter_thingy/borger.py
-skilleter_thingy/box.py
 skilleter_thingy/console_colours.py
 skilleter_thingy/diskspacecheck.py
 skilleter_thingy/docker_purge.py

skilleter_thingy-0.0.48/skilleter_thingy/box.py

@@ -1,33 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Draw a box with text in
-"""
-################################################################################
-
-import os
-import sys
-import argparse
-import thingy.colour as colour
-
-################################################################################
-
-def main():
-    """The guts"""
-    return
-################################################################################
-
-def box():
-    """Entry point"""
-
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    box()