Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for symlinks prior to counting file as a hardlink #609

Merged
merged 4 commits into from
Jul 19, 2024
Merged

Check for symlinks prior to counting file as a hardlink #609

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23887e0
Check for symlinks prior to counting file as a hardlink
glicholas Jul 18, 2024
206fd93
noHL is counting symlinks as part of its logic
glicholas Jul 18, 2024
eaf3d91
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 18, 2024
5bd789a
Merge branch 'develop' into glicholas/issue608
bobokun Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions modules/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,22 +536,28 @@ def __init__(self, root_dir, remote_dir):
def get_inode_count(self):
self.inode_count = {}
for file in self.root_files:
try:
inode_no = os.stat(file.replace(self.root_dir, self.remote_dir)).st_ino
except PermissionError as perm:
logger.warning(f"{perm} : file {file} has permission issues. Skipping...")
continue
except FileNotFoundError as file_not_found_error:
logger.warning(f"{file_not_found_error} : File {file} not found. Skipping...")
continue
except Exception as ex:
logger.stacktrace()
logger.error(ex)
continue
if inode_no in self.inode_count:
self.inode_count[inode_no] += 1
else:
self.inode_count[inode_no] = 1
# Only check hardlinks for files
glicholas marked this conversation as resolved.
Show resolved Hide resolved
if os.path.isfile(file):
# If the given file is a symlink, skip it
if os.path.islink(file):
continue
else:
try:
inode_no = os.stat(file.replace(self.root_dir, self.remote_dir)).st_ino
except PermissionError as perm:
logger.warning(f"{perm} : file {file} has permission issues. Skipping...")
continue
except FileNotFoundError as file_not_found_error:
logger.warning(f"{file_not_found_error} : File {file} not found. Skipping...")
continue
except Exception as ex:
logger.stacktrace()
logger.error(ex)
continue
if inode_no in self.inode_count:
self.inode_count[inode_no] += 1
else:
self.inode_count[inode_no] = 1

def nohardlink(self, file, notify, ignore_root_dir):
"""
Expand Down