Modularize license and copyright diff methods #84

Signed-off-by: John M. Horan <johnmhoran@gmail.com>

Author: johnmhoran

src/deltacode/__init__.py

@@ -204,7 +204,7 @@ def license_diff(self):
         ])
 
         for delta in self.deltas:
-            utils.determine_license_diff(delta, unique_categories)
+            utils.update_from_license_info(delta, unique_categories)
 
     def copyright_diff(self):
         """
@@ -215,7 +215,7 @@ def copyright_diff(self):
         attribute -- if there has been a copyright change.
         """
         for delta in self.deltas:
-            utils.determine_copyright_diff(delta)
+            utils.update_from_copyright_info(delta)
 
     def index_deltas(self, index_key='path', delta_list=[]):
         """
@@ -277,16 +277,16 @@ def is_unmodified(self):
         other than 'unmodified' and return True if all but 'unmodified' are
         ruled out.
         """
-        if (self.old_file and self.new_file and
-                self.old_file.sha1 == self.new_file.sha1 and
-                self.old_file.path == self.new_file.path):
+        if (self.new_file and self.old_file and
+                self.new_file.sha1 == self.old_file.sha1 and
+                self.new_file.path == self.old_file.path):
             return True
 
     def is_added(self):
         """
         Identify a Delta object reflecting the addition of a File.
         """
-        if not self.old_file and self.new_file:
+        if self.new_file and not self.old_file:
             return True
 
     def to_dict(self):

src/deltacode/utils.py

@@ -33,27 +33,43 @@
 from commoncode import paths
 
 
-def determine_license_diff(delta, unique_categories):
+def update_from_license_info(delta, unique_categories):
     """
     Increase an 'added' or 'modified' Delta object's 'score' attribute and add
     one or more appropriate categories to its 'factors' attribute if there has
     been a license change and depending on the nature of that change.
     """
     if delta.is_added():
-        new_licenses = delta.new_file.licenses or []
-        new_categories = set(license.category for license in new_licenses)
-
-        if delta.new_file.has_licenses():
-            delta.update(20, 'license info added')
-            # no license ==> 'Copyleft Limited'or higher
-            for category in new_categories:
-                if category in unique_categories:
-                    delta.update(20, category.lower() + ' added')
-            return
-
-    if not delta.is_modified():
+        update_added_from_license_info(delta, unique_categories)
+
+    if delta.is_modified():
+        update_modified_from_license_info(delta, unique_categories)
+
+
+def update_added_from_license_info(delta, unique_categories):
+    """
+    Increase an 'added' Delta object's 'score' attribute and add
+    one or more categories to its 'factors' attribute if there has
+    been a license change.
+    """
+    new_licenses = delta.new_file.licenses or []
+    new_categories = set(license.category for license in new_licenses)
+
+    if delta.new_file.has_licenses():
+        delta.update(20, 'license info added')
+        # no license ==> 'Copyleft Limited'or higher
+        for category in new_categories:
+            if category in unique_categories:
+                delta.update(20, category.lower() + ' added')
         return
 
+
+def update_modified_from_license_info(delta, unique_categories):
+    """
+    Increase a 'modified' Delta object's 'score' attribute and add
+    one or more categories to its 'factors' attribute if there has
+    been a license change.
+    """
     if not delta.new_file.has_licenses() and delta.old_file.has_licenses():
         delta.update(15, 'license info removed')
         return
@@ -83,20 +99,36 @@ def determine_license_diff(delta, unique_categories):
                 delta.update(20, category.lower() + ' added')
 
 
-def determine_copyright_diff(delta):
+def update_from_copyright_info(delta):
     """
     Increase an 'added' or 'modified' Delta object's 'score' attribute and add
     one or more appropriate categories to its 'factors' attribute if there has
     been a copyright change and depending on the nature of that change.
     """
     if delta.is_added():
-        if delta.new_file.has_copyrights():
-            delta.update(10, 'copyright info added')
-            return
+        update_added_from_copyright_info(delta)
+
+    if delta.is_modified():
+        update_modified_from_copyright_info(delta)
+
 
-    if not delta.is_modified():
+def update_added_from_copyright_info(delta):
+    """
+    Increase an 'added' Delta object's 'score' attribute and add
+    one or more categories to its 'factors' attribute if there has
+    been a copyright change.
+    """
+    if delta.new_file.has_copyrights():
+        delta.update(10, 'copyright info added')
         return
 
+
+def update_modified_from_copyright_info(delta):
+    """
+    Increase a 'modified' Delta object's 'score' attribute and add
+    one or more categories to its 'factors' attribute if there has
+    been a copyright change.
+    """
     new_copyrights = delta.new_file.copyrights or []
     old_copyrights = delta.old_file.copyrights or []