skilleter-thingy 0.0.38__tar.gz → 0.0.40__tar.gz

{skilleter_thingy-0.0.38/src/skilleter_thingy.egg-info → skilleter_thingy-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.38
+Version: 0.0.40
 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.40/pyproject.toml

@@ -0,0 +1,84 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "skilleter_thingy"
+
+# Version must be incremented to install updated Thingy
+
+version = "0.0.40"
+
+authors = [
+    {name="John Skilleter", email="john@skilleter.org.uk"},
+]
+
+description = "A collection of useful utilities, mainly aimed at making Git more friendly"
+
+readme = "README.md"
+
+requires-python = ">=3.6"
+
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+    "Operating System :: OS Independent",
+]
+
+dependencies = [
+    "imagehash",
+    "inotify",
+    "pillow",
+    "psutil",
+    "pyaml",
+    "pygit2",
+    "python-dateutil",
+    "requests",
+]
+
+[project.urls]
+Home = "https://skilleter.org.uk"
+
+[project.scripts]
+addpath = "skilleter_thingy:addpath.addpath"
+borger = "skilleter_thingy:borger.borger"
+console_colours = "skilleter_thingy:console_colours.console_colours"
+diskspacecheck = "skilleter_thingy:diskspacecheck.diskspacecheck"
+docker-purge = "skilleter_thingy:docker_purge.docker_purge"
+ffind = "skilleter_thingy:ffind.ffind"
+ggit = "skilleter_thingy:ggit.ggit"
+ggrep = "skilleter_thingy:ggrep.ggrep"
+git-br = "skilleter_thingy:git_br.git_br"
+git-ca = "skilleter_thingy:git_ca.git_ca"
+git-cleanup = "skilleter_thingy:git_cleanup.git_cleanup"
+git-co = "skilleter_thingy:git_co.git_co"
+git-common = "skilleter_thingy:git_common.git_common"
+git-hold = "skilleter_thingy:git_hold.git_hold"
+git-mr = "skilleter_thingy:git_mr.git_mr"
+git-parent = "skilleter_thingy:git_parent.git_parent"
+git-review = "skilleter_thingy:git_review.git_review"
+git-update = "skilleter_thingy:git_update.git_update"
+git-wt = "skilleter_thingy:git_wt.git_wt"
+gitcmp-helper = "skilleter_thingy:gitcmp_helper.gitcmp_helper"
+gitprompt = "skilleter_thingy:gitprompt.gitprompt"
+gl = "skilleter_thingy:gl.gl"
+gphotosync = "skilleter_thingy:gphotosync.gphotosync"
+linecount = "skilleter_thingy:linecount.linecount"
+moviemover = "skilleter_thingy:moviemover.moviemover"
+photodupe = "skilleter_thingy:photodupe.photodupe"
+phototidier = "skilleter_thingy:phototidier.phototidier"
+py-audit = "skilleter_thingy:py_audit.py_audit"
+readable = "skilleter_thingy:readable.readable"
+remdir = "skilleter_thingy:remdir.remdir"
+rmdupe = "skilleter_thingy:rmdupe.rmdupe"
+rpylint = "skilleter_thingy:rpylint.rpylint"
+s3-sync = "skilleter_thingy:s3_sync.s3_sync"
+splitpics = "skilleter_thingy:splitpics.splitpics"
+strreplace = "skilleter_thingy:strreplace.strreplace"
+sysmon = "skilleter_thingy:sysmon.sysmon"
+tfm = "skilleter_thingy:tfm.tfm"
+tfparse = "skilleter_thingy:tfparse.tfparse"
+trimpath = "skilleter_thingy:trimpath.trimpath"
+window-rename = "skilleter_thingy:window_rename.window_rename"
+xchmod = "skilleter_thingy:xchmod.xchmod"
+yamlcheck = "skilleter_thingy:yamlcheck.yamlcheck"

{skilleter_thingy-0.0.38 → skilleter_thingy-0.0.40/src/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.38
+Version: 0.0.40
 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.40/src/skilleter_thingy.egg-info/SOURCES.txt

@@ -0,0 +1,9 @@
+LICENSE
+README.md
+pyproject.toml
+src/skilleter_thingy.egg-info/PKG-INFO
+src/skilleter_thingy.egg-info/SOURCES.txt
+src/skilleter_thingy.egg-info/dependency_links.txt
+src/skilleter_thingy.egg-info/entry_points.txt
+src/skilleter_thingy.egg-info/requires.txt
+src/skilleter_thingy.egg-info/top_level.txt

skilleter_thingy-0.0.40/src/skilleter_thingy.egg-info/entry_points.txt

@@ -0,0 +1,43 @@
+[console_scripts]
+addpath = skilleter_thingy:addpath.addpath
+borger = skilleter_thingy:borger.borger
+console_colours = skilleter_thingy:console_colours.console_colours
+diskspacecheck = skilleter_thingy:diskspacecheck.diskspacecheck
+docker-purge = skilleter_thingy:docker_purge.docker_purge
+ffind = skilleter_thingy:ffind.ffind
+ggit = skilleter_thingy:ggit.ggit
+ggrep = skilleter_thingy:ggrep.ggrep
+git-br = skilleter_thingy:git_br.git_br
+git-ca = skilleter_thingy:git_ca.git_ca
+git-cleanup = skilleter_thingy:git_cleanup.git_cleanup
+git-co = skilleter_thingy:git_co.git_co
+git-common = skilleter_thingy:git_common.git_common
+git-hold = skilleter_thingy:git_hold.git_hold
+git-mr = skilleter_thingy:git_mr.git_mr
+git-parent = skilleter_thingy:git_parent.git_parent
+git-review = skilleter_thingy:git_review.git_review
+git-update = skilleter_thingy:git_update.git_update
+git-wt = skilleter_thingy:git_wt.git_wt
+gitcmp-helper = skilleter_thingy:gitcmp_helper.gitcmp_helper
+gitprompt = skilleter_thingy:gitprompt.gitprompt
+gl = skilleter_thingy:gl.gl
+gphotosync = skilleter_thingy:gphotosync.gphotosync
+linecount = skilleter_thingy:linecount.linecount
+moviemover = skilleter_thingy:moviemover.moviemover
+photodupe = skilleter_thingy:photodupe.photodupe
+phototidier = skilleter_thingy:phototidier.phototidier
+py-audit = skilleter_thingy:py_audit.py_audit
+readable = skilleter_thingy:readable.readable
+remdir = skilleter_thingy:remdir.remdir
+rmdupe = skilleter_thingy:rmdupe.rmdupe
+rpylint = skilleter_thingy:rpylint.rpylint
+s3-sync = skilleter_thingy:s3_sync.s3_sync
+splitpics = skilleter_thingy:splitpics.splitpics
+strreplace = skilleter_thingy:strreplace.strreplace
+sysmon = skilleter_thingy:sysmon.sysmon
+tfm = skilleter_thingy:tfm.tfm
+tfparse = skilleter_thingy:tfparse.tfparse
+trimpath = skilleter_thingy:trimpath.trimpath
+window-rename = skilleter_thingy:window_rename.window_rename
+xchmod = skilleter_thingy:xchmod.xchmod
+yamlcheck = skilleter_thingy:yamlcheck.yamlcheck

skilleter_thingy-0.0.40/src/skilleter_thingy.egg-info/top_level.txt

@@ -0,0 +1 @@
+thingy

skilleter_thingy-0.0.38/pyproject.toml

@@ -1,84 +0,0 @@
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "skilleter_thingy"
-
-# Version must be incremented to install updated Thingy
-
-version = "0.0.38"
-
-authors = [
-    {name="John Skilleter", email="john@skilleter.org.uk"},
-]
-
-description = "A collection of useful utilities, mainly aimed at making Git more friendly"
-
-readme = "README.md"
-
-requires-python = ">=3.6"
-
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
-    "Operating System :: OS Independent",
-]
-
-dependencies = [
-    "imagehash",
-    "inotify",
-    "pillow",
-    "psutil",
-    "pyaml",
-    "pygit2",
-    "python-dateutil",
-    "requests",
-]
-
-[project.urls]
-Home = "https://skilleter.org.uk"
-
-[project.scripts]
-addpath = "src:addpath.addpath"
-borger = "src:borger.borger"
-console_colours = "src:console_colours.console_colours"
-diskspacecheck = "src:diskspacecheck.diskspacecheck"
-docker-purge = "src:docker_purge.docker_purge"
-ffind = "src:ffind.ffind"
-ggit = "src:ggit.ggit"
-ggrep = "src:ggrep.ggrep"
-git-br = "src:git_br.git_br"
-git-ca = "src:git_ca.git_ca"
-git-cleanup = "src:git_cleanup.git_cleanup"
-git-co = "src:git_co.git_co"
-git-common = "src:git_common.git_common"
-git-hold = "src:git_hold.git_hold"
-git-mr = "src:git_mr.git_mr"
-git-parent = "src:git_parent.git_parent"
-git-review = "src:git_review.git_review"
-git-update = "src:git_update.git_update"
-git-wt = "src:git_wt.git_wt"
-gitcmp-helper = "src:gitcmp_helper.gitcmp_helper"
-gitprompt = "src:gitprompt.gitprompt"
-gl = "src:gl.gl"
-gphotosync = "src:gphotosync.gphotosync"
-linecount = "src:linecount.linecount"
-moviemover = "src:moviemover.moviemover"
-photodupe = "src:photodupe.photodupe"
-phototidier = "src:phototidier.phototidier"
-py-audit = "src:py_audit.py_audit"
-readable = "src:readable.readable"
-remdir = "src:remdir.remdir"
-rmdupe = "src:rmdupe.rmdupe"
-rpylint = "src:rpylint.rpylint"
-s3-sync = "src:s3_sync.s3_sync"
-splitpics = "src:splitpics.splitpics"
-strreplace = "src:strreplace.strreplace"
-sysmon = "src:sysmon.sysmon"
-tfm = "src:tfm.tfm"
-tfparse = "src:tfparse.tfparse"
-trimpath = "src:trimpath.trimpath"
-window-rename = "src:window_rename.window_rename"
-xchmod = "src:xchmod.xchmod"
-yamlcheck = "src:yamlcheck.yamlcheck"

skilleter_thingy-0.0.38/src/__init__.py

@@ -1,6 +0,0 @@
-import os
-import sys
-
-thingy_path = os.path.dirname(os.path.realpath(__file__))
-
-sys.path.append(thingy_path)

skilleter_thingy-0.0.38/src/addpath.py

@@ -1,107 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Thingy addpath command
-
-    Copyright (C) 2018 John Skilleter
-
-    Update a $PATH-type variable by adding or removing entries.
-
-    Intended to be used as in:
-
-        export PATH=$(addpath $PATH --add /opt/bin)
-"""
-################################################################################
-
-import sys
-import os
-import argparse
-
-################################################################################
-
-def pathmod(pathentries, separator, pathlist, prefix=False, suffix=False, delete=False, force=False):
-    """ Modify a path.
-    """
-
-    # Only do something if the list of paths to add exists
-
-    if pathlist:
-        # Join the list path entries together then split them into individual entries
-        # Allows for a list of entries in the form ['a:b:c', 'd', 'e']
-
-        paths = separator.join(pathlist).split(separator)
-
-        # Process each entry
-
-        for entry in paths:
-            # Do nothing (except delete) if the path does not exist and we aren't forcing
-
-            if not entry or (not os.path.isdir(entry) and not (force or delete)):
-                continue
-
-            # If we are removing or adding/moving an entry remove any existing entry
-
-            if (delete or prefix or suffix) and entry in pathentries:
-                pathentries.remove(entry)
-
-            # Prefix or suffix the entry
-
-            if not delete and entry not in pathentries:
-                if suffix:
-                    pathentries.append(entry)
-                else:
-                    pathentries.insert(0, entry)
-
-    return pathentries
-
-################################################################################
-
-def main():
-    """ Main function - handles command line, outputs result to stdout """
-
-    parser = argparse.ArgumentParser(description='Add or remove entries from a path list (e.g. as used by the PATH environment variable)')
-    parser.add_argument('--add', action='append', help='Add an entry to the front of the path (do nothing if it is already present in the path)')
-    parser.add_argument('--prefix', action='append', help='Add an entry to the front of the path (or move it there if it is already present)')
-    parser.add_argument('--suffix', action='append', help='Add an entry to the end of the path (or move it there if it is already present)')
-    parser.add_argument('--remove', action='append', help='Remove an entry from the path (do nothing if it is not present')
-    parser.add_argument('--force', default=False, help='Add entries even if a corresponding directory does not exist')
-    parser.add_argument('--separator', action='store', default=':', help='Override the default path separator')
-    parser.add_argument('path', nargs=1, help='The path to modify')
-
-    args = parser.parse_args()
-
-    # Split the given path into component parts
-
-    pathsplit = [pathentry for pathentry in args.path[0].split(args.separator) if pathentry]
-
-    # Process the additions, suffixations, prefixanisms and deletes.
-
-    pathmod(pathsplit, args.separator, args.add)
-    pathmod(pathsplit, args.separator, args.prefix, prefix=True)
-    pathmod(pathsplit, args.separator, args.suffix, suffix=True)
-    pathmod(pathsplit, args.separator, args.remove, delete=True)
-
-    # Glue the path back together
-
-    pathjoin = args.separator.join(pathsplit)
-
-    # Output the updated path to stdout
-
-    print(pathjoin)
-
-################################################################################
-
-def addpath():
-    """Entry point"""
-
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    addpath()

skilleter_thingy-0.0.38/src/borger.py

@@ -1,269 +0,0 @@
-#! /usr/bin/env python3
-
-"""
-Wrapper for the borg backup command
-
-Copyright (C) 2018 John Skilleter
-
-TODO: Major tidy-up as this is a translation of a Bash script.
-TODO: Merge with the usb-backup script since both do almost the same job
-TODO: Default configuration file should be named for the hostname
-TODO: Move all configuration data into the configuration file
-"""
-
-################################################################################
-# Imports
-
-import sys
-import os
-import time
-import argparse
-import configparser
-import subprocess
-from pathlib import Path
-
-################################################################################
-# Variables
-
-DEFAULT_CONFIG_FILE = Path('borger.ini')
-
-COMMANDS = ('backup', 'mount', 'umount', 'compact', 'info', 'prune', 'check', 'init')
-
-# TODO: NOT USED
-PRUNE_OPTIONS = [
-    '--keep-within', '7d',
-    '--keep-daily', '30',
-    '--keep-weekly', '26',
-    '--keep-monthly', '24',
-    '--keep-yearly', '10',
-]
-
-################################################################################
-
-def run(args, cmd):
-    """Run a subprocess."""
-
-    if args.debug:
-        cmd_str = ' '.join(cmd)
-        print(f'Running "{cmd_str}"')
-
-    return subprocess.run(cmd, check=True)
-
-################################################################################
-
-def borg_backup(args, exclude_list):
-    """Perform a backup."""
-
-    create_options = ['--compression', 'auto,lzma']
-
-    version = time.strftime('%Y-%m-%d-%H:%M:%S')
-
-    print(f'Creating backup version {version}')
-
-    if args.verbose:
-        create_options += ['--list', '--filter=AMC']
-
-    if args.dryrun:
-        create_options.append('--dry-run')
-    else:
-        create_options.append('--stats')
-
-    exclude_opts = []
-
-    if exclude_list:
-        for exclude in exclude_list:
-            exclude_opts += ['--exclude', exclude]
-
-    os.chdir(args.source)
-
-    run(args,
-        ['borg'] + args.options + ['create', f'{str(args.destination)}::{version}', str(args.source)] + create_options +
-        ['--show-rc', '--one-file-system', '--exclude-caches'] + exclude_opts)
-
-################################################################################
-
-def borg_prune(args):
-    """Prune the repo by limiting the number of backups stored."""
-
-    print('Pruning old backups')
-
-    # Keep all backups for at least 7 days, 1 per day for 30 days, 1 per week for 2 years
-    # 1 per month for 4 years and 1 per year for 10 years.
-
-    run(args, ['borg'] + args.options + ['prune', str(args.destination)] + PRUNE_OPTIONS)
-
-################################################################################
-
-def borg_compact(args):
-    """Compact the repo."""
-
-    print('Compacting the backup')
-
-    # Keep all backups for at least 7 days, 1 per day for 30 days, 1 per week for 2 years
-    # 1 per month for 4 years and 1 per year for 10 years.
-
-    run(args, ['borg'] + args.options + ['compact', str(args.destination)])
-
-################################################################################
-
-def borg_info(args):
-    """Info."""
-
-    run(args, ['borg'] + args.options + ['info', str(args.destination)])
-
-################################################################################
-
-def borg_mount(args):
-    """Mount."""
-
-    print(f'Mounting Borg backups at {args.mount_dir}')
-
-    mount = Path(args.mount_dir)
-
-    if not mount.is_dir():
-        mount.mkdir()
-
-    run(args, ['borg'] + args.options + ['mount', str(args.destination), str(mount)])
-
-################################################################################
-
-def borg_umount(args):
-    """Unmount."""
-
-    print('Unmounting {args.mount}')
-
-    run(args, ['borg'] + args.options + ['umount', str(args.mount)])
-
-################################################################################
-
-def borg_check(args):
-    """Check the status of a backup."""
-
-    run(args, ['borg'] + args.options + ['check', str(args.destination)])
-
-################################################################################
-
-def borg_init(args):
-    """Initialise a backup."""
-
-    run(args, ['borg'] + args.options + ['init', str(args.destination), '--encryption=none'])
-
-################################################################################
-
-def process_excludes(exclude_data):
-    """Process the include list from the configuration file."""
-
-    return exclude_data.replace('%', str(Path.cwd())).split('\n')
-
-################################################################################
-
-def main():
-    """Entry point."""
-
-    command_list = ', '.join(COMMANDS)
-
-    parser = argparse.ArgumentParser(description='Wrapper app for Borg backup to make it easier to use')
-    parser.add_argument('--dryrun', '--dry-run', '-D', action='store_true', help='Dry-run comands')
-    parser.add_argument('--debug', '-d', action='store_true', help='Debug')
-    parser.add_argument('--verbose', '-v', action='store_true', help='Verbosity to the maximum')
-    parser.add_argument('--config', '-c', default=None, help='Specify the configuration file')
-    parser.add_argument('commands', nargs='+', help=f'One or more commands ({command_list})')
-    args = parser.parse_args()
-
-    # If no config file specified then look in all the usual places
-
-    if args.config:
-        args.config = Path(args.config)
-    elif DEFAULT_CONFIG_FILE.is_file():
-        args.config = DEFAULT_CONFIG_FILE
-    else:
-        args.config = Path.home() / DEFAULT_CONFIG_FILE
-
-        if not args.config.is_file():
-            args.config = Path(sys.argv[0]).parent / DEFAULT_CONFIG_FILE
-
-    # Check that the configuration file exists
-
-    if not args.config.is_file():
-        print(f'Configuration file "{args.config}" not found')
-        sys.exit(1)
-
-    # Default options
-
-    args.options = []
-
-    # Read the configuration file
-
-    config = configparser.ConfigParser(interpolation=configparser.ExtendedInterpolation())
-    config.read(args.config)
-
-    if 'borger' not in config:
-        print('Invalid configuration file "args.config"')
-        sys.exit(1)
-
-    exclude = process_excludes(config['borger']['exclude']) if 'exclude' in config['borger'] else []
-
-    if 'prune' in config['borger']:
-        # TODO: Stuff
-        print('Parser for the prune option is not implemented yet')
-        sys.exit(1)
-
-    if 'destination' in config['borger']:
-        args.destination = config['borger']['destination']
-    else:
-        print('Destination directory not specified')
-        sys.exit(1)
-
-    if 'source' in config['borger']:
-        args.source = Path(config['borger']['source'])
-    else:
-        print('Source directory not specified')
-        sys.exit(1)
-
-    # Initialise if necessary
-
-    if args.debug:
-        args.options.append('--verbose')
-
-    if args.verbose:
-        args.options.append('--progress')
-
-    # Decide what to do
-
-    for command in args.commands:
-        if command == 'backup':
-            borg_backup(args, exclude)
-        elif command == 'mount':
-            borg_mount(args)
-        elif command == 'umount':
-            borg_umount(args)
-        elif command == 'info':
-            borg_info(args)
-        elif command == 'prune':
-            borg_prune(args)
-        elif command == 'check':
-            borg_check(args)
-        elif command == 'init':
-            borg_init(args)
-        elif command == 'compact':
-            borg_compact(args)
-        else:
-            print(f'Unrecognized command: {command}')
-            sys.exit(2)
-
-################################################################################
-
-def borger():
-    """Entry point"""
-
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    borger()

skilleter_thingy-0.0.38/src/console_colours.py

@@ -1,63 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Output all console colours
-
-    Copyright (C) 2017-18 John Skilleter
-
-    Licence: GPL v3 or later
-"""
-################################################################################
-
-import sys
-
-import thingy.colour as colour
-
-################################################################################
-
-def main():
-    """ Main function - draw the colour grid """
-
-    # Extended ANSI colour are slightly weird.
-    # Colours 0-15 are the standard basic colours
-    # Colours 16-231 form a 6x6x6 colour cube
-    # Colours 232-255 are greyscale range with colours 0 and 15 as black and white
-
-    for code in range(0, 256):
-        if code in (8, 16) or (code > 16 and (code - 16) % 6 == 0):
-            colour.write('')
-
-        if (code - 16) % 36 == 0:
-            colour.write('')
-
-        # Set the foreground code to be white for dark backgrounds
-
-        foreground = 15 if code in (0, 1, 4, 5, 8, 12) \
-            or (16 <= code <= 33) \
-            or (52 <= code <= 69) \
-            or (88 <= code <= 105) \
-            or (124 <= code <= 135) \
-            or (160 <= code <= 171) \
-            or (196 <= code <= 201) \
-            or (232 <= code <= 243) else 0
-
-        colour.write('[B%d][%d] %3d [NORMAL] ' % (code, foreground, code), newline=False)
-
-    print()
-
-################################################################################
-
-def console_colours():
-    """Entry point"""
-
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    console_colours()