skilleter-thingy 0.1.28__py3-none-any.whl → 0.1.30__py3-none-any.whl

skilleter_thingy/localphotosync.py

@@ -14,6 +14,7 @@ import sys
 import logging
 import argparse
 import re
+import datetime
 
 from enum import Enum
 
@@ -126,15 +127,24 @@ def media_sync(args):
             continue
 
         date_match = filetype_re.fullmatch(os.path.basename(sourcefile))
-        if not date_match:
-            logging.debug('Ignoring %s - unable to extract date from filename', sourcefile)
-            continue
+        if date_match:
+            year = date_match.group(2)
+            month = date_match.group(3)
+            day = date_match.group(4)
+            
+            default_dest_dir = f'{dest_dir}/{year}/{year}-{month}-{day}'
+        else:
+            logging.debug('Ignoring %s - unable to extract date from filename - using last-modified date', sourcefile)
+            
+            timestamp = os.path.getmtime(sourcefile)
+            last_modified_date = datetime.datetime.fromtimestamp(timestamp)
+            
+            year = last_modified_date.year
+            month = last_modified_date.month
+            day = last_modified_date.day
 
-        year = date_match.group(2)
-        month = date_match.group(3)
-        day = date_match.group(4)
+            default_dest_dir = f'{dest_dir}/{year:04}/{year:04}-{month:02}-{day:02}'
 
-        default_dest_dir = f'{dest_dir}/{year}/{year}-{month}-{day}'
         dest_dir_pattern = f'{default_dest_dir}*'
 
         dest_dirs = [path for path in glob.glob(dest_dir_pattern) if os.path.isdir(path)]

skilleter_thingy/multigit.py

@@ -317,6 +317,8 @@ def add_new_repo(args, config, repo):
 
     abs_repo_path = absolute_repo_path(args, repo)
 
+    added = repo not in config
+
     config[repo] = {}
 
     default_branch = git.branch(path=abs_repo_path)
@@ -335,7 +337,10 @@ def add_new_repo(args, config, repo):
         config[repo]['repo name'] = os.path.basename(repo)
 
     if not args.quiet:
-        colour.write(f'Added [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
+        if added:
+            colour.write(f'Added [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
+        else:
+            colour.write(f'Reset [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
 
 ################################################################################
 
@@ -472,9 +477,21 @@ def mg_add(args, config, console):
     location = args.parameters[1]
 
     if os.path.exists(location):
-        colour.error(f'"[BLUE:{location}]" already exists', prefix=True)
+        if os.path.isdir(os.path.join(location, '.git')):
+            remotes = git.remotes(path=location)
+
+            for remote in remotes:
+                if repo.endswith('.git') and repo == remotes[remote]:
+                    break
+                elif f'{repo}.git' == remotes[remote]:
+                    break
+            else:
+                colour.error(f'"[BLUE:{location}]" already exists and was not cloned from [BLUE:{repo}]', prefix=True)
+        else:
+            colour.error(f'"[BLUE:{location}]" already exists and is not a Git working tree')
 
-    git.clone(repo, path=location)
+    else:
+        git.clone(repo, path=location)
 
     # Add to the configuration
 

skilleter_thingy/thingy/colour.py

@@ -198,6 +198,17 @@ def error(txt, newline=True, stream=sys.stderr, status=1, prefix=False):
 
 ################################################################################
 
+def warning(txt, newline=True, stream=sys.stderr, prefix=False):
+    """ Write a warning message to the specified stream (defaulting to
+        stderr). Prefix the output with 'WARNING:' in red if prefix==True """
+
+    if prefix:
+        write('[RED:WARNING]: ', newline=False, stream=stream, )
+
+    write(txt, newline, stream)
+
+################################################################################
+
 if __name__ == '__main__':
     write('Foreground: [RED]red [GREEN]green [BLACK]black [NORMAL]normal')
     write('Background: [BRED]red [BGREEN]green [BBLACK]black [NORMAL]normal')

{skilleter_thingy-0.1.28.dist-info → skilleter_thingy-0.1.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.28
+Version: 0.1.30
 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.30.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.

{skilleter_thingy-0.1.28.dist-info → skilleter_thingy-0.1.30.dist-info}/RECORD

@@ -23,9 +23,9 @@ skilleter_thingy/gitcmp_helper.py,sha256=NgQ0BZfa4TVA-XV6YKvrm5147boWUpGw-jDPUsk
 skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
 skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/linecount.py,sha256=ehTN6VD76i4U5k6dXuYoiqSRHI67_BP-bziklNAJSKY,4309
-skilleter_thingy/localphotosync.py,sha256=WF0TcCvLfl7cVOLzYYQK_t2WebLfQ-5FM6UB3r7Fpvw,5952
+skilleter_thingy/localphotosync.py,sha256=mK3rRewRBh4Fa3SAkFDudl5QLqvjrrozJnIMHNrj4nw,6382
 skilleter_thingy/moviemover.py,sha256=QzUAWQzQ1AWWREIhl-VMaLo2h8MMhOekBnao5jGWV1s,4470
-skilleter_thingy/multigit.py,sha256=0OCg45ma70YWnsXGonevc2v5PQHEaW3eshKkI-eUiWQ,34512
+skilleter_thingy/multigit.py,sha256=rnQ0YGkEy6H54PRt8nCt-G02LGy-wiKRJVk8ovR_pTw,35179
 skilleter_thingy/photodupe.py,sha256=2hw4EhDKH37_BgdXKkPm9GrftfIORmubQi38Yn0b4Mg,4084
 skilleter_thingy/phototidier.py,sha256=BOu-cKHMivDlBqlRqv7sL3J6Ix1K2dxWWNcderldyZo,7818
 skilleter_thingy/py_audit.py,sha256=4CAdqBAIIVcpTCn_7dGm56bdfGpUtUJofqTGZomClkY,4417
@@ -44,7 +44,7 @@ skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63s
 skilleter_thingy/xchmod.py,sha256=T89xiH_po0nvH5T1AGgQOD5yhjKd9-LcHcmez3IORww,4604
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
 skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
-skilleter_thingy/thingy/colour.py,sha256=1rDxU8NwCQQUUx5cOb-9ndp_XO39uQUlZJLrFO6lGPg,7567
+skilleter_thingy/thingy/colour.py,sha256=mxHDpbUYad6xDsOKWco7CL0Nk3J5VKV_IZ3T5VjXwOI,7978
 skilleter_thingy/thingy/dc_curses.py,sha256=fuuQPR11zV_akAhygL_cAhVLC5YAgKgowzlITVbETE8,8539
 skilleter_thingy/thingy/dc_defaults.py,sha256=ahcteQvoWZrO5iTU68zkIY1Zex6iX5uR5ubwI4CCYBk,6170
 skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUsMhOFs,1783
@@ -61,9 +61,10 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=XTTpSm71CyQyGmlVLuCthioOwech0jhUiFUXb-chS_Q,19792
 skilleter_thingy/thingy/tidy.py,sha256=AQ2RawsZJg6WHrgayi_ZptFL9occ7suSdCHbU3P-cys,5971
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.1.28.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.1.28.dist-info/METADATA,sha256=RjIkDjog59L5uWr-RaSGqVhsDFdF1Bg2XA--iSmG068,30430
-skilleter_thingy-0.1.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.1.28.dist-info/entry_points.txt,sha256=mklrWFvNKw9Hyem9RG3x0PoVYjlx2fDnJ3xWMTMOmfs,2258
-skilleter_thingy-0.1.28.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.1.28.dist-info/RECORD,,
+skilleter_thingy-0.1.30.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.1.30.dist-info/METADATA,sha256=hDRbrKxebem0Pnh5PTxhpeEYmRHcA9kMxLi5aXeKk3g,30430
+skilleter_thingy-0.1.30.dist-info/PKG-INFO 2,sha256=BryF-1KGwXobPiiN60EmDKuqAtIBSPadlgmJ72xZhMk,5313
+skilleter_thingy-0.1.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.1.30.dist-info/entry_points.txt,sha256=mklrWFvNKw9Hyem9RG3x0PoVYjlx2fDnJ3xWMTMOmfs,2258
+skilleter_thingy-0.1.30.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.1.30.dist-info/RECORD,,