dennisro 5 سال پیش
والد
کامیت
988b27abc7
1فایلهای تغییر یافته به همراه12 افزوده شده و 9 حذف شده
  1. 12 9
      2.py

+ 12 - 9
2.py

@@ -7,11 +7,12 @@ parser = argparse.ArgumentParser(description='What the dupe!?')
 
 optional = parser._action_groups.pop()
 required = parser.add_argument_group('required arguments')
+mutuallyexclusive = parser.add_mutually_exclusive_group(required=False)
 
-optional.add_argument('--threshold', type=str,
+mutuallyexclusive.add_argument('--threshold', type=str,
                     help='Only output files greater than \'size\', e.g. 100M')
 
-optional.add_argument('--sizes', type=str, nargs='+',
+mutuallyexclusive.add_argument('--sizes', type=str, nargs='+',
                     help='Only output files greater than \'size\', e.g. 100M')
 
 required.add_argument('--dir', type=str, nargs='?', required=True, action='append',
@@ -102,22 +103,24 @@ def printResults(dict1):
             count = 0
             while count+1 < len(sizes):
                 try:
-                    if file_size >= humanfriendly.parse_size(sizes[count]) and file_size < humanfriendly.parse_size(sizes[count+1]):
+                    if file_size >= humanfriendly.parse_size(sizes[count]) and file_size < humanfriendly.parse_size(sizes[count+1] and result not in final[sizes[count+1]]):
                         final[sizes[count+1]].append(result)
+                        print('Hi')
                 except:
+                    print('Hi')
                     final[sizes[-1]].append(result)
                 count += 1
-                if args.threshold and args.sizes:
-                    pass
-                elif file_size < humanfriendly.parse_size(sizes[0]):
+                if file_size < humanfriendly.parse_size(sizes[0]) and result not in final[sizes[0]]:
                     print('Hi')
-                    final[sizes[0]].append(result)
+                    final[sizes[1]].append(result)
         else:
             print('Hi')
             if file_size >= threshold:
                 final[threshold].append(result)
-
-    if len(results) > 0:
+    print(final)
+    test=[x for x in final if len(final[x]) > 0]
+    print(test)
+    if len(results) > 0 and (len(test) > 0):
         print('___________________')
         print('\n\033[1;34m\033[1;34m\u25b6 Duplicates Found\033[0m\n')
         print('  The following files are identical. The name could differ, but the content is identical')