skilleter-thingy 0.1.18__py3-none-any.whl → 0.1.21__py3-none-any.whl

skilleter_thingy/ffind.py

@@ -380,10 +380,10 @@ def validate_arguments(args):
 
     if args.git:
         if git.working_tree() is None:
-            colour.error('[RED:ERROR]: The current directory is not inside a git working tree')
+            colour.error('The current directory is not inside a git working tree', prefix=True)
 
         if args.dir:
-            colour.error('[RED:ERROR]: Git does not track directories, so you cannot search for them in a git working tree')
+            colour.error('Git does not track directories, so you cannot search for them in a git working tree', prefix=True)
 
     if args.verbose:
         print(f'Searching directory "{args.path}" for matches with "{args.patterns}"')

skilleter_thingy/ggit.py

@@ -55,7 +55,7 @@ def main():
     try:
         os.chdir(args.path)
     except FileNotFoundError:
-        colour.error(f'[RED:ERROR]: Invalid path [BLUE:{args.path}]')
+        colour.error(f'Invalid path [BLUE:{args.path}]', prefix=True)
 
     # If the current directory is in a working tree and below the top-level
     # directory then we run the git command here as well as in subdirectories

skilleter_thingy/ggrep.py

@@ -39,7 +39,8 @@ def parse_command_line():
     parser.add_argument('--files-with-matches', '-l', action='store_true', help='Show only the names of files that contain matches')
     parser.add_argument('--files-without-matches', '-L', action='store_true', help='Show only the names of files that do NOT contain matches')
     parser.add_argument('--wildcard', '-W', action='append', help='Only search files matching the wildcard(s)')
-    parser.add_argument('--only-matching', '-o', action='store_true', help='Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line.')
+    parser.add_argument('--only-matching', '-o', action='store_true',
+                        help='Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line.')
     parser.add_argument('--no-color', action='store_true', help='Turn off match highlighting')
     parser.add_argument('pattern', action='store', help='Regular expression to search for')
     parser.add_argument('paths', nargs='*', help='Optional list of one or more paths to search')

skilleter_thingy/git_br.py

@@ -39,7 +39,7 @@ def parse_command_line():
     args = parser.parse_args()
 
     if args.delete and not args.branches:
-        colour.error('[RED:ERROR]: You must specify the branches to delete')
+        colour.error('You must specify the branches to delete', prefix=True)
 
     return args
 
@@ -105,7 +105,7 @@ def list_branches(branches):
         output = []
 
         for i, field in enumerate(branch):
-            if i==1:
+            if i == 1:
                 field = parse(field)
                 time_str = field.strftime('%H:%M:%S')
 
@@ -172,7 +172,7 @@ def git_br():
     except BrokenPipeError:
         sys.exit(2)
     except git.GitError as exc:
-        colour.error(f'[RED:ERROR]: {exc.msg}', status=exc.status)
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_common.py

@@ -27,12 +27,12 @@ def main():
     args = parser.parse_args()
 
     if args.long and args.short:
-        colour.error('[RED:ERROR]: The [BLUE:--long] and [BLUE:--short] options cannot be used together')
+        colour.error('The [BLUE:--long] and [BLUE:--short] options cannot be used together', prefix=True)
 
     try:
         ancestor = git.find_common_ancestor(args.commit1, args.commit2)
     except git.GitError as exc:
-        colour.error(f'[RED:ERROR]: {exc}', status=exc.status)
+        colour.error(exc, status=exc.status, prefix=True)
 
     if args.short:
         print(ancestor)

skilleter_thingy/git_hold.py

@@ -48,13 +48,13 @@ def archive_branches(branches):
 
     for branch in branches:
         if not git.isbranch(branch):
-            colour.error(f'[RED:ERROR:] Branch {branch} does not exist')
+            colour.error(f'Branch {branch} does not exist', prefix=True)
 
         if archive_tag_name(branch) in tags:
-            colour.error(f'[RED:ERROR:] An archive tag already exists for branch {branch}')
+            colour.error(f'An archive tag already exists for branch {branch}', prefix=True)
 
         if branch == current_branch:
-            colour.error('[RED:ERROR:] Cannot archive the current branch')
+            colour.error('Cannot archive the current branch', prefix=True)
 
     for branch in branches:
         tag_name = archive_tag_name(branch)
@@ -96,7 +96,7 @@ def restore_archive_branches(branches):
 
     for branch in branches:
         if archive_tag_name(branch) not in tags:
-            colour.error(f'[RED:ERROR:] Archive branch {branch} does not exist')
+            colour.error(f'Archive branch {branch} does not exist', prefix=True)
 
     archive_tag_names = []
 
@@ -123,10 +123,10 @@ def main():
     args = parser.parse_args()
 
     if args.list and args.restore:
-        colour.error('[RED:ERROR:] The list and restore options cannot be specified together')
+        colour.error('The list and restore options cannot be specified together', prefix=True)
 
     if not args.branches and not args.list:
-        colour.error('[RED:ERROR:] No branches specified')
+        colour.error('No branches specified', prefix=True)
 
     if args.list:
         list_archive_branches(args.branches)

skilleter_thingy/git_parent.py

@@ -23,7 +23,8 @@ def main():
     parser = argparse.ArgumentParser(description='Attempt to determine the parent branch for the specified branch (defaulting to the current one)')
     parser.add_argument('--all', '-a', action='store_true', help='Include feature branches as possible parents')
     parser.add_argument('--verbose', '-v', action='store_true', help='Report verbose results (includes number of commits between branch and parent)')
-    parser.add_argument('branch', action='store', nargs='?', type=str, default=current_branch, help=f'Branch, commit or commit (defaults to current branch; {current_branch})')
+    parser.add_argument('branch', action='store', nargs='?', type=str, default=current_branch,
+                        help=f'Branch, commit or commit (defaults to current branch; {current_branch})')
 
     args = parser.parse_args()
 
@@ -48,7 +49,7 @@ def main():
                         parents.append(more)
 
     except git.GitError as exc:
-        colour.error(f'[RED:ERROR:] {exc.msg}', status=exc.status)
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
     if parents:
         if args.verbose:
@@ -59,7 +60,7 @@ def main():
         else:
             print(', '.join(parents))
     else:
-        colour.error('[RED:Could not determine parent branch]\n')
+        colour.error('Could not determine parent branch\n', prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_review.py

@@ -228,7 +228,11 @@ class GitReview():
 
         # Move to the top-level directory in the working tree
 
-        self.current_dir = os.getcwd()
+        try:
+            self.current_dir = os.getcwd()
+        except FileNotFoundError:
+            raise GitReviewError('Unable to locate current directory')
+
         self.working_tree_dir = git.working_tree()
 
         if not self.working_tree_dir:
@@ -444,7 +448,7 @@ class GitReview():
                 self.filter_modified = pickle_data.get('filter_modified', self.filter_modified)
                 self.sort_order = pickle_data.get('sort_order', self.sort_order)
                 self.reverse_sort = pickle_data.get('reverse_sort', self.reverse_sort)
-                self.filter_none_whitespace_only= pickle_data.get('filter_none_whitespace_only', self.filter_none_whitespace_only)
+                self.filter_none_whitespace_only = pickle_data.get('filter_none_whitespace_only', self.filter_none_whitespace_only)
                 self.show_none_whitespace_stats = pickle_data.get('show_none_whitespace_stats', self.show_none_whitespace_stats)
 
                 # Transfer the reviewed flag for each file in the pickle
@@ -456,7 +460,7 @@ class GitReview():
                             newfile['reviewed'] = oldfile['reviewed']
                             break
 
-            except (EOFError, pickle.UnpicklingError, ModuleNotFoundError, AttributeError): # TODO: Why did I get ModuleNotFoundError or AttributeError????
+            except (EOFError, pickle.UnpicklingError, ModuleNotFoundError, AttributeError):  # TODO: Why did I get ModuleNotFoundError or AttributeError????
                 pass
 
             self.__constrain_display_parameters()
@@ -1309,13 +1313,13 @@ def parse_command_line():
     # Make sure that we're actually in a git working tree
 
     if not git.working_tree():
-        colour.error('[RED:ERROR] Not a git repository')
+        colour.error('Not a git repository', prefix=True)
 
     # -C/--change is shorthand for '--commit HEAD^'
 
     if args.change:
         if args.commits:
-            colour.error('[RED:ERROR] The -C/--change option does not take parameters')
+            colour.error('The -C/--change option does not take parameters', prefix=True)
 
         args.commits = ['HEAD^']
 
@@ -1345,7 +1349,7 @@ def parse_command_line():
                     paths.append(entry)
                     parsing_commits = False
                 else:
-                    colour.error(f'[RED:ERROR] Invalid path/commit: {entry}')
+                    colour.error(f'Invalid path/commit: {entry}', prefix=True)
 
         args.commits = commits
         args.paths = paths
@@ -1353,13 +1357,13 @@ def parse_command_line():
     # Validate the commits & paths
 
     if len(args.commits) > 2:
-        colour.error('[RED:ERROR]: No more than 2 commits can be specified')
+        colour.error('No more than 2 commits can be specified', prefix=True)
 
     if (args.branch or args.commit) and args.commits:
-        colour.error('[RED:ERROR]: Additional commits should not be specified in conjunction with the -b/--branch option')
+        colour.error('Additional commits should not be specified in conjunction with the -b/--branch option', prefix=True)
 
     if args.commit and args.branch:
-        colour.error('[RED:ERROR]: The -c/--commit and -b/--branch options are mutually exclusive')
+        colour.error('The -c/--commit and -b/--branch options are mutually exclusive', prefix=True)
 
     # If the -c/--commit option is used, then review against its parent
     # If the -b/--branch option is used, then review against the oldest common ancestor
@@ -1369,7 +1373,7 @@ def parse_command_line():
         try:
             args.commits = [git.find_common_ancestor('HEAD', args.branch)]
         except git.GitError as exc:
-            colour.error(f'[ERROR]: {exc}', status=exc.status)
+            colour.error(exc, status=exc.status, prefix=True)
 
     elif args.commit:
         args.commits = ['%s^' % args.commit, args.commit]
@@ -1387,9 +1391,9 @@ def parse_command_line():
             if len(matches) == 1:
                 args.commits[i] = matches[0]
             else:
-                colour.error(f'[RED:ERROR]: Multiple commits match {entry}')
+                colour.error(f'Multiple commits match {entry}', prefix=True)
         else:
-            colour.error(f'[RED:ERROR] {entry} is not a valid commit ID')
+            colour.error(f'{entry} is not a valid commit ID', prefix=True)
 
     # Things work easier if we always have two commits to compare
 

skilleter_thingy/git_update.py

@@ -85,7 +85,7 @@ def branch_rebase(args, results, branch):
         if args.all_parents:
             parents, _ = git.parents()
         else:
-            parents, _ = git.parents(ignore='feature/*' )
+            parents, _ = git.parents(ignore='feature/*')
 
             logging.debug('Probable parents of %s: %s', branch, parents)
 
@@ -314,7 +314,7 @@ def main():
 
     # List of stuff that's been done, to report in the summary
 
-    results = {'deleted': set(), 'pulled': set(), 'failed': set(), 'rebased': set(), 'unchanged': set(), 'no-tracking': set() }
+    results = {'deleted': set(), 'pulled': set(), 'failed': set(), 'rebased': set(), 'unchanged': set(), 'no-tracking': set()}
 
     to_rebase = set()
 

skilleter_thingy/git_wt.py

@@ -26,15 +26,15 @@ def main():
     parser = argparse.ArgumentParser(description='Report top-level directory of the current git working tree.')
     parser.add_argument('--parent', '-p', action='store_true',
                         help='If we are already at the top of the working tree, check if the parent directory is in a working tree and output the top-level directory of that tree.')
-    parser.add_argument('--dir', '-d', action='store', default=os.getcwd(),
+    parser.add_argument('--dir', '-d', action='store', default=None,
                         help='Find the location of the top-level directory in the working tree starting at the specified directory')
 
     args = parser.parse_args()
 
-    start_dir = os.path.abspath(args.dir)
-
-    if not os.path.isdir(start_dir):
-        sys.stderr.write(f'Unable to locate directory {args.dir}\n')
+    try:
+        start_dir = os.path.abspath(args.dir or os.getcwd())
+    except FileNotFoundError:
+        sys.stderr.write('Unable to determine initial directory\n')
         sys.exit(1)
 
     # Search for a .git directory in the current or parent directories

skilleter_thingy/gitcmp_helper.py

@@ -169,7 +169,12 @@ def main():
 
     # Determine the best way of reporting the path to the file
 
-    working_tree_path = os.getcwd()
+    try:
+        working_tree_path = os.getcwd()
+    except FileNotFoundError:
+        sys.stderr.write('Unable to get current working directory')
+        sys.exit(2)
+
     current_path = os.path.join(working_tree_path, os.getenv('GIT_SUBDIR', ''))
 
     current_file_path = os.path.relpath(args.file_path if args.new_name is None else args.new_name, current_path)

skilleter_thingy/gphotosync.py

@@ -94,7 +94,7 @@ def parse_yyyymm(datestr):
     date_match = YYYY_MM_re.fullmatch(datestr)
 
     if not date_match:
-        colour.error(f'ERROR: Invalid date: {datestr}')
+        colour.error(f'Invalid date: {datestr}', prefix=True)
 
     return datetime.date(int(date_match.group(1)), int(date_match.group(2)), day=1)
 
@@ -111,15 +111,19 @@ def parse_command_line():
 
     parser.add_argument('--verbose', '-v', action='store_true', help='Output verbose status information')
     parser.add_argument('--dryrun', '-D', action='store_true', help='Just list files to be copied, without actually copying them')
-    parser.add_argument('--picturedir', '-P', action='store', default=DEFAULT_PHOTO_DIR, help=f'Location of local picture storage directory (defaults to {DEFAULT_PHOTO_DIR})')
-    parser.add_argument('--videodir', '-V', action='store', default=DEFAULT_VIDEO_DIR, help=f'Location of local video storage directory (defaults to {DEFAULT_VIDEO_DIR})')
+    parser.add_argument('--picturedir', '-P', action='store', default=DEFAULT_PHOTO_DIR,
+                        help=f'Location of local picture storage directory (defaults to {DEFAULT_PHOTO_DIR})')
+    parser.add_argument('--videodir', '-V', action='store', default=DEFAULT_VIDEO_DIR,
+                        help=f'Location of local video storage directory (defaults to {DEFAULT_VIDEO_DIR})')
     parser.add_argument('--start', '-s', action='store', default=None, help='Start date (in the form YYYY-MM, defaults to current month)')
     parser.add_argument('--end', '-e', action='store', default=None, help=f'End date (in the form YYYY-MM, defaults to {DEFAULT_MONTHS} before the start date)')
     parser.add_argument('--months', '-m', action='store', type=int, default=None, help='Synchronise this number of months of data (current month included)')
     parser.add_argument('--cache', '-c', action='store', default=DEFAULT_CACHE_DIR, help=f'Cache directory for Google photos (defaults to {DEFAULT_CACHE_DIR})')
-    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('--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('--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)')
 
@@ -387,9 +391,9 @@ def update_cache(args, year, month):
 
             subprocess.run(cmd, check=True)
         except subprocess.CalledProcessError:
-            colour.error(f'[RED:ERROR]: Failed to sync Google photos for month [BLUE:{month}] of year [BLUE:{year}]')
+            colour.error(f'Failed to sync Google photos for month [BLUE:{month}] of year [BLUE:{year}]', prefix=True)
         except FileNotFoundError as exc:
-            colour.error('f[RED:ERROR]: {exc}')
+            colour.error(exc, prefix=True)
 
 ################################################################################
 
@@ -450,7 +454,7 @@ def remove_duplicates(media_files):
     # Originals can have upper or lower case extensions, copies only tend to have lower
     # case, so build a lower case to original lookup table
 
-    names = {name.lower():name for name in media_files}
+    names = {name.lower(): name for name in media_files}
 
     duplicates = defaultdict(list)