Tell user directory count which contain dupe files

Closes #8

Author: NYPD

phodupe/__main__.py

@@ -24,13 +24,15 @@ def main():
     if user_input == 'y':
         allDirectoriesMustHaveSameDupes = True
 
-    dupe_files = DupeFinder.getDuplicateFileNames(destination1, destinationsToDelete, recursivelySearch, allDirectoriesMustHaveSameDupes)
+    dupeFileInfoTuple = DupeFinder.getDuplicateFileNames(destination1, destinationsToDelete, recursivelySearch, allDirectoriesMustHaveSameDupes)
+    dupe_files = dupeFileInfoTuple[0]
+    dupeFileLength = len(dupe_files)
 
-    if len(dupe_files) is 0:
+    if dupeFileLength is 0:
         print('No dupe files found!')
         exit()
 
-    user_input = input("{} duplicate file names found. Enter 'y' to delete or 'n' to abort:\n".format(len(dupe_files)))
+    user_input = input("{} duplicate file names found across {} directories. Enter 'y' to delete or 'n' to abort:\n".format(dupeFileLength, dupeFileInfoTuple[1]))
 
     if user_input == 'y':
         destinationsToDelete.append(destination1)

phodupe/dupe_finder.py

@@ -8,47 +8,13 @@ class DupeFinder:
         Simple utility class for finding and manipulating duplicate files
     """
 
-    @staticmethod
-    def _getAllDirectoryPaths(directories, recursivelySearch):
-        """
-        Returns a list of directory paths.
-        
-        Parameters
-        ----------
-        directories : list or str
-
-                List of string paths to multiple directories or singular string path to one
-
-        recursivelySearch : boolean
-
-                True or False depending if recursively searching is required
-        
-        Returns
-        -------
-        list
-
-            A list of directory Path objects of all the directories passed in as well as any
-            potential recursive directories inside
-        """
-        destinationDirectoryPaths = []
-
-        if type(directories) is list:
-            for destination in directories:
-                destinationDirectoryPaths.append(pathlib.Path(destination))
-        else:
-            destinationDirectoryPaths.append(pathlib.Path(destination))
-
-        if recursivelySearch:
-            for destinationDir in destinationDirectoryPaths:
-                destinationDirectoryPaths.extend([f.path for f in os.scandir(destinationDir) if f.is_dir()])
-
-        return destinationDirectoryPaths
-
     @staticmethod
     def getDuplicateFileNames(directory1, destinationsToDelete, recursivelySearch, matchAllDirectories):
         """
-        Returns a list of duplicate file name "stems" using directory1 as the
-        master directory and then recursively or not (if passed in True) checking all the destinationsToDelete for
+        Returns a tuple containing list of duplicate file name "stems" and a count of directories dupe file name "stems"
+        were found.
+        
+        It uses directory1 as the master directory and then recursively or not (if recursivelySearch is True) checking all the destinationsToDelete for
         duplicate file "stems". If matchAllDirectories is set to true, then all destinationsToDelete (and recursive directories if required) 
         must all have the same file name "stem"
         
@@ -64,7 +30,7 @@ def getDuplicateFileNames(directory1, destinationsToDelete, recursivelySearch, m
         
         destinationsToDelete : [a.png, b.png, dir1 : [a.png, c.png]]
         
-        returns: [a, b]
+        returns: ([a, b], 3)
 
         ---
 
@@ -78,7 +44,7 @@ def getDuplicateFileNames(directory1, destinationsToDelete, recursivelySearch, m
         
         destinationsToDelete : [a.png, b.png, dir1 : [a.png, c.png]]
         
-        returns: [a]
+        returns: ([a], 3)
 
         ---
 
@@ -98,61 +64,73 @@ def getDuplicateFileNames(directory1, destinationsToDelete, recursivelySearch, m
         
         Returns
         -------
-        list
+        
+        (list, int):
+            
+            list
 
-            A list of the duplicate file names between all directories using the first parameter passed in
-            as the master directory. If no duplicate files are found, an empty list is returned
+                A list of the duplicate file names between all directories using the first parameter passed in
+                as the master directory. If no duplicate files are found, an empty list is returned
+
+            int
+
+                count of directeries dupe file names were found
         """
         directory1Path = pathlib.Path(directory1)
-        destinationDirectoryPaths = DupeFinder._getAllDirectoryPaths(destinationsToDelete, recursivelySearch)
+        destinationDirectoryPaths = []
+
+        if type(destinationsToDelete) is list:
+            for destination in destinationsToDelete:
+                destinationDirectoryPaths.append(pathlib.Path(destination))
+        else:
+            destinationDirectoryPaths.append(pathlib.Path(destinationsToDelete))
+
+        if recursivelySearch:
+            for destinationDir in destinationDirectoryPaths:
+                destinationDirectoryPaths.extend([f.path for f in os.scandir(destinationDir) if f.is_dir()])
 
         directory1FilesNoExt = []
+        destinationDirectoriesFilesListNoExt = []
 
         for file in os.listdir(directory1Path):
             purePath = pathlib.Path(os.path.join(directory1, file))
             directory1FilesNoExt.append(purePath.stem)
 
-        if matchAllDirectories:
-
-            destinationDirectoriesFilesListNoExt = []
+        for destinationDir in destinationDirectoryPaths:
 
-            for destinationDir in destinationDirectoryPaths:
+            destinationDirectoriesFilesNoExt = []
 
-                destinationDirectoriesFilesNoExt = []
+            for file in os.listdir(destinationDir):
+                purePath = pathlib.Path(os.path.join(destinationDir, file))
+                destinationDirectoriesFilesNoExt.append(purePath.stem)
+            
+            destinationDirectoriesFilesListNoExt.append(destinationDirectoriesFilesNoExt)
 
-                for file in os.listdir(destinationDir):
-                    purePath = pathlib.Path(os.path.join(destinationDir, file))
-                    destinationDirectoriesFilesNoExt.append(purePath.stem)
-                
-                destinationDirectoriesFilesListNoExt.append(destinationDirectoriesFilesNoExt)
+        dupeFiles = []
+        dupeDirectoryIndexes = set()
 
-            dupeFiles = []
+        for fileName in directory1FilesNoExt:
 
-            for fileName in directory1FilesNoExt:
+            if matchAllDirectories:
                 fileCount = 0
                 for destinationDirectoryFilesListNoExt in destinationDirectoriesFilesListNoExt:
                     if fileName in destinationDirectoryFilesListNoExt:
                         fileCount += 1
 
                 if fileCount == len(destinationDirectoriesFilesListNoExt):    
-                    dupeFiles.append(fileName) 
-
-            return dupeFiles
-            
-        destinationDirectoriesFilesNoExt = set()
-
-        for destinationDir in destinationDirectoryPaths:
-            for file in os.listdir(destinationDir):
-                purePath = pathlib.Path(os.path.join(destinationDir, file))
-                destinationDirectoriesFilesNoExt.add(purePath.stem)
-
-        dupeFiles = []
-
-        for fileName in directory1FilesNoExt:
-            if fileName in destinationDirectoriesFilesNoExt:
-                dupeFiles.append(fileName)
+                    dupeFiles.append(fileName)
+            else:
+
+                for x in range(len(destinationDirectoriesFilesListNoExt)):
+                    if fileName in destinationDirectoriesFilesListNoExt[x]:
+                        dupeFiles.append(fileName)
+                        dupeDirectoryIndexes.add(x)
+                        break
 
-        return dupeFiles
+        if matchAllDirectories:
+            return (dupeFiles, len(destinationDirectoryPaths) + 1)
+        else:
+            return (dupeFiles, len(dupeDirectoryIndexes) + 1)
 
     @staticmethod
     def deleteFiles(fileNames, destinationsToDelete, recursivelySearch=False):