[diffoscope] 01/01: rename get_{filtered => adjusted}_members_sizes for consistency
Ximin Luo
infinity0 at debian.org
Mon May 29 12:18:59 CEST 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch experimental
in repository diffoscope.
commit 5b833952ce0e42f1016681d82fd232bf15f44574
Author: Ximin Luo <infinity0 at debian.org>
Date: Mon May 29 12:18:40 2017 +0200
rename get_{filtered => adjusted}_members_sizes for consistency
---
diffoscope/comparators/directory.py | 4 ++--
diffoscope/comparators/utils/container.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py
index 5365aa9..8497264 100644
--- a/diffoscope/comparators/directory.py
+++ b/diffoscope/comparators/directory.py
@@ -191,8 +191,8 @@ class DirectoryContainer(Container):
return FilesystemFile(os.path.join(self.source.path, member_name), container=self)
def comparisons(self, other):
- my_members = OrderedDict(self.get_filtered_members_sizes())
- other_members = OrderedDict(other.get_filtered_members_sizes())
+ my_members = OrderedDict(self.get_adjusted_members_sizes())
+ other_members = OrderedDict(other.get_adjusted_members_sizes())
total_size = sum(x[1] for x in my_members.values()) + sum(x[1] for x in other_members.values())
to_compare = set(my_members.keys()).intersection(other_members.keys())
diff --git a/diffoscope/comparators/utils/container.py b/diffoscope/comparators/utils/container.py
index 7ec4b8d..b35cfa3 100644
--- a/diffoscope/comparators/utils/container.py
+++ b/diffoscope/comparators/utils/container.py
@@ -109,7 +109,7 @@ class Container(object, metaclass=abc.ABCMeta):
return container.lookup_file(*remainings)
- def get_filtered_members_sizes(self):
+ def get_adjusted_members_sizes(self):
for name, member in self.get_adjusted_members():
if member.is_directory():
size = 4096 # default "size" of a directory
@@ -118,8 +118,8 @@ class Container(object, metaclass=abc.ABCMeta):
yield name, (member, size)
def comparisons(self, other):
- my_members = OrderedDict(self.get_filtered_members_sizes())
- other_members = OrderedDict(other.get_filtered_members_sizes())
+ my_members = OrderedDict(self.get_adjusted_members_sizes())
+ other_members = OrderedDict(other.get_adjusted_members_sizes())
total_size = sum(x[1] for x in itertools.chain(my_members.values(), other_members.values()))
# TODO: progress could be a bit more accurate here, give more weight to fuzzy-hashed files
# TODO: merge DirectoryContainer.comparisons() into this
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the diffoscope
mailing list