include extra_words in detection_log if present

- I added `extra_words` in  secondary types of Detections.
- Reorder the if else condition in analyze_detection function to correctly give extra_words if present, previously these function return `perfect_detection` when extra-words was present.

Signed-off-by: Alok Kumar <[email protected]>

Author: alok1304

src/licensedcode/detection.py

@@ -124,6 +124,7 @@ class DetectionRule(Enum):
     These are logged in LicenseDetection.detection_log for verbosity.
     """
     UNKNOWN_MATCH = 'unknown-match'
+    EXTRA_WORDS = 'extra-words'
     LICENSE_CLUES = 'license-clues'
     LOW_QUALITY_MATCH_FRAGMENTS = 'low-quality-matches'
     FALSE_POSITIVE = 'possible-false-positive'
@@ -1537,6 +1538,12 @@ def get_detected_license_expression(
             logger_debug(f'analysis {DetectionCategory.LICENSE_CLUES.value}')
         detection_log.append(DetectionRule.LICENSE_CLUES.value)
         return detection_log, combined_expression
+    
+    elif analysis == DetectionCategory.EXTRA_WORDS.value:
+        if TRACE_ANALYSIS:
+            logger_debug(f'analysis {DetectionCategory.EXTRA_WORDS.value}')
+        matches_for_expression = license_matches
+        detection_log.append(DetectionRule.EXTRA_WORDS.value)
 
     elif analysis == DetectionCategory.LOW_QUALITY_MATCH_FRAGMENTS.value:
         if TRACE_ANALYSIS:
@@ -1725,6 +1732,10 @@ def analyze_detection(license_matches, package_license=False):
         license_matches=license_matches
     ):
         return DetectionCategory.LICENSE_CLUES.value
+    
+    # Case where at least one of the match have extra words
+    elif has_extra_words(license_matches=license_matches):
+        return DetectionCategory.EXTRA_WORDS.value
 
     # Case where all matches have `matcher` as `1-hash` or `4-spdx-id`
     elif is_correct_detection_non_unknown(license_matches=license_matches):
@@ -1746,10 +1757,6 @@ def analyze_detection(license_matches, package_license=False):
     ):
         return DetectionCategory.IMPERFECT_COVERAGE.value
 
-    # Case where at least one of the match have extra words
-    elif has_extra_words(license_matches=license_matches):
-        return DetectionCategory.EXTRA_WORDS.value
-
     # Cases where Match Coverage is a perfect 100 for all matches
     else:
         return DetectionCategory.PERFECT_DETECTION.value