skilleter-thingy 0.0.25__tar.gz → 0.0.27__tar.gz

{skilleter_thingy-0.0.25/skilleter_thingy.egg-info → skilleter_thingy-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.25
+Version: 0.0.27
 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
@@ -18,7 +18,6 @@ Requires-Dist: pyaml
 Requires-Dist: pygit2
 Requires-Dist: python-dateutil
 Requires-Dist: requests
-Requires-Dist: numpy
 
 # Thingy
 

{skilleter_thingy-0.0.25 → skilleter_thingy-0.0.27}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.25"
+version = "0.0.27"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -34,7 +34,6 @@ dependencies = [
     "pygit2",
     "python-dateutil",
     "requests",
-    "numpy",
 ]
 
 [project.urls]

{skilleter_thingy-0.0.25 → skilleter_thingy-0.0.27}/skilleter_thingy/git_review.py

@@ -514,6 +514,12 @@ class GitReview():
     def show_file_list(self):
         """ Draw the current page of the file list """
 
+        def format_change(prefix, value):
+            """If value is 0 just return it as a string, otherwise apply the prefix and
+               return it (e.g. '+' or '-')"""
+
+            return f'{prefix}{value}' if value else '0'
+
         for ypos in range(0, self.file_list_h):
 
             normal_colour = curses.color_pair(COLOUR_NORMAL)
@@ -535,13 +541,13 @@ class GitReview():
                 # Diff stats, with or without non-whitespace changes
 
                 if self.show_none_whitespace_stats:
-                    added = f'+{current_file["non-ws added"]}'
-                    deleted = f'-{current_file["non-ws deleted"]}'
+                    added = format_change('+', current_file["non-ws added"])
+                    deleted = format_change('-', current_file["non-ws deleted"])
                 else:
-                    added = f'+{current_file["added"]}'
-                    deleted = f'-{current_file["deleted"]}'
+                    added = format_change('+', current_file["added"])
+                    deleted = format_change('-', current_file["deleted"])
 
-                status = f'{current_file["status"]} {added:>4}/{deleted:>4}'
+                status = f'{current_file["status"]} {deleted:>4}/{added:>4}'
 
                 abspath = os.path.join(self.working_tree_dir, filename)
 

{skilleter_thingy-0.0.25 → skilleter_thingy-0.0.27}/skilleter_thingy/readable.py

@@ -29,8 +29,8 @@ from skilleter_thingy import files
 TF_OBJECTS_CHANGED_END = 'Terraform detected the following changes made outside of Terraform since the last "terraform apply":'
 TF_IGNORE_MSG = 'Unless you have made equivalent changes to your configuration, or ignored the relevant attributes using ignore_changes, the following plan may include actions to undo or respond to these changes.'
 
-TF_REFRESHING_AND_READING = re.compile(r'.*: (?:Refreshing state\.\.\.|Reading\.\.\.|Read complete after ).*')
-TF_FINDING_AND_INSTALLING = re.compile(r'- (?:Finding .*[.]{3}|Installing .*[.]{3}|Installed .*)') 
+TF_REFRESHING_AND_READING = re.compile(r'.*: (?:Refreshing state\.\.\.|Reading\.\.\.|Read complete after |Preparing import\.\.\.).*')
+TF_FINDING_AND_INSTALLING = re.compile(r'- (?:Finding .*[.]{3}|Installing .*[.]{3}|Installed .*)')
 
 TF_HAS_CHANGED = re.compile(r'  # .* has changed')
 TF_READ_DURING_APPLY = re.compile(r' +# [-a-z_.0-9\[\]]+ will be read during apply')

{skilleter_thingy-0.0.25 → skilleter_thingy-0.0.27/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.25
+Version: 0.0.27
 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
@@ -18,7 +18,6 @@ Requires-Dist: pyaml
 Requires-Dist: pygit2
 Requires-Dist: python-dateutil
 Requires-Dist: requests
-Requires-Dist: numpy
 
 # Thingy
 

{skilleter_thingy-0.0.25 → skilleter_thingy-0.0.27}/skilleter_thingy.egg-info/SOURCES.txt

@@ -35,7 +35,6 @@ skilleter_thingy/gitlab.py
 skilleter_thingy/gitprompt.py
 skilleter_thingy/gl.py
 skilleter_thingy/gphotosync.py
-skilleter_thingy/imagedupe.py
 skilleter_thingy/linecount.py
 skilleter_thingy/logger.py
 skilleter_thingy/moviemover.py

{skilleter_thingy-0.0.25 → skilleter_thingy-0.0.27}/skilleter_thingy.egg-info/requires.txt

@@ -6,4 +6,3 @@ pyaml
 pygit2
 python-dateutil
 requests
-numpy

skilleter_thingy-0.0.25/skilleter_thingy/imagedupe.py

@@ -1,281 +0,0 @@
-#!/usr/bin/env python3
-"""Hash photos to find closely-similar images and report them"""
-
-# TODO: Configurable hash type and stored in pickle data
-# TODO: Option to pickle duplicates
-# TODO: Check for files that are no longer present after scanning and remove them from the data
-# TODO: Display duplicates - borrow code from imagedup
-# TODO: Note that if a==b, we get reports for a==b and b==a so we need to do some filtering and decide on what's likely to be an original and what is a duplicate
-# TODO: Maybe store file date, size and image dimensions in 'updated' for better comparisons
-# TODO: Pickle data named for directories
-# TODO: Use database instead of pickling - very slow to load big pickles - would facilitate scanning/checking specific directories
-# TODO: If directories specified, the only scan and compare within those directories (but keep everything in pickle file (yes, it will get biggerer, and biggererer)
-
-import threading
-import queue
-import sys
-import os
-import pickle
-import argparse
-from pathlib import PurePath
-from typing import List, Union
-
-from imagededup.methods import PHash
-
-import matplotlib.gridspec as gridspec
-import matplotlib.pyplot as plt
-from matplotlib import figure
-
-import numpy as np
-from PIL import Image
-
-################################################################################
-
-PICKLE_FILE = 'imagedupe.pickle'
-
-IMAGE_EXT_LIST =  ('.jpeg', '.jpg', '.png', '.bmp', '.mpo', '.ppm', '.tif', '.tiff', '.gif', '.svg', '.pgm', '.pbm', '.webp')
-
-PICKLE_VERSION = 1
-
-NUM_THREADS = 24
-
-################################################################################
-
-def queue_files_to_hash(file_queue, directories):
-    """Read all the specfied directories queue every file therein"""
-
-    # 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:
-                file_queue.put(os.path.join(root, file))
-
-################################################################################
-
-def hasher_thread(method, file_queue, hash_queue, hashes, updated):
-    """Thread - reads a file from the queue and, if it is an unhashed or updated image
-       calculate the hash and post it and the modification time on the updated queue"""
-
-    while not file_queue.empty():
-        filepath = file_queue.get()
-
-        fileext = os.path.splitext(filepath)[1]
-        mod_time = os.path.getmtime(filepath)
-
-        # If the file type is an image and the file hasn't been hashed or the modification time has changed
-        # then save the hash and the modification time
-
-        if fileext.lower() in IMAGE_EXT_LIST and (filepath not in hashes or mod_time != updated[filepath]):
-            # Calculate the hash and store path, dimensions and file size under the hash entry in the hashes table
-
-            print(f'Calculating hash for {filepath}')
-            encoding = method.encode_image(image_file=filepath)
-
-            if encoding:
-                hash_queue.put({'filepath': filepath, 'encoding': encoding, 'updated': mod_time})
-            else:
-                print(f'Invalid image {filepath}')
-
-        file_queue.task_done()
-
-################################################################################
-
-def hash_directories(directories, method, hashes, updated):
-    """Scan for new files and calculate their hashes"""
-
-    # Create the I/O queues
-
-    file_queue = queue.Queue()
-    hash_queue = queue.Queue()
-
-    # Queue the list of files to hash
-
-    queue_files_to_hash(file_queue, directories)
-
-    # Start the threads hashing away
-
-    thread_list = []
-    for _ in range(NUM_THREADS):
-        thread = threading.Thread(target=hasher_thread, daemon=True, args=(method, file_queue, hash_queue, hashes, updated))
-        thread.start()
-        thread_list.append(thread)
-
-    # Wait for the threads to stop working
-
-    print('Waiting for threads to terminate')
-
-    for thread in thread_list:
-        thread.join()
-
-    # Process the results
-
-    while not hash_queue.empty():
-        entry = hash_queue.get()
-
-        filepath = entry['filepath']
-        hashes[filepath] = entry['encoding']
-        updated[filepath] = entry['updated']
-
-################################################################################
-
-def plot_images(
-    orig: str,
-    image_list: List,
-    scores: bool = False,
-    outfile: str = None,
-) -> None:
-    """
-    Plotting function for plot_duplicates() defined below.
-
-    Args:
-        orig: filename for which duplicates are to be plotted.
-        image_list: List of duplicate filenames, could also be with scores (filename, score).
-        scores: Whether only filenames are present in the image_list or scores as well.
-        outfile:  Name of the file to save the plot.
-    """
-
-    def formatter(val: Union[int, np.float32]):
-        """
-        For printing floats only upto 3rd precision. Ints are unchanged.
-        """
-        if isinstance(val, np.float32):
-            return f'{val:.3f}'
-
-        return val
-
-    n_ims = len(image_list)
-    ncols = 4  # fixed for a consistent layout
-    nrows = int(np.ceil(n_ims / ncols)) + 1
-    fig = figure.Figure(figsize=(10, 14))
-
-    gs = gridspec.GridSpec(nrows=nrows, ncols=ncols)
-    ax = plt.subplot(
-        gs[0, 1:3]
-    )  # Always plot the original image in the middle of top row
-    ax.imshow(Image.open(orig))
-    ax.set_title(f'Original Image: {format(orig)}')
-    ax.axis('off')
-
-    for i in range(0, n_ims):
-        row_num = (i // ncols) + 1
-        col_num = i % ncols
-
-        ax = plt.subplot(gs[row_num, col_num])
-        if scores:
-            ax.imshow(Image.open(image_list[i][0]))
-            val = formatter(image_list[i][1])
-            title = ' '.join([image_list[i][0], f'({val})'])
-        else:
-            ax.imshow(Image.open(image_list[i]))
-            title = image_list[i]
-
-        ax.set_title(title, fontsize=6)
-        ax.axis('off')
-    gs.tight_layout(fig)
-
-    if outfile:
-        plt.savefig(outfile)
-
-    plt.show()
-    plt.close()
-
-################################################################################
-
-def main():
-    """Read the hashes and report duplicates in a vaguely civilised way"""
-
-    # Hashing and comparison method
-
-    method = PHash()
-
-    # Handle command line arguments
-
-    parser = argparse.ArgumentParser(description='Search for similar images')
-    parser.add_argument('--no-scan', action='store_true', help='Use pickled scan data without updating it')
-    parser.add_argument('--no-compare', action='store_true', help='Use pickled comparison data without updating it')
-    parser.add_argument('--show', action='store_true', help='Show duplicate images')
-    parser.add_argument('directories', nargs='*', action='store', help='Directories to search')
-
-    args = parser.parse_args()
-
-    breakpoint()
-    
-    if not args.no_scan and not args.directories:
-        print('You must be specify at least one directory in order to perform a scan')
-        sys.exit(1)
-
-    # We pickle the current set of files, hashes and comparisons
-
-    try:
-        print('Loading cached data')
-
-        with open(PICKLE_FILE, 'rb') as pickles:
-            data = pickle.load(pickles)
-
-            if data['version'] != PICKLE_VERSION:
-                print(f'WARNING: Current version is {PICKLE_VERSION} but saved data is from version {data["version"]}. Interesting things could happen....')
-
-            hashes = data['hashes']
-            updated = data['updated']
-            duplicates = data.get('duplicates', None)
-
-    except (FileNotFoundError, EOFError):
-        if args.no_scan:
-            print('ERROR: Cannot use no-scan option as no cached scan data is available')
-            sys.exit(1)
-
-        hashes = {}
-        updated = {}
-        duplicates = {}
-
-    if args.no_compare and not duplicates:
-        print('ERROR: Cannot use no-compare option as no cached comparison data is available')
-        sys.exit(1)
-
-    if not args.no_scan:
-        # Scan for new values and calculate hashes
-
-        hash_directories(method, args.directories, hashes, updated)
-
-    if not args.no_compare:
-        # Look for duplicates
-
-        duplicates = method.find_duplicates(encoding_map=hashes)
-
-    # Pickle the updated results
-
-    with open(PICKLE_FILE, 'wb') as pickles:
-        dupe_data = {'hashes': hashes, 'updated': updated, 'version': PICKLE_VERSION, 'duplicates': duplicates}
-        pickle.dump(dupe_data, pickles)
-
-    # Report them
-
-    for entry in duplicates:
-        if duplicates[entry]:
-            print(f'{entry}: {duplicates[entry]}')
-            if args.show:
-                plot_duplicates(entry, duplicates[entry])
-
-################################################################################
-
-def photodupe():
-    """Entry point"""
-
-    try:
-        main()
-
-    except KeyboardInterrupt:
-        sys.exit(1)
-
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    photodupe()