skilleter-thingy 0.0.24__tar.gz → 0.0.26__tar.gz

{skilleter_thingy-0.0.24/skilleter_thingy.egg-info → skilleter_thingy-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.24
+Version: 0.0.26
 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
@@ -10,7 +10,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: boto3
 Requires-Dist: imagehash
 Requires-Dist: inotify
 Requires-Dist: pillow

{skilleter_thingy-0.0.24 → skilleter_thingy-0.0.26}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.24"
+version = "0.0.26"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -26,7 +26,6 @@ classifiers = [
 ]
 
 dependencies = [
-    "boto3",
     "imagehash",
     "inotify",
     "pillow",

{skilleter_thingy-0.0.24 → skilleter_thingy-0.0.26}/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.24 → skilleter_thingy-0.0.26}/skilleter_thingy/photodupe.py

@@ -5,6 +5,7 @@ import sys
 import os
 import sys
 import pickle
+import argparse
 
 import PIL
 
@@ -15,28 +16,42 @@ import imagehash
 
 ################################################################################
 
-def read_image_hashes():
+def read_image_hashes(directories):
     """Read all the specfied directories and hash every picture therein"""
 
     hashes = defaultdict(list)
 
-    for directory in sys.argv[1:]:
+    # 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)
-
-                try:
-                    with Image.open(filepath) as image:
-                        hash_value = imagehash.average_hash(image, hash_size=12)
-
-                        size = os.stat(filepath).st_size
-                        hashes[hash_value].append({'path': filepath, 'width': image.width, 'height': image.height, 'size': size})
-
-                except PIL.UnidentifiedImageError:
-                    sys.stderr.write(f'ERROR: Unrecognized format {filepath}\n')
-
-                except OSError:
-                    sys.stderr.write(f'ERROR: Unable to read {filepath}\n')
+                
+                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)
+
+                            size = os.stat(filepath).st_size
+                            hashes[hash_value].append({'path': filepath, 'width': image.width, 'height': image.height, 'size': size})
+
+                    except PIL.UnidentifiedImageError:
+                        sys.stderr.write(f'ERROR: Unrecognized format {filepath} (size={size})\n')
+
+                    except OSError:
+                        sys.stderr.write(f'ERROR: Unable to read {filepath} (size={size})\n')
+                    
+    # Return the hash table
+    
     return hashes
 
 ################################################################################
@@ -44,6 +59,15 @@ def read_image_hashes():
 def main():
     """Read the hashes and report duplicates in a vaguely civilised way"""
 
+    parser = argparse.ArgumentParser(description='Search for similar images')
+    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')
 
@@ -52,8 +76,10 @@ def main():
     except (FileNotFoundError, EOFError):
         print('Scanning directories')
 
-        hashes = read_image_hashes()
+        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-0.0.24 → skilleter_thingy-0.0.26/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.24
+Version: 0.0.26
 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
@@ -10,7 +10,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: boto3
 Requires-Dist: imagehash
 Requires-Dist: inotify
 Requires-Dist: pillow

{skilleter_thingy-0.0.24 → skilleter_thingy-0.0.26}/skilleter_thingy.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 pyproject.toml
 skilleter_thingy/__init__.py
 skilleter_thingy/addpath.py
-skilleter_thingy/aws.py
 skilleter_thingy/borger.py
 skilleter_thingy/colour.py
 skilleter_thingy/console_colours.py
@@ -50,7 +49,6 @@ skilleter_thingy/remdir.py
 skilleter_thingy/rmdupe.py
 skilleter_thingy/rpylint.py
 skilleter_thingy/run.py
-skilleter_thingy/s3_sync.py
 skilleter_thingy/splitpics.py
 skilleter_thingy/strreplace.py
 skilleter_thingy/sysmon.py

{skilleter_thingy-0.0.24 → skilleter_thingy-0.0.26}/skilleter_thingy.egg-info/requires.txt

@@ -1,4 +1,3 @@
-boto3
 imagehash
 inotify
 pillow