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

skilleter_thingy/photodupe.py

@@ -21,21 +21,21 @@ def read_image_hashes(directories):
     hashes = defaultdict(list)
 
     # Walk each directory tree
-    
+
     for directory in directories:
         print(f'Scanning directory tree {directory}')
-        
+
         for root, _, files in os.walk(directory):
             print(f'Scanning directory {root}')
-            
+
             for file in files:
                 filepath = os.path.join(root, file)
-                
+
                 fileext = os.path.splitext(file)[1]
 
                 if fileext.lower() not in ('.jbf', '.ini', '.xml', '.ffs_db'):
                     # Calculate the hash and store path, dimensions and file size under the hash entry in the hashes table
-                    
+
                     try:
                         with Image.open(filepath) as image:
                             hash_value = imagehash.average_hash(image, hash_size=12)
@@ -48,9 +48,9 @@ def read_image_hashes(directories):
 
                     except OSError:
                         sys.stderr.write(f'ERROR: Unable to read {filepath} (size={size})\n')
-                    
+
     # Return the hash table
-    
+
     return hashes
 
 ################################################################################
@@ -62,11 +62,11 @@ def main():
     parser.add_argument('directories', nargs='*', action='store', help='Directories to search')
 
     args = parser.parse_args()
-    
+
     if not args.directories:
         print('You must be specify at least one directory')
         sys.exit(1)
-        
+
     try:
         print('Loading cached data')
 
@@ -78,7 +78,7 @@ def main():
         hashes = read_image_hashes(args.directories)
 
     # Sort the list of hashes so that we can easily find close matches
-    
+
     print('Sorting hashes')
 
     hash_values = sorted([str(hashval) for hashval in hashes])

skilleter_thingy/py_audit.py

@@ -70,8 +70,10 @@ def audit(package, version):
 def main():
     """ Entry point """
 
-    parser = argparse.ArgumentParser(description='Query api.osv.dev to determine whether Python packagers in a requirments.txt file are subject to known security vulnerabilities')
-    parser.add_argument('requirements', nargs='*', type=str, action='store', help='The requirements file (if not specified, then the script searches for a requirements.txt file)')
+    parser = argparse.ArgumentParser(
+        description='Query api.osv.dev to determine whether Python packagers in a requirments.txt file are subject to known security vulnerabilities')
+    parser.add_argument('requirements', nargs='*', type=str, action='store',
+                        help='The requirements file (if not specified, then the script searches for a requirements.txt file)')
     args = parser.parse_args()
 
     requirements = args.requirements or glob.glob('**/requirements.txt', recursive=True)

skilleter_thingy/readable.py

@@ -47,13 +47,13 @@ TF_TAG_ENTRY_IGNORE = re.compile(r'^ +".*" += +".*"')
 TF_TAG_CHANGE_BLOCK_END = re.compile(r'^ +}$')
 
 TF_MISC_REGEX = \
-[
-    { 'regex': re.compile(r'(Read complete after) (\d+s|\d+m\d+s)'), 'replace': r'\1 {ELAPSED}'},
-    { 'regex': re.compile(r'"(.*:.*)"( = ".*")'), 'replace': r'\1\2'},
-    { 'regex': re.compile(r'"(.*:.*)"( = \[$)'), 'replace': r'\1\2'},
-    { 'regex': re.compile(r'^last "terraform apply":$'), 'replace':r'last "terraform apply" which may have affected this plan:'},
-    { 'find': ' ~ ', 'replace': ' * '},
-]
+    [
+        {'regex': re.compile(r'(Read complete after) (\d+s|\d+m\d+s)'), 'replace': r'\1 {ELAPSED}'},
+        {'regex': re.compile(r'"(.*:.*)"( = ".*")'), 'replace': r'\1\2'},
+        {'regex': re.compile(r'"(.*:.*)"( = \[$)'), 'replace': r'\1\2'},
+        {'regex': re.compile(r'^last "terraform apply":$'), 'replace': r'last "terraform apply" which may have affected this plan:'},
+        {'find': ' ~ ', 'replace': ' * '},
+    ]
 
 TF_IGNORE_LIST = [
     {'start': TF_HAS_CHANGED, 'end': TF_HAS_CHANGED_END},
@@ -91,8 +91,10 @@ def parse_command_line():
     parser.add_argument('--terraform', '-T', action='store_true', help='Clean Terraform plan/apply log files')
     parser.add_argument('--replace', '-R', action='append', default=None, help='Additional regex replacements in the form "REGEX=REPLACEMENT"')
     parser.add_argument('--verbose', '-v', action='store_true', help='Output verbose status')
-    parser.add_argument('--minimal', '-m', action='store_true', help='Remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
-    parser.add_argument('--non-minimal', '-M', action='store_true', help='Do not remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
+    parser.add_argument('--minimal', '-m', action='store_true',
+                        help='Remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
+    parser.add_argument('--non-minimal', '-M', action='store_true',
+                        help='Do not remove unnecessary data from the file (e.g. Terraform progress updates (Refreshing..., Reading..., etc.))')
     parser.add_argument('files', nargs='*', default=None, help='The files to convert (use stdin/stout if no input files are specified)')
 
     args = parser.parse_args()
@@ -144,7 +146,7 @@ def parse_command_line():
         for entry in args.replace:
             regex, replace = entry.split('=')
             try:
-                args.regex_replace.append({'regex': re.compile(regex), 'replace':replace})
+                args.regex_replace.append({'regex': re.compile(regex), 'replace': replace})
             except re.error as exc:
                 print(f'ERROR in regular expression {regex}: {exc}')
                 sys.exit(1)
@@ -291,7 +293,7 @@ def cleanfile(args, infile, outfile):
         # Write normal output, skipping >1 blank lines and skipping ignore blocks when the pre-ignore
         # count has hit zero.
 
-        if clean is not None and not (ignore_until and pre_ignore_count==0):
+        if clean is not None and not (ignore_until and pre_ignore_count == 0):
             if clean != '' or prev_line != '':
                 outfile.write(clean)
                 outfile.write('\n')

skilleter_thingy/sysmon.py

@@ -57,7 +57,7 @@ def show_cpu_times(scr, first, w, h, x, y):
         scr.addstr(y+2, x, 'IRQ:')
         scr.addstr(y+3, x, 'Soft IRQ:')
 
-        x+= w//3
+        x += w//3
 
         scr.addstr(y+1, x, 'Guest:')
         scr.addstr(y+2, x, 'Guest Nice:')
@@ -320,7 +320,7 @@ def show_temperatures(scr, first, w, h, x, y):
 
 # Panel title and the functions used to update them
 
-BOXES= {
+BOXES = {
     'System Load': show_system_load,
     'Disk Access': show_disk_access,
     'Processes': show_processes,

skilleter_thingy/thingy/colour.py

@@ -186,7 +186,7 @@ def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False, clea
 
 def error(txt, newline=True, stream=sys.stderr, status=1, prefix=False):
     """ Write an error message to the specified stream (defaulting to
-        stderr) and exit with the specified status code (defaulting to 1) 
+        stderr) and exit with the specified status code (defaulting to 1)
         Prefix the output with 'ERROR:' in red if prefix==True """
 
     if prefix:

skilleter_thingy/thingy/dircolors.py

@@ -20,6 +20,7 @@ import thingy.dc_util as dc_util
 __all__ = ['Dircolors']
 
 _CODE_MAP = OrderedDict()
+
 def _init_code_map():
     """ mapping between the key name in the .dircolors file and the two letter
     code found in the LS_COLORS environment variable.
@@ -53,6 +54,7 @@ class Dircolors:
     """ Main dircolors class. Contains a database of formats corresponding to file types,
     modes, and extensions. Use the format() method to check a file and color it appropriately.
     """
+
     def __init__(self, load=True):
         """ Initialize a Dircolors object. If load=True (the default), then try
         to load dircolors info from the LS_COLORS environment variable.
@@ -98,7 +100,7 @@ class Dircolors:
             try:
                 code, color = item.split('=', 1)
             except ValueError:
-                continue # no key=value, just ignore
+                continue  # no key=value, just ignore
             if code.startswith('*.'):
                 self._extensions[code[1:]] = color
             else:
@@ -134,7 +136,7 @@ class Dircolors:
         elif isinstance(database, TextIOBase):
             file = database
         else:
-            raise ValueError('database must be str or io.TextIOBase, not %s'%type(database))
+            raise ValueError('database must be str or io.TextIOBase, not %s' % type(database))
 
         try:
             for line in file:
@@ -147,18 +149,18 @@ class Dircolors:
                 split = line.split()
                 if len(split) != 2:
                     if strict:
-                        raise ValueError('Warning: unable to parse dircolors line "%s"'%line)
+                        raise ValueError('Warning: unable to parse dircolors line "%s"' % line)
                     continue
 
                 key, val = split
                 if key == 'TERM':
-                    continue # ignore TERM directives
+                    continue  # ignore TERM directives
                 elif key in _CODE_MAP:
                     self._codes[_CODE_MAP[key]] = val
                 elif key.startswith('.'):
                     self._extensions[key] = val
                 elif strict:
-                    raise ValueError('Warning: unable to parse dircolors line "%s"'%line)
+                    raise ValueError('Warning: unable to parse dircolors line "%s"' % line)
                 # elif not strict, skip
 
             if self._codes or self._extensions:
@@ -184,14 +186,14 @@ class Dircolors:
                 # change .xyz to *.xyz
                 yield '*' + pair[0], pair[1]
 
-        return ':'.join('%s=%s'%pair for pair in gen_pairs())
+        return ':'.join('%s=%s' % pair for pair in gen_pairs())
 
     def _format_code(self, text, code):
         """ format text with an lscolors code. Return text unmodified if code
         isn't found in the database """
         val = self._codes.get(code, None)
         if val:
-            return '\033[%sm%s\033[%sm'%(val, text, self._codes.get('rs', '0'))
+            return '\033[%sm%s\033[%sm' % (val, text, self._codes.get('rs', '0'))
         return text
 
     def _format_ext(self, text, ext):
@@ -200,7 +202,7 @@ class Dircolors:
         text need not actually end in '.ext' """
         val = self._extensions.get(ext, '0')
         if val:
-            return '\033[%sm%s\033[%sm'%(val, text, self._codes.get('rs', '0'))
+            return '\033[%sm%s\033[%sm' % (val, text, self._codes.get('rs', '0'))
         return text
 
     def format_mode(self, text, mode):
@@ -225,7 +227,7 @@ class Dircolors:
         elif isinstance(mode, os.stat_result):
             mode = mode.st_mode
         else:
-            raise ValueError('mode must be int or os.stat_result, not %s'%type(mode))
+            raise ValueError('mode must be int or os.stat_result, not %s' % type(mode))
 
         if mode:
             if stat.S_ISDIR(mode):
@@ -244,13 +246,13 @@ class Dircolors:
             # special file?
             # pylint: disable=bad-whitespace
             special_types = (
-                (stat.S_IFLNK,  'ln'), # symlink
-                (stat.S_IFIFO,  'pi'), # pipe (FIFO)
-                (stat.S_IFSOCK, 'so'), # socket
-                (stat.S_IFBLK,  'bd'), # block device
-                (stat.S_IFCHR,  'cd'), # character device
-                (stat.S_ISUID,  'su'), # setuid
-                (stat.S_ISGID,  'sg'), # setgid
+                (stat.S_IFLNK,  'ln'),  # symlink
+                (stat.S_IFIFO,  'pi'),  # pipe (FIFO)
+                (stat.S_IFSOCK, 'so'),  # socket
+                (stat.S_IFBLK,  'bd'),  # block device
+                (stat.S_IFCHR,  'cd'),  # character device
+                (stat.S_ISUID,  'su'),  # setuid
+                (stat.S_ISGID,  'sg'),  # setgid
             )
 
             for mask, code in special_types:
@@ -290,13 +292,13 @@ class Dircolors:
             try:
                 statbuf = dc_util.stat_at(file, cwd, follow_symlinks)
             except OSError as e:
-                return '%s [Error stat-ing: %s]'%(file, e.strerror)
+                return '%s [Error stat-ing: %s]' % (file, e.strerror)
 
             mode = statbuf.st_mode
             if (not follow_symlinks) and show_target and stat.S_ISLNK(mode):
                 target_path = dc_util.readlink_at(file, cwd)
                 try:
-                    dc_util.stat_at(target_path, cwd) # check for broken link
+                    dc_util.stat_at(target_path, cwd)  # check for broken link
                     target = self.format(target_path, cwd, False, False)
                 except OSError:
                     # format as "orphan"

skilleter_thingy/thingy/git2.py

@@ -1287,7 +1287,6 @@ def log(branch1, branch2=None):
 
 def clean(recurse=False, force=False, dry_run=False, quiet=False,
           exclude=None, ignore_rules=False, remove_only_ignored=False, path=None):
-
     """ Run git clean """
 
     cmd = ['clean']

skilleter_thingy/thingy/popup.py

@@ -82,6 +82,6 @@ class PopUp():
                     time.sleep(1 - elapsed)
 
             del self.panel
-            
+
         if self.refresh:
             self.screen.refresh()

skilleter_thingy/thingy/tfm_pane.py

@@ -148,7 +148,7 @@ class Pane():
 
             filestat = os.stat(filename, follow_symlinks=False)
 
-            info = {'name':filename,
+            info = {'name': filename,
                     'mode': filestat.st_mode,
                     'uid': filestat.st_uid,
                     'gid': filestat.st_gid,
@@ -310,7 +310,7 @@ class Pane():
             else:
                 self.screen.clrtoeol()
 
-            #if len(filename) < self.width:
+            # if len(filename) < self.width:
             #    self.screen.addstr(self.file_list_y + ypos, len(filename), ' ' * (self.width - len(filename)), normal_colour)
 
         current_dir = path.trimpath(self.current_dir, self.width)
@@ -541,7 +541,7 @@ class Pane():
 
         self.height = height
         self.file_list_h = height-1
-        self.width = pane_width-1 # TODO: Why '-1'?
+        self.width = pane_width-1  # TODO: Why '-1'?
         self.screen.resize(height, pane_width)
         self.screen.mvwin(y, x + pane_width*self.index)
 

skilleter_thingy/thingy/tidy.py

@@ -76,23 +76,24 @@ RE_SHA1 = [
 # AWS ids
 
 RE_AWS = \
-[
-    {'regex': re.compile(r'eni-0[0-9a-f]{16}'), 'replace': '{ENI-ID}'},
-    {'regex': re.compile(r'ami-0[0-9a-f]{16}'), 'replace': '{AMI-ID}'},
-    {'regex': re.compile(r'snap-0[0-9a-f]{16}'), 'replace': '{AMI-SNAP}'},
-    {'regex': re.compile(r'vol-0[0-9a-f]{16}'), 'replace': '{AMI-VOL}'},
-    {'regex': re.compile(r'sir-[0-9a-z]{8}'), 'replace': '{SPOT-INSTANCE}'},
-    {'regex': re.compile(r'i-0[0-9a-f]{16}'), 'replace': '{EC2-ID}'},
-    {'regex': re.compile(r'request id: [0-0a-f]{8}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{12}'), 'replace': 'request id: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'},
-]
+    [
+        {'regex': re.compile(r'eni-0[0-9a-f]{16}'), 'replace': '{ENI-ID}'},
+        {'regex': re.compile(r'ami-0[0-9a-f]{16}'), 'replace': '{AMI-ID}'},
+        {'regex': re.compile(r'snap-0[0-9a-f]{16}'), 'replace': '{AMI-SNAP}'},
+        {'regex': re.compile(r'vol-0[0-9a-f]{16}'), 'replace': '{AMI-VOL}'},
+        {'regex': re.compile(r'sir-[0-9a-z]{8}'), 'replace': '{SPOT-INSTANCE}'},
+        {'regex': re.compile(r'i-0[0-9a-f]{16}'), 'replace': '{EC2-ID}'},
+        {'regex': re.compile(r'request id: [0-0a-f]{8}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{4}-[0-0a-f]{12}'),
+         'replace': 'request id: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'},
+    ]
 
 # Data transfer speeds
 
 RE_SPEED = \
-[
-    {'regex': re.compile(r'[0-9.]+ *MB/s'), 'replace': '{SPEED}'},
-    {'regex': re.compile(r'[0-9.]+ *MiB/s'), 'replace': '{SPEED}'},
-]
+    [
+        {'regex': re.compile(r'[0-9.]+ *MB/s'), 'replace': '{SPEED}'},
+        {'regex': re.compile(r'[0-9.]+ *MiB/s'), 'replace': '{SPEED}'},
+    ]
 
 ################################################################################
 

skilleter_thingy/venv_create.py

@@ -24,7 +24,7 @@ def main():
 
     statinfo = os.stat(script)
 
-    os.chmod(script, statinfo.st_mode|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
+    os.chmod(script, statinfo.st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
 
     print(f'Created virtual environment: {script}')
 

{skilleter_thingy-0.1.19.dist-info → skilleter_thingy-0.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.19
+Version: 0.1.21
 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.1.21.dist-info/PKG-INFO 2

@@ -0,0 +1,193 @@
+Metadata-Version: 2.1
+Name: skilleter_thingy
+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
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: imagehash
+Requires-Dist: inotify
+Requires-Dist: pillow
+Requires-Dist: psutil
+Requires-Dist: pyaml
+Requires-Dist: pygit2
+Requires-Dist: python-dateutil
+Requires-Dist: requests
+
+# Thingy
+
+Licence: GPL v3
+
+Author: John Skilleter v0.99
+
+Collection of shell utilities and configuration stuff for Linux and MacOS. Untested on other operating systems.
+
+Permanently (for the forseeable future!) in a beta stage - usable, with a few rough edges, and probably with bugs when used in way I'm not expecting!
+
+The following commands are documented in detail in the help output that can be displayed by running the command with the '--help' option.
+
+This README just contains a summary of the functionality of each command.
+
+# General Commands
+
+## addpath
+
+Update a $PATH-type variable by adding or removing entries.
+
+## borger
+
+Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
+
+## console-colours
+
+Display all available colours in the console.
+
+## diskspacecheck
+
+Check how much free space is available on all filesystems, ignoring read-only filesystems, /dev and tmpfs.
+
+Issue a warning if any are above 90% used.
+
+## docker-purge
+
+Stop or kill docker instances and/or remove docker images.
+
+## ffind
+
+Simple file find utility
+
+Implements the functionality of the find command that is regularly used in a simpler fashion and ignores all the options that nobody ever uses.
+
+## gl
+
+### gphotosync
+
+Utility for syncing photos from Google Photos to local storage
+
+## linecount
+
+Count lines of code in a directory tree organised by file type.
+
+## moviemover
+
+Search for files matching a wildcard in a directory tree and move them to an equivalent location in a different tree
+
+## phototidier
+
+Perform various tidying operations on a directory full of photos:
+
+* Remove leading '$' and '_' from filenames
+* Move files in hidden directories up 1 level
+* If the EXIF data in a photo indicates that it was taken on date that doesn't match the name of the directory it is stored in (in YYYY-MM-DD format) then it is moved to the correct directory, creating it if necessary.
+
+All move/rename operations are carried out safely with the file being moved having
+a numeric suffix added to the name if it conflicts with an existing file.
+
+## photodupe
+
+## py-audit
+
+Query api.osv.dev to determine whether a specified version of a particular Python package is subject to known security vulnerabilities
+
+## readable
+
+Pipe for converting colour combinations to make them readable on a light background
+
+## remdir
+
+Recursively delete empty directories
+
+## rmdupe
+
+Search for duplicate files
+
+## rpylint
+
+Run pylint on all the Python source files in the current tree
+
+## s3-sync
+
+Synchronise files from S3 to local storage.
+
+## splitpics
+
+Copy a directory full of pictures to a destination, creating subdiretories with a fixed number of pictures in each in the destination directory for use with FAT filesystems and digital photo frames.
+
+## strreplace
+
+Simple search and replace utility for those times when trying to escape characters in a regexp to use sed is more hassle than it is worth.
+
+## sysmon
+
+## tfm
+
+Console-based file-manager, similar to Midnight Commander but better.
+
+## tfparse
+
+Read JSON Terraform output and convert back to human-readable text
+This allows multiple errors and warnings to be reported as there's
+no way of doing this directly from Terraform
+
+## trimpath
+
+Intelligently trim a path to fit a given width (used by gitprompt)
+
+## window-rename
+
+## xchmod
+
+WIP: Command to run chmod only on files that need it (only modifies files that don't have the required permissions already).
+
+Currently implements a *very* restricted set of functionality.
+
+## yamlcheck
+
+YAML validator - checks that a file is valid YAML (use yamllint to verify that it is nicely-formatted YAML).
+
+# Git Utilities
+
+## ggit
+
+Run a git command in all repos under the current directory
+
+## ggrep
+
+Run 'git grep' in all repos under the current directory
+
+## gitprompt
+
+Output a string containing colour-coded shell nesting level, current directory and git working tree status (used in the shell prompt).
+
+## git ca
+
+Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
+
+## git cleanup
+
+List or delete branches that have already been merged and delete tracking branches that are no longer on ther remote.
+
+## git co
+
+## git mr
+
+## git parent
+
+## git update
+
+Update the repo from the remote, rebase branches against their parents, optionally run git cleanup
+
+## git wt
+
+Output the top level directory of the git working tree or return an error if we are not in a git working tree.
+
+## git review
+
+## venv-create
+
+Create a script to create/update a virtual environment and run a python script in it.