PyPI - skilleter-thingy - Versions diffs - 0.2.1__tar.gz → 0.2.4__tar.gz - Mend

skilleter-thingy 0.2.1tar.gz → 0.2.4tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of skilleter-thingy might be problematic. Click here for more details.

Files changed (74) hide show

{skilleter_thingy-0.2.1 → skilleter_thingy-0.2.4}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.1
+Version: 0.2.4
 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
@@ -597,55 +597,10 @@ YAML validator - checks that a file is valid YAML (use yamllint to verify that i
 These will be moved to the skilleter-extras package in due course.
-## borger
-Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
 ## consolecolours
 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.
-## gphotosync & localphotosync
-Utilities for syncing photos from Google Photos or a local directory to local storage
-## 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
-Search for duplicate images in a directory tree
-## 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.
-## sysmon
-Simple console system monitor
-## window-rename
-Monitor window titles and rename them to fit an alphabetical grouping in 'Appname - Document' format.
 # Obsolescent Commands
 These commands will probably be retired in future versions of Thingy

{skilleter_thingy-0.2.1 → skilleter_thingy-0.2.4}/README.md RENAMED Viewed

@@ -574,55 +574,10 @@ YAML validator - checks that a file is valid YAML (use yamllint to verify that i
 These will be moved to the skilleter-extras package in due course.
-## borger
-Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
 ## consolecolours
 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.
-## gphotosync & localphotosync
-Utilities for syncing photos from Google Photos or a local directory to local storage
-## 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
-Search for duplicate images in a directory tree
-## 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.
-## sysmon
-Simple console system monitor
-## window-rename
-Monitor window titles and rename them to fit an alphabetical grouping in 'Appname - Document' format.
 # Obsolescent Commands
 These commands will probably be retired in future versions of Thingy

{skilleter_thingy-0.2.1 → skilleter_thingy-0.2.4}/pyproject.toml RENAMED Viewed

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 # Version must be incremented to install updated Thingy
-version = "0.2.1"
+version = "0.2.4"
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -42,9 +42,7 @@ Home = "https://skilleter.org.uk"
 [project.scripts]
 addpath         =  "skilleter_thingy:addpath.addpath"
-borger          =  "skilleter_thingy:borger.borger"
 consolecolours  =  "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"
@@ -66,26 +64,19 @@ gitprompt       =  "skilleter_thingy:gitprompt.gitprompt"
 gl              =  "skilleter_thingy:gl.gl"
 gphotosync      =  "skilleter_thingy:gphotosync.gphotosync"
 linecount       =  "skilleter_thingy:linecount.linecount"
-localphotosync  =  "skilleter_thingy:localphotosync.localphotosync"
 mg              =  "skilleter_thingy:mg.mg"
-moviemover      =  "skilleter_thingy:moviemover.moviemover"
 multigit        =  "skilleter_thingy:multigit.multigit"
-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"
 venv-create     =  "skilleter_thingy:venv_create.venv_create"
 webwatch        =  "skilleter_thingy:webwatch.webwatch"
-window-rename   =  "skilleter_thingy:window_rename.window_rename"
 xchmod          =  "skilleter_thingy:xchmod.xchmod"
 yamlcheck       =  "skilleter_thingy:yamlcheck.yamlcheck"

{skilleter_thingy-0.2.1 → skilleter_thingy-0.2.4}/skilleter_thingy.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.1
+Version: 0.2.4
 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
@@ -597,55 +597,10 @@ YAML validator - checks that a file is valid YAML (use yamllint to verify that i
 These will be moved to the skilleter-extras package in due course.
-## borger
-Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
 ## consolecolours
 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.
-## gphotosync & localphotosync
-Utilities for syncing photos from Google Photos or a local directory to local storage
-## 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
-Search for duplicate images in a directory tree
-## 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.
-## sysmon
-Simple console system monitor
-## window-rename
-Monitor window titles and rename them to fit an alphabetical grouping in 'Appname - Document' format.
 # Obsolescent Commands
 These commands will probably be retired in future versions of Thingy

{skilleter_thingy-0.2.1 → skilleter_thingy-0.2.4}/skilleter_thingy.egg-info/SOURCES.txt RENAMED Viewed

@@ -3,9 +3,7 @@ README.md
 pyproject.toml
 skilleter_thingy/__init__.py
 skilleter_thingy/addpath.py
-skilleter_thingy/borger.py
 skilleter_thingy/console_colours.py
-skilleter_thingy/diskspacecheck.py
 skilleter_thingy/docker_purge.py
 skilleter_thingy/ffind.py
 skilleter_thingy/ggit.py
@@ -26,24 +24,17 @@ skilleter_thingy/gitcmp_helper.py
 skilleter_thingy/gitprompt.py
 skilleter_thingy/gl.py
 skilleter_thingy/linecount.py
-skilleter_thingy/localphotosync.py
-skilleter_thingy/moviemover.py
 skilleter_thingy/multigit.py
-skilleter_thingy/photodupe.py
-skilleter_thingy/phototidier.py
 skilleter_thingy/py_audit.py
 skilleter_thingy/readable.py
 skilleter_thingy/remdir.py
 skilleter_thingy/rmdupe.py
 skilleter_thingy/rpylint.py
-skilleter_thingy/splitpics.py
 skilleter_thingy/strreplace.py
-skilleter_thingy/sysmon.py
 skilleter_thingy/tfm.py
 skilleter_thingy/tfparse.py
 skilleter_thingy/trimpath.py
 skilleter_thingy/venv_create.py
-skilleter_thingy/window_rename.py
 skilleter_thingy/xchmod.py
 skilleter_thingy/yamlcheck.py
 skilleter_thingy.egg-info/PKG-INFO

{skilleter_thingy-0.2.1 → skilleter_thingy-0.2.4}/skilleter_thingy.egg-info/entry_points.txt RENAMED Viewed

@@ -1,8 +1,6 @@
 [console_scripts]
 addpath = skilleter_thingy:addpath.addpath
-borger = skilleter_thingy:borger.borger
 consolecolours = 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
@@ -24,26 +22,19 @@ gitprompt = skilleter_thingy:gitprompt.gitprompt
 gl = skilleter_thingy:gl.gl
 gphotosync = skilleter_thingy:gphotosync.gphotosync
 linecount = skilleter_thingy:linecount.linecount
-localphotosync = skilleter_thingy:localphotosync.localphotosync
 mg = skilleter_thingy:mg.mg
-moviemover = skilleter_thingy:moviemover.moviemover
 multigit = skilleter_thingy:multigit.multigit
-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
 venv-create = skilleter_thingy:venv_create.venv_create
 webwatch = skilleter_thingy:webwatch.webwatch
-window-rename = skilleter_thingy:window_rename.window_rename
 xchmod = skilleter_thingy:xchmod.xchmod
 yamlcheck = skilleter_thingy:yamlcheck.yamlcheck

skilleter_thingy-0.2.1/skilleter_thingy/borger.py DELETED Viewed

@@ -1,273 +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}"')
-    try:
-        return subprocess.run(cmd, check=True)
-    except FileNotFoundError:
-        print('Borg backup is not installed')
-        sys.exit(1)
-################################################################################
-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.2.1/skilleter_thingy/diskspacecheck.py DELETED Viewed

@@ -1,67 +0,0 @@
-#! /usr/bin/env python3
-################################################################################
-""" 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.
-"""
-################################################################################
-import sys
-import argparse
-import psutil
-################################################################################
-WARNING_LEVEL = 15
-################################################################################
-def main():
-    """ Do everything """
-    parser = argparse.ArgumentParser(description='Check for filesystems that are running low on space')
-    parser.add_argument('--level', action='store', type=int, default=WARNING_LEVEL,
-                        help='Warning if less than this amount of space is available on any writeable, mounted filesystem (default=%d)' % WARNING_LEVEL)
-    args = parser.parse_args()
-    if args.level < 0 or args.level > 100:
-        print('Invalid value: %d' % args.level)
-        sys.exit(3)
-    disks = psutil.disk_partitions()
-    devices = []
-    warning = []
-    for disk in disks:
-        if 'ro' not in disk.opts.split(',') and disk.device not in devices:
-            devices.append(disk.device)
-            usage = psutil.disk_usage(disk.mountpoint)
-            disk_space = 100 - usage.percent
-            if disk_space < args.level:
-                warning.append('%s has only %2.1f%% space available' % (disk.mountpoint, disk_space))
-    if warning:
-        print('Filesystems with less than %d%% available space:' % args.level)
-        print('\n'.join(warning))
-################################################################################
-def diskspacecheck():
-    """Entry point"""
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-################################################################################
-if __name__ == '__main__':
-    diskspacecheck()

skilleter-thingy 0.2.1__tar.gz → 0.2.4__tar.gz

Potentially problematic release.

skilleter-thingy 0.2.1tar.gz → 0.2.4tar.gz