Merge pull request #106 from CCBR/vnk_dev

Accuracy calculation of bytes if hard links exist.
CCBR · Jul 16, 2024 · 7e23327 · 7e23327
2 parents 9019043 + ee0ae8d
commit 7e23327
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 ### Bug fixes
 
+## spacesavers2 v0.14.0
+
+- resolved #102
+
+### New features
+
 ## spacesavers2 v0.13.0
 
 ### New features

diff --git a/spacesavers2_mimeo b/spacesavers2_mimeo
@@ -57,6 +57,12 @@ def process_hh(
         if foldest.uid == uid or 0 == uid : user_owns_original = True
         uid_file_index = list(filter(lambda x:x!=oldest_index,uid_file_index)) # remove oldest if present in list
         inodes_already_summerized = [foldest.inode]
+        if user_owns_original:
+            fpaths = foldest.get_paths(mindepth, maxdepth)
+            for p in fpaths:
+                perfolder_summaries[p].nnondup_files += 1
+                perfolder_summaries[p].non_dup_Bytes.append(foldest.calculated_size)
+                perfolder_summaries[p].non_dup_ages.append(foldest.mtime)
         # if hashhash[h].ndup_files > 0: # we have duplicates
         if len(uid_file_index) > 0: # uid has copies
             for i in uid_file_index:
@@ -66,7 +72,7 @@ def process_hh(
                 fpaths = f.get_paths(mindepth, maxdepth)
                 if f.inode in inodes_already_summerized: # it is a hardlink
                     for p in fpaths:
-                        perfolder_summaries[p].ndup_files += 1
+                        perfolder_summaries[p].nnondup_files += 1
                 else:
                     inodes_already_summerized.append(f.inode)
                     if not parent in perfolder_dups:
@@ -76,13 +82,6 @@ def process_hh(
                         perfolder_summaries[p].ndup_files+=1
                         perfolder_summaries[p].dup_Bytes.append(f.calculated_size)
                         perfolder_summaries[p].dup_ages.append(f.mtime)
-        else: # we only have 1 original file
-            if user_owns_original:
-                fpaths = foldest.get_paths(mindepth, maxdepth)
-                for p in fpaths:
-                    perfolder_summaries[p].nnondup_files += 1
-                    perfolder_summaries[p].non_dup_Bytes.append(foldest.calculated_size)
-                    perfolder_summaries[p].non_dup_ages.append(foldest.mtime)
         out_index = []
         out_index.append(oldest_index)
         out_index.extend(uid_file_index)

diff --git a/src/VERSION b/src/VERSION
@@ -1 +1 @@
-0.13.0
+0.14.0