From 065d0a3f1e189db36699644efcb09d0e50e12faf Mon Sep 17 00:00:00 2001
From: "Yash D. Saraf" <yashdsaraf@gmail.com>
Date: Fri, 17 Nov 2017 02:43:57 +0530
Subject: [PATCH 001/122] Support multiple options for pre-scan plugins #787

Signed-off-by: Yash D. Saraf <yashdsaraf@gmail.com>
---
 src/plugincode/pre_scan.py          | 14 +++++++++-----
 src/scancode/cli.py                 | 20 ++++++++++----------
 src/scancode/plugin_ignore.py       | 13 +++++++++----
 tests/scancode/test_ignore_files.py | 12 ++++++------
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/plugincode/pre_scan.py b/src/plugincode/pre_scan.py
index c9ba789bdad..7f44363a5f9 100644
--- a/src/plugincode/pre_scan.py
+++ b/src/plugincode/pre_scan.py
@@ -40,13 +40,9 @@
 class PreScanPlugin(object):
     """
     A pre-scan plugin layout class to be extended by the pre_scan plugins.
-    Docstring of a plugin class will be used as the plugin option's help text
     """
 
-    # attributes to be used while creating the option for this plugin.
-    option_attrs = {}
-
-    def __init__(self, user_input):
+    def __init__(self, option, user_input):
         self.user_input = user_input
 
     def process_resource(self, resource):
@@ -63,6 +59,14 @@ def get_ignores(self):
         """
         return {}
 
+    @staticmethod
+    def get_click_options():
+        """
+        Return an iterable of `click.Option` objects to be
+        used for calling the plugin.
+        """
+        return ()
+
 
 pre_scan_plugins = PluginManager('pre_scan')
 pre_scan_plugins.add_hookspecs(sys.modules[__name__])
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 304bf2f7a16..ff35543f092 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -262,12 +262,11 @@ def __init__(self, name, context_settings=None, callback=None,
             option = ScanOption(('--' + name,), is_flag=True, help=help_text, group=POST_SCAN)
             self.params.append(option)
         for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-            attrs = plugin.option_attrs
-            attrs['default'] = None
-            attrs['group'] = PRE_SCAN
-            attrs['help'] = ' '.join(plugin.__doc__.split())
-            option = ScanOption(('--' + name,), **attrs)
-            self.params.append(option)
+            for option in plugin.get_click_options():
+                if not isinstance(option, click.Option):
+                    raise Exception('Invalid plugin "%(name)s": supplied click option is not an instance of "click.Option".' % locals())
+                option.group = PRE_SCAN
+                self.params.append(option)
 
     def format_options(self, ctx, formatter):
         """
@@ -470,10 +469,11 @@ def scancode(ctx,
     scans_cache_class = get_scans_cache_class()
     pre_scan_plugins = []
     for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-        user_input = kwargs[name.replace('-', '_')]
-        if user_input:
-            options['--' + name] = user_input
-            pre_scan_plugins.append(plugin(user_input))
+        for option in plugin.get_click_options():
+            user_input = kwargs[option.name]
+            if user_input:
+                options['--' + name] = user_input
+                pre_scan_plugins.append(plugin(option.name, user_input))
 
     try:
         files_count, results, success = scan(
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index fec8de91704..36ee999c7eb 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -25,6 +25,8 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+from click import Option
+
 from plugincode.pre_scan import PreScanPlugin
 from plugincode.pre_scan import pre_scan_impl
 
@@ -32,12 +34,15 @@
 @pre_scan_impl
 class ProcessIgnore(PreScanPlugin):
     """
-    Ignore files matching <pattern>.
+    Ignore files matching the supplied pattern.
     """
-    option_attrs = dict(multiple=True, metavar='<pattern>')
 
-    def __init__(self, user_input):
-        super(ProcessIgnore, self).__init__(user_input)
+    def __init__(self, option, user_input):
+        super(ProcessIgnore, self).__init__(option, user_input)
 
     def get_ignores(self):
         return {pattern: 'User ignore: Supplied by --ignore' for pattern in self.user_input}
+
+    @staticmethod
+    def get_click_options():
+        return [Option(('--ignore',), multiple=True, metavar='<pattern>', help='Ignore files matching <pattern>.')]
diff --git a/tests/scancode/test_ignore_files.py b/tests/scancode/test_ignore_files.py
index 0d8ea8e5cf3..a195c1393cc 100644
--- a/tests/scancode/test_ignore_files.py
+++ b/tests/scancode/test_ignore_files.py
@@ -72,7 +72,7 @@ def test_ignore_glob_file(self):
 
     def test_resource_paths_with_single_file(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore(('sample.doc',))
+        test_plugin = ProcessIgnore('ignore', ('sample.doc',))
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -87,7 +87,7 @@ def test_resource_paths_with_single_file(self):
 
     def test_resource_paths_with_multiple_files(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore(('ignore.doc',))
+        test_plugin = ProcessIgnore('ignore', ('ignore.doc',))
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -101,7 +101,7 @@ def test_resource_paths_with_multiple_files(self):
 
     def test_resource_paths_with_glob_file(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore(('*.doc',))
+        test_plugin = ProcessIgnore('ignore', ('*.doc',))
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -114,7 +114,7 @@ def test_resource_paths_with_glob_file(self):
 
     def test_resource_paths_with_glob_path(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore(('*/src/test',))
+        test_plugin = ProcessIgnore('ignore', ('*/src/test',))
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -129,8 +129,8 @@ def test_resource_paths_with_multiple_plugins(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         test_plugins = [
-            ProcessIgnore(('*.doc',)),
-            ProcessIgnore(('*/src/test/*',))
+            ProcessIgnore('ignore', ('*.doc',)),
+            ProcessIgnore('ignore', ('*/src/test/*',))
         ]
         expected = [
             'user',

From 6095fb1d8677fd46cc4bda6f603a9076e4f0f2a4 Mon Sep 17 00:00:00 2001
From: Saravanan G <sgoffl1603@gmail.com>
Date: Tue, 14 Nov 2017 10:03:27 +0530
Subject: [PATCH 002/122] Added MakeHuman Exception License

Signed-off-by: Saravanan G <sgoffl1603@gmail.com>
---
 .../data/licenses/make-human-exception.LICENSE  | 17 ++++++++++++++++-
 .../data/rules/make-human-exception.RULE        | 11 +++++++++++
 .../data/rules/make-human-exception.yml         |  2 ++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 src/licensedcode/data/rules/make-human-exception.RULE
 create mode 100644 src/licensedcode/data/rules/make-human-exception.yml

diff --git a/src/licensedcode/data/licenses/make-human-exception.LICENSE b/src/licensedcode/data/licenses/make-human-exception.LICENSE
index c9c36e47ef6..cdfe57b5d0b 100644
--- a/src/licensedcode/data/licenses/make-human-exception.LICENSE
+++ b/src/licensedcode/data/licenses/make-human-exception.LICENSE
@@ -1,3 +1,4 @@
+<<<<<<< Upstream, based on upstream/develop
 
 MakeHuman output GPL exception
 
@@ -21,4 +22,18 @@ for commercial purposes, all without asking permission.
 
 For an elaboration and clarification on our intention and interpretation of 
 these license terms see the License Explanation: 
-http://www.makehuman.org/content/license_explanation.html
\ No newline at end of file
+http://www.makehuman.org/content/license_explanation.html
+=======
+MakeHuman output GPL exception
+
+==================================
+
+As a special and limited exception, the copyright holders of the MakeHuman assets grants the option to use CC0 1.0 Universal as published by the Creative Commons, either version 1.0 of the License, or (at your option) any later version, as a license for the MakeHuman characters exported under the conditions that a) The assets were bundled in an export that was made using the file export functionality inside an OFFICIAL and UNMODIFIED version of MakeHuman and/or b) the asset solely consists of a 2D binary image in PNG, BMP or JPG format.
+
+The short version of CC0 is as follows:
+
+The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law. You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.
+
+For an elaboration and clarification on our intention and interpretation of these license terms see the License Explanation: http://www.makehuman.org/content/license_explanation.html
+
+>>>>>>> c4575f6 Added MakeHuman Exception License
diff --git a/src/licensedcode/data/rules/make-human-exception.RULE b/src/licensedcode/data/rules/make-human-exception.RULE
new file mode 100644
index 00000000000..5815e24a957
--- /dev/null
+++ b/src/licensedcode/data/rules/make-human-exception.RULE
@@ -0,0 +1,11 @@
+MakeHuman output GPL exception
+
+==================================
+
+As a special and limited exception, the copyright holders of the MakeHuman assets grants the option to use CC0 1.0 Universal as published by the Creative Commons, either version 1.0 of the License, or (at your option) any later version, as a license for the MakeHuman characters exported under the conditions that a) The assets were bundled in an export that was made using the file export functionality inside an OFFICIAL and UNMODIFIED version of MakeHuman and/or b) the asset solely consists of a 2D binary image in PNG, BMP or JPG format.
+
+The short version of CC0 is as follows:
+
+The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law. You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.
+
+For an elaboration and clarification on our intention and interpretation of these license terms see the License Explanation: http://www.makehuman.org/content/license_explanation.html
diff --git a/src/licensedcode/data/rules/make-human-exception.yml b/src/licensedcode/data/rules/make-human-exception.yml
new file mode 100644
index 00000000000..9253b459947
--- /dev/null
+++ b/src/licensedcode/data/rules/make-human-exception.yml
@@ -0,0 +1,2 @@
+licenses:
+    - make-human-exception

From 4f0475cdbebb34558d64015dd5b09618a40455c1 Mon Sep 17 00:00:00 2001
From: Saravanan G <sgoffl1603@gmail.com>
Date: Tue, 14 Nov 2017 18:24:17 +0530
Subject: [PATCH 003/122] formatted LICENSE file and removed rules

Signed-off-by: Saravanan G <sgoffl1603@gmail.com>
---
 .../data/licenses/make-human-exception.LICENSE  | 17 +----------------
 .../data/rules/make-human-exception.RULE        | 11 -----------
 .../data/rules/make-human-exception.yml         |  2 --
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 src/licensedcode/data/rules/make-human-exception.RULE
 delete mode 100644 src/licensedcode/data/rules/make-human-exception.yml

diff --git a/src/licensedcode/data/licenses/make-human-exception.LICENSE b/src/licensedcode/data/licenses/make-human-exception.LICENSE
index cdfe57b5d0b..c9c36e47ef6 100644
--- a/src/licensedcode/data/licenses/make-human-exception.LICENSE
+++ b/src/licensedcode/data/licenses/make-human-exception.LICENSE
@@ -1,4 +1,3 @@
-<<<<<<< Upstream, based on upstream/develop
 
 MakeHuman output GPL exception
 
@@ -22,18 +21,4 @@ for commercial purposes, all without asking permission.
 
 For an elaboration and clarification on our intention and interpretation of 
 these license terms see the License Explanation: 
-http://www.makehuman.org/content/license_explanation.html
-=======
-MakeHuman output GPL exception
-
-==================================
-
-As a special and limited exception, the copyright holders of the MakeHuman assets grants the option to use CC0 1.0 Universal as published by the Creative Commons, either version 1.0 of the License, or (at your option) any later version, as a license for the MakeHuman characters exported under the conditions that a) The assets were bundled in an export that was made using the file export functionality inside an OFFICIAL and UNMODIFIED version of MakeHuman and/or b) the asset solely consists of a 2D binary image in PNG, BMP or JPG format.
-
-The short version of CC0 is as follows:
-
-The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law. You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.
-
-For an elaboration and clarification on our intention and interpretation of these license terms see the License Explanation: http://www.makehuman.org/content/license_explanation.html
-
->>>>>>> c4575f6 Added MakeHuman Exception License
+http://www.makehuman.org/content/license_explanation.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/make-human-exception.RULE b/src/licensedcode/data/rules/make-human-exception.RULE
deleted file mode 100644
index 5815e24a957..00000000000
--- a/src/licensedcode/data/rules/make-human-exception.RULE
+++ /dev/null
@@ -1,11 +0,0 @@
-MakeHuman output GPL exception
-
-==================================
-
-As a special and limited exception, the copyright holders of the MakeHuman assets grants the option to use CC0 1.0 Universal as published by the Creative Commons, either version 1.0 of the License, or (at your option) any later version, as a license for the MakeHuman characters exported under the conditions that a) The assets were bundled in an export that was made using the file export functionality inside an OFFICIAL and UNMODIFIED version of MakeHuman and/or b) the asset solely consists of a 2D binary image in PNG, BMP or JPG format.
-
-The short version of CC0 is as follows:
-
-The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law. You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.
-
-For an elaboration and clarification on our intention and interpretation of these license terms see the License Explanation: http://www.makehuman.org/content/license_explanation.html
diff --git a/src/licensedcode/data/rules/make-human-exception.yml b/src/licensedcode/data/rules/make-human-exception.yml
deleted file mode 100644
index 9253b459947..00000000000
--- a/src/licensedcode/data/rules/make-human-exception.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-licenses:
-    - make-human-exception

From 5a304fd1a49e85e96ff1355f1e1b43d2adae9531 Mon Sep 17 00:00:00 2001
From: Haiko Schol <ext-haiko.schol@here.com>
Date: Thu, 23 Nov 2017 22:05:31 +0100
Subject: [PATCH 004/122] Refactor post scan plugins so they can have command
 line options

Signed-off-by: Haiko Schol <ext-haiko.schol@here.com>
---
 setup.py                             |  4 +--
 src/plugincode/post_scan.py          | 31 +++++++++++++----
 src/scancode/cli.py                  | 17 ++++-----
 src/scancode/plugin_mark_source.py   | 52 ++++++++++++++++------------
 src/scancode/plugin_only_findings.py | 26 +++++++++-----
 5 files changed, 83 insertions(+), 47 deletions(-)

diff --git a/setup.py b/setup.py
index b3d63e9c7eb..984d21fbc91 100644
--- a/setup.py
+++ b/setup.py
@@ -222,8 +222,8 @@ def read(*names, **kwargs):
         # becomes the ScanCode CLI boolean flag used to enable a
         # given post_scan plugin
         'scancode_post_scan': [
-            'only-findings = scancode.plugin_only_findings:process_only_findings',
-            'mark-source = scancode.plugin_mark_source:process_mark_source',
+            'only-findings = scancode.plugin_only_findings:OnlyFindings',
+            'mark-source = scancode.plugin_mark_source:MarkSource',
         ],
 
         # scancode_pre_scan is an entry point to define pre_scan plugins.
diff --git a/src/plugincode/post_scan.py b/src/plugincode/post_scan.py
index 4f1aee9ce79..8a0a8345ba3 100644
--- a/src/plugincode/post_scan.py
+++ b/src/plugincode/post_scan.py
@@ -38,14 +38,30 @@
 
 
 @post_scan_spec
-def post_scan_handler(active_scans, results):
+class PostScanPlugin(object):
     """
-    Process the scanned files and yield the modified results.
-    Parameters:
-     - `active_scans`: a list of scanners names requested in the current run.
-     - `results`: an iterable of scan results for each file or directory.
+    A post-scan plugin layout class to be extended by the post_scan plugins.
     """
-    pass
+
+    def __init__(self, option, user_input):
+        self.option = option
+        self.user_input = user_input
+
+    def process_results(self, results, active_scans):
+        """
+        Process the scan results.
+        results - an iterable of resources
+        active_scans - iterable of scanners that were used to obtain the results (e.g. "copyrights", "licenses")
+        """
+        return results
+
+    @staticmethod
+    def get_click_options():
+        """
+        Return an iterable of `click.Option` objects to be
+        used for calling the plugin.
+        """
+        return ()
 
 
 post_scan_plugins = PluginManager('post_scan')
@@ -57,6 +73,9 @@ def initialize():
     NOTE: this defines the entry points for use in setup.py
     """
     post_scan_plugins.load_setuptools_entrypoints('scancode_post_scan')
+    for name, plugin in get_post_scan_plugins().items():
+        if not issubclass(plugin, PostScanPlugin):
+            raise Exception('Invalid post-scan plugin "%(name)s": does not extend "plugincode.post_scan.PostScanPlugin".' % locals())
 
 
 def get_post_scan_plugins():
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index ff35543f092..fb9b242dacf 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -499,14 +499,15 @@ def scancode(ctx,
 
         has_requested_post_scan_plugins = False
 
-        for option, post_scan_handler in plugincode.post_scan.get_post_scan_plugins().items():
-            is_requested = kwargs[option.replace('-', '_')]
-            if is_requested:
-                options['--' + option] = True
-                if not quiet:
-                    echo_stderr('Running post-scan plugin: %(option)s...' % locals(), fg='green')
-                results = post_scan_handler(active_scans, results)
-                has_requested_post_scan_plugins = True
+        for name, plugin in plugincode.post_scan.get_post_scan_plugins().items():
+            for option in plugin.get_click_options():
+                user_input = kwargs[option.name]
+                if user_input:
+                    options['--' + name] = user_input
+                    if not quiet:
+                        echo_stderr('Running post-scan plugin: %(option)s...' % locals(), fg='green')
+                    results = plugin(option.name, user_input).process_results(results, active_scans)
+                    has_requested_post_scan_plugins = True
 
         if has_requested_post_scan_plugins:
             # FIXME: computing len needs a list and therefore needs loading it all ahead of time
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 6fefc52012b..299f20b3629 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -28,43 +28,51 @@
 
 from os import path
 
+from click import Option
+
+from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
 
 
 @post_scan_impl
-def process_mark_source(active_scans, results):
+class MarkSource(PostScanPlugin):
     """
     Set the "is_source" flag to true for directories that contain
     over 90% of source files as direct children.
     Has no effect unless the --info scan is requested.
     """
 
-    # FIXME: this is forcing all the scan results to be loaded in memory
-    # and defeats lazy loading from cache
-    results = list(results)
+    def process_results(self, results, _):
+        # FIXME: this is forcing all the scan results to be loaded in memory
+        # and defeats lazy loading from cache
+        results = list(results)
+
+        # FIXME: we should test for active scans instead, but "info" may not
+        # be present for now. check if the first item has a file info.
+        has_file_info = 'type' in results[0]
 
-    # FIXME: we should test for active scans instead, but "info" may not
-    # be present for now. check if the first item has a file info.
-    has_file_info = 'type' in results[0]
+        if not has_file_info:
+            # just yield results untouched
+            for scanned_file in results:
+                yield scanned_file
+            return
 
-    if not has_file_info:
-        # just yield results untouched
+        # FIXME: this is an nested loop, looping twice on results
+        # TODO: this may not recusrively roll up the is_source flag, as we
+        # may not iterate bottom up.
         for scanned_file in results:
+            if scanned_file['type'] == 'directory' and scanned_file['files_count'] > 0:
+                source_files_count = 0
+                for scanned_file2 in results:
+                    if path.dirname(scanned_file2['path']) == scanned_file['path']:
+                        if scanned_file2['is_source']:
+                            source_files_count += 1
+                mark_source(source_files_count, scanned_file)
             yield scanned_file
-        return
 
-    # FIXME: this is an nested loop, looping twice on results
-    # TODO: this may not recusrively roll up the is_source flag, as we
-    # may not iterate bottom up.
-    for scanned_file in results:
-        if scanned_file['type'] == 'directory' and scanned_file['files_count'] > 0:
-            source_files_count = 0
-            for scanned_file2 in results:
-                if path.dirname(scanned_file2['path']) == scanned_file['path']:
-                    if scanned_file2['is_source']:
-                        source_files_count += 1
-            mark_source(source_files_count, scanned_file)
-        yield scanned_file
+    @staticmethod
+    def get_click_options():
+        return [Option(('--mark-source',), is_flag=True)]
 
 
 def mark_source(source_files_count, scanned_file):
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index db155543e1d..40a42d1318f 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -25,25 +25,33 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+from click import Option
+
+from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
 
 
 @post_scan_impl
-def process_only_findings(active_scans, results):
+class OnlyFindings(PostScanPlugin):
     """
     Only return files or directories with findings for the requested
     scans. Files and directories without findings are omitted (not
     considering basic file information as findings).
     """
 
-    # FIXME: this is forcing all the scan results to be loaded in memory
-    # and defeats lazy loading from cache. Only a different caching
-    # (e.g. DB) could work here.
-    # FIXME: We should instead use a generator or use a filter function
-    # that pass to the scan results loader iterator
-    for scanned_file in results:
-        if has_findings(active_scans, scanned_file):
-            yield scanned_file
+    def process_results(self, results, active_scans):
+        # FIXME: this is forcing all the scan results to be loaded in memory
+        # and defeats lazy loading from cache. Only a different caching
+        # (e.g. DB) could work here.
+        # FIXME: We should instead use a generator or use a filter function
+        # that pass to the scan results loader iterator
+        for scanned_file in results:
+            if has_findings(active_scans, scanned_file):
+                yield scanned_file
+
+    @staticmethod
+    def get_click_options():
+        return [Option(('--only-findings',), is_flag=True)]
 
 
 def has_findings(active_scans, scanned_file):

From f41bca6f25607b4760eed947a5f13835549dee6c Mon Sep 17 00:00:00 2001
From: Haiko Schol <ext-haiko.schol@here.com>
Date: Fri, 24 Nov 2017 10:23:46 +0100
Subject: [PATCH 005/122] Improve documentation of
 PostScanPlugin.process_results()

Signed-off-by: Haiko Schol <ext-haiko.schol@here.com>
---
 src/plugincode/post_scan.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugincode/post_scan.py b/src/plugincode/post_scan.py
index 8a0a8345ba3..f7e4294416b 100644
--- a/src/plugincode/post_scan.py
+++ b/src/plugincode/post_scan.py
@@ -49,7 +49,8 @@ def __init__(self, option, user_input):
 
     def process_results(self, results, active_scans):
         """
-        Process the scan results.
+        Return an iterable of results (eventually transformed or filtered) based on the results iterable.
+
         results - an iterable of resources
         active_scans - iterable of scanners that were used to obtain the results (e.g. "copyrights", "licenses")
         """

From 403b1b2effffa5573c71b74b1861904327ea0845 Mon Sep 17 00:00:00 2001
From: Haiko Schol <ext-haiko.schol@here.com>
Date: Fri, 24 Nov 2017 10:59:00 +0100
Subject: [PATCH 006/122] Rename get_click_options() to get_options()

Signed-off-by: Haiko Schol <ext-haiko.schol@here.com>
---
 src/plugincode/post_scan.py          | 2 +-
 src/plugincode/pre_scan.py           | 2 +-
 src/scancode/cli.py                  | 6 +++---
 src/scancode/plugin_ignore.py        | 2 +-
 src/scancode/plugin_mark_source.py   | 2 +-
 src/scancode/plugin_only_findings.py | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugincode/post_scan.py b/src/plugincode/post_scan.py
index f7e4294416b..9af8641a77e 100644
--- a/src/plugincode/post_scan.py
+++ b/src/plugincode/post_scan.py
@@ -57,7 +57,7 @@ def process_results(self, results, active_scans):
         return results
 
     @staticmethod
-    def get_click_options():
+    def get_options():
         """
         Return an iterable of `click.Option` objects to be
         used for calling the plugin.
diff --git a/src/plugincode/pre_scan.py b/src/plugincode/pre_scan.py
index 7f44363a5f9..845db14ff2a 100644
--- a/src/plugincode/pre_scan.py
+++ b/src/plugincode/pre_scan.py
@@ -60,7 +60,7 @@ def get_ignores(self):
         return {}
 
     @staticmethod
-    def get_click_options():
+    def get_options():
         """
         Return an iterable of `click.Option` objects to be
         used for calling the plugin.
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index fb9b242dacf..f868aaaac6d 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -262,7 +262,7 @@ def __init__(self, name, context_settings=None, callback=None,
             option = ScanOption(('--' + name,), is_flag=True, help=help_text, group=POST_SCAN)
             self.params.append(option)
         for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-            for option in plugin.get_click_options():
+            for option in plugin.get_options():
                 if not isinstance(option, click.Option):
                     raise Exception('Invalid plugin "%(name)s": supplied click option is not an instance of "click.Option".' % locals())
                 option.group = PRE_SCAN
@@ -469,7 +469,7 @@ def scancode(ctx,
     scans_cache_class = get_scans_cache_class()
     pre_scan_plugins = []
     for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-        for option in plugin.get_click_options():
+        for option in plugin.get_options():
             user_input = kwargs[option.name]
             if user_input:
                 options['--' + name] = user_input
@@ -500,7 +500,7 @@ def scancode(ctx,
         has_requested_post_scan_plugins = False
 
         for name, plugin in plugincode.post_scan.get_post_scan_plugins().items():
-            for option in plugin.get_click_options():
+            for option in plugin.get_options():
                 user_input = kwargs[option.name]
                 if user_input:
                     options['--' + name] = user_input
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 36ee999c7eb..22b4b4e5af4 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -44,5 +44,5 @@ def get_ignores(self):
         return {pattern: 'User ignore: Supplied by --ignore' for pattern in self.user_input}
 
     @staticmethod
-    def get_click_options():
+    def get_options():
         return [Option(('--ignore',), multiple=True, metavar='<pattern>', help='Ignore files matching <pattern>.')]
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 299f20b3629..9e4c1c88d50 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -71,7 +71,7 @@ def process_results(self, results, _):
             yield scanned_file
 
     @staticmethod
-    def get_click_options():
+    def get_options():
         return [Option(('--mark-source',), is_flag=True)]
 
 
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index 40a42d1318f..47bfb5459c0 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -50,7 +50,7 @@ def process_results(self, results, active_scans):
                 yield scanned_file
 
     @staticmethod
-    def get_click_options():
+    def get_options():
         return [Option(('--only-findings',), is_flag=True)]
 
 

From 5f4c626be80dbb9aedd536bad7a00aa5106683d2 Mon Sep 17 00:00:00 2001
From: Haiko Schol <ext-haiko.schol@here.com>
Date: Fri, 24 Nov 2017 20:09:43 +0100
Subject: [PATCH 007/122] Allow post-scan plugins to take options other than
 boolean flags

Signed-off-by: Haiko Schol <ext-haiko.schol@here.com>
---
 setup.py            |  6 +++---
 src/scancode/cli.py | 33 ++++++++++++++++++++-------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/setup.py b/setup.py
index 984d21fbc91..00f23102337 100644
--- a/setup.py
+++ b/setup.py
@@ -218,9 +218,9 @@ def read(*names, **kwargs):
 
         # scancode_post_scan is an entry point for post_scan_plugins.
         # See plugincode.post_scan module for details and doc.
-        # note: the "name" of the entrypoint (e.g only-findings)
-        # becomes the ScanCode CLI boolean flag used to enable a
-        # given post_scan plugin
+        # note: for simple plugins, the "name" of the entrypoint
+        # (e.g only-findings) becomes the ScanCode CLI boolean flag
+        # used to enable the plugin
         'scancode_post_scan': [
             'only-findings = scancode.plugin_only_findings:OnlyFindings',
             'mark-source = scancode.plugin_mark_source:MarkSource',
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index f868aaaac6d..f19a0c25c44 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -256,17 +256,24 @@ def __init__(self, name, context_settings=None, callback=None,
         super(ScanCommand, self).__init__(name, context_settings, callback,
                  params, help, epilog, short_help, options_metavar, add_help_option)
 
-        for name, callback in plugincode.post_scan.get_post_scan_plugins().items():
-            # normalize white spaces in help.
-            help_text = ' '.join(callback.__doc__.split())
-            option = ScanOption(('--' + name,), is_flag=True, help=help_text, group=POST_SCAN)
-            self.params.append(option)
-        for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-            for option in plugin.get_options():
-                if not isinstance(option, click.Option):
-                    raise Exception('Invalid plugin "%(name)s": supplied click option is not an instance of "click.Option".' % locals())
-                option.group = PRE_SCAN
-                self.params.append(option)
+        plugins_by_group = {
+            PRE_SCAN: plugincode.pre_scan.get_pre_scan_plugins(),
+            POST_SCAN: plugincode.post_scan.get_post_scan_plugins(),
+        }
+
+        for group, plugins in plugins_by_group.items():
+            for name, plugin in plugins.items():
+                # Normalize white spaces in docstring and use it as help text for options
+                # that don't specify a help text.
+                help_text = ' '.join(plugin.__doc__.split())
+
+                for option in plugin.get_options():
+                    if not isinstance(option, click.Option):
+                        raise Exception('Invalid plugin "%(name)s": supplied click option is not an instance of "click.Option".' % locals())
+
+                    option.help = option.help or help_text
+                    option.group = group
+                    self.params.append(option)
 
     def format_options(self, ctx, formatter):
         """
@@ -503,9 +510,9 @@ def scancode(ctx,
             for option in plugin.get_options():
                 user_input = kwargs[option.name]
                 if user_input:
-                    options['--' + name] = user_input
+                    options['--' + option.name.replace('_', '-')] = user_input
                     if not quiet:
-                        echo_stderr('Running post-scan plugin: %(option)s...' % locals(), fg='green')
+                        echo_stderr('Running post-scan plugin: %(name)s...' % locals(), fg='green')
                     results = plugin(option.name, user_input).process_results(results, active_scans)
                     has_requested_post_scan_plugins = True
 

From 612cf689b8273613afa5331b9114f1633ca4cad1 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Sun, 10 Dec 2017 10:12:07 +0100
Subject: [PATCH 008/122] Use a common BasePlugin class for all plugins #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/__init__.py           | 46 +++++++++++++++++++++++++++-
 src/plugincode/post_scan.py          | 27 +++-------------
 src/plugincode/pre_scan.py           | 39 ++++++-----------------
 src/scancode/api.py                  |  7 ++---
 src/scancode/cli.py                  | 35 ++++++++++++---------
 src/scancode/plugin_ignore.py        | 11 ++++---
 src/scancode/plugin_only_findings.py |  2 +-
 7 files changed, 90 insertions(+), 77 deletions(-)

diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 7ebe6b01cb0..91d02bac53e 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -24,3 +24,47 @@
 
 
 from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
+
+
+class BasePlugin(object):
+    """
+    A base class for all scancode plugins.
+    """
+    # a short string describing this plugin. Subclass must override
+    name = None
+
+    def __init__(self, selected_options):
+        """
+        Initialize a new plugin with a mapping of user selected options.
+        """
+        self.selected_options = selected_options
+
+    def process_one(self, resource):
+        """
+        Yield zero, one or more Resource objects from a single `resource`
+        Resource object.
+        """
+        yield resource
+
+    def process_resources(self, resources):
+        """
+        Return an iterable of Resource objects, possibly transformed, filtered
+        or enhanced by this plugin from  a `resources` iterable of Resource
+        objects.
+        """
+        for resource in resources:
+            for res in self.process_one(resource):
+                if res:
+                    yield res
+
+    @classmethod
+    def get_plugin_options():
+        """
+        Return a list of `ScanOption` objects for this plugin.
+        Subclass must override.
+        """
+        return []
+
+
diff --git a/src/plugincode/post_scan.py b/src/plugincode/post_scan.py
index 9af8641a77e..ffe367b5135 100644
--- a/src/plugincode/post_scan.py
+++ b/src/plugincode/post_scan.py
@@ -32,38 +32,19 @@
 from pluggy import HookspecMarker
 from pluggy import PluginManager
 
+from plugincode import BasePlugin
+
 
 post_scan_spec = HookspecMarker('post_scan')
 post_scan_impl = HookimplMarker('post_scan')
 
 
 @post_scan_spec
-class PostScanPlugin(object):
+class PostScanPlugin(BasePlugin):
     """
-    A post-scan plugin layout class to be extended by the post_scan plugins.
+    A post-scan plugin base class.
     """
 
-    def __init__(self, option, user_input):
-        self.option = option
-        self.user_input = user_input
-
-    def process_results(self, results, active_scans):
-        """
-        Return an iterable of results (eventually transformed or filtered) based on the results iterable.
-
-        results - an iterable of resources
-        active_scans - iterable of scanners that were used to obtain the results (e.g. "copyrights", "licenses")
-        """
-        return results
-
-    @staticmethod
-    def get_options():
-        """
-        Return an iterable of `click.Option` objects to be
-        used for calling the plugin.
-        """
-        return ()
-
 
 post_scan_plugins = PluginManager('post_scan')
 post_scan_plugins.add_hookspecs(sys.modules[__name__])
diff --git a/src/plugincode/pre_scan.py b/src/plugincode/pre_scan.py
index 845db14ff2a..d28b61673ec 100644
--- a/src/plugincode/pre_scan.py
+++ b/src/plugincode/pre_scan.py
@@ -32,41 +32,19 @@
 from pluggy import HookspecMarker
 from pluggy import PluginManager
 
+from plugincode import BasePlugin
+
 
 pre_scan_spec = HookspecMarker('pre_scan')
 pre_scan_impl = HookimplMarker('pre_scan')
 
+
 @pre_scan_spec
-class PreScanPlugin(object):
+class PreScanPlugin(BasePlugin):
     """
-    A pre-scan plugin layout class to be extended by the pre_scan plugins.
+    A pre-scan plugin base class.
     """
 
-    def __init__(self, option, user_input):
-        self.user_input = user_input
-
-    def process_resource(self, resource):
-        """
-        Process a resource prior to scan.
-        :param resource: instance of Resource to process
-        :return: resource or None to ignore the resource
-        """
-        return resource
-
-    def get_ignores(self):
-        """
-        Return a dict of ignores to be used when processing resources
-        """
-        return {}
-
-    @staticmethod
-    def get_options():
-        """
-        Return an iterable of `click.Option` objects to be
-        used for calling the plugin.
-        """
-        return ()
-
 
 pre_scan_plugins = PluginManager('pre_scan')
 pre_scan_plugins.add_hookspecs(sys.modules[__name__])
@@ -79,10 +57,11 @@ def initialize():
         if not issubclass(plugin, PreScanPlugin):
             raise Exception('Invalid pre-scan plugin "%(name)s": does not extend "plugincode.pre_scan.PreScanPlugin".' % locals())
 
+
 def get_pre_scan_plugins():
     """
-    Return an ordered mapping of CLI option name --> plugin callable
-    for all the pre_scan plugins. The mapping is ordered by sorted key.
-    This is the main API for other code to access pre_scan plugins.
+    Return an ordered mapping of plugin "name" --> plugin object
+    for all the pre-scan plugins. The mapping is sorted by name.
+    This is the main API for other code to access pre-scan plugins.
     """
     return OrderedDict(sorted(pre_scan_plugins.list_name_plugin()))
diff --git a/src/scancode/api.py b/src/scancode/api.py
index 86d0eac8ad9..9f78b62288b 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -42,8 +42,8 @@
 
 class Resource(object):
     """
-    Store scanned details for a single resource (file or a directory)
-    such as infos and path
+    A resource represent a file or directory with its essential "file
+    information" and the scanned data details.
     """
 
     def __init__(self, scan_cache_class, abs_path, base_is_dir, len_base_path):
@@ -52,8 +52,7 @@ def __init__(self, scan_cache_class, abs_path, base_is_dir, len_base_path):
         self.abs_path = abs_path
         self.base_is_dir = base_is_dir
         posix_path = as_posixpath(abs_path)
-        # fix paths: keep the path as relative to the original
-        # base_path. This is always Unicode
+        # keep the path as relative to the original base_path, always Unicode
         self.rel_path = get_relative_path(posix_path, len_base_path, base_is_dir)
         self.infos = OrderedDict()
         self.infos['path'] = self.rel_path
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index f19a0c25c44..ca42200b60a 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -253,26 +253,28 @@ class ScanCommand(BaseCommand):
     def __init__(self, name, context_settings=None, callback=None,
                  params=None, help=None, epilog=None, short_help=None,
                  options_metavar='[OPTIONS]', add_help_option=True):
+
         super(ScanCommand, self).__init__(name, context_settings, callback,
                  params, help, epilog, short_help, options_metavar, add_help_option)
 
-        plugins_by_group = {
-            PRE_SCAN: plugincode.pre_scan.get_pre_scan_plugins(),
-            POST_SCAN: plugincode.post_scan.get_post_scan_plugins(),
-        }
+        plugins_by_group = [
+            (PRE_SCAN, plugincode.pre_scan.get_pre_scan_plugins()),
+            (POST_SCAN, plugincode.post_scan.get_post_scan_plugins()),
+        ]
 
-        for group, plugins in plugins_by_group.items():
-            for name, plugin in plugins.items():
+        for group, plugins in plugins_by_group:
+            for name, plugin in sorted(plugins.items()):
                 # Normalize white spaces in docstring and use it as help text for options
                 # that don't specify a help text.
                 help_text = ' '.join(plugin.__doc__.split())
 
                 for option in plugin.get_options():
-                    if not isinstance(option, click.Option):
-                        raise Exception('Invalid plugin "%(name)s": supplied click option is not an instance of "click.Option".' % locals())
+                    if not isinstance(option, ScanOption):
+                        raise Exception('Invalid plugin option "%(name)s": option is not an instance of "ScanOption".' % locals())
 
                     option.help = option.help or help_text
                     option.group = group
+                    # this makes the plugin options "available" to the command
                     self.params.append(option)
 
     def format_options(self, ctx, formatter):
@@ -304,6 +306,7 @@ def format_options(self, ctx, formatter):
                     with formatter.section(group):
                         formatter.write_dl(option)
 
+
 class ScanOption(click.Option):
     """
     Allow an extra param `group` to be set which can be used
@@ -315,10 +318,12 @@ def __init__(self, param_decls=None, show_default=False,
                  hide_input=False, is_flag=None, flag_value=None,
                  multiple=False, count=False, allow_from_autoenv=True,
                  type=None, help=None, group=None, **attrs):
+
         super(ScanOption, self).__init__(param_decls, show_default,
                      prompt, confirmation_prompt,
                      hide_input, is_flag, flag_value,
                      multiple, count, allow_from_autoenv, type, help, **attrs)
+        
         self.group = group
 
 
@@ -400,13 +405,14 @@ def validate_exclusive(ctx, exclusive_options):
 
 def scancode(ctx,
              input, output_file,
-             copyright, license, package,
-             email, url, info,
-             license_score, license_text, license_url_template,
+             copyright, package, email, url, info,
+             license,  license_score, license_text, license_url_template,
              strip_root, full_root,
-             format, verbose, quiet, processes,
+             format, 
+             
+             verbose, quiet, processes,
              diag, timeout, *args, **kwargs):
-    """scan the <input> file or directory for origin clues and license and save results to the <output_file>.
+    """scan the <input> file or directory for license, origin and packages and save results to <output_file(s)>.
 
     The scan results are printed to stdout if <output_file> is not provided.
     Error and progress is printed to stderr.
@@ -447,7 +453,8 @@ def scancode(ctx,
         options['--license'] = True
         options['--package'] = True
 
-    # A hack to force info being exposed for SPDX output in order to reuse calculated file SHA1s.
+    # A hack to force info being exposed for SPDX output in order to reuse
+    # calculated file SHA1s.
     if format in ('spdx-tv', 'spdx-rdf'):
         possible_scans['infos'] = True
 
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 22b4b4e5af4..d2b33fdfc45 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -36,13 +36,16 @@ class ProcessIgnore(PreScanPlugin):
     """
     Ignore files matching the supplied pattern.
     """
-
-    def __init__(self, option, user_input):
-        super(ProcessIgnore, self).__init__(option, user_input)
+    name = 'ignores'
 
     def get_ignores(self):
         return {pattern: 'User ignore: Supplied by --ignore' for pattern in self.user_input}
 
     @staticmethod
     def get_options():
-        return [Option(('--ignore',), multiple=True, metavar='<pattern>', help='Ignore files matching <pattern>.')]
+        return [
+            Option(('--ignore',), 
+                   multiple=True, 
+                   metavar='<pattern>', 
+                   help='Ignore files matching <pattern>.')
+        ]
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index 47bfb5459c0..5ba0b22276d 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -49,7 +49,7 @@ def process_results(self, results, active_scans):
             if has_findings(active_scans, scanned_file):
                 yield scanned_file
 
-    @staticmethod
+    @classmethod
     def get_options():
         return [Option(('--only-findings',), is_flag=True)]
 

From b765432d035ef7827d94de22b135d4146f7a1668 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 2 Jan 2018 13:22:15 +0100
Subject: [PATCH 009/122] Inline fileutils imports #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index ca42200b60a..265904c7000 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -46,11 +46,18 @@
 click.disable_unicode_literals_warning = True
 from click.termui import style
 
-from commoncode import filetype
-from commoncode import fileutils
+from commoncode.filetype import is_dir
+from commoncode.fileutils import as_posixpath
+from commoncode.fileutils import create_dir
+from commoncode.fileutils import file_name
+from commoncode.fileutils import parent_directory
+from commoncode.fileutils import PATH_TYPE
 from commoncode.fileutils import path_to_bytes
 from commoncode.fileutils import path_to_unicode
+from commoncode.fileutils import resource_iter
+
 from commoncode import ignore
+
 from commoncode.system import on_linux
 from commoncode.text import toascii
 
@@ -246,6 +253,7 @@ def reindex_licenses(ctx, param, value):
 number of files processed. Use --verbose to display file-by-file progress.
 '''
 
+
 class ScanCommand(BaseCommand):
     short_usage_help = '''
 Try 'scancode --help' for help on options and arguments.'''
@@ -357,7 +365,7 @@ def validate_exclusive(ctx, exclusive_options):
 @click.pass_context
 
 # ensure that the input path is bytes on Linux, unicode elsewhere
-@click.argument('input', metavar='<input>', type=click.Path(exists=True, readable=True, path_type=fileutils.PATH_TYPE))
+@click.argument('input', metavar='<input>', type=click.Path(exists=True, readable=True, path_type=PATH_TYPE))
 @click.argument('output_file', default='-', metavar='<output_file>', type=click.File(mode='wb', lazy=False))
 
 # Note that click's 'default' option is set to 'false' here despite these being documented to be enabled by default in
@@ -727,17 +735,17 @@ def _get_root_dir(input_path, strip_root=False, full_root=False):
         return
 
     scanned_path = os.path.abspath(os.path.normpath(os.path.expanduser(input_path)))
-    scanned_path = fileutils.as_posixpath(scanned_path)
-    if filetype.is_dir(scanned_path):
+    scanned_path = as_posixpath(scanned_path)
+    if is_dir(scanned_path):
         root_dir = scanned_path
     else:
-        root_dir = fileutils.parent_directory(scanned_path)
-        root_dir = fileutils.as_posixpath(root_dir)
+        root_dir = parent_directory(scanned_path)
+        root_dir = as_posixpath(root_dir)
 
     if full_root:
         return root_dir
     else:
-        return fileutils.file_name(root_dir)
+        return file_name(root_dir)
 
 
 def _resource_logger(logfile_fd, resources):
@@ -827,7 +835,7 @@ def resource_paths(base_path, diag, scans_cache_class, pre_scan_plugins=None):
             base_path = path_to_unicode(base_path)
 
     base_path = os.path.abspath(os.path.normpath(os.path.expanduser(base_path)))
-    base_is_dir = filetype.is_dir(base_path)
+    base_is_dir = is_dir(base_path)
     len_base_path = len(base_path)
     ignores = {}
     if pre_scan_plugins:
@@ -836,7 +844,7 @@ def resource_paths(base_path, diag, scans_cache_class, pre_scan_plugins=None):
     ignores.update(ignore.ignores_VCS)
 
     ignorer = build_ignorer(ignores, unignores={})
-    resources = fileutils.resource_iter(base_path, ignored=ignorer)
+    resources = resource_iter(base_path, ignored=ignorer)
 
     for abs_path in resources:
         resource = Resource(scans_cache_class, abs_path, base_is_dir, len_base_path)
@@ -927,7 +935,7 @@ def save_results(scanners, files_count, results, format, options, input, output_
         # we are writing to a real filesystem file: create directories!
         parent_dir = os.path.dirname(output_file.name)
         if parent_dir:
-            fileutils.create_dir(abspath(expanduser(parent_dir)))
+            create_dir(abspath(expanduser(parent_dir)))
 
     # Write scan results to file or screen as a formatted output ...
     # ... using a user-provided custom format template

From 7f9b74c16d9893567448e556ec878108aa2c51ae Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 2 Jan 2018 13:22:54 +0100
Subject: [PATCH 010/122] Use proper import in prep for Python 3 #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/fileutils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/commoncode/fileutils.py b/src/commoncode/fileutils.py
index a0c236212e1..4caac8fab8f 100644
--- a/src/commoncode/fileutils.py
+++ b/src/commoncode/fileutils.py
@@ -37,6 +37,7 @@
 
 try:
     from os import fsencode
+    from os import fsdecode
 except ImportError:
     from backports.os import fsencode
     from backports.os import fsdecode

From cff89add2a6bce29e2f28bd95a238cd32dea5bf9 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 2 Jan 2018 14:55:00 +0100
Subject: [PATCH 011/122] Update help text test to match latest code #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/scancode/data/help/help.txt       | 4 ++--
 tests/scancode/test_scan_help_groups.py | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index 9ffd2a0e6ad..e6327c116d1 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -1,7 +1,7 @@
 Usage: scancode [OPTIONS] <input> <output_file>
 
-  scan the <input> file or directory for origin clues and license and save
-  results to the <output_file>.
+  scan the <input> file or directory for license, origin and packages and save
+  results to <output_file(s)>.
 
   The scan results are printed to stdout if <output_file> is not provided.
   Error and progress is printed to stderr.
diff --git a/tests/scancode/test_scan_help_groups.py b/tests/scancode/test_scan_help_groups.py
index 6485b9652b9..a3fbc20746f 100644
--- a/tests/scancode/test_scan_help_groups.py
+++ b/tests/scancode/test_scan_help_groups.py
@@ -75,4 +75,8 @@ def scan(opt):
     def test_scan_cli_help(self):
         expected_file = self.get_test_loc('help/help.txt')
         result = run_scan_click(['--help'])
+        regen = False
+        if regen:
+            with open(expected_file, 'wb') as ef:
+                ef.write(result.output)
         assert open(expected_file).read() == result.output

From 75908e75694116d4c12bdf683cb537826ab73167 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 2 Jan 2018 14:56:23 +0100
Subject: [PATCH 012/122] Use class method for get_plugin_options #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/__init__.py           |  2 +-
 src/scancode/__init__.py             | 26 ++++++++++++++++++++++++++
 src/scancode/cli.py                  | 27 ++++-----------------------
 src/scancode/plugin_ignore.py        |  9 ++++-----
 src/scancode/plugin_mark_source.py   |  9 ++++-----
 src/scancode/plugin_only_findings.py |  7 +++----
 6 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 91d02bac53e..d65d438798d 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -60,7 +60,7 @@ def process_resources(self, resources):
                     yield res
 
     @classmethod
-    def get_plugin_options():
+    def get_plugin_options(cls):
         """
         Return a list of `ScanOption` objects for this plugin.
         Subclass must override.
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index 46affd53e35..5235507ad89 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -32,6 +32,8 @@
 from os.path import join
 from os.path import exists
 
+import click
+
 from commoncode import fileutils
 
 
@@ -51,3 +53,27 @@
 except DistributionNotFound:
     # package is not installed ??
     __version__ = '2.2.1'
+
+
+
+class ScanOption(click.Option):
+    """
+    Allow an extra param `group` to be set which can be used
+    to determine to which group the option belongs.
+    """
+
+    def __init__(self, param_decls=None, show_default=False,
+                 prompt=False, confirmation_prompt=False,
+                 hide_input=False, is_flag=None, flag_value=None,
+                 multiple=False, count=False, allow_from_autoenv=True,
+                 type=None, help=None, group=None, **attrs):
+
+        super(ScanOption, self).__init__(param_decls, show_default,
+                     prompt, confirmation_prompt,
+                     hide_input, is_flag, flag_value,
+                     multiple, count, allow_from_autoenv, type, help, **attrs)
+        
+        self.group = group
+
+
+
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 265904c7000..1788f9d9a2f 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -66,6 +66,7 @@
 import plugincode.pre_scan
 
 from scancode import __version__ as version
+from scancode import ScanOption
 
 from scancode.api import DEJACODE_LICENSE_URL
 from scancode.api import _empty_file_infos
@@ -276,7 +277,7 @@ def __init__(self, name, context_settings=None, callback=None,
                 # that don't specify a help text.
                 help_text = ' '.join(plugin.__doc__.split())
 
-                for option in plugin.get_options():
+                for option in plugin.get_plugin_options():
                     if not isinstance(option, ScanOption):
                         raise Exception('Invalid plugin option "%(name)s": option is not an instance of "ScanOption".' % locals())
 
@@ -315,26 +316,6 @@ def format_options(self, ctx, formatter):
                         formatter.write_dl(option)
 
 
-class ScanOption(click.Option):
-    """
-    Allow an extra param `group` to be set which can be used
-    to determine to which group the option belongs.
-    """
-
-    def __init__(self, param_decls=None, show_default=False,
-                 prompt=False, confirmation_prompt=False,
-                 hide_input=False, is_flag=None, flag_value=None,
-                 multiple=False, count=False, allow_from_autoenv=True,
-                 type=None, help=None, group=None, **attrs):
-
-        super(ScanOption, self).__init__(param_decls, show_default,
-                     prompt, confirmation_prompt,
-                     hide_input, is_flag, flag_value,
-                     multiple, count, allow_from_autoenv, type, help, **attrs)
-        
-        self.group = group
-
-
 def validate_formats(ctx, param, value):
     """
     Validate formats and template files. Raise a BadParameter on errors.
@@ -491,7 +472,7 @@ def scancode(ctx,
     scans_cache_class = get_scans_cache_class()
     pre_scan_plugins = []
     for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-        for option in plugin.get_options():
+        for option in plugin.get_plugin_options():
             user_input = kwargs[option.name]
             if user_input:
                 options['--' + name] = user_input
@@ -522,7 +503,7 @@ def scancode(ctx,
         has_requested_post_scan_plugins = False
 
         for name, plugin in plugincode.post_scan.get_post_scan_plugins().items():
-            for option in plugin.get_options():
+            for option in plugin.get_plugin_options():
                 user_input = kwargs[option.name]
                 if user_input:
                     options['--' + option.name.replace('_', '-')] = user_input
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index d2b33fdfc45..7e284c76e57 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -25,10 +25,9 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from click import Option
-
 from plugincode.pre_scan import PreScanPlugin
 from plugincode.pre_scan import pre_scan_impl
+from scancode.cli import ScanOption
 
 
 @pre_scan_impl
@@ -41,10 +40,10 @@ class ProcessIgnore(PreScanPlugin):
     def get_ignores(self):
         return {pattern: 'User ignore: Supplied by --ignore' for pattern in self.user_input}
 
-    @staticmethod
-    def get_options():
+    @classmethod
+    def get_plugin_options(cls):
         return [
-            Option(('--ignore',), 
+            ScanOption(('--ignore',), 
                    multiple=True, 
                    metavar='<pattern>', 
                    help='Ignore files matching <pattern>.')
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 9e4c1c88d50..0677d4545c4 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -28,10 +28,9 @@
 
 from os import path
 
-from click import Option
-
 from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
+from scancode.cli import ScanOption
 
 
 @post_scan_impl
@@ -70,9 +69,9 @@ def process_results(self, results, _):
                 mark_source(source_files_count, scanned_file)
             yield scanned_file
 
-    @staticmethod
-    def get_options():
-        return [Option(('--mark-source',), is_flag=True)]
+    @classmethod
+    def get_plugin_options(cls):
+        return [ScanOption(('--mark-source',), is_flag=True)]
 
 
 def mark_source(source_files_count, scanned_file):
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index 5ba0b22276d..f282a80436a 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -25,10 +25,9 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from click import Option
-
 from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
+from scancode.cli import ScanOption
 
 
 @post_scan_impl
@@ -50,8 +49,8 @@ def process_results(self, results, active_scans):
                 yield scanned_file
 
     @classmethod
-    def get_options():
-        return [Option(('--only-findings',), is_flag=True)]
+    def get_plugin_options(cls):
+        return [ScanOption(('--only-findings',), is_flag=True)]
 
 
 def has_findings(active_scans, scanned_file):

From 586d392018e72b02f93ce5e5b809a2f72e698c3c Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 2 Jan 2018 14:56:49 +0100
Subject: [PATCH 013/122] Use scans_cache_class not scan_cache_class #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/api.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/scancode/api.py b/src/scancode/api.py
index 9f78b62288b..c877f1e53fa 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -46,8 +46,8 @@ class Resource(object):
     information" and the scanned data details.
     """
 
-    def __init__(self, scan_cache_class, abs_path, base_is_dir, len_base_path):
-        self.scan_cache_class = scan_cache_class()
+    def __init__(self, scans_cache_class, abs_path, base_is_dir, len_base_path):
+        self.scans_cache_class = scans_cache_class()
         self.is_cached = False
         self.abs_path = abs_path
         self.base_is_dir = base_is_dir
@@ -62,13 +62,13 @@ def put_info(self, infos):
         Cache file info and set `is_cached` to True if already cached or false otherwise.
         """
         self.infos.update(infos)
-        self.is_cached = self.scan_cache_class.put_info(self.rel_path, self.infos)
+        self.is_cached = self.scans_cache_class.put_info(self.rel_path, self.infos)
 
     def get_info(self):
         """
         Retrieve info from cache.
         """
-        return self.scan_cache_class.get_info(self.rel_path)
+        return self.scans_cache_class.get_info(self.rel_path)
 
 
 def extract_archives(location, recurse=True):

From 66ec6dc4c9856a97e61930645db50335380a1f98 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 2 Jan 2018 14:57:14 +0100
Subject: [PATCH 014/122] Extract function to get_cache_dir #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cache.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/scancode/cache.py b/src/scancode/cache.py
index 1621dc42798..e8f9cd7c90c 100644
--- a/src/scancode/cache.py
+++ b/src/scancode/cache.py
@@ -87,16 +87,24 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, unicode) and a or repr(a) for a in args))
 
 
-def get_scans_cache_class(cache_dir=scans_cache_dir):
+def get_cache_dir(base_cache_dir=scans_cache_dir):
     """
-    Return a new persistent cache class configured with a unique storage directory.
+    Return a new, created and unique cache storage directory.
     """
     # create a unique temp directory in cache_dir
-    fileutils.create_dir(cache_dir)
+    fileutils.create_dir(base_cache_dir)
     prefix = timeutils.time2tstamp() + u'-'
-    cache_dir = fileutils.get_temp_dir(cache_dir, prefix=prefix)
+    cache_dir = fileutils.get_temp_dir(base_cache_dir, prefix=prefix)
     if on_linux:
         cache_dir = path_to_bytes(cache_dir)
+    return cache_dir
+
+
+def get_scans_cache_class(base_cache_dir=scans_cache_dir):
+    """
+    Return a new persistent cache class configured with a unique storage directory.
+    """
+    cache_dir = get_cache_dir(base_cache_dir=base_cache_dir)
     sc = ScanFileCache(cache_dir)
     sc.setup()
     return partial(ScanFileCache, cache_dir)

From 81780ea6274fc8eb9b3a1fd282c2031f3795af5d Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 2 Jan 2018 16:39:24 +0100
Subject: [PATCH 015/122] Ensure all tests pass #787

 * more ScanOption to scancode.__init__.py
 * add active_scans to BasePlugin initializer
 * ensure plugins work consistently
 * try to not make ignores a special case

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/__init__.py             |  6 +-
 src/scancode/cli.py                  | 94 +++++++++++++++-------------
 src/scancode/plugin_ignore.py        |  5 +-
 src/scancode/plugin_mark_source.py   |  2 +-
 src/scancode/plugin_only_findings.py |  5 +-
 tests/scancode/test_ignore_files.py  | 12 ++--
 6 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index 5235507ad89..8e0e0999a77 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -55,7 +55,6 @@
     __version__ = '2.2.1'
 
 
-
 class ScanOption(click.Option):
     """
     Allow an extra param `group` to be set which can be used
@@ -72,8 +71,5 @@ def __init__(self, param_decls=None, show_default=False,
                      prompt, confirmation_prompt,
                      hide_input, is_flag, flag_value,
                      multiple, count, allow_from_autoenv, type, help, **attrs)
-        
-        self.group = group
-
-
 
+        self.group = group
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 1788f9d9a2f..d2c7c3efa58 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -272,14 +272,14 @@ def __init__(self, name, context_settings=None, callback=None,
         ]
 
         for group, plugins in plugins_by_group:
-            for name, plugin in sorted(plugins.items()):
-                # Normalize white spaces in docstring and use it as help text for options
-                # that don't specify a help text.
+            for pname, plugin in sorted(plugins.items()):
+                # Normalize white spaces in docstring and use it as help text
+                # for options that don't specify a help text.
                 help_text = ' '.join(plugin.__doc__.split())
 
                 for option in plugin.get_plugin_options():
                     if not isinstance(option, ScanOption):
-                        raise Exception('Invalid plugin option "%(name)s": option is not an instance of "ScanOption".' % locals())
+                        raise Exception('Invalid plugin option "%(pname)s": option is not an instance of "ScanOption".' % locals())
 
                     option.help = option.help or help_text
                     option.group = group
@@ -395,10 +395,10 @@ def validate_exclusive(ctx, exclusive_options):
 def scancode(ctx,
              input, output_file,
              copyright, package, email, url, info,
-             license,  license_score, license_text, license_url_template,
+             license, license_score, license_text, license_url_template,
              strip_root, full_root,
-             format, 
-             
+             format,
+
              verbose, quiet, processes,
              diag, timeout, *args, **kwargs):
     """scan the <input> file or directory for license, origin and packages and save results to <output_file(s)>.
@@ -468,50 +468,56 @@ def scancode(ctx,
 
     # FIXME: this is does not make sense to use tuple and positional values
     scanners = OrderedDict(zip(possible_scans.keys(), zip(possible_scans.values(), scan_functions)))
+    # Find all scans that are both enabled and have a valid function
+    # reference. This deliberately filters out the "info" scan
+    # (which always has a "None" function reference) as there is no
+    # dedicated "infos" key in the results that "plugin_only_findings.has_findings()"
+    # could check.
+    # FIXME: we should not use positional tings tuples for v[0], v[1] that are mysterious values for now
+    active_scans = [k for k, v in scanners.items() if v[0] and v[1]]
 
     scans_cache_class = get_scans_cache_class()
     pre_scan_plugins = []
     for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
+        pre_scan_plugins.append(plugin(kwargs, active_scans))
+        # FIXME: this just does not make sense at all: collecting which option
+        # is enabled and how should be made in a cleaner way
         for option in plugin.get_plugin_options():
             user_input = kwargs[option.name]
             if user_input:
+                # FIXME: we should not dabble with CLI args
                 options['--' + name] = user_input
-                pre_scan_plugins.append(plugin(option.name, user_input))
+
 
     try:
-        files_count, results, success = scan(
-            input_path=input,
-            scanners=scanners,
-            verbose=verbose,
-            quiet=quiet,
-            processes=processes,
-            timeout=timeout,
-            diag=diag,
+        files_count, results, success = scan_all(
+            input_path=input, scanners=scanners,
+            verbose=verbose, quiet=quiet,
+            processes=processes, timeout=timeout, diag=diag,
             scans_cache_class=scans_cache_class,
-            strip_root=strip_root,
-            full_root=full_root,
+            strip_root=strip_root, full_root=full_root,
             pre_scan_plugins=pre_scan_plugins)
 
-        # Find all scans that are both enabled and have a valid function
-        # reference. This deliberately filters out the "info" scan
-        # (which always has a "None" function reference) as there is no
-        # dedicated "infos" key in the results that "plugin_only_findings.has_findings()"
-        # could check.
-        # FIXME: we should not use positional tings tuples for v[0], v[1] that are mysterious values for now
-        active_scans = [k for k, v in scanners.items() if v[0] and v[1]]
-
+        # FIXME: THIS IS USELESS!!
         has_requested_post_scan_plugins = False
 
-        for name, plugin in plugincode.post_scan.get_post_scan_plugins().items():
+        for pname, plugin in plugincode.post_scan.get_post_scan_plugins().items():
+            # FIXME: this just does not make sense at all: collecting which option
+            # is enabled and how should be made in a cleaner way
             for option in plugin.get_plugin_options():
                 user_input = kwargs[option.name]
+                # FIXME: this is wrong!!!!!: what is the option value is False or None?
                 if user_input:
+                    # FIXME: we should not dabble with CLI args
                     options['--' + option.name.replace('_', '-')] = user_input
                     if not quiet:
-                        echo_stderr('Running post-scan plugin: %(name)s...' % locals(), fg='green')
-                    results = plugin(option.name, user_input).process_results(results, active_scans)
+                        echo_stderr('Running post-scan plugin: %(pname)s...' % locals(), fg='green')
                     has_requested_post_scan_plugins = True
 
+                    # FIXME: this is wrong!!!!!1
+                    plugin_runner = plugin(kwargs, active_scans)
+                    results = plugin_runner.process_resources(results)
+
         if has_requested_post_scan_plugins:
             # FIXME: computing len needs a list and therefore needs loading it all ahead of time
             results = list(results)
@@ -532,14 +538,10 @@ def scancode(ctx,
     ctx.exit(rc)
 
 
-def scan(input_path,
-         scanners,
-         verbose=False, quiet=False,
-         processes=1, timeout=DEFAULT_TIMEOUT,
-         diag=False,
-         scans_cache_class=None,
-         strip_root=False,
-         full_root=False,
+def scan_all(input_path, scanners,
+         verbose=False, quiet=False, processes=1, timeout=DEFAULT_TIMEOUT,
+         diag=False, scans_cache_class=None,
+         strip_root=False, full_root=False,
          pre_scan_plugins=None):
     """
     Return a tuple of (files_count, scan_results, success) where
@@ -825,15 +827,23 @@ def resource_paths(base_path, diag, scans_cache_class, pre_scan_plugins=None):
     ignores.update(ignore.ignores_VCS)
 
     ignorer = build_ignorer(ignores, unignores={})
-    resources = resource_iter(base_path, ignored=ignorer)
+    locations = resource_iter(base_path, ignored=ignorer)
+
+    resources = build_resources(locations, scans_cache_class, base_is_dir, len_base_path, diag)
+    if pre_scan_plugins:
+        for plugin in pre_scan_plugins:
+            resources = plugin.process_resources(resources)
+    return resources
+
 
-    for abs_path in resources:
+def build_resources(locations, scans_cache_class, base_is_dir, len_base_path, diag):
+    """
+    Yield Resource objects from an iterable of absolute paths.
+    """
+    for abs_path in locations:
         resource = Resource(scans_cache_class, abs_path, base_is_dir, len_base_path)
         # always fetch infos and cache.
         resource.put_info(scan_infos(abs_path, diag=diag))
-        if pre_scan_plugins:
-            for plugin in pre_scan_plugins:
-                resource = plugin.process_resource(resource)
         if resource:
             yield resource
 
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 7e284c76e57..6193635f8fa 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -35,10 +35,11 @@ class ProcessIgnore(PreScanPlugin):
     """
     Ignore files matching the supplied pattern.
     """
-    name = 'ignores'
+    name = 'ignore'
 
     def get_ignores(self):
-        return {pattern: 'User ignore: Supplied by --ignore' for pattern in self.user_input}
+        user_ignores = self.selected_options.get('ignore') or []
+        return {pattern: 'User ignore: Supplied by --ignore' for pattern in user_ignores}
 
     @classmethod
     def get_plugin_options(cls):
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 0677d4545c4..54f1ffd4ba2 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -41,7 +41,7 @@ class MarkSource(PostScanPlugin):
     Has no effect unless the --info scan is requested.
     """
 
-    def process_results(self, results, _):
+    def process_resources(self, results):
         # FIXME: this is forcing all the scan results to be loaded in memory
         # and defeats lazy loading from cache
         results = list(results)
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index f282a80436a..e1662472594 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -38,14 +38,15 @@ class OnlyFindings(PostScanPlugin):
     considering basic file information as findings).
     """
 
-    def process_results(self, results, active_scans):
+    def process_resources(self, results):
         # FIXME: this is forcing all the scan results to be loaded in memory
         # and defeats lazy loading from cache. Only a different caching
         # (e.g. DB) could work here.
         # FIXME: We should instead use a generator or use a filter function
         # that pass to the scan results loader iterator
+        active_scan_names= self.active_scan_names
         for scanned_file in results:
-            if has_findings(active_scans, scanned_file):
+            if has_findings(active_scan_names, scanned_file):
                 yield scanned_file
 
     @classmethod
diff --git a/tests/scancode/test_ignore_files.py b/tests/scancode/test_ignore_files.py
index a195c1393cc..88d2f3c9cb8 100644
--- a/tests/scancode/test_ignore_files.py
+++ b/tests/scancode/test_ignore_files.py
@@ -72,7 +72,7 @@ def test_ignore_glob_file(self):
 
     def test_resource_paths_with_single_file(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore('ignore', ('sample.doc',))
+        test_plugin = ProcessIgnore({'ignore': ('sample.doc',)})
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -87,7 +87,7 @@ def test_resource_paths_with_single_file(self):
 
     def test_resource_paths_with_multiple_files(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore('ignore', ('ignore.doc',))
+        test_plugin = ProcessIgnore({'ignore': ('ignore.doc',)})
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -101,7 +101,7 @@ def test_resource_paths_with_multiple_files(self):
 
     def test_resource_paths_with_glob_file(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore('ignore', ('*.doc',))
+        test_plugin = ProcessIgnore({'ignore': ('*.doc',)})
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -114,7 +114,7 @@ def test_resource_paths_with_glob_file(self):
 
     def test_resource_paths_with_glob_path(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore('ignore', ('*/src/test',))
+        test_plugin = ProcessIgnore({'ignore': ('*/src/test',)})
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -129,8 +129,8 @@ def test_resource_paths_with_multiple_plugins(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         test_plugins = [
-            ProcessIgnore('ignore', ('*.doc',)),
-            ProcessIgnore('ignore', ('*/src/test/*',))
+            ProcessIgnore({'ignore': ('*.doc',)}),
+            ProcessIgnore({'ignore': ('*/src/test/*',)})
         ]
         expected = [
             'user',

From d9f8ec1f19fb41fe43862edbfb00931ebc12989a Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 3 Jan 2018 17:30:08 +0100
Subject: [PATCH 016/122] Remove junk print statements

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/paths.py     | 2 --
 src/extractcode/sevenzip.py | 1 -
 src/packagedcode/pypi.py    | 2 +-
 src/packagedcode/rpm.py     | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/commoncode/paths.py b/src/commoncode/paths.py
index 903eba1e224..71ff649aa11 100644
--- a/src/commoncode/paths.py
+++ b/src/commoncode/paths.py
@@ -78,8 +78,6 @@ def safe_path(path, posix=False):
     segments = [s.strip() for s in path.split(path_sep) if s.strip()]
     segments = [portable_filename(s) for s in segments]
 
-    # print('safe_path: orig:', orig_path, 'segments:', segments)
-
     if not segments:
         return '_'
 
diff --git a/src/extractcode/sevenzip.py b/src/extractcode/sevenzip.py
index c626fba2699..ff800eaa7ca 100644
--- a/src/extractcode/sevenzip.py
+++ b/src/extractcode/sevenzip.py
@@ -222,7 +222,6 @@ def list_entries(location, arch_type='*'):
     if rc != 0:
         # FIXME: this test is useless
         _error = get_7z_errors(stdout) or UNKNOWN_ERROR
-        # print(_error)
 
     # the listing was produced as UTF on windows to avoid damaging binary
     # paths in console outputs
diff --git a/src/packagedcode/pypi.py b/src/packagedcode/pypi.py
index c99368fcb16..ae724c4d550 100644
--- a/src/packagedcode/pypi.py
+++ b/src/packagedcode/pypi.py
@@ -129,8 +129,8 @@ def parse_metadata(location):
                for fname in ('METADATA', 'DESCRIPTION.rst')):
         return
     # FIXME: wrap in a with statement
+    # FIXME: use ordereddict
     infos = json.loads(open(location, 'rb').read())
-    print(infos)
     homepage_url = None
     authors = []
     if infos['extensions']:
diff --git a/src/packagedcode/rpm.py b/src/packagedcode/rpm.py
index b715bb16952..5d25131842f 100644
--- a/src/packagedcode/rpm.py
+++ b/src/packagedcode/rpm.py
@@ -118,7 +118,6 @@ def info(location, include_desc=False):
     the long RPM description value if include_desc is True.
     """
     tgs = tags(location, include_desc)
-    print(tgs)
     return tgs and RPMInfo(**tgs) or None
 
 

From 4f143b7268b34cb6997002f79efba43c71526fbe Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 3 Jan 2018 18:05:58 +0100
Subject: [PATCH 017/122] Streamline core CLI and plugins processing

 * use structured namedtuple to track Scanners and CommandOptions
 * rework how default scan and selected options are handled using these
   tuples to streamline the corresponding code and the way selected
   options are reported in the scan results (at least for JSON)
 * add is_enabled method to Plugin
 * ensure the help of options is used for each option, and not a global
   help for all the options of a given plugin
 * add new plural option for each scan (such as --licenses) that maps
   exactly to the key used in the scan results. Use plural variables
   throughout to simplify the code
 * use kwargs for the main cli.scancode function for all all options and
   no longer use named arguments: args can come from any plugins and
   are not known until runtime.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/__init__.py                    |  35 +-
 src/scancode/__init__.py                      |   2 +-
 src/scancode/cli.py                           | 391 +++++-----
 src/scancode/plugin_ignore.py                 |  26 +-
 src/scancode/plugin_mark_source.py            |  34 +-
 src/scancode/plugin_only_findings.py          |  21 +-
 tests/formattedcode/data/csv/srp.csv          |   6 +-
 .../formattedcode/data/csv/tree/expected.csv  |   6 +-
 .../data/json/simple-expected.json            |  10 +-
 .../data/json/simple-expected.jsonlines       |  71 +-
 .../data/json/simple-expected.jsonpp          |   9 +-
 .../data/json/tree/expected.json              |  12 +-
 .../data/spdx/license_known/expected.rdf      |  48 +-
 .../spdx/license_known/expected_with_text.rdf |  38 +-
 .../data/spdx/license_ref/expected.rdf        |  58 +-
 .../spdx/license_ref/expected_with_text.rdf   |  40 +-
 .../data/spdx/or_later/expected.rdf           |  24 +-
 .../data/spdx/simple/expected.rdf             |  26 +-
 .../formattedcode/data/spdx/tree/expected.rdf | 110 +--
 .../data/spdx/unicode/expected.rdf            |  48 +-
 tests/formattedcode/test_format_jsonlines.py  |   8 +-
 .../data/index/test__add_rules.json           | 310 ++++----
 .../index/test__add_rules_with_templates.json | 308 ++++----
 .../data/index/test_init_with_rules.json      | 310 ++++----
 .../data/models/licenses.expected.json        | 206 +++---
 .../data/models/rules.expected.json           |  20 +-
 .../data/altpath/copyright.expected.json      |   8 +-
 .../data/composer/composer.expected.json      |   4 +-
 .../data/failing/patchelf.expected.json       |   6 +-
 tests/scancode/data/help/help.txt             |  32 +-
 tests/scancode/data/info/all.expected.json    |  10 +-
 .../data/info/all.rooted.expected.json        |  10 +-
 tests/scancode/data/info/basic.expected.json  |   6 +-
 .../data/info/basic.rooted.expected.json      |   4 +-
 .../data/info/email_url_info.expected.json    |  10 +-
 .../scancode/data/license_text/test.expected  |   6 +-
 .../data/mark_source/with_info.expected.json  | 679 +++++++++---------
 .../mark_source/without_info.expected.json    |   8 +-
 .../data/non_utf8/expected-linux.json         |   6 +-
 .../scancode/data/only_findings/expected.json | 215 +++---
 ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json |   4 +-
 .../unicodepath.expected-linux.json           |  16 +-
 .../data/weird_file_name/expected-linux.json  |   8 +-
 tests/scancode/test_ignore_files.py           |  26 +-
 44 files changed, 1646 insertions(+), 1589 deletions(-)

diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index d65d438798d..2ef741012d1 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -35,16 +35,34 @@ class BasePlugin(object):
     # a short string describing this plugin. Subclass must override
     name = None
 
-    def __init__(self, selected_options):
+    def __init__(self, selected_options, active_scan_names=None):
         """
-        Initialize a new plugin with a mapping of user selected options.
+        Initialize a new plugin with a mapping of user `selected_options` (e.g.
+        keyword arguments) and a list of `active_scan_names`.
         """
-        self.selected_options = selected_options
+        self.selected_options = selected_options or {}
+        self.active_scan_names = active_scan_names or []
+
+    @classmethod
+    def get_plugin_options(cls):
+        """
+        Return a list of `ScanOption` objects for this plugin.
+        Subclasses must override and implement.
+        """
+        raise NotImplementedError
+
+    def is_enabled(self):
+        """
+        Return True is this plugin is enabled by user-selected options.
+        Subclasses must override and implement.
+        """
+        raise NotImplementedError
 
     def process_one(self, resource):
         """
         Yield zero, one or more Resource objects from a single `resource`
         Resource object.
+        Subclasses should override.
         """
         yield resource
 
@@ -53,18 +71,9 @@ def process_resources(self, resources):
         Return an iterable of Resource objects, possibly transformed, filtered
         or enhanced by this plugin from  a `resources` iterable of Resource
         objects.
+        Subclasses should override.
         """
         for resource in resources:
             for res in self.process_one(resource):
                 if res:
                     yield res
-
-    @classmethod
-    def get_plugin_options(cls):
-        """
-        Return a list of `ScanOption` objects for this plugin.
-        Subclass must override.
-        """
-        return []
-
-
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index 8e0e0999a77..c75ca34b5d1 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -65,7 +65,7 @@ def __init__(self, param_decls=None, show_default=False,
                  prompt=False, confirmation_prompt=False,
                  hide_input=False, is_flag=None, flag_value=None,
                  multiple=False, count=False, allow_from_autoenv=True,
-                 type=None, help=None, group=None, **attrs):
+                 type=None, help=None, group=None, expose_value=True, **attrs):
 
         super(ScanOption, self).__init__(param_decls, show_default,
                      prompt, confirmation_prompt,
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index d2c7c3efa58..f968808db61 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -31,6 +31,7 @@
 from scancode.pool import get_pool
 
 import codecs
+from collections import namedtuple
 from collections import OrderedDict
 from functools import partial
 from itertools import imap
@@ -113,6 +114,10 @@
 plugincode.post_scan.initialize()
 
 
+CommandOption = namedtuple('CommandOption', 'group, name, option, value, default')
+Scanner = namedtuple('Scanner', 'name function is_enabled')
+
+
 info_text = '''
 ScanCode scans code and other files for origin and license.
 Visit https://github.com/nexB/scancode-toolkit/ for support and download.
@@ -256,41 +261,42 @@ def reindex_licenses(ctx, param, value):
 
 
 class ScanCommand(BaseCommand):
+    """
+    A command class that is aware of ScanCode plugins and provides help where
+    each option is grouped by group.
+    """
     short_usage_help = '''
 Try 'scancode --help' for help on options and arguments.'''
 
     def __init__(self, name, context_settings=None, callback=None,
                  params=None, help=None, epilog=None, short_help=None,
-                 options_metavar='[OPTIONS]', add_help_option=True):
+                 options_metavar='[OPTIONS]', add_help_option=True,
+                 plugins_by_group=()):
 
         super(ScanCommand, self).__init__(name, context_settings, callback,
                  params, help, epilog, short_help, options_metavar, add_help_option)
 
-        plugins_by_group = [
-            (PRE_SCAN, plugincode.pre_scan.get_pre_scan_plugins()),
-            (POST_SCAN, plugincode.post_scan.get_post_scan_plugins()),
-        ]
-
         for group, plugins in plugins_by_group:
             for pname, plugin in sorted(plugins.items()):
-                # Normalize white spaces in docstring and use it as help text
-                # for options that don't specify a help text.
-                help_text = ' '.join(plugin.__doc__.split())
-
                 for option in plugin.get_plugin_options():
                     if not isinstance(option, ScanOption):
-                        raise Exception('Invalid plugin option "%(pname)s": option is not an instance of "ScanOption".' % locals())
+                        raise Exception(
+                            'Invalid plugin option "%(pname)s": option is not '
+                            'an instance of "ScanOption".' % locals())
 
-                    option.help = option.help or help_text
+                    # normalize the help text, which may otherwise be messy
+                    option.help = option.help and ' '.join(option.help.split())
                     option.group = group
-                    # this makes the plugin options "available" to the command
+                    # this makes the plugin options "known" from the command
                     self.params.append(option)
 
     def format_options(self, ctx, formatter):
         """
-        Overridden from click.Command to write all options into the formatter in groups
-        they belong to. If a group is not specified, add the option to MISC group.
+        Overridden from click.Command to write all options into the formatter in
+        groups they belong to. If a group is not specified, add the option to
+        MISC group.
         """
+        # this mapping defines the CLI help presentation order
         groups = OrderedDict([
             (SCANS, []),
             (OUTPUT, []),
@@ -307,6 +313,7 @@ def format_options(self, ctx, formatter):
                 if getattr(param, 'group', None):
                     groups[param.group].append(help_record)
                 else:
+                    # use the misc group if no group is defined
                     groups['misc'].append(help_record)
 
         with formatter.section('Options'):
@@ -325,7 +332,9 @@ def validate_formats(ctx, param, value):
         return value_lower
     # render using a user-provided custom format template
     if not os.path.isfile(value):
-        raise click.BadParameter('Unknwow <format> or invalid template file path: "%(value)s" does not exist or is not readable.' % locals())
+        raise click.BadParameter(
+            'Unknwow <format> or invalid template file path: "%(value)s" '
+            'does not exist or is not readable.' % locals())
     return value
 
 
@@ -342,7 +351,14 @@ def validate_exclusive(ctx, exclusive_options):
         raise click.UsageError(msg)
 
 
-@click.command(name='scancode', epilog=epilog_text, cls=ScanCommand)
+# collect plugins for each group and add plugins options to the command
+# params
+_plugins_by_group = [
+    (PRE_SCAN, plugincode.pre_scan.get_pre_scan_plugins()),
+    (POST_SCAN, plugincode.post_scan.get_post_scan_plugins()),
+]
+
+@click.command(name='scancode', epilog=epilog_text, cls=ScanCommand, plugins_by_group=_plugins_by_group)
 @click.pass_context
 
 # ensure that the input path is bytes on Linux, unicode elsewhere
@@ -351,13 +367,13 @@ def validate_exclusive(ctx, exclusive_options):
 
 # Note that click's 'default' option is set to 'false' here despite these being documented to be enabled by default in
 # order to more elegantly enable all of these (see code below) if *none* of the command line options are specified.
-@click.option('-c', '--copyright', is_flag=True, default=False, help='Scan <input> for copyrights. [default]', group=SCANS, cls=ScanOption)
-@click.option('-l', '--license', is_flag=True, default=False, help='Scan <input> for licenses. [default]', group=SCANS, cls=ScanOption)
-@click.option('-p', '--package', is_flag=True, default=False, help='Scan <input> for packages. [default]', group=SCANS, cls=ScanOption)
+@click.option('-c', '--copyright', '--copyrights', is_flag=True, default=False, help='Scan <input> for copyrights. [default]', group=SCANS, cls=ScanOption)
+@click.option('-l', '--license', '--licenses', is_flag=True, default=False, help='Scan <input> for licenses. [default]', group=SCANS, cls=ScanOption)
+@click.option('-p', '--package', '--packages', is_flag=True, default=False, help='Scan <input> for packages. [default]', group=SCANS, cls=ScanOption)
 
-@click.option('-e', '--email', is_flag=True, default=False, help='Scan <input> for emails.', group=SCANS, cls=ScanOption)
-@click.option('-u', '--url', is_flag=True, default=False, help='Scan <input> for urls.', group=SCANS, cls=ScanOption)
-@click.option('-i', '--info', is_flag=True, default=False, help='Include information such as size, type, etc.', group=SCANS, cls=ScanOption)
+@click.option('-e', '--email', '--emails', is_flag=True, default=False, help='Scan <input> for emails.', group=SCANS, cls=ScanOption)
+@click.option('-u', '--url', '--urls', is_flag=True, default=False, help='Scan <input> for urls.', group=SCANS, cls=ScanOption)
+@click.option('-i', '--info', '--infos', is_flag=True, default=False, help='Include information such as size, type, etc.', group=SCANS, cls=ScanOption)
 
 @click.option('--license-score', is_flag=False, default=0, type=int, show_default=True,
               help='Do not return license matches with scores lower than this score. A number between 0 and 100.', group=SCANS, cls=ScanOption)
@@ -392,136 +408,124 @@ def validate_exclusive(ctx, exclusive_options):
 @click.option('--timeout', is_flag=False, default=DEFAULT_TIMEOUT, type=float, show_default=True, help='Stop scanning a file if scanning takes longer than a timeout in seconds.', group=CORE, cls=ScanOption)
 @click.option('--reindex-licenses', is_flag=True, default=False, is_eager=True, callback=reindex_licenses, help='Force a check and possible reindexing of the cached license index.', group=MISC, cls=ScanOption)
 
-def scancode(ctx,
-             input, output_file,
-             copyright, package, email, url, info,
-             license, license_score, license_text, license_url_template,
-             strip_root, full_root,
-             format,
-
-             verbose, quiet, processes,
-             diag, timeout, *args, **kwargs):
+def scancode(ctx, input, output_file, *args, **kwargs):
     """scan the <input> file or directory for license, origin and packages and save results to <output_file(s)>.
 
     The scan results are printed to stdout if <output_file> is not provided.
     Error and progress is printed to stderr.
     """
-
     validate_exclusive(ctx, ['strip_root', 'full_root'])
 
-    possible_scans = OrderedDict([
-        ('infos', info),
-        ('licenses', license),
-        ('copyrights', copyright),
-        ('packages', package),
-        ('emails', email),
-        ('urls', url)
-    ])
-
-    options = OrderedDict([
-        ('--copyright', copyright),
-        ('--license', license),
-        ('--package', package),
-        ('--email', email),
-        ('--url', url),
-        ('--info', info),
-        ('--license-score', license_score),
-        ('--license-text', license_text),
-        ('--strip-root', strip_root),
-        ('--full-root', full_root),
-        ('--format', format),
-        ('--diag', diag),
-    ])
-
-    # Use default scan options when no options are provided on the command line.
-    if not any(possible_scans.values()):
-        possible_scans['copyrights'] = True
-        possible_scans['licenses'] = True
-        possible_scans['packages'] = True
-        options['--copyright'] = True
-        options['--license'] = True
-        options['--package'] = True
-
-    # A hack to force info being exposed for SPDX output in order to reuse
-    # calculated file SHA1s.
-    if format in ('spdx-tv', 'spdx-rdf'):
-        possible_scans['infos'] = True
-
-    # FIXME: pombredanne: what is this? I cannot understand what this does
-    for key in options:
-        if key == "--license-score":
-            continue
-        if options[key] == False:
-            del options[key]
-
-    get_licenses_with_score = partial(get_licenses, min_score=license_score, include_text=license_text, diag=diag, license_url_template=license_url_template)
-
-    # List of scan functions in the same order as "possible_scans".
-    scan_functions = [
-        None,  # For "infos" there is no separate scan function, they are always gathered, though not always exposed.
-        get_licenses_with_score,
-        get_copyrights,
-        get_package_infos,
-        get_emails,
-        get_urls
+    # ## TODO: FIX when plugins are used everywhere
+    copyrights = kwargs.get('copyrights')
+    licenses = kwargs.get('licenses')
+    packages = kwargs.get('packages')
+    emails = kwargs.get('emails')
+    urls = kwargs.get('urls')
+    infos = kwargs.get('infos')
+
+    strip_root = kwargs.get('strip_root')
+    full_root = kwargs.get('full_root')
+    format = kwargs.get('format')
+
+    verbose = kwargs.get('verbose')
+    quiet = kwargs.get('quiet')
+    processes = kwargs.get('processes')
+    diag = kwargs.get('diag')
+    timeout = kwargs.get('timeout')
+    # ## TODO: END FIX when plugins are used everywhere
+
+    # Use default scan options when no scan option is provided
+    # FIXME: this should be removed?
+    use_default_scans = not any([infos, licenses, copyrights, packages, emails, urls])
+
+    # FIXME: A hack to force info being exposed for SPDX output in order to
+    # reuse calculated file SHA1s.
+    is_spdx = format in ('spdx-tv', 'spdx-rdf')
+
+    get_licenses_with_score = partial(get_licenses,
+        diag=diag,
+        min_score=kwargs.get('license_score'),
+        include_text=kwargs.get('license_text'),
+        license_url_template=kwargs.get('license_url_template'))
+
+    scanners = [
+        # FIXME: For "infos" there is no separate scan function, they are always
+        # gathered, though not always exposed.
+        Scanner('infos', None, infos or is_spdx),
+        Scanner('licenses', get_licenses_with_score, licenses or use_default_scans),
+        Scanner('copyrights', get_copyrights, copyrights or use_default_scans),
+        Scanner('packages', get_package_infos, packages or use_default_scans),
+        Scanner('emails', get_emails, emails),
+        Scanner('urls', get_urls, urls)
     ]
 
-    # FIXME: this is does not make sense to use tuple and positional values
-    scanners = OrderedDict(zip(possible_scans.keys(), zip(possible_scans.values(), scan_functions)))
+    ignored_options = 'verbose', 'quiet', 'processes', 'timeout'
+    all_options = list(get_command_options(ctx, ignores=ignored_options, skip_no_group=True))
+
+    # FIXME: this is terribly hackish :|
+    # FIXUP OPTIONS FOR DEFAULT SCANS
+    options = []
+    enabled_scans = {sc.name: sc.is_enabled for sc in scanners}
+    for opt in all_options:
+        if enabled_scans.get(opt.name):
+            options.append(opt._replace(value=True))
+            continue
+
+        # do not report option set to defaults or with an empty list value
+        if isinstance(opt.value, (list, tuple)):
+            if opt.value:
+                options.append(opt)
+            continue
+        if opt.value != opt.default:
+            options.append(opt)
+
     # Find all scans that are both enabled and have a valid function
     # reference. This deliberately filters out the "info" scan
     # (which always has a "None" function reference) as there is no
     # dedicated "infos" key in the results that "plugin_only_findings.has_findings()"
     # could check.
-    # FIXME: we should not use positional tings tuples for v[0], v[1] that are mysterious values for now
-    active_scans = [k for k, v in scanners.items() if v[0] and v[1]]
+    active_scans = [scan.name for scan in scanners if scan.is_enabled]
 
-    scans_cache_class = get_scans_cache_class()
+
+    # FIXME: Prescan should happen HERE not as part of the per-file scan
     pre_scan_plugins = []
     for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-        pre_scan_plugins.append(plugin(kwargs, active_scans))
-        # FIXME: this just does not make sense at all: collecting which option
-        # is enabled and how should be made in a cleaner way
-        for option in plugin.get_plugin_options():
-            user_input = kwargs[option.name]
-            if user_input:
-                # FIXME: we should not dabble with CLI args
-                options['--' + name] = user_input
+        if plugin.is_enabled:
+            pre_scan_plugins.append(plugin(all_options, active_scans))
 
+    # TODO: new loop
+    # 1. collect minimally the whole files tree in memory as a Resource tree
+    # 2. apply the pre scan plugins to this tree
+    # 3. run the scan proper, save scan details on disk
+    # 4. apply the post scan plugins to this tree, lazy load as needed the scan
+    # details from disk. save back updated details on disk
 
+    scans_cache_class = get_scans_cache_class()
     try:
         files_count, results, success = scan_all(
-            input_path=input, scanners=scanners,
+            input_path=input,
+            scanners=scanners,
             verbose=verbose, quiet=quiet,
             processes=processes, timeout=timeout, diag=diag,
             scans_cache_class=scans_cache_class,
             strip_root=strip_root, full_root=full_root,
+            # FIXME: this should not be part of the of scan_all!!!!
             pre_scan_plugins=pre_scan_plugins)
 
-        # FIXME: THIS IS USELESS!!
-        has_requested_post_scan_plugins = False
-
+        # FIXME!!!
         for pname, plugin in plugincode.post_scan.get_post_scan_plugins().items():
-            # FIXME: this just does not make sense at all: collecting which option
-            # is enabled and how should be made in a cleaner way
-            for option in plugin.get_plugin_options():
-                user_input = kwargs[option.name]
-                # FIXME: this is wrong!!!!!: what is the option value is False or None?
-                if user_input:
-                    # FIXME: we should not dabble with CLI args
-                    options['--' + option.name.replace('_', '-')] = user_input
-                    if not quiet:
-                        echo_stderr('Running post-scan plugin: %(pname)s...' % locals(), fg='green')
-                    has_requested_post_scan_plugins = True
-
-                    # FIXME: this is wrong!!!!!1
-                    plugin_runner = plugin(kwargs, active_scans)
-                    results = plugin_runner.process_resources(results)
-
-        if has_requested_post_scan_plugins:
-            # FIXME: computing len needs a list and therefore needs loading it all ahead of time
-            results = list(results)
-            files_count = len(results)
+            plug = plugin(all_options, active_scans)
+            if plug.is_enabled():
+                if not quiet:
+                    echo_stderr('Running post-scan plugin: %(pname)s...' % locals(), fg='green')
+                # FIXME: we should always catch errors from plugins properly
+                results = plug.process_resources(results)
+
+        # FIXME: computing len needs a list and therefore needs loading it all ahead of time
+        # this should NOT be needed with a better cache architecture!!!
+        results = list(results)
+        files_count = len(results)
 
         if not quiet:
             echo_stderr('Saving results.', fg='green')
@@ -558,8 +562,7 @@ def scan_all(input_path, scanners,
 
     # Display scan start details
     ############################
-    # FIXME: it does not make sense to use tuple and positional values
-    scans = [k for k, v in scanners.items() if v[0]]
+    scans = [scan.name for scan in scanners if scan.is_enabled]
     _scans = ', '.join(scans)
     if not quiet:
         echo_stderr('Scanning files for: %(_scans)s with %(processes)d process(es)...' % locals())
@@ -567,11 +570,12 @@ def scan_all(input_path, scanners,
     scan_summary['scans'] = scans[:]
     scan_start = time()
     indexing_time = 0
-    # FIXME: It does not make sense to use tuple and positional values
-    with_licenses, _ = scanners.get('licenses', (False, ''))
+
+    # FIXME:  THIS SHOULD NOT TAKE PLACE HERE!!!!!!
+    with_licenses = any(sc for sc in scanners if sc.name == 'licenses' and sc.is_enabled)
     if with_licenses:
         # build index outside of the main loop for speed
-        # this also ensures that forked processes will get the index on POSIX naturally
+        # REALLY????? this also ensures that forked processes will get the index on POSIX naturally
         if not quiet:
             echo_stderr('Building license detection index...', fg='green', nl=False)
         from licensedcode.cache import get_index
@@ -584,10 +588,13 @@ def scan_all(input_path, scanners,
 
     pool = None
 
-    resources = resource_paths(input_path, diag, scans_cache_class, pre_scan_plugins=pre_scan_plugins)
+    # FIXME: THIS IS NOT where PRE SCANS should take place!!!
+    resources = resource_paths(
+        input_path, diag, scans_cache_class, pre_scan_plugins=pre_scan_plugins)
+
     paths_with_error = []
     files_count = 0
-
+    #FIXME: we should NOT USE a logfile!!!
     logfile_path = scans_cache_class().cache_files_log
     if on_linux:
         file_logger = partial(open, logfile_path, 'wb')
@@ -706,6 +713,13 @@ def scan_event(item):
     # finally return an iterator on cached results
     cached_scan = scans_cache_class()
     root_dir = _get_root_dir(input_path, strip_root, full_root)
+    #############################################
+    #############################################
+    #############################################
+    # FIXME: we must return Resources here!!!!
+    #############################################
+    #############################################
+    #############################################
     return files_count, cached_scan.iterate(scans, root_dir), success
 
 
@@ -751,35 +765,34 @@ def _scanit(resource, scanners, scans_cache_class, diag, timeout=DEFAULT_TIMEOUT
     success = True
     scans_cache = scans_cache_class()
 
-    # note: "flag and function" expressions return the function if flag is True
-    # note: the order of the scans matters to show things in logical order
-    scanner_functions = map(lambda t : t[0] and t[1], scanners.values())
-    scanners = OrderedDict(zip(scanners.keys(), scanner_functions))
-
     if processes:
         interrupter = interruptible
     else:
         # fake, non inteerrupting used for debugging when processes=0
         interrupter = fake_interruptible
 
-    if any(scanner_functions):
-        # Skip other scans if already cached
-        # FIXME: ENSURE we only do this for files not directories
-        if not resource.is_cached:
-            # run the scan as an interruptiple task
-            scans_runner = partial(scan_one, resource.abs_path, scanners, diag)
-            success, scan_result = interrupter(scans_runner, timeout=timeout)
-            if not success:
-                # Use scan errors as the scan result for that file on failure this is
-                # a top-level error not attachedd to a specific scanner, hence the
-                # "scan" key is used for these errors
-                scan_result = {'scan_errors': [scan_result]}
-
-            scans_cache.put_scan(resource.rel_path, resource.get_info(), scan_result)
-
-            # do not report success if some other errors happened
-            if scan_result.get('scan_errors'):
-                success = False
+    scanners = [scanner for scanner in scanners
+                if scanner.is_enabled and scanner.function]
+    if not scanners:
+        return success, resource.rel_path
+
+    # Skip other scans if already cached
+    # FIXME: ENSURE we only do this for files not directories
+    if not resource.is_cached:
+        # run the scan as an interruptiple task
+        scans_runner = partial(scan_one, resource.abs_path, scanners, diag)
+        success, scan_result = interrupter(scans_runner, timeout=timeout)
+        if not success:
+            # Use scan errors as the scan result for that file on failure this is
+            # a top-level error not attachedd to a specific scanner, hence the
+            # "scan" key is used for these errors
+            scan_result = {'scan_errors': [scan_result]}
+
+        scans_cache.put_scan(resource.rel_path, resource.get_info(), scan_result)
+
+        # do not report success if some other errors happened
+        if scan_result.get('scan_errors'):
+            success = False
 
     return success, resource.rel_path
 
@@ -843,9 +856,9 @@ def build_resources(locations, scans_cache_class, base_is_dir, len_base_path, di
     for abs_path in locations:
         resource = Resource(scans_cache_class, abs_path, base_is_dir, len_base_path)
         # always fetch infos and cache.
-        resource.put_info(scan_infos(abs_path, diag=diag))
-        if resource:
-            yield resource
+        infos = scan_infos(abs_path, diag=diag)
+        resource.put_info(infos)
+        yield resource
 
 
 def scan_infos(input_file, diag=False):
@@ -855,6 +868,8 @@ def scan_infos(input_file, diag=False):
     possibly empty. If `diag` is True, additional diagnostic messages
     are included.
     """
+    # FIXME: WE SHOULD PROCESS THIS IS MEMORY AND AS PART OF THE SCAN PROPER... and BOTTOM UP!!!!
+    # THE PROCESSING TIME OF SIZE AGGREGATION ON DIRECTORY IS WAY WAY TOO HIGH!!!
     errors = []
     try:
         infos = get_file_infos(input_file)
@@ -872,8 +887,7 @@ def scan_infos(input_file, diag=False):
 def scan_one(location, scanners, diag=False):
     """
     Scan one file or directory at `location` and return a scan result
-    mapping, calling every scanner callable in the `scanners` mapping of
-    (scan name -> scan function).
+    mapping, calling every scanner callable in the `scanners` list of Scanners.
 
     The scan result mapping contain a 'scan_errors' key with a list of
     error messages. If `diag` is True, 'scan_errors' error messages also
@@ -887,23 +901,21 @@ def scan_one(location, scanners, diag=False):
 
     scan_result = OrderedDict()
     scan_errors = []
-    for scan_name, scanner in scanners.items():
-        if not scanner:
-            continue
+    for scanner in scanners:
         try:
-            scan_details = scanner(location)
+            scan_details = scanner.function(location)
             # consume generators
             if isinstance(scan_details, GeneratorType):
                 scan_details = list(scan_details)
-            scan_result[scan_name] = scan_details
+            scan_result[scanner.name] = scan_details
         except TimeoutError:
             raise
         except Exception as e:
             # never fail but instead add an error message and keep an empty scan:
-            scan_result[scan_name] = []
-            messages = ['ERROR: ' + scan_name + ': ' + e.message]
+            scan_result[scanner.name] = []
+            messages = ['ERROR: ' + scanner.name + ': ' + e.message]
             if diag:
-                messages.append('ERROR: ' + scan_name + ': ' + traceback.format_exc())
+                messages.append('ERROR: ' + scanner.name + ': ' + traceback.format_exc())
             scan_errors.extend(messages)
 
     # put errors last, after scans proper
@@ -948,7 +960,48 @@ def save_results(scanners, files_count, results, format, options, input, output_
         writer = format_plugins[format]
         # FIXME: carrying an echo function does not make sense
         # FIXME: do not use input as a variable name
+        # FIXME: do NOT pass options around, but a header instead
+        opts = OrderedDict([(o.option, o.value) for o in options])
         writer(files_count=files_count, version=version, notice=notice,
                scanned_files=results,
-               options=options,
+               options=opts,
                input=input, output_file=output_file, _echo=echo_stderr)
+
+
+def get_command_options(ctx, ignores=(), skip_default=False, skip_no_group=False):
+    """
+    Yield CommandOption tuples for each Click option in the `ctx` Click context.
+    Ignore:
+    - eager flags,
+    - Parameter with a "name" listed in the `ignores` sequence
+    - Parameters whose value is the default if `skip_default` is True
+    - Parameters without a group if `skip_no_group` is True
+    """
+    param_values = ctx.params
+    for param in ctx.command.params:
+
+        if param.is_eager:
+            continue
+
+        group = getattr(param, 'group', None)
+        if skip_no_group and not group:
+            continue
+
+        name = param.name
+        if ignores and name in ignores:
+            continue
+
+        # opts is a list, the last one is the long form by convention
+        option = param.opts[-1]
+
+        value = param_values.get(name)
+        # for opened file args that may have a name
+        if value and hasattr(value, 'name'):
+            value = getattr(value, 'name', None)
+
+        default = param.default
+
+        if skip_default and value == default:
+            continue
+
+        yield CommandOption(group, name, option, value, default)
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 6193635f8fa..4f93a98a213 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -35,17 +35,27 @@ class ProcessIgnore(PreScanPlugin):
     """
     Ignore files matching the supplied pattern.
     """
-    name = 'ignore'
-
-    def get_ignores(self):
-        user_ignores = self.selected_options.get('ignore') or []
-        return {pattern: 'User ignore: Supplied by --ignore' for pattern in user_ignores}
 
     @classmethod
     def get_plugin_options(cls):
         return [
-            ScanOption(('--ignore',), 
-                   multiple=True, 
-                   metavar='<pattern>', 
+            ScanOption(('--ignore',),
+                   multiple=True,
+                   metavar='<pattern>',
                    help='Ignore files matching <pattern>.')
         ]
+
+    # FIXME:!!!!
+    def get_ignores(self):
+        user_ignores = []
+        for se in self.selected_options:
+            if se.name == 'ignore':
+                user_ignores=se.value
+
+        return {pattern: 'User ignore: Supplied by --ignore' for pattern in user_ignores}
+
+    def is_enabled(self):
+        return any(se.value for se in self.selected_options
+              if se.name == 'ignore')
+
+        PreScanPlugin.is_enabled(self)
\ No newline at end of file
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 54f1ffd4ba2..9fddafe6ae3 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -41,23 +41,31 @@ class MarkSource(PostScanPlugin):
     Has no effect unless the --info scan is requested.
     """
 
+    @classmethod
+    def get_plugin_options(cls):
+        return [
+            ScanOption(('--mark-source',), is_flag=True,
+                help='''
+                Set the "is_source" flag to true for directories that contain
+                over 90% of source files as direct children.
+                Has no effect unless the --info scan is requested.
+                ''')
+        ]
+
+    def is_enabled(self):
+        # FIXME: we need infos for this to work, we should use a better way to
+        # express dependencies on one or more scan
+        return all(se.value for se in self.selected_options
+                      if se.name in ('mark_source', 'infos'))
+
     def process_resources(self, results):
+        # FIXME: we need to process Resources NOT results mappings!!!
         # FIXME: this is forcing all the scan results to be loaded in memory
         # and defeats lazy loading from cache
         results = list(results)
 
-        # FIXME: we should test for active scans instead, but "info" may not
-        # be present for now. check if the first item has a file info.
-        has_file_info = 'type' in results[0]
-
-        if not has_file_info:
-            # just yield results untouched
-            for scanned_file in results:
-                yield scanned_file
-            return
-
         # FIXME: this is an nested loop, looping twice on results
-        # TODO: this may not recusrively roll up the is_source flag, as we
+        # TODO: this may not recursively roll up the is_source flag, as we
         # may not iterate bottom up.
         for scanned_file in results:
             if scanned_file['type'] == 'directory' and scanned_file['files_count'] > 0:
@@ -69,10 +77,6 @@ def process_resources(self, results):
                 mark_source(source_files_count, scanned_file)
             yield scanned_file
 
-    @classmethod
-    def get_plugin_options(cls):
-        return [ScanOption(('--mark-source',), is_flag=True)]
-
 
 def mark_source(source_files_count, scanned_file):
     """
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index e1662472594..870696bc335 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -38,21 +38,32 @@ class OnlyFindings(PostScanPlugin):
     considering basic file information as findings).
     """
 
+    @classmethod
+    def get_plugin_options(cls):
+        return [
+            ScanOption(('--only-findings',), is_flag=True,
+                help='''
+                Only return files or directories with findings for the requested
+                scans. Files and directories without findings are omitted (not
+                considering basic file information as findings).
+                ''')
+        ]
+
+    def is_enabled(self):
+        return any(se.value == True for se in self.selected_options
+                      if se.name == 'only_findings')
+
     def process_resources(self, results):
         # FIXME: this is forcing all the scan results to be loaded in memory
         # and defeats lazy loading from cache. Only a different caching
         # (e.g. DB) could work here.
         # FIXME: We should instead use a generator or use a filter function
         # that pass to the scan results loader iterator
-        active_scan_names= self.active_scan_names
+        active_scan_names = self.active_scan_names
         for scanned_file in results:
             if has_findings(active_scan_names, scanned_file):
                 yield scanned_file
 
-    @classmethod
-    def get_plugin_options(cls):
-        return [ScanOption(('--only-findings',), is_flag=True)]
-
 
 def has_findings(active_scans, scanned_file):
     """
diff --git a/tests/formattedcode/data/csv/srp.csv b/tests/formattedcode/data/csv/srp.csv
index 6f6556de5da..25a06299727 100644
--- a/tests/formattedcode/data/csv/srp.csv
+++ b/tests/formattedcode/data/csv/srp.csv
@@ -1,8 +1,8 @@
 Resource,scan_errors,copyright,start_line,end_line,copyright_holder
+/srp/srp_vfy.c,,,,,
+/srp/srp_vfy.c,,Copyright 2011-2016 The OpenSSL Project,2,2,
+/srp/srp_vfy.c,,,2,2,The OpenSSL Project
 /srp/build.info,,,,,
 /srp/srp_lib.c,,,,,
 /srp/srp_lib.c,,Copyright 2011-2016 The OpenSSL Project,2,2,
 /srp/srp_lib.c,,,2,2,The OpenSSL Project
-/srp/srp_vfy.c,,,,,
-/srp/srp_vfy.c,,Copyright 2011-2016 The OpenSSL Project,2,2,
-/srp/srp_vfy.c,,,2,2,The OpenSSL Project
diff --git a/tests/formattedcode/data/csv/tree/expected.csv b/tests/formattedcode/data/csv/tree/expected.csv
index 304dee89a97..f785fa5f70e 100644
--- a/tests/formattedcode/data/csv/tree/expected.csv
+++ b/tests/formattedcode/data/csv/tree/expected.csv
@@ -12,12 +12,12 @@ Resource,scan_errors,copyright,start_line,end_line,copyright_holder
 /scan/subdir/copy1.c,,,,,
 /scan/subdir/copy1.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
 /scan/subdir/copy1.c,,,1,1,"ACME, Inc."
+/scan/subdir/copy4.c,,,,,
+/scan/subdir/copy4.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
+/scan/subdir/copy4.c,,,1,1,"ACME, Inc."
 /scan/subdir/copy2.c,,,,,
 /scan/subdir/copy2.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
 /scan/subdir/copy2.c,,,1,1,"ACME, Inc."
 /scan/subdir/copy3.c,,,,,
 /scan/subdir/copy3.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
 /scan/subdir/copy3.c,,,1,1,"ACME, Inc."
-/scan/subdir/copy4.c,,,,,
-/scan/subdir/copy4.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
-/scan/subdir/copy4.c,,,1,1,"ACME, Inc."
diff --git a/tests/formattedcode/data/json/simple-expected.json b/tests/formattedcode/data/json/simple-expected.json
index 22ed5e36e73..90169700f96 100644
--- a/tests/formattedcode/data/json/simple-expected.json
+++ b/tests/formattedcode/data/json/simple-expected.json
@@ -1,12 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--license": true,
-    "--package": true,
-    "--info": true,
-    "--license-score": 0,
-    "--format": "json"
+    "--copyrights": true,
+    "--licenses": true,
+    "--packages": true,
+    "--infos": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index 519ffd60496..8665f431ebc 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -1,40 +1,37 @@
 [
-    {
-        "header": {
-            "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
-            "scancode_version": "2.1.0.post69.536f354.dirty.20171004191716",
-            "scancode_options": {
-                "--info": true,
-                "--license-score": 0,
-                "--format": "jsonlines"
-            },
-            "files_count": 1
-        }
-    },
-    {
-        "files": [
-            {
-                "path": "simple/copyright_acme_c-c.c",
-                "type": "file",
-                "name": "copyright_acme_c-c.c",
-                "base_name": "copyright_acme_c-c",
-                "extension": ".c",
-                "date": "2017-10-03",
-                "size": 55,
-                "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
-                "md5": "bdf7c572beb4094c2059508fa73c05a4",
-                "files_count": null,
-                "mime_type": "text/plain",
-                "file_type": "UTF-8 Unicode text, with no line terminators",
-                "programming_language": "C",
-                "is_binary": false,
-                "is_text": true,
-                "is_archive": false,
-                "is_media": false,
-                "is_source": true,
-                "is_script": false,
-                "scan_errors": []
-            }
-        ]
+  {
+    "header": {
+      "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+      "scancode_options": {
+        "--infos": true,
+        "--format": "jsonlines"
+      },
+      "files_count": 1
     }
+  },
+  {
+    "files": [
+      {
+        "path": "simple/copyright_acme_c-c.c",
+        "type": "file",
+        "name": "copyright_acme_c-c.c",
+        "base_name": "copyright_acme_c-c",
+        "extension": ".c",
+        "size": 55,
+        "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
+        "md5": "bdf7c572beb4094c2059508fa73c05a4",
+        "files_count": null,
+        "mime_type": "text/plain",
+        "file_type": "UTF-8 Unicode text, with no line terminators",
+        "programming_language": "C",
+        "is_binary": false,
+        "is_text": true,
+        "is_archive": false,
+        "is_media": false,
+        "is_source": true,
+        "is_script": false,
+        "scan_errors": []
+      }
+    ]
+  }
 ]
\ No newline at end of file
diff --git a/tests/formattedcode/data/json/simple-expected.jsonpp b/tests/formattedcode/data/json/simple-expected.jsonpp
index 940c30598b3..cb66fa72c88 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonpp
+++ b/tests/formattedcode/data/json/simple-expected.jsonpp
@@ -1,11 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--license": true,
-    "--package": true,
-    "--info": true,
-    "--license-score": 0,
+    "--copyrights": true,
+    "--licenses": true,
+    "--packages": true,
+    "--infos": true,
     "--format": "json-pp"
   },
   "files_count": 1,
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
index 966717566af..2fcc3244780 100644
--- a/tests/formattedcode/data/json/tree/expected.json
+++ b/tests/formattedcode/data/json/tree/expected.json
@@ -1,13 +1,11 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--license": true,
-    "--package": true,
-    "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--copyrights": true,
+    "--licenses": true,
+    "--packages": true,
+    "--infos": true,
+    "--strip-root": true
   },
   "files_count": 8,
   "files": [
diff --git a/tests/formattedcode/data/spdx/license_known/expected.rdf b/tests/formattedcode/data/spdx/license_known/expected.rdf
index 49602d49c82..03d7afda23c 100644
--- a/tests/formattedcode/data/spdx/license_known/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected.rdf
@@ -5,76 +5,76 @@
     "ns1:SpdxDocument": {
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:hasFile": [
             null, 
             null
           ], 
-          "ns1:licenseConcluded": {
+          "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:name": "scan", 
           "ns1:licenseInfoFromFiles": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:name": "scan"
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }
         }
       }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": [
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
+                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }, 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            }, 
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
           }
         }, 
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
+                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+            }
           }
         }
       ], 
diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
index 22cdd8c71e5..ce83519f92e 100644
--- a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
@@ -3,15 +3,21 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:name": "scan", 
-          "ns1:licenseDeclared": {
+          "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:downloadLocation": {
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": [
+            null, 
+            null
+          ], 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -26,25 +32,19 @@
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": [
-            null, 
-            null
-          ]
+          "ns1:name": "scan"
         }
       }, 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": [
         {
           "ns1:File": {
             "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
+                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
@@ -54,27 +54,27 @@
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }, 
-            "ns1:fileName": "./scan/apache-2.0.LICENSE"
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
           }
         }, 
         {
           "ns1:File": {
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
+                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-            }, 
+            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
+            }
           }
         }
       ], 
diff --git a/tests/formattedcode/data/spdx/license_ref/expected.rdf b/tests/formattedcode/data/spdx/license_ref/expected.rdf
index f12c0f93321..3be5b00f4b4 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected.rdf
@@ -11,43 +11,23 @@
           "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
         }
       }, 
-      "ns1:describesPackage": {
-        "ns1:Package": {
-          "ns1:hasFile": null, 
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:name": "scan", 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:licenseInfoFromFiles": [
+      "ns1:referencesFile": {
+        "ns1:File": {
+          "ns1:licenseInfoInFile": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
+            {
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+            }, 
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
                 "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
                 "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
               }
-            }, 
-            {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
-        }
-      }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
-      "ns1:referencesFile": {
-        "ns1:File": {
           "ns1:checksum": {
             "ns1:Checksum": {
               "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
@@ -57,7 +37,25 @@
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseInfoInFile": [
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:fileName": "./scan/NOTICE"
+        }
+      }, 
+      "ns1:specVersion": "SPDX-2.1", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
+      "ns1:describesPackage": {
+        "ns1:Package": {
+          "ns1:name": "scan", 
+          "ns1:downloadLocation": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
@@ -72,8 +70,10 @@
               }
             }
           ], 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:fileName": "./scan/NOTICE"
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
         }
       }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
index 3745b692426..4590e71c31a 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
@@ -14,18 +14,19 @@
       "ns1:describesPackage": {
         "ns1:Package": {
           "ns1:hasFile": null, 
-          "ns1:licenseDeclared": {
+          "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:downloadLocation": {
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:name": "scan", 
           "ns1:licenseInfoFromFiles": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }, 
             {
               "ns1:ExtractedLicensingInfo": {
@@ -35,11 +36,10 @@
               }
             }
           ], 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "scan"
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
         }
       }, 
       "ns1:specVersion": "SPDX-2.1", 
@@ -48,23 +48,12 @@
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
-          "ns1:fileName": "./scan/NOTICE", 
-          "ns1:checksum": {
-            "ns1:Checksum": {
-              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
-              "ns1:algorithm": "SHA1"
-            }
-          }, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
           "ns1:licenseInfoInFile": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }, 
             {
               "ns1:ExtractedLicensingInfo": {
@@ -73,7 +62,18 @@
                 "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
               }
             }
-          ]
+          ], 
+          "ns1:checksum": {
+            "ns1:Checksum": {
+              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
+              "ns1:algorithm": "SHA1"
+            }
+          }, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:fileName": "./scan/NOTICE"
         }
       }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
diff --git a/tests/formattedcode/data/spdx/or_later/expected.rdf b/tests/formattedcode/data/spdx/or_later/expected.rdf
index 9b319226c3a..c723b8e20bb 100644
--- a/tests/formattedcode/data/spdx/or_later/expected.rdf
+++ b/tests/formattedcode/data/spdx/or_later/expected.rdf
@@ -3,9 +3,6 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
           "ns1:downloadLocation": {
@@ -14,21 +11,23 @@
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "or_later", 
-          "ns1:licenseInfoFromFiles": {
-            "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
-          }, 
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
+          "ns1:hasFile": null, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
+          "ns1:licenseInfoFromFiles": {
+            "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
+          }, 
+          "ns1:name": "or_later"
         }
       }, 
       "ns1:specVersion": "SPDX-2.1", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:referencesFile": {
         "ns1:File": {
-          "ns1:fileName": "./test.java", 
           "ns1:checksum": {
             "ns1:Checksum": {
               "ns1:checksumValue": "0c5bf934430394112921e7a1a8128176606d32ca", 
@@ -38,10 +37,11 @@
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
           "ns1:licenseInfoInFile": {
             "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
-          }
+          }, 
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
+          "ns1:fileName": "./test.java"
         }
       }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
diff --git a/tests/formattedcode/data/spdx/simple/expected.rdf b/tests/formattedcode/data/spdx/simple/expected.rdf
index 35bf0c8305c..d3b0af43363 100644
--- a/tests/formattedcode/data/spdx/simple/expected.rdf
+++ b/tests/formattedcode/data/spdx/simple/expected.rdf
@@ -3,34 +3,33 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:name": "simple", 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseConcluded": {
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": {
+          "ns1:name": "simple", 
+          "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
-          "ns1:licenseInfoFromFiles": {
+          "ns1:copyrightText": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:hasFile": null
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:referencesFile": {
         "ns1:File": {
-          "ns1:fileName": "./simple/test.txt", 
           "ns1:checksum": {
             "ns1:Checksum": {
               "ns1:checksumValue": "b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8", 
@@ -45,7 +44,8 @@
           }, 
           "ns1:copyrightText": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }
+          }, 
+          "ns1:fileName": "./simple/test.txt"
         }
       }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
diff --git a/tests/formattedcode/data/spdx/tree/expected.rdf b/tests/formattedcode/data/spdx/tree/expected.rdf
index 65e40a151aa..ad2c421eb1e 100644
--- a/tests/formattedcode/data/spdx/tree/expected.rdf
+++ b/tests/formattedcode/data/spdx/tree/expected.rdf
@@ -3,30 +3,62 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "ns1:describesPackage": {
+        "ns1:Package": {
+          "ns1:name": "scan", 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:downloadLocation": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseInfoFromFiles": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:hasFile": [
+            null, 
+            null, 
+            null, 
+            null, 
+            null, 
+            null, 
+            null
+          ]
+        }
+      }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:referencesFile": [
         {
           "ns1:File": {
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
+                "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
             "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy1.c"
+            "ns1:fileName": "./scan/subdir/copy3.c"
           }
         }, 
         {
           "ns1:File": {
+            "ns1:fileName": "./scan/copy1.c", 
+            "ns1:licenseConcluded": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+            }, 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }, 
@@ -36,15 +68,12 @@
                 "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:licenseConcluded": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-            }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy2.c"
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
           }
         }, 
         {
           "ns1:File": {
+            "ns1:fileName": "./scan/copy2.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
                 "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
@@ -54,65 +83,64 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/subdir/copy1.c", 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
           }
         }, 
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/copy3.c", 
+            "ns1:fileName": "./scan/subdir/copy1.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
           }
         }, 
         {
           "ns1:File": {
+            "ns1:fileName": "./scan/subdir/copy2.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/subdir/copy4.c", 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
           }
         }, 
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f", 
+                "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:fileName": "./scan/subdir/copy4.c", 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy3.c"
+            }
           }
         }, 
         {
@@ -122,7 +150,7 @@
             }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
+                "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
@@ -130,38 +158,10 @@
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy2.c"
+            "ns1:fileName": "./scan/copy3.c"
           }
         }
       ], 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:describesPackage": {
-        "ns1:Package": {
-          "ns1:hasFile": [
-            null, 
-            null, 
-            null, 
-            null, 
-            null, 
-            null, 
-            null
-          ], 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:name": "scan", 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-          "ns1:licenseInfoFromFiles": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }
-        }
-      }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
diff --git a/tests/formattedcode/data/spdx/unicode/expected.rdf b/tests/formattedcode/data/spdx/unicode/expected.rdf
index 6a5babd4fbf..fb927092f95 100644
--- a/tests/formattedcode/data/spdx/unicode/expected.rdf
+++ b/tests/formattedcode/data/spdx/unicode/expected.rdf
@@ -11,53 +11,53 @@
           "ns1:licenseId": "LicenseRef-agere-bsd"
         }
       }, 
-      "ns1:referencesFile": {
-        "ns1:File": {
-          "ns1:licenseInfoInFile": {
+      "ns1:describesPackage": {
+        "ns1:Package": {
+          "ns1:name": "unicode", 
+          "ns1:downloadLocation": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseInfoFromFiles": {
             "ns1:ExtractedLicensingInfo": {
               "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
               "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
               "ns1:licenseId": "LicenseRef-agere-bsd"
             }
           }, 
-          "ns1:checksum": {
-            "ns1:Checksum": {
-              "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90", 
-              "ns1:algorithm": "SHA1"
-            }
-          }, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
-          "ns1:fileName": "./et131x.h"
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc."
         }
       }, 
       "ns1:specVersion": "SPDX-2.1", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
-      "ns1:describesPackage": {
-        "ns1:Package": {
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+      "ns1:referencesFile": {
+        "ns1:File": {
+          "ns1:fileName": "./et131x.h", 
+          "ns1:checksum": {
+            "ns1:Checksum": {
+              "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90", 
+              "ns1:algorithm": "SHA1"
+            }
           }, 
-          "ns1:licenseDeclared": {
+          "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
-          "ns1:licenseInfoFromFiles": {
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
+          "ns1:licenseInfoInFile": {
             "ns1:ExtractedLicensingInfo": {
               "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
               "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
               "ns1:licenseId": "LicenseRef-agere-bsd"
             }
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.", 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:name": "unicode"
+          }
         }
       }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
diff --git a/tests/formattedcode/test_format_jsonlines.py b/tests/formattedcode/test_format_jsonlines.py
index 18483dc67a6..abb191634b9 100644
--- a/tests/formattedcode/test_format_jsonlines.py
+++ b/tests/formattedcode/test_format_jsonlines.py
@@ -48,10 +48,9 @@ def remove_variable_data(scan_result):
     for line in scan_result:
         header = line.get('header')
         if header:
-            del header['scancode_version']
+            header.pop('scancode_version', None)
         for scanned_file in line.get('files', []):
-            if 'date' in scanned_file:
-                del scanned_file['date']
+            scanned_file.pop('date', None)
 
 
 def check_jsonlines_scan(expected_file, result_file, regen=False):
@@ -66,8 +65,7 @@ def check_jsonlines_scan(expected_file, result_file, regen=False):
 
     if regen:
         with open(expected_file, 'wb') as reg:
-            json.dump(result, reg)
-
+            json.dump(result, reg, indent=2, separators=(',', ': '))
     expected = _load_json_result(expected_file)
     remove_variable_data(expected)
 
diff --git a/tests/licensedcode/data/index/test__add_rules.json b/tests/licensedcode/data/index/test__add_rules.json
index 70699ae6c09..014dd598949 100644
--- a/tests/licensedcode/data/index/test__add_rules.json
+++ b/tests/licensedcode/data/index/test__add_rules.json
@@ -1,403 +1,403 @@
 {
   "bsd-no-mod_1": {
     "warranty": [
-      47, 
+      47,
       120
-    ], 
+    ],
     "interruption": [
       194
-    ], 
+    ],
     "requirement": [
       81
-    ], 
+    ],
     "exemplary": [
       171
-    ], 
+    ],
     "negligence": [
       211
-    ], 
+    ],
     "caused": [
       196
-    ], 
+    ],
     "fitness": [
       151
-    ], 
+    ],
     "herein": [
       21
-    ], 
+    ],
     "conditioned": [
       74
-    ], 
+    ],
     "minimum": [
       61
-    ], 
+    ],
     "including": [
-      76, 
-      139, 
-      175, 
+      76,
+      139,
+      175,
       210
-    ], 
+    ],
     "names": [
-      89, 
+      89,
       98
-    ], 
+    ],
     "substantially": [
       78
-    ], 
+    ],
     "further": [
       83
-    ], 
+    ],
     "event": [
       160
-    ], 
+    ],
     "substitute": [
       182
-    ], 
+    ],
     "use": [
-      2, 
-      188, 
+      2,
+      188,
       221
-    ], 
+    ],
     "strict": [
       206
-    ], 
+    ],
     "unmodified": [
-      23, 
+      23,
       27
-    ], 
+    ],
     "shall": [
       161
-    ], 
+    ],
     "merchantibility": [
       149
-    ], 
+    ],
     "forms": [
       7
-    ], 
+    ],
     "tort": [
       209
-    ], 
+    ],
     "contained": [
       20
-    ], 
+    ],
     "materials": [
       19
-    ], 
+    ],
     "damages": [
-      174, 
+      174,
       233
-    ], 
+    ],
     "above": [
-      36, 
+      36,
       92
-    ], 
+    ],
     "endorse": [
       106
-    ], 
+    ],
     "consequential": [
       173
-    ], 
+    ],
     "neither": [
       87
-    ], 
+    ],
     "warranties": [
-      138, 
+      138,
       146
-    ], 
+    ],
     "particular": [
       154
-    ], 
+    ],
     "notice": [
       38
-    ], 
+    ],
     "used": [
-      26, 
+      26,
       104
-    ], 
+    ],
     "form": [
       57
-    ], 
+    ],
     "permission": [
       118
-    ], 
+    ],
     "express": [
       135
-    ], 
+    ],
     "however": [
       195
-    ], 
+    ],
     "possibility": [
       230
-    ], 
+    ],
     "otherwise": [
       213
-    ], 
+    ],
     "liability": [
-      202, 
+      202,
       207
-    ], 
+    ],
     "met": [
       16
-    ], 
+    ],
     "goods": [
       183
-    ], 
+    ],
     "purpose": [
       155
-    ], 
+    ],
     "noninfringement": [
       148
-    ], 
+    ],
     "advised": [
       227
-    ], 
+    ],
     "promote": [
       108
-    ], 
+    ],
     "nor": [
       96
-    ], 
+    ],
     "must": [
-      33, 
-      58, 
+      33,
+      58,
       72
-    ], 
+    ],
     "loss": [
       186
-    ], 
+    ],
     "redistributions": [
-      29, 
+      29,
       54
-    ], 
+    ],
     "disclaimed": [
       157
-    ], 
+    ],
     "contract": [
       205
-    ], 
+    ],
     "reproduce": [
       59
-    ], 
+    ],
     "procurement": [
       180
-    ], 
+    ],
     "implied": [
-      137, 
+      137,
       145
-    ], 
+    ],
     "liable": [
       168
-    ], 
+    ],
     "retain": [
       34
-    ], 
+    ],
     "redistribution": [
-      0, 
-      71, 
+      0,
+      71,
       85
-    ], 
+    ],
     "arising": [
       214
-    ], 
+    ],
     "modification": [
       52
-    ], 
+    ],
     "profits": [
       191
-    ], 
+    ],
     "disclaimer": [
-      48, 
-      50, 
-      63, 
-      67, 
+      48,
+      50,
+      63,
+      67,
       80
     ]
-  }, 
+  },
   "bsd-new_0": {
     "interruption": [
       173
-    ], 
+    ],
     "exemplary": [
       150
-    ], 
+    ],
     "negligence": [
       190
-    ], 
+    ],
     "caused": [
       175
-    ], 
+    ],
     "fitness": [
       126
-    ], 
+    ],
     "direct": [
       146
-    ], 
+    ],
     "including": [
-      115, 
-      154, 
+      115,
+      154,
       189
-    ], 
+    ],
     "names": [
       76
-    ], 
+    ],
     "owner": [
       139
-    ], 
+    ],
     "indirect": [
       147
-    ], 
+    ],
     "event": [
       135
-    ], 
+    ],
     "substitute": [
       161
-    ], 
+    ],
     "use": [
-      2, 
-      167, 
+      2,
+      167,
       200
-    ], 
+    ],
     "strict": [
       185
-    ], 
+    ],
     "shall": [
       136
-    ], 
+    ],
     "damage": [
       212
-    ], 
+    ],
     "forms": [
       7
-    ], 
+    ],
     "tort": [
       188
-    ], 
+    ],
     "materials": [
       63
-    ], 
+    ],
     "damages": [
       153
-    ], 
+    ],
     "above": [
-      28, 
+      28,
       46
-    ], 
+    ],
     "endorse": [
       84
-    ], 
+    ],
     "consequential": [
       152
-    ], 
+    ],
     "neither": [
       68
-    ], 
+    ],
     "warranties": [
-      114, 
+      114,
       122
-    ], 
+    ],
     "particular": [
       129
-    ], 
+    ],
     "notice": [
-      30, 
+      30,
       48
-    ], 
+    ],
     "used": [
       82
-    ], 
+    ],
     "form": [
       42
-    ], 
+    ],
     "permission": [
       96
-    ], 
+    ],
     "express": [
       111
-    ], 
+    ],
     "however": [
       174
-    ], 
+    ],
     "possibility": [
       209
-    ], 
+    ],
     "otherwise": [
       192
-    ], 
+    ],
     "liability": [
-      181, 
+      181,
       186
-    ], 
+    ],
     "met": [
       20
-    ], 
+    ],
     "goods": [
       162
-    ], 
+    ],
     "purpose": [
       130
-    ], 
+    ],
     "advised": [
       206
-    ], 
+    ],
     "promote": [
       86
-    ], 
+    ],
     "nor": [
       74
-    ], 
+    ],
     "must": [
-      25, 
+      25,
       43
-    ], 
+    ],
     "loss": [
       165
-    ], 
+    ],
     "redistributions": [
-      21, 
+      21,
       39
-    ], 
+    ],
     "disclaimed": [
       132
-    ], 
+    ],
     "incidental": [
       148
-    ], 
+    ],
     "contract": [
       184
-    ], 
+    ],
     "reproduce": [
       44
-    ], 
+    ],
     "procurement": [
       159
-    ], 
+    ],
     "implied": [
-      113, 
+      113,
       121
-    ], 
+    ],
     "liable": [
       143
-    ], 
+    ],
     "retain": [
       26
-    ], 
+    ],
     "merchantability": [
       124
-    ], 
+    ],
     "redistribution": [
       0
-    ], 
+    ],
     "arising": [
       193
-    ], 
+    ],
     "modification": [
       11
-    ], 
+    ],
     "profits": [
       170
-    ], 
+    ],
     "disclaimer": [
-      38, 
+      38,
       56
     ]
   }
diff --git a/tests/licensedcode/data/index/test__add_rules_with_templates.json b/tests/licensedcode/data/index/test__add_rules_with_templates.json
index 80df55df84a..6a1b178da6b 100644
--- a/tests/licensedcode/data/index/test__add_rules_with_templates.json
+++ b/tests/licensedcode/data/index/test__add_rules_with_templates.json
@@ -1,402 +1,402 @@
 {
   "bsd-no-mod_1": {
     "warranty": [
-      45, 
+      45,
       118
-    ], 
+    ],
     "interruption": [
       192
-    ], 
+    ],
     "requirement": [
       79
-    ], 
+    ],
     "exemplary": [
       169
-    ], 
+    ],
     "negligence": [
       209
-    ], 
+    ],
     "caused": [
       194
-    ], 
+    ],
     "fitness": [
       149
-    ], 
+    ],
     "herein": [
       19
-    ], 
+    ],
     "conditioned": [
       72
-    ], 
+    ],
     "minimum": [
       59
-    ], 
+    ],
     "including": [
-      74, 
-      137, 
-      173, 
+      74,
+      137,
+      173,
       208
-    ], 
+    ],
     "names": [
-      87, 
+      87,
       96
-    ], 
+    ],
     "substantially": [
       76
-    ], 
+    ],
     "further": [
       81
-    ], 
+    ],
     "event": [
       158
-    ], 
+    ],
     "substitute": [
       180
-    ], 
+    ],
     "use": [
-      186, 
+      186,
       219
-    ], 
+    ],
     "strict": [
       204
-    ], 
+    ],
     "unmodified": [
-      21, 
+      21,
       25
-    ], 
+    ],
     "shall": [
       159
-    ], 
+    ],
     "merchantibility": [
       147
-    ], 
+    ],
     "forms": [
       5
-    ], 
+    ],
     "tort": [
       207
-    ], 
+    ],
     "contained": [
       18
-    ], 
+    ],
     "materials": [
       17
-    ], 
+    ],
     "damages": [
-      172, 
+      172,
       231
-    ], 
+    ],
     "above": [
-      34, 
+      34,
       90
-    ], 
+    ],
     "endorse": [
       104
-    ], 
+    ],
     "consequential": [
       171
-    ], 
+    ],
     "neither": [
       85
-    ], 
+    ],
     "warranties": [
-      136, 
+      136,
       144
-    ], 
+    ],
     "particular": [
       152
-    ], 
+    ],
     "notice": [
       36
-    ], 
+    ],
     "used": [
-      24, 
+      24,
       102
-    ], 
+    ],
     "form": [
       55
-    ], 
+    ],
     "permission": [
       116
-    ], 
+    ],
     "express": [
       133
-    ], 
+    ],
     "however": [
       193
-    ], 
+    ],
     "possibility": [
       228
-    ], 
+    ],
     "otherwise": [
       211
-    ], 
+    ],
     "liability": [
-      200, 
+      200,
       205
-    ], 
+    ],
     "met": [
       14
-    ], 
+    ],
     "goods": [
       181
-    ], 
+    ],
     "purpose": [
       153
-    ], 
+    ],
     "noninfringement": [
       146
-    ], 
+    ],
     "advised": [
       225
-    ], 
+    ],
     "promote": [
       106
-    ], 
+    ],
     "nor": [
       94
-    ], 
+    ],
     "must": [
-      31, 
-      56, 
+      31,
+      56,
       70
-    ], 
+    ],
     "loss": [
       184
-    ], 
+    ],
     "redistributions": [
-      27, 
+      27,
       52
-    ], 
+    ],
     "disclaimed": [
       155
-    ], 
+    ],
     "contract": [
       203
-    ], 
+    ],
     "reproduce": [
       57
-    ], 
+    ],
     "procurement": [
       178
-    ], 
+    ],
     "implied": [
-      135, 
+      135,
       143
-    ], 
+    ],
     "liable": [
       166
-    ], 
+    ],
     "retain": [
       32
-    ], 
+    ],
     "redistribution": [
-      0, 
-      69, 
+      0,
+      69,
       83
-    ], 
+    ],
     "arising": [
       212
-    ], 
+    ],
     "modification": [
       50
-    ], 
+    ],
     "profits": [
       189
-    ], 
+    ],
     "disclaimer": [
-      46, 
-      48, 
-      61, 
-      65, 
+      46,
+      48,
+      61,
+      65,
       78
     ]
-  }, 
+  },
   "bsd-new_0": {
     "interruption": [
       171
-    ], 
+    ],
     "exemplary": [
       148
-    ], 
+    ],
     "negligence": [
       188
-    ], 
+    ],
     "caused": [
       173
-    ], 
+    ],
     "fitness": [
       124
-    ], 
+    ],
     "direct": [
       144
-    ], 
+    ],
     "including": [
-      113, 
-      152, 
+      113,
+      152,
       187
-    ], 
+    ],
     "names": [
       74
-    ], 
+    ],
     "owner": [
       137
-    ], 
+    ],
     "indirect": [
       145
-    ], 
+    ],
     "event": [
       133
-    ], 
+    ],
     "substitute": [
       159
-    ], 
+    ],
     "use": [
-      2, 
-      165, 
+      2,
+      165,
       198
-    ], 
+    ],
     "strict": [
       183
-    ], 
+    ],
     "shall": [
       134
-    ], 
+    ],
     "damage": [
       210
-    ], 
+    ],
     "forms": [
       7
-    ], 
+    ],
     "tort": [
       186
-    ], 
+    ],
     "materials": [
       63
-    ], 
+    ],
     "damages": [
       151
-    ], 
+    ],
     "above": [
-      28, 
+      28,
       46
-    ], 
+    ],
     "endorse": [
       82
-    ], 
+    ],
     "consequential": [
       150
-    ], 
+    ],
     "neither": [
       68
-    ], 
+    ],
     "warranties": [
-      112, 
+      112,
       120
-    ], 
+    ],
     "particular": [
       127
-    ], 
+    ],
     "notice": [
-      30, 
+      30,
       48
-    ], 
+    ],
     "used": [
       80
-    ], 
+    ],
     "form": [
       42
-    ], 
+    ],
     "permission": [
       94
-    ], 
+    ],
     "express": [
       109
-    ], 
+    ],
     "however": [
       172
-    ], 
+    ],
     "possibility": [
       207
-    ], 
+    ],
     "otherwise": [
       190
-    ], 
+    ],
     "liability": [
-      179, 
+      179,
       184
-    ], 
+    ],
     "met": [
       20
-    ], 
+    ],
     "goods": [
       160
-    ], 
+    ],
     "purpose": [
       128
-    ], 
+    ],
     "advised": [
       204
-    ], 
+    ],
     "promote": [
       84
-    ], 
+    ],
     "nor": [
       72
-    ], 
+    ],
     "must": [
-      25, 
+      25,
       43
-    ], 
+    ],
     "loss": [
       163
-    ], 
+    ],
     "redistributions": [
-      21, 
+      21,
       39
-    ], 
+    ],
     "disclaimed": [
       130
-    ], 
+    ],
     "incidental": [
       146
-    ], 
+    ],
     "contract": [
       182
-    ], 
+    ],
     "reproduce": [
       44
-    ], 
+    ],
     "procurement": [
       157
-    ], 
+    ],
     "implied": [
-      111, 
+      111,
       119
-    ], 
+    ],
     "liable": [
       141
-    ], 
+    ],
     "retain": [
       26
-    ], 
+    ],
     "merchantability": [
       122
-    ], 
+    ],
     "redistribution": [
       0
-    ], 
+    ],
     "arising": [
       191
-    ], 
+    ],
     "modification": [
       11
-    ], 
+    ],
     "profits": [
       168
-    ], 
+    ],
     "disclaimer": [
-      38, 
+      38,
       56
     ]
   }
diff --git a/tests/licensedcode/data/index/test_init_with_rules.json b/tests/licensedcode/data/index/test_init_with_rules.json
index 70699ae6c09..014dd598949 100644
--- a/tests/licensedcode/data/index/test_init_with_rules.json
+++ b/tests/licensedcode/data/index/test_init_with_rules.json
@@ -1,403 +1,403 @@
 {
   "bsd-no-mod_1": {
     "warranty": [
-      47, 
+      47,
       120
-    ], 
+    ],
     "interruption": [
       194
-    ], 
+    ],
     "requirement": [
       81
-    ], 
+    ],
     "exemplary": [
       171
-    ], 
+    ],
     "negligence": [
       211
-    ], 
+    ],
     "caused": [
       196
-    ], 
+    ],
     "fitness": [
       151
-    ], 
+    ],
     "herein": [
       21
-    ], 
+    ],
     "conditioned": [
       74
-    ], 
+    ],
     "minimum": [
       61
-    ], 
+    ],
     "including": [
-      76, 
-      139, 
-      175, 
+      76,
+      139,
+      175,
       210
-    ], 
+    ],
     "names": [
-      89, 
+      89,
       98
-    ], 
+    ],
     "substantially": [
       78
-    ], 
+    ],
     "further": [
       83
-    ], 
+    ],
     "event": [
       160
-    ], 
+    ],
     "substitute": [
       182
-    ], 
+    ],
     "use": [
-      2, 
-      188, 
+      2,
+      188,
       221
-    ], 
+    ],
     "strict": [
       206
-    ], 
+    ],
     "unmodified": [
-      23, 
+      23,
       27
-    ], 
+    ],
     "shall": [
       161
-    ], 
+    ],
     "merchantibility": [
       149
-    ], 
+    ],
     "forms": [
       7
-    ], 
+    ],
     "tort": [
       209
-    ], 
+    ],
     "contained": [
       20
-    ], 
+    ],
     "materials": [
       19
-    ], 
+    ],
     "damages": [
-      174, 
+      174,
       233
-    ], 
+    ],
     "above": [
-      36, 
+      36,
       92
-    ], 
+    ],
     "endorse": [
       106
-    ], 
+    ],
     "consequential": [
       173
-    ], 
+    ],
     "neither": [
       87
-    ], 
+    ],
     "warranties": [
-      138, 
+      138,
       146
-    ], 
+    ],
     "particular": [
       154
-    ], 
+    ],
     "notice": [
       38
-    ], 
+    ],
     "used": [
-      26, 
+      26,
       104
-    ], 
+    ],
     "form": [
       57
-    ], 
+    ],
     "permission": [
       118
-    ], 
+    ],
     "express": [
       135
-    ], 
+    ],
     "however": [
       195
-    ], 
+    ],
     "possibility": [
       230
-    ], 
+    ],
     "otherwise": [
       213
-    ], 
+    ],
     "liability": [
-      202, 
+      202,
       207
-    ], 
+    ],
     "met": [
       16
-    ], 
+    ],
     "goods": [
       183
-    ], 
+    ],
     "purpose": [
       155
-    ], 
+    ],
     "noninfringement": [
       148
-    ], 
+    ],
     "advised": [
       227
-    ], 
+    ],
     "promote": [
       108
-    ], 
+    ],
     "nor": [
       96
-    ], 
+    ],
     "must": [
-      33, 
-      58, 
+      33,
+      58,
       72
-    ], 
+    ],
     "loss": [
       186
-    ], 
+    ],
     "redistributions": [
-      29, 
+      29,
       54
-    ], 
+    ],
     "disclaimed": [
       157
-    ], 
+    ],
     "contract": [
       205
-    ], 
+    ],
     "reproduce": [
       59
-    ], 
+    ],
     "procurement": [
       180
-    ], 
+    ],
     "implied": [
-      137, 
+      137,
       145
-    ], 
+    ],
     "liable": [
       168
-    ], 
+    ],
     "retain": [
       34
-    ], 
+    ],
     "redistribution": [
-      0, 
-      71, 
+      0,
+      71,
       85
-    ], 
+    ],
     "arising": [
       214
-    ], 
+    ],
     "modification": [
       52
-    ], 
+    ],
     "profits": [
       191
-    ], 
+    ],
     "disclaimer": [
-      48, 
-      50, 
-      63, 
-      67, 
+      48,
+      50,
+      63,
+      67,
       80
     ]
-  }, 
+  },
   "bsd-new_0": {
     "interruption": [
       173
-    ], 
+    ],
     "exemplary": [
       150
-    ], 
+    ],
     "negligence": [
       190
-    ], 
+    ],
     "caused": [
       175
-    ], 
+    ],
     "fitness": [
       126
-    ], 
+    ],
     "direct": [
       146
-    ], 
+    ],
     "including": [
-      115, 
-      154, 
+      115,
+      154,
       189
-    ], 
+    ],
     "names": [
       76
-    ], 
+    ],
     "owner": [
       139
-    ], 
+    ],
     "indirect": [
       147
-    ], 
+    ],
     "event": [
       135
-    ], 
+    ],
     "substitute": [
       161
-    ], 
+    ],
     "use": [
-      2, 
-      167, 
+      2,
+      167,
       200
-    ], 
+    ],
     "strict": [
       185
-    ], 
+    ],
     "shall": [
       136
-    ], 
+    ],
     "damage": [
       212
-    ], 
+    ],
     "forms": [
       7
-    ], 
+    ],
     "tort": [
       188
-    ], 
+    ],
     "materials": [
       63
-    ], 
+    ],
     "damages": [
       153
-    ], 
+    ],
     "above": [
-      28, 
+      28,
       46
-    ], 
+    ],
     "endorse": [
       84
-    ], 
+    ],
     "consequential": [
       152
-    ], 
+    ],
     "neither": [
       68
-    ], 
+    ],
     "warranties": [
-      114, 
+      114,
       122
-    ], 
+    ],
     "particular": [
       129
-    ], 
+    ],
     "notice": [
-      30, 
+      30,
       48
-    ], 
+    ],
     "used": [
       82
-    ], 
+    ],
     "form": [
       42
-    ], 
+    ],
     "permission": [
       96
-    ], 
+    ],
     "express": [
       111
-    ], 
+    ],
     "however": [
       174
-    ], 
+    ],
     "possibility": [
       209
-    ], 
+    ],
     "otherwise": [
       192
-    ], 
+    ],
     "liability": [
-      181, 
+      181,
       186
-    ], 
+    ],
     "met": [
       20
-    ], 
+    ],
     "goods": [
       162
-    ], 
+    ],
     "purpose": [
       130
-    ], 
+    ],
     "advised": [
       206
-    ], 
+    ],
     "promote": [
       86
-    ], 
+    ],
     "nor": [
       74
-    ], 
+    ],
     "must": [
-      25, 
+      25,
       43
-    ], 
+    ],
     "loss": [
       165
-    ], 
+    ],
     "redistributions": [
-      21, 
+      21,
       39
-    ], 
+    ],
     "disclaimed": [
       132
-    ], 
+    ],
     "incidental": [
       148
-    ], 
+    ],
     "contract": [
       184
-    ], 
+    ],
     "reproduce": [
       44
-    ], 
+    ],
     "procurement": [
       159
-    ], 
+    ],
     "implied": [
-      113, 
+      113,
       121
-    ], 
+    ],
     "liable": [
       143
-    ], 
+    ],
     "retain": [
       26
-    ], 
+    ],
     "merchantability": [
       124
-    ], 
+    ],
     "redistribution": [
       0
-    ], 
+    ],
     "arising": [
       193
-    ], 
+    ],
     "modification": [
       11
-    ], 
+    ],
     "profits": [
       170
-    ], 
+    ],
     "disclaimer": [
-      38, 
+      38,
       56
     ]
   }
diff --git a/tests/licensedcode/data/models/licenses.expected.json b/tests/licensedcode/data/models/licenses.expected.json
index dff77edc128..ff308c45cd4 100644
--- a/tests/licensedcode/data/models/licenses.expected.json
+++ b/tests/licensedcode/data/models/licenses.expected.json
@@ -1,141 +1,141 @@
 [
   {
-    "key": "w3c-docs-19990405", 
-    "short_name": "W3C-DOCS-19990405", 
-    "name": "W3C Document Notice and License (1999-04-05)", 
-    "category": "Permissive Restricted", 
-    "owner": "W3C - World Wide Web Consortium", 
+    "key": "w3c-docs-19990405",
+    "short_name": "W3C-DOCS-19990405",
+    "name": "W3C Document Notice and License (1999-04-05)",
+    "category": "Permissive Restricted",
+    "owner": "W3C - World Wide Web Consortium",
     "homepage_url": "http://www.w3.org/Consortium/Legal/copyright-documents-19990405"
-  }, 
+  },
   {
-    "key": "gpl-2.0-library", 
-    "short_name": "GPL 2.0 with Library exception", 
-    "name": "GNU General Public License 2.0 with Library exception", 
-    "category": "Copyleft Limited", 
-    "owner": "Grammatica", 
-    "is_exception": true, 
+    "key": "gpl-2.0-library",
+    "short_name": "GPL 2.0 with Library exception",
+    "name": "GNU General Public License 2.0 with Library exception",
+    "category": "Copyleft Limited",
+    "owner": "Grammatica",
+    "is_exception": true,
     "other_urls": [
       "http://grammatica.percederberg.net/index.html"
     ]
-  }, 
+  },
   {
-    "key": "bsd-ack-carrot2", 
-    "short_name": "BSD Acknowledgment (Carrot2) License", 
-    "name": "BSD Acknowledgment (Carrot2) License", 
-    "category": "Permissive", 
-    "owner": "Carrot2", 
-    "homepage_url": "http://www.carrot2.org/carrot2.LICENSE", 
+    "key": "bsd-ack-carrot2",
+    "short_name": "BSD Acknowledgment (Carrot2) License",
+    "name": "BSD Acknowledgment (Carrot2) License",
+    "category": "Permissive",
+    "owner": "Carrot2",
+    "homepage_url": "http://www.carrot2.org/carrot2.LICENSE",
     "minimum_coverage": 80
-  }, 
+  },
   {
-    "key": "gpl-3.0-plus", 
-    "short_name": "GPL 3.0 or later", 
-    "name": "GNU General Public License 3.0 or later", 
-    "category": "Copyleft", 
-    "owner": "Free Software Foundation (FSF)", 
-    "homepage_url": "http://www.gnu.org/licenses/gpl-3.0-standalone.html", 
-    "notes": "notes from SPDX:\nThis license was released: 29 June 2007 This license is OSI certified.", 
-    "is_or_later": true, 
-    "base_license": "gpl-3.0", 
+    "key": "gpl-3.0-plus",
+    "short_name": "GPL 3.0 or later",
+    "name": "GNU General Public License 3.0 or later",
+    "category": "Copyleft",
+    "owner": "Free Software Foundation (FSF)",
+    "homepage_url": "http://www.gnu.org/licenses/gpl-3.0-standalone.html",
+    "notes": "notes from SPDX:\nThis license was released: 29 June 2007 This license is OSI certified.",
+    "is_or_later": true,
+    "base_license": "gpl-3.0",
     "spdx_license_key": "GPL-3.0+"
-  }, 
+  },
   {
-    "key": "apache-2.0", 
-    "short_name": "Apache 2.0", 
-    "name": "Apache License 2.0", 
-    "category": "Permissive", 
-    "owner": "Apache Software Foundation", 
-    "homepage_url": "http://www.apache.org/licenses/", 
-    "spdx_license_key": "Apache-2.0", 
+    "key": "apache-2.0",
+    "short_name": "Apache 2.0",
+    "name": "Apache License 2.0",
+    "category": "Permissive",
+    "owner": "Apache Software Foundation",
+    "homepage_url": "http://www.apache.org/licenses/",
+    "spdx_license_key": "Apache-2.0",
     "text_urls": [
       "http://www.apache.org/licenses/LICENSE-2.0"
-    ], 
-    "osi_url": "http://opensource.org/licenses/apache2.0.php", 
+    ],
+    "osi_url": "http://opensource.org/licenses/apache2.0.php",
     "faq_url": "http://www.apache.org/foundation/licence-FAQ.html"
-  }, 
+  },
   {
-    "key": "gpl-1.0-plus", 
-    "short_name": "GPL 1.0 or later", 
-    "name": "GNU General Public License 1.0 or later", 
-    "category": "Copyleft", 
-    "owner": "Free Software Foundation (FSF)", 
-    "homepage_url": "http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html", 
-    "notes": "notes from SPDX:\nThis license was released: February 1989.", 
-    "next_version": "gpl-2.0-plus", 
-    "is_or_later": true, 
-    "base_license": "gpl-1.0", 
+    "key": "gpl-1.0-plus",
+    "short_name": "GPL 1.0 or later",
+    "name": "GNU General Public License 1.0 or later",
+    "category": "Copyleft",
+    "owner": "Free Software Foundation (FSF)",
+    "homepage_url": "http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html",
+    "notes": "notes from SPDX:\nThis license was released: February 1989.",
+    "next_version": "gpl-2.0-plus",
+    "is_or_later": true,
+    "base_license": "gpl-1.0",
     "spdx_license_key": "GPL-1.0+"
-  }, 
+  },
   {
-    "key": "gpl-2.0-plus", 
-    "short_name": "GPL 2.0 or later", 
-    "name": "GNU General Public License 2.0 or later", 
-    "category": "Copyleft", 
-    "owner": "Free Software Foundation (FSF)", 
-    "homepage_url": "http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html", 
-    "notes": "notes from SPDX:\nThis license was released: June 1991 This license is OSI certified.", 
-    "next_version": "gpl-3.0-plus", 
-    "is_or_later": true, 
-    "base_license": "gpl-2.0", 
+    "key": "gpl-2.0-plus",
+    "short_name": "GPL 2.0 or later",
+    "name": "GNU General Public License 2.0 or later",
+    "category": "Copyleft",
+    "owner": "Free Software Foundation (FSF)",
+    "homepage_url": "http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html",
+    "notes": "notes from SPDX:\nThis license was released: June 1991 This license is OSI certified.",
+    "next_version": "gpl-3.0-plus",
+    "is_or_later": true,
+    "base_license": "gpl-2.0",
     "spdx_license_key": "GPL-2.0+"
-  }, 
+  },
   {
-    "key": "gpl-1.0", 
-    "short_name": "GPL 1.0", 
-    "name": "GNU General Public License 1.0", 
-    "category": "Copyleft", 
-    "owner": "Free Software Foundation (FSF)", 
-    "homepage_url": "http://www.gnu.org/licenses/gpl-1.0.html", 
-    "notes": "notes from SPDX:\nThis license was released: February 1989.", 
-    "next_version": "gpl-2.0", 
-    "spdx_license_key": "GPL-1.0", 
+    "key": "gpl-1.0",
+    "short_name": "GPL 1.0",
+    "name": "GNU General Public License 1.0",
+    "category": "Copyleft",
+    "owner": "Free Software Foundation (FSF)",
+    "homepage_url": "http://www.gnu.org/licenses/gpl-1.0.html",
+    "notes": "notes from SPDX:\nThis license was released: February 1989.",
+    "next_version": "gpl-2.0",
+    "spdx_license_key": "GPL-1.0",
     "text_urls": [
       "http://www.gnu.org/licenses/gpl-1.0.txt"
-    ], 
-    "faq_url": "http://www.gnu.org/licenses/gpl-faq.html", 
+    ],
+    "faq_url": "http://www.gnu.org/licenses/gpl-faq.html",
     "other_urls": [
       "http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html"
     ]
-  }, 
+  },
   {
-    "key": "gpl-3.0", 
-    "short_name": "GPL 3.0", 
-    "name": "GNU General Public License 3.0", 
-    "category": "Copyleft", 
-    "owner": "Free Software Foundation (FSF)", 
-    "homepage_url": "http://www.gnu.org/licenses/gpl-3.0.html", 
-    "notes": "notes from SPDX:\nThis license was released: 29 June 2007 This license is OSI certified.", 
-    "spdx_license_key": "GPL-3.0", 
+    "key": "gpl-3.0",
+    "short_name": "GPL 3.0",
+    "name": "GNU General Public License 3.0",
+    "category": "Copyleft",
+    "owner": "Free Software Foundation (FSF)",
+    "homepage_url": "http://www.gnu.org/licenses/gpl-3.0.html",
+    "notes": "notes from SPDX:\nThis license was released: 29 June 2007 This license is OSI certified.",
+    "spdx_license_key": "GPL-3.0",
     "text_urls": [
-      "http://www.gnu.org/licenses/gpl-3.0.txt", 
+      "http://www.gnu.org/licenses/gpl-3.0.txt",
       "http://www.gnu.org/licenses/gpl-3.0-standalone.html"
-    ], 
-    "osi_url": "http://opensource.org/licenses/gpl-3.0.html", 
-    "faq_url": "http://www.gnu.org/licenses/gpl-faq.html", 
+    ],
+    "osi_url": "http://opensource.org/licenses/gpl-3.0.html",
+    "faq_url": "http://www.gnu.org/licenses/gpl-faq.html",
     "other_urls": [
       "http://www.gnu.org/licenses/quick-guide-gplv3.html"
     ]
-  }, 
+  },
   {
-    "key": "gpl-2.0", 
-    "short_name": "GPL 2.0", 
-    "name": "GNU General Public License 2.0", 
-    "category": "Copyleft", 
-    "owner": "Free Software Foundation (FSF)", 
-    "homepage_url": "http://www.gnu.org/licenses/gpl-2.0.html", 
-    "notes": "This is the last version of the GPL text as published by the FSF. This license was released: June 1991 This license is OSI certified.\n", 
-    "next_version": "gpl-3.0", 
-    "spdx_license_key": "GPL-2.0", 
+    "key": "gpl-2.0",
+    "short_name": "GPL 2.0",
+    "name": "GNU General Public License 2.0",
+    "category": "Copyleft",
+    "owner": "Free Software Foundation (FSF)",
+    "homepage_url": "http://www.gnu.org/licenses/gpl-2.0.html",
+    "notes": "This is the last version of the GPL text as published by the FSF. This license was released: June 1991 This license is OSI certified.\n",
+    "next_version": "gpl-3.0",
+    "spdx_license_key": "GPL-2.0",
     "text_urls": [
-      "http://www.gnu.org/licenses/gpl-2.0.txt", 
+      "http://www.gnu.org/licenses/gpl-2.0.txt",
       "http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt"
-    ], 
-    "osi_url": "http://opensource.org/licenses/gpl-license.php", 
-    "faq_url": "http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html", 
+    ],
+    "osi_url": "http://opensource.org/licenses/gpl-license.php",
+    "faq_url": "http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html",
     "other_urls": [
-      "http://creativecommons.org/licenses/GPL/2.0/", 
-      "http://creativecommons.org/choose/cc-gpl", 
-      "http://creativecommons.org/images/public/cc-GPL-a.png", 
+      "http://creativecommons.org/licenses/GPL/2.0/",
+      "http://creativecommons.org/choose/cc-gpl",
+      "http://creativecommons.org/images/public/cc-GPL-a.png",
       "http://creativecommons.org/licenses/GPL/2.0/legalcode.pt"
     ]
   }
diff --git a/tests/licensedcode/data/models/rules.expected.json b/tests/licensedcode/data/models/rules.expected.json
index a8e63110c3d..4f8e327f0cc 100644
--- a/tests/licensedcode/data/models/rules.expected.json
+++ b/tests/licensedcode/data/models/rules.expected.json
@@ -3,51 +3,51 @@
     "licenses": [
       "apache-2.0"
     ]
-  }, 
+  },
   {
     "licenses": [
       "gpl-1.0"
     ]
-  }, 
+  },
   {
     "licenses": [
       "gpl-1.0-plus"
     ]
-  }, 
+  },
   {
     "licenses": [
       "gpl-2.0"
     ]
-  }, 
+  },
   {
     "licenses": [
       "gpl-2.0-library"
     ]
-  }, 
+  },
   {
     "licenses": [
       "gpl-2.0-plus"
     ]
-  }, 
+  },
   {
     "licenses": [
       "gpl-3.0"
     ]
-  }, 
+  },
   {
     "licenses": [
       "gpl-3.0-plus"
     ]
-  }, 
+  },
   {
     "licenses": [
       "w3c-docs-19990405"
     ]
-  }, 
+  },
   {
     "licenses": [
       "bsd-ack-carrot2"
-    ], 
+    ],
     "minimum_coverage": 80
   }
 ]
\ No newline at end of file
diff --git a/tests/scancode/data/altpath/copyright.expected.json b/tests/scancode/data/altpath/copyright.expected.json
index 38c437da23a..d34ecded2b2 100644
--- a/tests/scancode/data/altpath/copyright.expected.json
+++ b/tests/scancode/data/altpath/copyright.expected.json
@@ -1,11 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--copyrights": true,
+    "--infos": true,
+    "--strip-root": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index 13cdc7241b0..2929b1b95bd 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -1,9 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--package": true,
-    "--license-score": 0,
-    "--format": "json"
+    "--packages": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/scancode/data/failing/patchelf.expected.json b/tests/scancode/data/failing/patchelf.expected.json
index 9d803185f32..8ca24a2fd9c 100644
--- a/tests/scancode/data/failing/patchelf.expected.json
+++ b/tests/scancode/data/failing/patchelf.expected.json
@@ -1,10 +1,8 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--copyrights": true,
+    "--strip-root": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index e6327c116d1..7f6c71b97c1 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -9,22 +9,22 @@ Usage: scancode [OPTIONS] <input> <output_file>
 Options:
 
   scans:
-    -c, --copyright              Scan <input> for copyrights. [default]
-    -l, --license                Scan <input> for licenses. [default]
-    -p, --package                Scan <input> for packages. [default]
-    -e, --email                  Scan <input> for emails.
-    -u, --url                    Scan <input> for urls.
-    -i, --info                   Include information such as size, type, etc.
-    --license-score INTEGER      Do not return license matches with scores lower
-                                 than this score. A number between 0 and 100.
-                                 [default: 0]
-    --license-text               Include the detected licenses matched text. Has
-                                 no effect unless --license is requested.
-    --license-url-template TEXT  Set the template URL used for the license
-                                 reference URLs. In a template URL, curly braces
-                                 ({}) are replaced by the license key.  [default: h
-                                 ttps://enterprise.dejacode.com/urn/urn:dje:licens
-                                 e:{}]
+    -c, --copyright, --copyrights  Scan <input> for copyrights. [default]
+    -l, --license, --licenses      Scan <input> for licenses. [default]
+    -p, --package, --packages      Scan <input> for packages. [default]
+    -e, --email, --emails          Scan <input> for emails.
+    -u, --url, --urls              Scan <input> for urls.
+    -i, --info, --infos            Include information such as size, type, etc.
+    --license-score INTEGER        Do not return license matches with scores lower
+                                   than this score. A number between 0 and 100.
+                                   [default: 0]
+    --license-text                 Include the detected licenses matched text. Has
+                                   no effect unless --license is requested.
+    --license-url-template TEXT    Set the template URL used for the license
+                                   reference URLs. In a template URL, curly braces
+                                   ({}) are replaced by the license key.
+                                   [default: https://enterprise.dejacode.com/urn/u
+                                   rn:dje:license:{}]
 
   output:
     --strip-root           Strip the root directory segment of all paths. The
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 37abfe5779f..370c4ce6295 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -1,12 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--license": true,
-    "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--copyrights": true,
+    "--licenses": true,
+    "--infos": true,
+    "--strip-root": true
   },
   "files_count": 11,
   "files": [
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index 54aae79eab5..1f0ba7c8be5 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -1,12 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--license": true,
-    "--email": true,
-    "--url": true,
-    "--license-score": 0,
-    "--format": "json"
+    "--copyrights": true,
+    "--licenses": true,
+    "--emails": true,
+    "--urls": true
   },
   "files_count": 11,
   "files": [
diff --git a/tests/scancode/data/info/basic.expected.json b/tests/scancode/data/info/basic.expected.json
index 3b419812f9d..4c3526d19f1 100644
--- a/tests/scancode/data/info/basic.expected.json
+++ b/tests/scancode/data/info/basic.expected.json
@@ -1,10 +1,8 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--infos": true,
+    "--strip-root": true
   },
   "files_count": 11,
   "files": [
diff --git a/tests/scancode/data/info/basic.rooted.expected.json b/tests/scancode/data/info/basic.rooted.expected.json
index 677472d2bb0..fb3b4f58b95 100644
--- a/tests/scancode/data/info/basic.rooted.expected.json
+++ b/tests/scancode/data/info/basic.rooted.expected.json
@@ -1,9 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--info": true,
-    "--license-score": 0,
-    "--format": "json"
+    "--infos": true
   },
   "files_count": 11,
   "files": [
diff --git a/tests/scancode/data/info/email_url_info.expected.json b/tests/scancode/data/info/email_url_info.expected.json
index 0a200dae894..a0508cb1f61 100644
--- a/tests/scancode/data/info/email_url_info.expected.json
+++ b/tests/scancode/data/info/email_url_info.expected.json
@@ -1,12 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--email": true,
-    "--url": true,
-    "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--emails": true,
+    "--urls": true,
+    "--infos": true,
+    "--strip-root": true
   },
   "files_count": 11,
   "files": [
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index 73635377faa..1e4d7aa7621 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -1,11 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--license": true,
-    "--license-score": 0,
+    "--licenses": true,
     "--license-text": true,
-    "--strip-root": true,
-    "--format": "json"
+    "--strip-root": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/scancode/data/mark_source/with_info.expected.json b/tests/scancode/data/mark_source/with_info.expected.json
index 20479ac7cb1..5de62945398 100644
--- a/tests/scancode/data/mark_source/with_info.expected.json
+++ b/tests/scancode/data/mark_source/with_info.expected.json
@@ -1,343 +1,340 @@
 {
-    "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
-    "scancode_version": "2.0.1.post147.63a9004c0.dirty.20170806064809",
-    "scancode_options": {
-        "--info": true,
-        "--license-score": 0,
-        "--format": "json",
-        "--mark-source": true
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "--infos": true,
+    "--mark-source": true
+  },
+  "files_count": 15,
+  "files": [
+    {
+      "path": "JGroups.tgz/JGroups",
+      "type": "directory",
+      "name": "JGroups",
+      "base_name": "JGroups",
+      "extension": "",
+      "date": null,
+      "size": 206642,
+      "sha1": null,
+      "md5": null,
+      "files_count": 12,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
-    "files_count": 15,
-    "files": [
-        {
-            "path": "JGroups.tgz/JGroups",
-            "type": "directory",
-            "name": "JGroups",
-            "base_name": "JGroups",
-            "extension": "",
-            "date": null,
-            "size": 206642,
-            "sha1": null,
-            "md5": null,
-            "files_count": 12,
-            "mime_type": null,
-            "file_type": null,
-            "programming_language": null,
-            "is_binary": false,
-            "is_text": false,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": false,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/src",
-            "type": "directory",
-            "name": "src",
-            "base_name": "src",
-            "extension": "",
-            "date": null,
-            "size": 152090,
-            "sha1": null,
-            "md5": null,
-            "files_count": 7,
-            "mime_type": null,
-            "file_type": null,
-            "programming_language": null,
-            "is_binary": false,
-            "is_text": false,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": true,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/licenses",
-            "type": "directory",
-            "name": "licenses",
-            "base_name": "licenses",
-            "extension": "",
-            "date": null,
-            "size": 54552,
-            "sha1": null,
-            "md5": null,
-            "files_count": 5,
-            "mime_type": null,
-            "file_type": null,
-            "programming_language": null,
-            "is_binary": false,
-            "is_text": false,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": false,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/src/S3_PING.java",
-            "type": "file",
-            "name": "S3_PING.java",
-            "base_name": "S3_PING",
-            "extension": ".java",
-            "date": "2017-08-05",
-            "size": 122528,
-            "sha1": "08dba9986f69719970ead3592dc565465164df0d",
-            "md5": "83d8324f37d0e3f120bc89865cf0bd39",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text",
-            "programming_language": "Java",
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": true,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/src/RouterStubManager.java",
-            "type": "file",
-            "name": "RouterStubManager.java",
-            "base_name": "RouterStubManager",
-            "extension": ".java",
-            "date": "2017-08-05",
-            "size": 8162,
-            "sha1": "eb419dc94cfe11ca318a3e743a7f9f080e70c751",
-            "md5": "20bee9631b7c82a45c250e095352aec7",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text",
-            "programming_language": "Java",
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": true,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/src/RouterStub.java",
-            "type": "file",
-            "name": "RouterStub.java",
-            "base_name": "RouterStub",
-            "extension": ".java",
-            "date": "2017-08-05",
-            "size": 9913,
-            "sha1": "c1f6818f8ee7bddcc9f444bc94c099729d716d52",
-            "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text",
-            "programming_language": "Java",
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": true,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/src/RATE_LIMITER.java",
-            "type": "file",
-            "name": "RATE_LIMITER.java",
-            "base_name": "RATE_LIMITER",
-            "extension": ".java",
-            "date": "2017-08-05",
-            "size": 3692,
-            "sha1": "a8087e5d50da3273536ebda9b87b77aa4ff55deb",
-            "md5": "4626bdbc48871b55513e1a12991c61a8",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text",
-            "programming_language": "Java",
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": true,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/src/ImmutableReference.java",
-            "type": "file",
-            "name": "ImmutableReference.java",
-            "base_name": "ImmutableReference",
-            "extension": ".java",
-            "date": "2017-08-05",
-            "size": 1838,
-            "sha1": "30f56b876d5576d9869e2c5c509b08db57110592",
-            "md5": "48ca3c72fb9a65c771a321222f118b88",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text",
-            "programming_language": "Java",
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": true,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/src/GuardedBy.java",
-            "type": "file",
-            "name": "GuardedBy.java",
-            "base_name": "GuardedBy",
-            "extension": ".java",
-            "date": "2017-08-05",
-            "size": 813,
-            "sha1": "981d67087e65e9a44957c026d4b10817cf77d966",
-            "md5": "c5064400f759d3e81771005051d17dc1",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text",
-            "programming_language": "Java",
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": true,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/src/FixedMembershipToken.java",
-            "type": "file",
-            "name": "FixedMembershipToken.java",
-            "base_name": "FixedMembershipToken",
-            "extension": ".java",
-            "date": "2017-08-05",
-            "size": 5144,
-            "sha1": "5901f73dcc78155a1a2c7b5663a3a11fba400b19",
-            "md5": "aca9640ec8beee21b098bcf8ecc91442",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text",
-            "programming_language": "Java",
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": true,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/licenses/lgpl.txt",
-            "type": "file",
-            "name": "lgpl.txt",
-            "base_name": "lgpl",
-            "extension": ".txt",
-            "date": "2017-08-05",
-            "size": 26934,
-            "sha1": "8f1a637d2e2ed1bdb9eb01a7dccb5c12cc0557e1",
-            "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text, with CRLF line terminators",
-            "programming_language": null,
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": false,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/licenses/cpl-1.0.txt",
-            "type": "file",
-            "name": "cpl-1.0.txt",
-            "base_name": "cpl-1.0",
-            "extension": ".txt",
-            "date": "2017-08-05",
-            "size": 11987,
-            "sha1": "681cf776bcd79752543d42490ec7ed22a29fd888",
-            "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text, with CRLF line terminators",
-            "programming_language": null,
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": false,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/licenses/bouncycastle.txt",
-            "type": "file",
-            "name": "bouncycastle.txt",
-            "base_name": "bouncycastle",
-            "extension": ".txt",
-            "date": "2017-08-05",
-            "size": 1186,
-            "sha1": "74facb0e9a734479f9cd893b5be3fe1bf651b760",
-            "md5": "9fffd8de865a5705969f62b128381f85",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text",
-            "programming_language": null,
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": false,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/licenses/apache-2.0.txt",
-            "type": "file",
-            "name": "apache-2.0.txt",
-            "base_name": "apache-2.0",
-            "extension": ".txt",
-            "date": "2017-08-05",
-            "size": 11560,
-            "sha1": "47b573e3824cd5e02a1a3ae99e2735b49e0256e4",
-            "md5": "d273d63619c9aeaf15cdaf76422c4f87",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text, with CRLF line terminators",
-            "programming_language": null,
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": false,
-            "is_script": false,
-            "scan_errors": []
-        },
-        {
-            "path": "JGroups.tgz/JGroups/licenses/apache-1.1.txt",
-            "type": "file",
-            "name": "apache-1.1.txt",
-            "base_name": "apache-1.1",
-            "extension": ".txt",
-            "date": "2017-08-05",
-            "size": 2885,
-            "sha1": "6b5608d35c3e304532af43db8bbfc5947bef46a6",
-            "md5": "276982197c941f4cbf3d218546e17ae2",
-            "files_count": null,
-            "mime_type": "text/plain",
-            "file_type": "ASCII text, with CRLF line terminators",
-            "programming_language": null,
-            "is_binary": false,
-            "is_text": true,
-            "is_archive": false,
-            "is_media": false,
-            "is_source": false,
-            "is_script": false,
-            "scan_errors": []
-        }
-    ]
-}
+    {
+      "path": "JGroups.tgz/JGroups/licenses",
+      "type": "directory",
+      "name": "licenses",
+      "base_name": "licenses",
+      "extension": "",
+      "date": null,
+      "size": 54552,
+      "sha1": null,
+      "md5": null,
+      "files_count": 5,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/licenses/apache-1.1.txt",
+      "type": "file",
+      "name": "apache-1.1.txt",
+      "base_name": "apache-1.1",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 2885,
+      "sha1": "6b5608d35c3e304532af43db8bbfc5947bef46a6",
+      "md5": "276982197c941f4cbf3d218546e17ae2",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with CRLF line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/licenses/apache-2.0.txt",
+      "type": "file",
+      "name": "apache-2.0.txt",
+      "base_name": "apache-2.0",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 11560,
+      "sha1": "47b573e3824cd5e02a1a3ae99e2735b49e0256e4",
+      "md5": "d273d63619c9aeaf15cdaf76422c4f87",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with CRLF line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/licenses/bouncycastle.txt",
+      "type": "file",
+      "name": "bouncycastle.txt",
+      "base_name": "bouncycastle",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 1186,
+      "sha1": "74facb0e9a734479f9cd893b5be3fe1bf651b760",
+      "md5": "9fffd8de865a5705969f62b128381f85",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/licenses/cpl-1.0.txt",
+      "type": "file",
+      "name": "cpl-1.0.txt",
+      "base_name": "cpl-1.0",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 11987,
+      "sha1": "681cf776bcd79752543d42490ec7ed22a29fd888",
+      "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with CRLF line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/licenses/lgpl.txt",
+      "type": "file",
+      "name": "lgpl.txt",
+      "base_name": "lgpl",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 26934,
+      "sha1": "8f1a637d2e2ed1bdb9eb01a7dccb5c12cc0557e1",
+      "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with CRLF line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/src",
+      "type": "directory",
+      "name": "src",
+      "base_name": "src",
+      "extension": "",
+      "date": null,
+      "size": 152090,
+      "sha1": null,
+      "md5": null,
+      "files_count": 7,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/src/FixedMembershipToken.java",
+      "type": "file",
+      "name": "FixedMembershipToken.java",
+      "base_name": "FixedMembershipToken",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 5144,
+      "sha1": "5901f73dcc78155a1a2c7b5663a3a11fba400b19",
+      "md5": "aca9640ec8beee21b098bcf8ecc91442",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/src/GuardedBy.java",
+      "type": "file",
+      "name": "GuardedBy.java",
+      "base_name": "GuardedBy",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 813,
+      "sha1": "981d67087e65e9a44957c026d4b10817cf77d966",
+      "md5": "c5064400f759d3e81771005051d17dc1",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/src/ImmutableReference.java",
+      "type": "file",
+      "name": "ImmutableReference.java",
+      "base_name": "ImmutableReference",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 1838,
+      "sha1": "30f56b876d5576d9869e2c5c509b08db57110592",
+      "md5": "48ca3c72fb9a65c771a321222f118b88",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/src/RATE_LIMITER.java",
+      "type": "file",
+      "name": "RATE_LIMITER.java",
+      "base_name": "RATE_LIMITER",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 3692,
+      "sha1": "a8087e5d50da3273536ebda9b87b77aa4ff55deb",
+      "md5": "4626bdbc48871b55513e1a12991c61a8",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/src/RouterStub.java",
+      "type": "file",
+      "name": "RouterStub.java",
+      "base_name": "RouterStub",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 9913,
+      "sha1": "c1f6818f8ee7bddcc9f444bc94c099729d716d52",
+      "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/src/RouterStubManager.java",
+      "type": "file",
+      "name": "RouterStubManager.java",
+      "base_name": "RouterStubManager",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 8162,
+      "sha1": "eb419dc94cfe11ca318a3e743a7f9f080e70c751",
+      "md5": "20bee9631b7c82a45c250e095352aec7",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    },
+    {
+      "path": "JGroups.tgz/JGroups/src/S3_PING.java",
+      "type": "file",
+      "name": "S3_PING.java",
+      "base_name": "S3_PING",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 122528,
+      "sha1": "08dba9986f69719970ead3592dc565465164df0d",
+      "md5": "83d8324f37d0e3f120bc89865cf0bd39",
+      "files_count": null,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/mark_source/without_info.expected.json b/tests/scancode/data/mark_source/without_info.expected.json
index 718179f0c2e..5d639c1d296 100644
--- a/tests/scancode/data/mark_source/without_info.expected.json
+++ b/tests/scancode/data/mark_source/without_info.expected.json
@@ -1,11 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--license": true,
-    "--package": true,
-    "--license-score": 0,
-    "--format": "json",
+    "--copyrights": true,
+    "--licenses": true,
+    "--packages": true,
     "--mark-source": true
   },
   "files_count": 15,
diff --git a/tests/scancode/data/non_utf8/expected-linux.json b/tests/scancode/data/non_utf8/expected-linux.json
index b6ab979a358..59dce226ed2 100644
--- a/tests/scancode/data/non_utf8/expected-linux.json
+++ b/tests/scancode/data/non_utf8/expected-linux.json
@@ -1,10 +1,8 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--infos": true,
+    "--strip-root": true
   },
   "files_count": 19,
   "files": [
diff --git a/tests/scancode/data/only_findings/expected.json b/tests/scancode/data/only_findings/expected.json
index 864a30631c0..d9377448de4 100644
--- a/tests/scancode/data/only_findings/expected.json
+++ b/tests/scancode/data/only_findings/expected.json
@@ -1,16 +1,115 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
-  "scancode_version": "2.0.1.post147.5eab12f53",
   "scancode_options": {
-    "--copyright": true,
-    "--license": true,
-    "--package": true,
-    "--license-score": 0,
-    "--format": "json",
+    "--copyrights": true,
+    "--licenses": true,
+    "--packages": true,
     "--only-findings": true
   },
   "files_count": 3,
   "files": [
+    {
+      "path": "basic.tgz/basic/dir/e.tar",
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [
+        {
+          "type": "plain tarball",
+          "name": null,
+          "version": null,
+          "primary_language": null,
+          "packaging": "archive",
+          "summary": null,
+          "description": null,
+          "payload_type": null,
+          "size": null,
+          "release_date": null,
+          "authors": [],
+          "maintainers": [],
+          "contributors": [],
+          "owners": [],
+          "packagers": [],
+          "distributors": [],
+          "vendors": [],
+          "keywords": [],
+          "keywords_doc_url": null,
+          "metafile_locations": [],
+          "metafile_urls": [],
+          "homepage_url": null,
+          "notes": null,
+          "download_urls": [],
+          "download_sha1": null,
+          "download_sha256": null,
+          "download_md5": null,
+          "bug_tracking_url": null,
+          "support_contacts": [],
+          "code_view_url": null,
+          "vcs_tool": null,
+          "vcs_repository": null,
+          "vcs_revision": null,
+          "copyright_top_level": null,
+          "copyrights": [],
+          "asserted_licenses": [],
+          "legal_file_locations": [],
+          "license_expression": null,
+          "license_texts": [],
+          "notice_texts": [],
+          "dependencies": {},
+          "related_packages": []
+        }
+      ]
+    },
+    {
+      "path": "basic.tgz/basic/dir2/subdir/bcopy.s",
+      "scan_errors": [],
+      "licenses": [
+        {
+          "key": "bsd-original-uc",
+          "score": 100.0,
+          "short_name": "BSD-Original-UC",
+          "category": "Permissive",
+          "owner": "Regents of the University of California",
+          "homepage_url": "ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change",
+          "text_url": "http://www.xfree86.org/3.3.6/COPYRIGHT2.html",
+          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:bsd-original-uc",
+          "spdx_license_key": "BSD-4-Clause-UC",
+          "spdx_url": "https://spdx.org/licenses/BSD-4-Clause-UC",
+          "start_line": 25,
+          "end_line": 51,
+          "matched_rule": {
+            "identifier": "bsd-original-uc_4.RULE",
+            "license_choice": false,
+            "licenses": [
+              "bsd-original-uc"
+            ]
+          }
+        }
+      ],
+      "copyrights": [
+        {
+          "statements": [
+            "Copyright (c) 1993 The Regents of the University of California."
+          ],
+          "holders": [
+            "The Regents of the University of California."
+          ],
+          "authors": [],
+          "start_line": 22,
+          "end_line": 23
+        },
+        {
+          "statements": [],
+          "holders": [],
+          "authors": [
+            "the University of California, Berkeley and its contributors."
+          ],
+          "start_line": 34,
+          "end_line": 37
+        }
+      ],
+      "packages": []
+    },
     {
       "path": "basic.tgz/basic/main.c",
       "scan_errors": [],
@@ -74,108 +173,6 @@
         }
       ],
       "packages": []
-    },
-    {
-      "path": "basic.tgz/basic/dir2/subdir/bcopy.s",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "bsd-original-uc",
-          "score": 100.0,
-          "short_name": "BSD-Original-UC",
-          "category": "Permissive",
-          "owner": "Regents of the University of California",
-          "homepage_url": "ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change",
-          "text_url": "http://www.xfree86.org/3.3.6/COPYRIGHT2.html",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:bsd-original-uc",
-          "spdx_license_key": "BSD-4-Clause-UC",
-          "spdx_url": "https://spdx.org/licenses/BSD-4-Clause-UC",
-          "start_line": 25,
-          "end_line": 51,
-          "matched_rule": {
-            "identifier": "bsd-original-uc_4.RULE",
-            "license_choice": false,
-            "licenses": [
-              "bsd-original-uc"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [
-            "Copyright (c) 1993 The Regents of the University of California."
-          ],
-          "holders": [
-            "The Regents of the University of California."
-          ],
-          "authors": [],
-          "start_line": 22,
-          "end_line": 23
-        },
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "the University of California, Berkeley and its contributors."
-          ],
-          "start_line": 34,
-          "end_line": 37
-        }
-      ],
-      "packages": []
-    },
-    {
-      "path": "basic.tgz/basic/dir/e.tar",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": [
-        {
-          "type": "plain tarball",
-          "name": null,
-          "version": null,
-          "primary_language": null,
-          "packaging": "archive",
-          "summary": null,
-          "description": null,
-          "payload_type": null,
-          "size": null,
-          "release_date": null,
-          "authors": [],
-          "maintainers": [],
-          "contributors": [],
-          "owners": [],
-          "packagers": [],
-          "distributors": [],
-          "vendors": [],
-          "keywords": [],
-          "keywords_doc_url": null,
-          "metafile_locations": [],
-          "metafile_urls": [],
-          "homepage_url": null,
-          "notes": null,
-          "download_urls": [],
-          "download_sha1": null,
-          "download_sha256": null,
-          "download_md5": null,
-          "bug_tracking_url": null,
-          "support_contacts": [],
-          "code_view_url": null,
-          "vcs_tool": null,
-          "vcs_repository": null,
-          "vcs_revision": null,
-          "copyright_top_level": null,
-          "copyrights": [],
-          "asserted_licenses": [],
-          "legal_file_locations": [],
-          "license_expression": null,
-          "license_texts": [],
-          "notice_texts": [],
-          "dependencies": {},
-          "related_packages": []
-        }
-      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
index 1af4296df8d..6cb51660901 100644
--- a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
+++ b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
@@ -1,9 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--package": true,
-    "--license-score": 0,
-    "--format": "json"
+    "--packages": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
index c61d80baee1..155e4c9f0a9 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
@@ -1,15 +1,13 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--license": true,
-    "--package": true,
-    "--email": true,
-    "--url": true,
-    "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--copyrights": true,
+    "--licenses": true,
+    "--packages": true,
+    "--emails": true,
+    "--urls": true,
+    "--infos": true,
+    "--strip-root": true
   },
   "files_count": 4,
   "files": [
diff --git a/tests/scancode/data/weird_file_name/expected-linux.json b/tests/scancode/data/weird_file_name/expected-linux.json
index 25225a75c16..60876d55708 100644
--- a/tests/scancode/data/weird_file_name/expected-linux.json
+++ b/tests/scancode/data/weird_file_name/expected-linux.json
@@ -1,11 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyright": true,
-    "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--copyrights": true,
+    "--infos": true,
+    "--strip-root": true
   },
   "files_count": 5,
   "files": [
diff --git a/tests/scancode/test_ignore_files.py b/tests/scancode/test_ignore_files.py
index 88d2f3c9cb8..c92d53c102a 100644
--- a/tests/scancode/test_ignore_files.py
+++ b/tests/scancode/test_ignore_files.py
@@ -30,6 +30,7 @@
 from commoncode.testcase import FileBasedTesting
 from commoncode.ignore import is_ignored
 from scancode.cache import get_scans_cache_class
+from scancode.cli import CommandOption
 from scancode.cli import resource_paths
 from scancode.plugin_ignore import ProcessIgnore
 
@@ -71,8 +72,11 @@ def test_ignore_glob_file(self):
         assert is_ignored(*test)
 
     def test_resource_paths_with_single_file(self):
+
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore({'ignore': ('sample.doc',)})
+        test_plugin = ProcessIgnore(
+            [CommandOption(group=None, name='ignore', option='--ignore', value=('sample.doc',), default=None)]
+        )
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -87,7 +91,9 @@ def test_resource_paths_with_single_file(self):
 
     def test_resource_paths_with_multiple_files(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore({'ignore': ('ignore.doc',)})
+        test_plugin = ProcessIgnore(
+            [CommandOption(group=None, name='ignore', option='--ignore', value=('ignore.doc',), default=None)]
+        )
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -101,7 +107,9 @@ def test_resource_paths_with_multiple_files(self):
 
     def test_resource_paths_with_glob_file(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore({'ignore': ('*.doc',)})
+        test_plugin = ProcessIgnore(
+            [CommandOption(group=None, name='ignore', option='--ignore', value=('*.doc',), default=None)]
+        )
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -114,7 +122,9 @@ def test_resource_paths_with_glob_file(self):
 
     def test_resource_paths_with_glob_path(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore({'ignore': ('*/src/test',)})
+        test_plugin = ProcessIgnore(
+            [CommandOption(group=None, name='ignore', option='--ignore', value=('*/src/test',), default=None)]
+        )
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -129,8 +139,12 @@ def test_resource_paths_with_multiple_plugins(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         test_plugins = [
-            ProcessIgnore({'ignore': ('*.doc',)}),
-            ProcessIgnore({'ignore': ('*/src/test/*',)})
+            ProcessIgnore(
+                [CommandOption(group=None, name='ignore', option='--ignore', value=('*.doc',), default=None)]
+            ),
+            ProcessIgnore(
+                [CommandOption(group=None, name='ignore', option='--ignore', value=('*/src/test/*',), default=None)]
+            ),
         ]
         expected = [
             'user',

From 7ef1cbaf02c874099067db8dda9016e63437b450 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 5 Jan 2018 08:50:13 +0100
Subject: [PATCH 018/122] Use resource_iter everywhere #787

 * fileutils.py: remove file_iter and dir_iter as they were not really
   used/useful

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/fileutils.py        |  41 +--------
 src/extractcode/archive.py         |   2 +-
 src/licensedcode/cache.py          |   4 +-
 src/licensedcode/models.py         |   6 +-
 tests/commoncode/test_fileutils.py | 136 ++++++++++++++---------------
 tests/extractcode/test_archive.py  |   6 +-
 tests/packagedcode/test_maven.py   |   4 +-
 tests/scancode/test_cli.py         |   2 +-
 tests/scancode/test_extract_cli.py |  10 +--
 tests/textcode/test_analysis.py    |   6 +-
 10 files changed, 90 insertions(+), 127 deletions(-)

diff --git a/src/commoncode/fileutils.py b/src/commoncode/fileutils.py
index 4caac8fab8f..e9dedaf9da9 100644
--- a/src/commoncode/fileutils.py
+++ b/src/commoncode/fileutils.py
@@ -433,56 +433,23 @@ def walk(location, ignored=ignore_nothing):
                 yield tripple
 
 
-def file_iter(location, ignored=ignore_nothing):
+def resource_iter(location, ignored=ignore_nothing, with_dirs=True):
     """
-    Return an iterable of files at `location` recursively.
+    Return an iterable of paths at `location` recursively.
 
     :param location: a file or a directory.
     :param ignored: a callable accepting a location argument and returning True
                     if the location should be ignored.
-    :return: an iterable of file locations.
-    """
-    if on_linux:
-        location = path_to_bytes(location)
-
-    return resource_iter(location, ignored, with_dirs=False)
-
-
-def dir_iter(location, ignored=ignore_nothing):
-    """
-    Return an iterable of directories at `location` recursively.
-
-    :param location: a directory.
-    :param ignored: a callable accepting a location argument and returning True
-                    if the location should be ignored.
-    :return: an iterable of directory locations.
-    """
-    if on_linux:
-        location = path_to_bytes(location)
-    return resource_iter(location, ignored, with_files=False)
-
-
-def resource_iter(location, ignored=ignore_nothing, with_files=True, with_dirs=True):
-    """
-    Return an iterable of resources at `location` recursively.
-
-    :param location: a file or a directory.
-    :param ignored: a callable accepting a location argument and returning True
-                    if the location should be ignored.
-    :param with_dirs: If True, include the directories.
-    :param with_files: If True, include the  files.
     :return: an iterable of file and directory locations.
     """
-    assert with_dirs or with_files, "fileutils.resource_iter: One or both of 'with_dirs' and 'with_files' is required"
     if on_linux:
         location = path_to_bytes(location)
     for top, dirs, files in walk(location, ignored):
-        if with_files:
-            for f in files:
-                yield os.path.join(top, f)
         if with_dirs:
             for d in dirs:
                 yield os.path.join(top, d)
+        for f in files:
+            yield os.path.join(top, f)
 #
 # COPY
 #
diff --git a/src/extractcode/archive.py b/src/extractcode/archive.py
index 673bcd1199b..436d5441675 100644
--- a/src/extractcode/archive.py
+++ b/src/extractcode/archive.py
@@ -323,7 +323,7 @@ def extract_twice(location, target_dir, extractor1, extractor2):
 
     # extract this intermediate payload to the final target_dir
     try:
-        inner_archives = list(fileutils.file_iter(temp_target))
+        inner_archives = list(fileutils.resource_iter(temp_target, with_dirs=False))
         if not inner_archives:
             warnings.append(location + ': No files found in archive.')
         else:
diff --git a/src/licensedcode/cache.py b/src/licensedcode/cache.py
index 6f155e97ec4..dd486de32ad 100644
--- a/src/licensedcode/cache.py
+++ b/src/licensedcode/cache.py
@@ -34,7 +34,7 @@
 
 import yg.lockfile  # @UnresolvedImport
 
-from commoncode.fileutils import file_iter
+from commoncode.fileutils import resource_iter
 from commoncode import ignore
 
 from licensedcode import root_dir
@@ -71,7 +71,7 @@ def tree_checksum(tree_base_dir=src_dir, _ignored=_ignored_from_hash):
     NOTE: this is not 100% fool proof but good enough in practice.
     """
     hashable = (pth + str(getmtime(pth)) + str(getsize(pth))
-                for pth in file_iter(tree_base_dir, ignored=_ignored))
+                for pth in resource_iter(tree_base_dir, ignored=_ignored, with_dirs=False))
     return md5(''.join(sorted(hashable))).hexdigest()
 
 
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index 6057761d43e..81ee0cc42e7 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -39,7 +39,7 @@
 
 from commoncode.fileutils import file_base_name
 from commoncode.fileutils import file_name
-from commoncode.fileutils import file_iter
+from commoncode.fileutils import resource_iter
 from commoncode import saneyaml
 from textcode.analysis import text_lines
 
@@ -431,7 +431,7 @@ def load_licenses(licenses_data_dir=licenses_data_dir , with_deprecated=False):
     Return a mapping of key -> license objects, loaded from license files.
     """
     licenses = {}
-    for data_file in file_iter(licenses_data_dir):
+    for data_file in resource_iter(licenses_data_dir, with_dirs=False):
         if not data_file.endswith('.yml'):
             continue
         key = file_base_name(data_file)
@@ -511,7 +511,7 @@ def load_rules(rules_data_dir=rules_data_dir, load_notes=False):
     processed_files = set()
     lower_case_files = set()
     case_problems = set()
-    for data_file in file_iter(rules_data_dir):
+    for data_file in resource_iter(rules_data_dir, with_dirs=False):
         if data_file.endswith('.yml'):
             base_name = file_base_name(data_file)
             rule_file = join(rules_data_dir, base_name + '.RULE')
diff --git a/tests/commoncode/test_fileutils.py b/tests/commoncode/test_fileutils.py
index ea94a5b75fa..cd6b4ed1c87 100644
--- a/tests/commoncode/test_fileutils.py
+++ b/tests/commoncode/test_fileutils.py
@@ -306,6 +306,19 @@ def test_resource_name(self):
         assert 'f.a' == fileutils.resource_name('a/b/d/f/f.a')
         assert 'f.a' == fileutils.resource_name('f.a')
 
+    @skipIf(on_windows, 'Windows FS encoding is ... different')
+    def test_path_to_unicode_and_path_to_bytes_are_idempotent(self):
+        a = b'foo\xb1bar'
+        b = u'foo\udcb1bar'
+        assert a == path_to_bytes(path_to_unicode(a))
+        assert a == path_to_bytes(path_to_unicode(b))
+        assert b == path_to_unicode(path_to_bytes(a))
+        assert b == path_to_unicode(path_to_bytes(b))
+
+
+class TestFileUtilsWalk(FileBasedTesting):
+    test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
+
     def test_os_walk_with_unicode_path(self):
         test_dir = self.extract_test_zip('fileutils/walk/unicode.zip')
         test_dir = join(test_dir, 'unicode')
@@ -359,10 +372,34 @@ def test_fileutils_walk_can_walk_an_empty_dir(self):
         ]
         assert expected == result
 
-    def test_file_iter(self):
+    def test_walk_can_walk_non_utf8_path_from_unicode_path(self):
+        test_dir = self.extract_test_tar_raw('fileutils/walk_non_utf8/non_unicode.tgz')
+        test_dir = join(test_dir, 'non_unicode')
+
+        if not on_linux:
+            test_dir = unicode(test_dir)
+        result = list(fileutils.walk(test_dir))[0]
+        _dirpath, _dirnames, filenames = result
+        assert 18 == len(filenames)
+
+    def test_os_walk_can_walk_non_utf8_path_from_unicode_path(self):
+        test_dir = self.extract_test_tar_raw('fileutils/walk_non_utf8/non_unicode.tgz')
+        test_dir = join(test_dir, 'non_unicode')
+
+        if not on_linux:
+            test_dir = unicode(test_dir)
+        result = list(os.walk(test_dir))[0]
+        _dirpath, _dirnames, filenames = result
+        assert 18 == len(filenames)
+
+
+class TestFileUtilsIter(FileBasedTesting):
+    test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
+
+    def test_resource_iter(self):
         test_dir = self.get_test_loc('fileutils/walk')
         base = self.get_test_loc('fileutils')
-        result = [as_posixpath(f.replace(base, '')) for f in fileutils.file_iter(test_dir)]
+        result = [as_posixpath(f.replace(base, '')) for f in fileutils.resource_iter(test_dir, with_dirs=False)]
         expected = [
             '/walk/f',
             '/walk/unicode.zip',
@@ -372,23 +409,35 @@ def test_file_iter(self):
         ]
         assert sorted(expected) == sorted(result)
 
-    def test_file_iter_can_iterate_a_single_file(self):
+    def test_resource_iter_can_iterate_a_single_file(self):
         test_file = self.get_test_loc('fileutils/walk/f')
-        result = [as_posixpath(f) for f in fileutils.file_iter(test_file)]
+        result = [as_posixpath(f) for f in fileutils.resource_iter(test_file, with_dirs=False)]
         expected = [as_posixpath(test_file)]
         assert expected == result
 
-    def test_file_iter_can_walk_an_empty_dir(self):
+    def test_resource_iter_can_iterate_a_single_file_with_dirs(self):
+        test_file = self.get_test_loc('fileutils/walk/f')
+        result = [as_posixpath(f) for f in fileutils.resource_iter(test_file, with_dirs=True)]
+        expected = [as_posixpath(test_file)]
+        assert expected == result
+
+    def test_resource_iter_can_walk_an_empty_dir(self):
         test_dir = self.get_temp_dir()
-        result = list(fileutils.file_iter(test_dir))
+        result = list(fileutils.resource_iter(test_dir, with_dirs=False))
         expected = []
         assert expected == result
 
-    def test_resource_iter_with_files_no_dir(self):
+    def test_resource_iter_can_walk_an_empty_dir_with_dirs(self):
+        test_dir = self.get_temp_dir()
+        result = list(fileutils.resource_iter(test_dir, with_dirs=False))
+        expected = []
+        assert expected == result
+
+    def test_resource_iter_without_dir(self):
         test_dir = self.get_test_loc('fileutils/walk')
         base = self.get_test_loc('fileutils')
         result = sorted([as_posixpath(f.replace(base, ''))
-                         for f in fileutils.resource_iter(test_dir, with_files=True, with_dirs=False)])
+                         for f in fileutils.resource_iter(test_dir, with_dirs=False)])
         expected = [
             '/walk/f',
             '/walk/unicode.zip',
@@ -398,11 +447,11 @@ def test_resource_iter_with_files_no_dir(self):
         ]
         assert sorted(expected) == sorted(result)
 
-    def test_resource_iter_with_files_and_dir(self):
+    def test_resource_iter_with_dirs(self):
         test_dir = self.get_test_loc('fileutils/walk')
         base = self.get_test_loc('fileutils')
         result = sorted([as_posixpath(f.replace(base, ''))
-                         for f in fileutils.resource_iter(test_dir, with_files=True, with_dirs=True)])
+                         for f in fileutils.resource_iter(test_dir, with_dirs=True)])
         expected = [
             '/walk/d1',
             '/walk/d1/d2',
@@ -415,23 +464,11 @@ def test_resource_iter_with_files_and_dir(self):
         ]
         assert sorted(expected) == sorted(result)
 
-    def test_resource_iter_with_dir_only(self):
-        test_dir = self.get_test_loc('fileutils/walk')
-        base = self.get_test_loc('fileutils')
-        result = sorted([as_posixpath(f.replace(base, ''))
-                         for f in fileutils.resource_iter(test_dir, with_files=False, with_dirs=True)])
-        expected = [
-             '/walk/d1',
-             '/walk/d1/d2',
-             '/walk/d1/d2/d3',
-        ]
-        assert sorted(expected) == sorted(result)
-
     def test_resource_iter_return_byte_on_byte_input(self):
         test_dir = self.get_test_loc('fileutils/walk')
         base = self.get_test_loc('fileutils')
         result = sorted([as_posixpath(f.replace(base, ''))
-                         for f in fileutils.resource_iter(test_dir, with_files=True, with_dirs=True)])
+                         for f in fileutils.resource_iter(test_dir, with_dirs=True)])
         expected = [
             '/walk/d1',
             '/walk/d1/d2',
@@ -452,7 +489,7 @@ def test_resource_iter_return_unicode_on_unicode_input(self):
         test_dir = self.get_test_loc('fileutils/walk')
         base = unicode(self.get_test_loc('fileutils'))
         result = sorted([as_posixpath(f.replace(base, ''))
-                         for f in fileutils.resource_iter(test_dir, with_files=True, with_dirs=True)])
+                         for f in fileutils.resource_iter(test_dir, with_dirs=True)])
         expected = [
             u'/walk/d1',
             u'/walk/d1/d2',
@@ -466,19 +503,7 @@ def test_resource_iter_return_unicode_on_unicode_input(self):
         assert sorted(expected) == sorted(result)
         assert all(isinstance(p, unicode) for p in result)
 
-    def test_resource_iter_can_iterate_a_single_file(self):
-        test_file = self.get_test_loc('fileutils/walk/f')
-        result = [as_posixpath(f) for f in fileutils.resource_iter(test_file)]
-        expected = [as_posixpath(test_file)]
-        assert expected == result
-
-    def test_resource_iter_can_walk_an_empty_dir(self):
-        test_dir = self.get_temp_dir()
-        result = list(fileutils.resource_iter(test_dir))
-        expected = []
-        assert expected == result
-
-    def test_fileutils_resource_iter_can_walk_unicode_path_with_zip(self):
+    def test_resource_iter_can_walk_unicode_path_with_zip(self):
         test_dir = self.extract_test_zip('fileutils/walk/unicode.zip')
         test_dir = join(test_dir, 'unicode')
 
@@ -509,53 +534,24 @@ def test_fileutils_resource_iter_can_walk_unicode_path_with_zip(self):
             ]
         assert expected == result
 
-    def test_resource_iter_can_walk_non_utf8_path_from_unicode_path(self):
+    def test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs(self):
         test_dir = self.extract_test_tar_raw('fileutils/walk_non_utf8/non_unicode.tgz')
         test_dir = join(test_dir, 'non_unicode')
 
         if not on_linux:
             test_dir = unicode(test_dir)
-        result = list(fileutils.resource_iter(test_dir))
+        result = list(fileutils.resource_iter(test_dir, with_dirs=True))
         assert 18 == len(result)
 
-    def test_walk_can_walk_non_utf8_path_from_unicode_path(self):
-        test_dir = self.extract_test_tar_raw('fileutils/walk_non_utf8/non_unicode.tgz')
-        test_dir = join(test_dir, 'non_unicode')
-
-        if not on_linux:
-            test_dir = unicode(test_dir)
-        result = list(fileutils.walk(test_dir))[0]
-        _dirpath, _dirnames, filenames = result
-        assert 18 == len(filenames)
-
-    def test_file_iter_can_walk_non_utf8_path_from_unicode_path(self):
+    def test_resource_iter_can_walk_non_utf8_path_from_unicode_path(self):
         test_dir = self.extract_test_tar_raw('fileutils/walk_non_utf8/non_unicode.tgz')
         test_dir = join(test_dir, 'non_unicode')
 
         if not on_linux:
             test_dir = unicode(test_dir)
-        result = list(fileutils.file_iter(test_dir))
+        result = list(fileutils.resource_iter(test_dir, with_dirs=False))
         assert 18 == len(result)
 
-    def test_os_walk_can_walk_non_utf8_path_from_unicode_path(self):
-        test_dir = self.extract_test_tar_raw('fileutils/walk_non_utf8/non_unicode.tgz')
-        test_dir = join(test_dir, 'non_unicode')
-
-        if not on_linux:
-            test_dir = unicode(test_dir)
-        result = list(os.walk(test_dir))[0]
-        _dirpath, _dirnames, filenames = result
-        assert 18 == len(filenames)
-
-    @skipIf(on_windows, 'Windows FS encoding is ... different')
-    def test_path_to_unicode_and_path_to_bytes_are_idempotent(self):
-        a = b'foo\xb1bar'
-        b = u'foo\udcb1bar'
-        assert a == path_to_bytes(path_to_unicode(a))
-        assert a == path_to_bytes(path_to_unicode(b))
-        assert b == path_to_unicode(path_to_bytes(a))
-        assert b == path_to_unicode(path_to_bytes(b))
-
 
 class TestBaseName(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index b1ab4839776..0736463c05f 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -255,7 +255,7 @@ def check_extract(self, test_function, test_file, expected, expected_warnings=No
 
         if check_all:
             len_test_dir = len(test_dir)
-            extracted = {path[len_test_dir:]: filetype.get_size(path) for path in fileutils.file_iter(test_dir)}
+            extracted = {path[len_test_dir:]: filetype.get_size(path) for path in fileutils.resource_iter(test_dir, with_dirs=False)}
             expected = {os.path.join(test_dir, exp_path): exp_size for exp_path, exp_size in expected.items()}
             assert sorted(expected.items()) == sorted(extracted.items())
         else:
@@ -865,7 +865,7 @@ def test_extract_zip_with_backslash_in_path_3(self):
         test_dir = self.get_temp_dir()
         archive.extract_zip(test_file, test_dir)
         print()
-        map(print, fileutils.file_iter(test_dir))
+        map(print, fileutils.resource_iter(test_dir, with_dirs=False))
         result = os.path.join(test_dir, 'src/Boo.Lang.Compiler/TypeSystem/InternalCallableType.cs')
         assert os.path.exists(result)
 
@@ -2114,7 +2114,7 @@ def check_extract(self, test_function, test_file, expected_suffix, expected_warn
             return
 
         len_test_dir = len(test_dir)
-        extracted = sorted(path[len_test_dir:] for path in fileutils.file_iter(test_dir))
+        extracted = sorted(path[len_test_dir:] for path in fileutils.resource_iter(test_dir, with_dirs=False))
         extracted = [unicode(p) for p in extracted]
         extracted = [to_posix(p) for p in extracted]
 
diff --git a/tests/packagedcode/test_maven.py b/tests/packagedcode/test_maven.py
index 1ef082236a3..8152f271d1e 100644
--- a/tests/packagedcode/test_maven.py
+++ b/tests/packagedcode/test_maven.py
@@ -57,7 +57,7 @@ def test_is_pom_non_pom(self):
 
     def test_is_pom_maven2(self):
         test_dir = self.get_test_loc('maven2')
-        for test_file in fileutils.file_iter(test_dir):
+        for test_file in fileutils.resource_iter(test_dir, with_dirs=False):
             if test_file.endswith('.json'):
                 continue
 
@@ -70,7 +70,7 @@ def test_is_pom_not_misc2(self):
 
     def test_is_pom_m2(self):
         test_dir = self.get_test_loc('m2')
-        for test_file in fileutils.file_iter(test_dir):
+        for test_file in fileutils.resource_iter(test_dir, with_dirs=False):
             if test_file.endswith('.json'):
                 continue
 
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index 8a83f60f7e1..ddc20bea381 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -430,7 +430,7 @@ def test_scan_works_with_multiple_processes_and_timeouts():
     # add some random bytes to the test files to ensure that the license results will
     # not be cached
     import time, random
-    for tf in fileutils.file_iter(test_dir):
+    for tf in fileutils.resource_iter(test_dir, with_dirs=False):
         with open(tf, 'ab') as tfh:
             tfh.write('(c)' + str(time.time()) + repr([random.randint(0, 10 ** 6) for _ in range(10000)]) + '(c)')
 
diff --git a/tests/scancode/test_extract_cli.py b/tests/scancode/test_extract_cli.py
index 18134e6932e..4c3e07ee01f 100644
--- a/tests/scancode/test_extract_cli.py
+++ b/tests/scancode/test_extract_cli.py
@@ -33,7 +33,7 @@
 from click.testing import CliRunner
 
 from commoncode.fileutils import as_posixpath
-from commoncode.fileutils import file_iter
+from commoncode.fileutils import resource_iter
 from commoncode.testcase import FileDrivenTesting
 from commoncode.system import on_windows
 from scancode import extract_cli
@@ -125,7 +125,7 @@ def test_extractcode_command_works_with_relative_paths(monkeypatch):
         assert not 'WARNING' in result.output
         assert not 'ERROR' in result.output
         expected = ['/c/a/a.txt', '/c/b/a.txt', '/c/c/a.txt']
-        file_result = [as_posixpath(f.replace(test_tgt_dir, '')) for f in fileutils.file_iter(test_tgt_dir)]
+        file_result = [as_posixpath(f.replace(test_tgt_dir, '')) for f in fileutils.resource_iter(test_tgt_dir, with_dirs=False)]
         assert sorted(expected) == sorted(file_result)
     finally:
         fileutils.delete(test_src_dir)
@@ -199,7 +199,7 @@ def test_extractcode_command_can_extract_archive_with_unicode_names_verbose(monk
     uni_arch = b'unicodepath.tgz' if on_linux else 'unicodepath.tgz'
     uni_path = b'/unicodepath/' if on_linux else '/unicodepath/'
 
-    file_result = [f for f in map(as_posixpath, file_iter(test_dir)) if not f.endswith(uni_arch)]
+    file_result = [f for f in map(as_posixpath, resource_iter(test_dir, with_dirs=False)) if not f.endswith(uni_arch)]
     file_result = [EMPTY_STRING.join(f.partition(uni_path)[1:]) for f in file_result]
     file_result = [f for f in file_result if f]
     expected = [
@@ -222,7 +222,7 @@ def test_extractcode_command_can_extract_archive_with_unicode_names(monkeypatch)
     uni_arch = b'unicodepath.tgz' if on_linux else 'unicodepath.tgz'
     uni_path = b'/unicodepath/' if on_linux else '/unicodepath/'
 
-    file_result = [f for f in map(as_posixpath, file_iter(test_dir)) if not f.endswith(uni_arch)]
+    file_result = [f for f in map(as_posixpath, resource_iter(test_dir, with_dirs=False)) if not f.endswith(uni_arch)]
     file_result = [EMPTY_STRING.join(f.partition(uni_path)[1:]) for f in file_result]
     file_result = [f for f in file_result if f]
     expected = [
@@ -239,7 +239,7 @@ def test_extractcode_command_can_extract_shallow(monkeypatch):
     runner = CliRunner()
     result = runner.invoke(extract_cli.extractcode, ['--shallow', test_dir])
     assert result.exit_code == 0
-    file_result = [f for f in map(as_posixpath, file_iter(test_dir)) if not f.endswith('unicodepath.tgz')]
+    file_result = [f for f in map(as_posixpath, resource_iter(test_dir, with_dirs=False)) if not f.endswith('unicodepath.tgz')]
     file_result = [''.join(f.partition('/top.zip-extract/')[1:]) for f in file_result]
     file_result = [f for f in file_result if f]
     # this checks that the zip in top.zip are not extracted
diff --git a/tests/textcode/test_analysis.py b/tests/textcode/test_analysis.py
index 85591c27379..d1f3d036c3d 100644
--- a/tests/textcode/test_analysis.py
+++ b/tests/textcode/test_analysis.py
@@ -33,7 +33,7 @@
 
 from textcode.analysis import unicode_text_lines
 from textcode.analysis import text_lines
-from commoncode.fileutils import file_iter
+from commoncode.fileutils import resource_iter
 
 
 class TestAnalysis(FileBasedTesting):
@@ -68,13 +68,13 @@ def test_archives_do_not_yield_text_lines(self):
 
     def test_some_media_do_yield_text_lines(self):
         test_dir = self.get_test_loc('media_with_text')
-        for test_file in file_iter(test_dir):
+        for test_file in resource_iter(test_dir, with_dirs=False):
             result = list(text_lines(test_file))
             assert result, 'Should return text lines:' + test_file
             assert any('nexb' in l for l in result)
 
     def test_some_media_do_not_yield_text_lines(self):
         test_dir = self.get_test_loc('media_without_text')
-        for test_file in file_iter(test_dir):
+        for test_file in resource_iter(test_dir, with_dirs=False):
             result = list(text_lines(test_file))
             assert [] == result, 'Should not return text lines:' + test_file

From a6446c94bea1f327da227328ae318b07ec0d34fc Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 5 Jan 2018 09:00:27 +0100
Subject: [PATCH 019/122] Do not use on-disk file log. Improve pre-scan plugins
 #787

 * refactor pre-scan plugins to use the same approach as all other
   plugins and not make ignoring a special case
 * cli.py and cache.py: remove the on-disk file log and use an in-memory
   list instead

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cache.py               | 253 ++++++++++++++--------------
 src/scancode/cli.py                 | 220 +++++++++---------------
 src/scancode/plugin_ignore.py       |  49 ++++--
 tests/scancode/test_ignore_files.py |  59 ++++---
 4 files changed, 286 insertions(+), 295 deletions(-)

diff --git a/src/scancode/cache.py b/src/scancode/cache.py
index e8f9cd7c90c..6f44e1efc29 100644
--- a/src/scancode/cache.py
+++ b/src/scancode/cache.py
@@ -35,12 +35,15 @@
 import posixpath
 import sys
 
-from commoncode import fileutils
+# from commoncode import fileutils
 from commoncode.fileutils import as_posixpath
+from commoncode.fileutils import create_dir
+from commoncode.fileutils import delete
+from commoncode.fileutils import get_temp_dir
 from commoncode.fileutils import path_to_bytes
 from commoncode.fileutils import path_to_unicode
 from commoncode.system import on_linux
-from commoncode import timeutils
+from commoncode.timeutils import time2tstamp
 
 from scancode import scans_cache_dir
 
@@ -48,25 +51,30 @@
 """
 Cache scan results for a file or directory disk using a file-based cache.
 
-The approach is to cache the scan of a file using these files:
- - one "global" file contains a log of all the paths scanned.
- - for each file being scanned, we store a file that contains the corresponding file
-   info data as JSON. This file is named after the hash of the path of a scanned file.
- - for each unique file being scanned (e.g. based on its content SHA1), we store a
-   another JSON file that contains the corresponding scan data. This file is named
-   after the hash of the scanned file content.
+The approach is to cache the scan of a file using these data structure and files:
+
+ - a resource_paths list contains all the paths scanned.
+
+ - for each file being scanned, we store a file that contains the corresponding
+   file info data as JSON. This file is named after the hash of the path of a
+   scanned file.
+
+ - for each unique file being scanned (e.g. based on its content SHA1), we store
+   a another JSON file that contains the corresponding scan data. This file is
+   named after the hash of the scanned file content.
 
 Once a scan is completed, we iterate the cache to output the final scan results:
-First iterate the global log file to get the paths, from there collect the cached
-file info for that file and from the path and file info collect the cached scanned
-result. This iterator is then streamed to the final JSON output.
+First iterate the resource_paths, from there collect the cached file info for
+that file and from the path and file info collect the cached scanned result.
+This iterator is then streamed to the final JSON output.
 
 Finally once a scan is completed the cache is destroyed to free up disk space.
 
-Internally the cache is organized as a tree of directories named after the first few
-characters or a path hash or file hash. This is to avoid having having too many files
-per directory that can make some filesystems choke as well as having directories that
-are too deep or having file paths that are too long which problematic on some OS.
+Internally the cache is organized as a tree of directories named after the first
+few characters or a path hash or file hash. This is to avoid having having too
+many files per directory that can make some filesystems choke as well as having
+directories that are too deep or having file paths that are too long which
+problematic on some OS.
 """
 
 # Tracing flags
@@ -84,17 +92,18 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, unicode) and a or repr(a) for a in args))
+        return logger.debug(' '.join(isinstance(a, unicode)
+                                     and a or repr(a) for a in args))
 
 
 def get_cache_dir(base_cache_dir=scans_cache_dir):
     """
     Return a new, created and unique cache storage directory.
     """
+    create_dir(base_cache_dir)
     # create a unique temp directory in cache_dir
-    fileutils.create_dir(base_cache_dir)
-    prefix = timeutils.time2tstamp() + u'-'
-    cache_dir = fileutils.get_temp_dir(base_cache_dir, prefix=prefix)
+    prefix = time2tstamp() + u'-'
+    cache_dir = get_temp_dir(base_cache_dir, prefix=prefix)
     if on_linux:
         cache_dir = path_to_bytes(cache_dir)
     return cache_dir
@@ -102,7 +111,8 @@ def get_cache_dir(base_cache_dir=scans_cache_dir):
 
 def get_scans_cache_class(base_cache_dir=scans_cache_dir):
     """
-    Return a new persistent cache class configured with a unique storage directory.
+    Return a new persistent cache class configured with a unique storage
+    directory.
     """
     cache_dir = get_cache_dir(base_cache_dir=base_cache_dir)
     sc = ScanFileCache(cache_dir)
@@ -134,7 +144,8 @@ def info_keys(path, seed=None):
 def scan_keys(path, file_info):
     """
     Return a scan cache keys tripple for a path and file_info. If the file_info
-    sha1 is empty (e.g. such as a directory), return a key based on the path instead.
+    sha1 is empty (e.g. such as a directory), return a key based on the path
+    instead.
     """
     # we "get" because in some off cases getting file info may have failed
     # or there may be none for a directory
@@ -151,12 +162,13 @@ def keys_from_hash(hexdigest):
     """
     Return a cache keys triple for a hash hexdigest string.
 
-    NOTE: since we use the first character and next two characters as directories, we
-    create at most 16 dir at the first level and 16 dir at the second level for each
-    first level directory for a maximum total of 16*16 = 256 directories. For a
-    million files we would have about 4000 files per directory on average with this
-    scheme which should keep most file systems happy and avoid some performance
-    issues when there are too many files in a single directory.
+    NOTE: since we use the first character and next two characters as
+    directories, we create at most 16 dir at the first level and 16 dir at the
+    second level for each first level directory for a maximum total of 16*16 =
+    256 directories. For a million files we would have about 4000 files per
+    directory on average with this scheme which should keep most file systems
+    happy and avoid some performance issues when there are too many files in a
+    single directory.
 
     For example:
     >>> expected = ('f', 'b', '87db2bb28e9501ac7fdc4812782118f4c94a0f')
@@ -169,8 +181,9 @@ def keys_from_hash(hexdigest):
 
 def paths_from_keys(base_path, keys):
     """
-    Return a tuple of (parent dir path, filename) for a cache entry built from a cache
-    keys triple and a base_directory. Ensure that the parent directory exist.
+    Return a tuple of (parent dir path, filename) for a cache entry built from a
+    cache keys triple and a base_directory. Ensure that the parent directory
+    exist.
     """
     if on_linux:
         keys = [path_to_bytes(k) for k in keys]
@@ -181,53 +194,39 @@ def paths_from_keys(base_path, keys):
 
     dir1, dir2, file_name = keys
     parent = os.path.join(base_path, dir1, dir2)
-    fileutils.create_dir(parent)
+    create_dir(parent)
     return parent, file_name
 
 
 class ScanFileCache(object):
     """
-    A file-based cache for scan results saving results in files and using no locking.
-    This is NOT thread-safe and NOT multi-process safe but works OK in our context:
-    we cache the scan for a given file once and read it only a few times.
+    A file-based cache for scan results saving results in files and using no
+    locking. This is NOT thread-safe and NOT multi-process safe but works OK in
+    our context: we cache the scan for a given file once and read it only a few
+    times.
     """
     def __init__(self, cache_dir):
         # subdirs for info and scans_dir caches
         if on_linux:
             infos_dir = b'infos_dir/'
             scans_dir = b'scans_dir/'
-            files_log = b'files_log'
             self.cache_base_dir = path_to_bytes(cache_dir)
 
         else:
             infos_dir = u'infos_dir/'
             scans_dir = u'scans_dir/'
-            files_log = u'files_log'
             self.cache_base_dir = cache_dir
 
         self.cache_infos_dir = as_posixpath(os.path.join(self.cache_base_dir, infos_dir))
         self.cache_scans_dir = as_posixpath(os.path.join(self.cache_base_dir, scans_dir))
-        self.cache_files_log = as_posixpath(os.path.join(self.cache_base_dir, files_log))
 
     def setup(self):
         """
         Setup the cache: must be called at least once globally after cache
         initialization.
         """
-        fileutils.create_dir(self.cache_infos_dir)
-        fileutils.create_dir(self.cache_scans_dir)
-
-    @classmethod
-    def log_file_path(cls, logfile_fd, path):
-        """
-        Log file path in the cache logfile_fd **opened** file descriptor.
-        """
-        # we dump one path per line written as bytes or unicode
-        if on_linux:
-            path = path_to_bytes(path) + b'\n'
-        else:
-            path = path_to_unicode(path) + '\n'
-        logfile_fd.write(path)
+        create_dir(self.cache_infos_dir)
+        create_dir(self.cache_scans_dir)
 
     def get_cached_info_path(self, path):
         """
@@ -239,8 +238,8 @@ def get_cached_info_path(self, path):
 
     def put_info(self, path, file_info):
         """
-        Put file_info for path in the cache and return True if the file referenced
-        in file_info has already been scanned or False otherwise.
+        Put file_info for path in the cache and return True if the file
+        referenced in file_info has already been scanned or False otherwise.
         """
         info_path = self.get_cached_info_path(path)
         with codecs.open(info_path, 'wb', encoding='utf-8') as cached_infos:
@@ -248,7 +247,9 @@ def put_info(self, path, file_info):
         scan_path = self.get_cached_scan_path(path, file_info)
         is_scan_cached = os.path.exists(scan_path)
         if TRACE:
-            logger_debug('put_infos:', 'path:', path, 'is_scan_cached:', is_scan_cached, 'file_info:', file_info, '\n')
+            logger_debug(
+                'put_infos:', 'path:', path, 'is_scan_cached:', is_scan_cached,
+                'file_info:', file_info, '\n')
         return is_scan_cached
 
     def get_info(self, path):
@@ -263,7 +264,8 @@ def get_info(self, path):
 
     def get_cached_scan_path(self, path, file_info):
         """
-        Return the path where to store a scan in the cache given a path and file_info.
+        Return the path where to store a scan in the cache given a path and
+        file_info.
         """
         keys = scan_keys(path, file_info)
         paths = paths_from_keys(self.cache_scans_dir, keys)
@@ -278,7 +280,9 @@ def put_scan(self, path, file_info, scan_result):
             with codecs.open(scan_path, 'wb', encoding='utf-8') as cached_scan:
                 json.dump(scan_result, cached_scan, check_circular=False)
         if TRACE:
-            logger_debug('put_scan:', 'scan_path:', scan_path, 'file_info:', file_info, 'scan_result:', scan_result, '\n')
+            logger_debug(
+                'put_scan:', 'scan_path:', scan_path, 'file_info:', file_info,
+                'scan_result:', scan_result, '\n')
 
     def get_scan(self, path, file_info):
         """
@@ -290,93 +294,88 @@ def get_scan(self, path, file_info):
             with codecs.open(scan_path, 'r', encoding='utf-8') as cached_scan:
                 return json.load(cached_scan, object_pairs_hook=OrderedDict)
 
-    def iterate(self, scan_names, root_dir=None, paths_subset=tuple()):
+    def iterate(self, resource_paths, scan_names, root_dir=None, paths_subset=tuple()):
         """
-        Yield scan data for all cached scans e.g. the whole cache given
-        a list of scan names.
-        If a `paths_subset` sequence of paths is provided, then only
-        these paths are iterated.
+        Yield scan data for all cached scans e.g. the whole cache given a list
+        of `resource_paths` and `scan_names`.
 
-        The logfile MUST have been closed before calling this method.
+        If a `paths_subset` sequence of paths is provided, then only these paths
+        are iterated.
         """
         if on_linux:
             paths_subset = set(path_to_bytes(p) for p in paths_subset)
         else:
             paths_subset = set(path_to_unicode(p) for p in paths_subset)
 
-        if on_linux:
-            log_opener = partial(open, self.cache_files_log, 'rb')
-        else:
-            log_opener = partial(codecs.open, self.cache_files_log, 'rb', encoding='utf-8')
-        EOL = b'\n' if on_linux else '\n'
+        for resource_path in resource_paths:
+            if paths_subset and resource_path not in paths_subset:
+                continue
+            file_info = self.get_info(resource_path)
 
-        with log_opener() as cached_files:
-            # iterate paths, one by line
-            for file_log in cached_files:
-                # must be unicode
-                path = file_log.rstrip(EOL)
-                if paths_subset and path not in paths_subset:
-                    continue
-                file_info = self.get_info(path)
+            if on_linux:
+                unicode_path = path_to_unicode(resource_path)
+            else:
+                unicode_path = resource_path
 
+            if root_dir:
+                # must be unicode
                 if on_linux:
-                    unicode_path = path_to_unicode(path)
-                else:
-                    unicode_path = path
-
-                if root_dir:
-                    # must be unicode
-                    if on_linux:
-                        root_dir = path_to_unicode(root_dir)
-                    rooted_path = posixpath.join(root_dir, unicode_path)
-                else:
-                    rooted_path = unicode_path
-                rooted_path = fileutils.as_posixpath(rooted_path)
-                logger_debug('iterate:', 'rooted_path:', rooted_path)
-
-                # rare but possible corner case
-                if file_info is None:
-                    no_info = ('ERROR: file info unavailable in cache: '
-                               'This is either a bug or processing was aborted with CTRL-C.')
-                    scan_result = OrderedDict(path=rooted_path)
-                    scan_result['scan_errors'] = [no_info]
-                    if TRACE:
-                        logger_debug('iterate:', 'scan_result:', scan_result, 'for path:', rooted_path, '\n')
-                    yield scan_result
-                    continue
-
-                _unicode_path_from_file_info = file_info.pop('path')
+                    root_dir = path_to_unicode(root_dir)
+                rooted_path = posixpath.join(root_dir, unicode_path)
+            else:
+                rooted_path = unicode_path
+            rooted_path = as_posixpath(rooted_path)
+            logger_debug('iterate:', 'rooted_path:', rooted_path)
+
+            # rare but possible corner case
+            if file_info is None:
+                no_info = ('ERROR: file info unavailable in cache: '
+                           'This is either a bug or processing was aborted '
+                           'with CTRL-C.')
                 scan_result = OrderedDict(path=rooted_path)
-
-                if 'infos' in scan_names:
-                    # info are always collected but only returned if requested
-                    # we flatten these as direct attributes of a file object
-                    scan_result.update(file_info.items())
-
-                if not scan_result.get('scan_errors'):
-                    scan_result['scan_errors'] = []
-
-                # check if we have more than just infos
-                if ['infos'] != scan_names:
-                    errors = scan_result['scan_errors']
-                    scan_details = self.get_scan(path, file_info)
-                    if scan_details is None:
-                        no_scan_details = (
-                            'ERROR: scan details unavailable in cache: '
-                            'This is either a bug or processing was aborted with CTRL-C.')
-                        errors.append(no_scan_details)
-                    else:
-                        # append errors to other top level errors if any
-                        scan_errors = scan_details.pop('scan_errors', [])
-                        errors.extend(scan_errors)
-                        scan_result.update(scan_details)
-
+                scan_result['scan_errors'] = [no_info]
                 if TRACE:
-                    logger_debug('iterate:', 'scan_result:', scan_result, 'for path:', rooted_path, '\n')
+                    logger_debug(
+                        'iterate:', 'scan_result:', scan_result,
+                        'for resource_path:', rooted_path, '\n')
                 yield scan_result
+                continue
+
+            _unicode_path_from_file_info = file_info.pop('path')
+            scan_result = OrderedDict(path=rooted_path)
+
+            if 'infos' in scan_names:
+                # info are always collected but only returned if requested
+                # we flatten these as direct attributes of a file object
+                scan_result.update(file_info.items())
+
+            if not scan_result.get('scan_errors'):
+                scan_result['scan_errors'] = []
+
+            # check if we have more than just infos
+            if ['infos'] != scan_names:
+                errors = scan_result['scan_errors']
+                scan_details = self.get_scan(resource_path, file_info)
+                if scan_details is None:
+                    no_scan_details = (
+                        'ERROR: scan details unavailable in cache: '
+                        'This is either a bug or processing was aborted with '
+                        'CTRL-C.')
+                    errors.append(no_scan_details)
+                else:
+                    # append errors to other top level errors if any
+                    scan_errors = scan_details.pop('scan_errors', [])
+                    errors.extend(scan_errors)
+                    scan_result.update(scan_details)
+
+            if TRACE:
+                logger_debug(
+                    'iterate:', 'scan_result:', scan_result,
+                    'for resource_path:', rooted_path, '\n')
+            yield scan_result
 
     def clear(self, *args):
         """
         Purge the cache by deleting the corresponding cached data files.
         """
-        fileutils.delete(self.cache_base_dir)
+        delete(self.cache_base_dir)
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index f968808db61..6cc34767373 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -30,7 +30,6 @@
 # Import early because this import has monkey-patching side effects
 from scancode.pool import get_pool
 
-import codecs
 from collections import namedtuple
 from collections import OrderedDict
 from functools import partial
@@ -56,9 +55,7 @@
 from commoncode.fileutils import path_to_bytes
 from commoncode.fileutils import path_to_unicode
 from commoncode.fileutils import resource_iter
-
 from commoncode import ignore
-
 from commoncode.system import on_linux
 from commoncode.text import toascii
 
@@ -68,7 +65,6 @@
 
 from scancode import __version__ as version
 from scancode import ScanOption
-
 from scancode.api import DEJACODE_LICENSE_URL
 from scancode.api import _empty_file_infos
 from scancode.api import get_copyrights
@@ -78,15 +74,11 @@
 from scancode.api import get_package_infos
 from scancode.api import get_urls
 from scancode.api import Resource
-
 from scancode.cache import get_scans_cache_class
-from scancode.cache import ScanFileCache
-
 from scancode.interrupt import DEFAULT_TIMEOUT
 from scancode.interrupt import fake_interruptible
 from scancode.interrupt import interruptible
 from scancode.interrupt import TimeoutError
-
 from scancode.utils import BaseCommand
 from scancode.utils import compute_fn_max_len
 from scancode.utils import fixed_width_file_name
@@ -588,83 +580,77 @@ def scan_all(input_path, scanners,
 
     pool = None
 
-    # FIXME: THIS IS NOT where PRE SCANS should take place!!!
-    resources = resource_paths(
-        input_path, diag, scans_cache_class, pre_scan_plugins=pre_scan_plugins)
+    resources = get_resources(input_path, diag, scans_cache_class)
+
+    # FIXME: we should try/catch here
+    for plugin in pre_scan_plugins:
+        resources = plugin.process_resources(resources)
+
+    resources = list(resources)
 
     paths_with_error = []
     files_count = 0
-    #FIXME: we should NOT USE a logfile!!!
-    logfile_path = scans_cache_class().cache_files_log
-    if on_linux:
-        file_logger = partial(open, logfile_path, 'wb')
-    else:
-        file_logger = partial(codecs.open, logfile_path, 'w', encoding='utf-8')
-
-    with file_logger() as logfile_fd:
 
-        logged_resources = _resource_logger(logfile_fd, resources)
+    scanit = partial(_scanit, scanners=scanners, scans_cache_class=scans_cache_class,
+                     diag=diag, timeout=timeout, processes=processes)
 
-        scanit = partial(_scanit, scanners=scanners, scans_cache_class=scans_cache_class,
-                         diag=diag, timeout=timeout, processes=processes)
+    max_file_name_len = compute_fn_max_len()
+    # do not display a file name in progress bar if there is less than 5 chars available.
+    display_fn = bool(max_file_name_len > 10)
+    try:
+        if processes:
+            # maxtasksperchild helps with recycling processes in case of leaks
+            pool = get_pool(processes=processes, maxtasksperchild=1000)
+            # Using chunksize is documented as much more efficient in the Python doc.
+            # Yet "1" still provides a better and more progressive feedback.
+            # With imap_unordered, results are returned as soon as ready and out of order.
+            scanned_files = pool.imap_unordered(scanit, resources, chunksize=1)
+            pool.close()
+        else:
+            # no multiprocessing with processes=0
+            scanned_files = imap(scanit, resources)
+            if not quiet:
+                echo_stderr('Disabling multi-processing and multi-threading...', fg='yellow')
 
-        max_file_name_len = compute_fn_max_len()
-        # do not display a file name in progress bar if there is less than 5 chars available.
-        display_fn = bool(max_file_name_len > 10)
-        try:
-            if processes:
-                # maxtasksperchild helps with recycling processes in case of leaks
-                pool = get_pool(processes=processes, maxtasksperchild=1000)
-                # Using chunksize is documented as much more efficient in the Python doc.
-                # Yet "1" still provides a better and more progressive feedback.
-                # With imap_unordered, results are returned as soon as ready and out of order.
-                scanned_files = pool.imap_unordered(scanit, logged_resources, chunksize=1)
-                pool.close()
+        if not quiet:
+            echo_stderr('Scanning files...', fg='green')
+
+        def scan_event(item):
+            """Progress event displayed each time a file is scanned"""
+            if quiet or not item or not display_fn:
+                return ''
+            _scan_success, _scanned_path = item
+            _scanned_path = unicode(toascii(_scanned_path))
+            if verbose:
+                _progress_line = _scanned_path
             else:
-                # no multiprocessing with processes=0
-                scanned_files = imap(scanit, logged_resources)
-                if not quiet:
-                    echo_stderr('Disabling multi-processing and multi-threading...', fg='yellow')
-
-            if not quiet:
-                echo_stderr('Scanning files...', fg='green')
-
-            def scan_event(item):
-                """Progress event displayed each time a file is scanned"""
-                if quiet or not item or not display_fn:
-                    return ''
-                _scan_success, _scanned_path = item
-                _scanned_path = unicode(toascii(_scanned_path))
-                if verbose:
-                    _progress_line = _scanned_path
-                else:
-                    _progress_line = fixed_width_file_name(_scanned_path, max_file_name_len)
-                return style('Scanned: ') + style(_progress_line, fg=_scan_success and 'green' or 'red')
-
-            scanning_errors = []
-            files_count = 0
-            with progressmanager(
-                scanned_files, item_show_func=scan_event, show_pos=True,
-                verbose=verbose, quiet=quiet, file=sys.stderr) as scanned:
-                while True:
-                    try:
-                        result = scanned.next()
-                        scan_success, scanned_rel_path = result
-                        if not scan_success:
-                            paths_with_error.append(scanned_rel_path)
-                        files_count += 1
-                    except StopIteration:
-                        break
-                    except KeyboardInterrupt:
-                        print('\nAborted with Ctrl+C!')
-                        if pool:
-                            pool.terminate()
-                        break
-        finally:
-            if pool:
-                # ensure the pool is really dead to work around a Python 2.7.3 bug:
-                # http://bugs.python.org/issue15101
-                pool.terminate()
+                _progress_line = fixed_width_file_name(_scanned_path, max_file_name_len)
+            return style('Scanned: ') + style(_progress_line, fg=_scan_success and 'green' or 'red')
+
+        scanning_errors = []
+        files_count = 0
+        with progressmanager(
+            scanned_files, item_show_func=scan_event, show_pos=True,
+            verbose=verbose, quiet=quiet, file=sys.stderr) as scanned:
+            while True:
+                try:
+                    result = scanned.next()
+                    scan_success, scanned_rel_path = result
+                    if not scan_success:
+                        paths_with_error.append(scanned_rel_path)
+                    files_count += 1
+                except StopIteration:
+                    break
+                except KeyboardInterrupt:
+                    print('\nAborted with Ctrl+C!')
+                    if pool:
+                        pool.terminate()
+                    break
+    finally:
+        if pool:
+            # ensure the pool is really dead to work around a Python 2.7.3 bug:
+            # http://bugs.python.org/issue15101
+            pool.terminate()
 
     # TODO: add stats to results somehow
 
@@ -690,7 +676,8 @@ def scan_event(item):
                 # iterate cached results to collect all scan errors
                 cached_scan = scans_cache_class()
                 root_dir = _get_root_dir(input_path, strip_root, full_root)
-                scan_results = cached_scan.iterate(scans, root_dir, paths_subset=paths_with_error)
+                resource_paths = (r.rel_path for r in resources)
+                scan_results = cached_scan.iterate(resource_paths, scans, root_dir, paths_subset=paths_with_error)
                 for scan_result in scan_results:
                     errored_path = scan_result.get('path', '')
                     echo_stderr('Path: ' + errored_path, fg='red')
@@ -720,7 +707,8 @@ def scan_event(item):
     #############################################
     #############################################
     #############################################
-    return files_count, cached_scan.iterate(scans, root_dir), success
+    resource_paths = (r.rel_path for r in resources)
+    return files_count, cached_scan.iterate(resource_paths, scans, root_dir), success
 
 
 def _get_root_dir(input_path, strip_root=False, full_root=False):
@@ -745,17 +733,6 @@ def _get_root_dir(input_path, strip_root=False, full_root=False):
         return file_name(root_dir)
 
 
-def _resource_logger(logfile_fd, resources):
-    """
-    Log file path to the logfile_fd opened file descriptor for each resource and
-    yield back the resources.
-    """
-    file_logger = ScanFileCache.log_file_path
-    for resource in resources:
-        file_logger(logfile_fd, resource.rel_path)
-        yield resource
-
-
 def _scanit(resource, scanners, scans_cache_class, diag, timeout=DEFAULT_TIMEOUT, processes=1):
     """
     Run scans and cache results on disk. Return a tuple of (success, scanned relative
@@ -797,65 +774,32 @@ def _scanit(resource, scanners, scans_cache_class, diag, timeout=DEFAULT_TIMEOUT
     return success, resource.rel_path
 
 
-def build_ignorer(ignores, unignores):
+def get_resources(base_path, diag, scans_cache_class):
     """
-    Return a callable suitable for path ignores with OS-specific encoding
-    preset.
+    Yield `Resource` objects for all the files found at base_path (either a
+    directory or file) given an absolute base_path.
     """
-    ignores = ignores or {}
-    unignores = unignores or {}
     if on_linux:
-        ignores = {path_to_bytes(k): v for k, v in ignores.items()}
-        unignores = {path_to_bytes(k): v for k, v in unignores.items()}
+        base_path = base_path and path_to_bytes(base_path)
     else:
-        ignores = {path_to_unicode(k): v for k, v in ignores.items()}
-        unignores = {path_to_unicode(k): v for k, v in unignores.items()}
-    return partial(ignore.is_ignored, ignores=ignores, unignores=unignores)
-
-
-def resource_paths(base_path, diag, scans_cache_class, pre_scan_plugins=None):
-    """
-    Yield `Resource` objects for all the files found at base_path
-    (either a directory or file) given an absolute base_path. Only yield
-    Files, not directories.
-    absolute path is a native OS path.
-    base_path-relative path is a POSIX path.
-
-    The relative path is guaranted to be unicode and may be URL-encoded and may not
-    be suitable to address an actual file.
-    """
-    if base_path:
-        if on_linux:
-            base_path = path_to_bytes(base_path)
-        else:
-            base_path = path_to_unicode(base_path)
+        base_path = base_path and path_to_unicode(base_path)
 
     base_path = os.path.abspath(os.path.normpath(os.path.expanduser(base_path)))
     base_is_dir = is_dir(base_path)
     len_base_path = len(base_path)
-    ignores = {}
-    if pre_scan_plugins:
-        for plugin in pre_scan_plugins:
-            ignores.update(plugin.get_ignores())
-    ignores.update(ignore.ignores_VCS)
-
-    ignorer = build_ignorer(ignores, unignores={})
-    locations = resource_iter(base_path, ignored=ignorer)
-
-    resources = build_resources(locations, scans_cache_class, base_is_dir, len_base_path, diag)
-    if pre_scan_plugins:
-        for plugin in pre_scan_plugins:
-            resources = plugin.process_resources(resources)
-    return resources
 
+    ignores = ignore.ignores_VCS
+    if on_linux:
+        ignores = {path_to_bytes(k): v for k, v in ignores.items()}
+    else:
+        ignores = {path_to_unicode(k): v for k, v in ignores.items()}
+    ignorer = partial(ignore.is_ignored, ignores=ignores, unignores={}, skip_special=True)
 
-def build_resources(locations, scans_cache_class, base_is_dir, len_base_path, diag):
-    """
-    Yield Resource objects from an iterable of absolute paths.
-    """
+    locations = resource_iter(base_path, ignored=ignorer, with_dirs=True)
     for abs_path in locations:
         resource = Resource(scans_cache_class, abs_path, base_is_dir, len_base_path)
-        # always fetch infos and cache.
+        # FIXME: they should be kept in memory instead
+        # always fetch infos and cache them.
         infos = scan_infos(abs_path, diag=diag)
         resource.put_info(infos)
         yield resource
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 4f93a98a213..cf0286438d4 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -25,17 +25,42 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+from commoncode import fileset
+from commoncode.fileutils import parent_directory
+from commoncode.system import on_linux
 from plugincode.pre_scan import PreScanPlugin
 from plugincode.pre_scan import pre_scan_impl
 from scancode.cli import ScanOption
 
 
+def is_ignored(location, ignores):
+    """
+    Return a tuple of (pattern , message) if a file at location is ignored or
+    False otherwise. `ignores` is a mappings of patterns to a reason.
+    """
+    return fileset.match(location, includes=ignores, excludes={})
+
+
 @pre_scan_impl
 class ProcessIgnore(PreScanPlugin):
     """
     Ignore files matching the supplied pattern.
     """
 
+    def __init__(self, selected_options, active_scan_names=None):
+        PreScanPlugin.__init__(
+            self, selected_options, active_scan_names=active_scan_names)
+
+        ignores = []
+        for se in selected_options:
+            if se.name == 'ignore':
+                ignores = se.value or []
+
+        self.ignores = {
+            pattern: 'User ignore: Supplied by --ignore' for pattern in ignores
+        }
+
+
     @classmethod
     def get_plugin_options(cls):
         return [
@@ -45,17 +70,19 @@ def get_plugin_options(cls):
                    help='Ignore files matching <pattern>.')
         ]
 
-    # FIXME:!!!!
-    def get_ignores(self):
-        user_ignores = []
-        for se in self.selected_options:
-            if se.name == 'ignore':
-                user_ignores=se.value
-
-        return {pattern: 'User ignore: Supplied by --ignore' for pattern in user_ignores}
+    def process_resources(self, resources):
+        # FIXME: this is hacksih at best
+        ignored_paths = set()
+        seps = b'/\\' if on_linux else '/\\'
+        for resource in resources:
+            abs_path = resource.abs_path.strip(seps)
+            if is_ignored(abs_path, ignores=self.ignores):
+                ignored_paths.add(abs_path)
+            else:
+                parent = parent_directory(abs_path).strip(seps)
+                if parent not in ignored_paths:
+                    yield resource
 
     def is_enabled(self):
         return any(se.value for se in self.selected_options
-              if se.name == 'ignore')
-
-        PreScanPlugin.is_enabled(self)
\ No newline at end of file
+                   if se.name == 'ignore')
diff --git a/tests/scancode/test_ignore_files.py b/tests/scancode/test_ignore_files.py
index c92d53c102a..020d7ff9974 100644
--- a/tests/scancode/test_ignore_files.py
+++ b/tests/scancode/test_ignore_files.py
@@ -31,7 +31,7 @@
 from commoncode.ignore import is_ignored
 from scancode.cache import get_scans_cache_class
 from scancode.cli import CommandOption
-from scancode.cli import resource_paths
+from scancode.cli import get_resources
 from scancode.plugin_ignore import ProcessIgnore
 
 
@@ -74,9 +74,9 @@ def test_ignore_glob_file(self):
     def test_resource_paths_with_single_file(self):
 
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore(
+        test_plugins = [ProcessIgnore(
             [CommandOption(group=None, name='ignore', option='--ignore', value=('sample.doc',), default=None)]
-        )
+        )]
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -86,14 +86,19 @@ def test_resource_paths_with_single_file(self):
             'user/src/test',
             'user/src/test/sample.txt'
         ]
-        test = [resource.rel_path for resource in resource_paths(test_dir, False, scan_cache_class, [test_plugin])]
-        assert expected == sorted(test)
+
+        resources = get_resources(test_dir, False, scan_cache_class)
+        for plugin in test_plugins:
+            resources = plugin.process_resources(resources)
+
+        resources = [resource.rel_path for resource in resources]
+        assert expected == sorted(resources)
 
     def test_resource_paths_with_multiple_files(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore(
+        test_plugins = [ProcessIgnore(
             [CommandOption(group=None, name='ignore', option='--ignore', value=('ignore.doc',), default=None)]
-        )
+        )]
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -102,14 +107,18 @@ def test_resource_paths_with_multiple_files(self):
             'user/src/test/sample.doc',
             'user/src/test/sample.txt'
         ]
-        test = [resource.rel_path for resource in resource_paths(test_dir, False, scan_cache_class, [test_plugin])]
-        assert expected == sorted(test)
+        resources = get_resources(test_dir, False, scan_cache_class)
+        for plugin in test_plugins:
+            resources = plugin.process_resources(resources)
+
+        resources = [resource.rel_path for resource in resources]
+        assert expected == sorted(resources)
 
     def test_resource_paths_with_glob_file(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore(
+        test_plugins = [ProcessIgnore(
             [CommandOption(group=None, name='ignore', option='--ignore', value=('*.doc',), default=None)]
-        )
+        )]
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -117,14 +126,18 @@ def test_resource_paths_with_glob_file(self):
             'user/src/test',
             'user/src/test/sample.txt'
         ]
-        test = [resource.rel_path for resource in resource_paths(test_dir, False, scan_cache_class, [test_plugin])]
-        assert expected == sorted(test)
+        resources = get_resources(test_dir, False, scan_cache_class)
+        for plugin in test_plugins:
+            resources = plugin.process_resources(resources)
+
+        resources = [resource.rel_path for resource in resources]
+        assert expected == sorted(resources)
 
     def test_resource_paths_with_glob_path(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugin = ProcessIgnore(
+        test_plugins = [ProcessIgnore(
             [CommandOption(group=None, name='ignore', option='--ignore', value=('*/src/test',), default=None)]
-        )
+        )]
         scan_cache_class = get_scans_cache_class(self.get_temp_dir())
         expected = [
             'user',
@@ -132,8 +145,12 @@ def test_resource_paths_with_glob_path(self):
             'user/src',
             'user/src/ignore.doc'
         ]
-        test = [resource.rel_path for resource in resource_paths(test_dir, False, scan_cache_class, [test_plugin])]
-        assert expected == sorted(test)
+        resources = get_resources(test_dir, False, scan_cache_class)
+        for plugin in test_plugins:
+            resources = plugin.process_resources(resources)
+
+        resources = [resource.rel_path for resource in resources]
+        assert expected == sorted(resources)
 
     def test_resource_paths_with_multiple_plugins(self):
         test_dir = self.extract_test_tar('ignore/user.tgz')
@@ -151,5 +168,9 @@ def test_resource_paths_with_multiple_plugins(self):
             'user/src',
             'user/src/test'
         ]
-        test = [resource.rel_path for resource in resource_paths(test_dir, False, scan_cache_class, test_plugins)]
-        assert expected == sorted(test)
+        resources = get_resources(test_dir, False, scan_cache_class)
+        for plugin in test_plugins:
+            resources = plugin.process_resources(resources)
+
+        resources = [resource.rel_path for resource in resources]
+        assert expected == sorted(resources)

From 0c3625b0343e6edc223ffe48deffe74e66a5c252 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 5 Jan 2018 09:09:19 +0100
Subject: [PATCH 020/122] Add new extract_zip_raw test function

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/testcase.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/commoncode/testcase.py b/src/commoncode/testcase.py
index 780fd74a29d..096f39727bd 100644
--- a/src/commoncode/testcase.py
+++ b/src/commoncode/testcase.py
@@ -247,7 +247,6 @@ def remove_vcs(self, test_dir):
             map(os.remove, [os.path.join(root, file_loc)
                             for file_loc in files if file_loc.endswith(tilde)])
 
-
     def __extract(self, test_path, extract_func=None, verbatim=False):
         """
         Given an archive file identified by test_path relative
@@ -272,6 +271,9 @@ def __extract(self, test_path, extract_func=None, verbatim=False):
     def extract_test_zip(self, test_path, *args, **kwargs):
         return self.__extract(test_path, extract_zip)
 
+    def extract_test_zip_raw(self, test_path, *args, **kwargs):
+        return self.__extract(test_path, extract_zip_raw)
+
     def extract_test_tar(self, test_path, verbatim=False):
         return self.__extract(test_path, extract_tar, verbatim)
 
@@ -353,6 +355,22 @@ def extract_zip(location, target_dir, *args, **kwargs):
                     f.write(content)
 
 
+def extract_zip_raw(location, target_dir, *args, **kwargs):
+    """
+    Extract a zip archive file at location in the target_dir directory.
+    Use the builtin extractall function
+    """
+    if not os.path.isfile(location) and zipfile.is_zipfile(location):
+        raise Exception('Incorrect zip file %(location)r' % locals())
+
+    if on_linux:
+        location = path_to_bytes(location)
+        target_dir = path_to_bytes(target_dir)
+
+    with zipfile.ZipFile(location) as zipf:
+        zipf.extractall(path=target_dir)
+
+
 def tar_can_extract(tarinfo, verbatim):
     """
     Return True if a tar member can be extracted to handle OS specifics.

From 9884c9f293df54cddf765f5cf69a652f2de72e3f Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 5 Jan 2018 11:09:20 +0100
Subject: [PATCH 021/122] Bump attrs and add typing library #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .../prod/attrs-16.3.0-py2.py3-none-any.whl    | Bin 21266 -> 0 bytes
 .../prod/attrs-17.4.0-py2.py3-none-any.whl    | Bin 0 -> 31658 bytes
 thirdparty/prod/attrs.ABOUT                   |   8 +-
 thirdparty/prod/typing-3.6.2-py2-none-any.whl | Bin 0 -> 20226 bytes
 thirdparty/prod/typing.ABOUT                  |   9 +
 thirdparty/prod/typing.LICENSE                | 254 ++++++++++++++++++
 6 files changed, 267 insertions(+), 4 deletions(-)
 delete mode 100644 thirdparty/prod/attrs-16.3.0-py2.py3-none-any.whl
 create mode 100644 thirdparty/prod/attrs-17.4.0-py2.py3-none-any.whl
 create mode 100644 thirdparty/prod/typing-3.6.2-py2-none-any.whl
 create mode 100644 thirdparty/prod/typing.ABOUT
 create mode 100644 thirdparty/prod/typing.LICENSE

diff --git a/thirdparty/prod/attrs-16.3.0-py2.py3-none-any.whl b/thirdparty/prod/attrs-16.3.0-py2.py3-none-any.whl
deleted file mode 100644
index 6124236be40a718dc5d02fa4c6304234177c87b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21266
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
b)Lptrd3e?QDC+@8*bmRfg~M4a5|aM|UNkzP

diff --git a/thirdparty/prod/attrs-17.4.0-py2.py3-none-any.whl b/thirdparty/prod/attrs-17.4.0-py2.py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..54a2652c9dbfd6f54bbcf45b6aef38e71b0a0f58
GIT binary patch
literal 31658
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
GeENUQ%0Vvx

literal 0
HcmV?d00001

diff --git a/thirdparty/prod/attrs.ABOUT b/thirdparty/prod/attrs.ABOUT
index dca5af0e243..b2cdd3b73a3 100644
--- a/thirdparty/prod/attrs.ABOUT
+++ b/thirdparty/prod/attrs.ABOUT
@@ -1,8 +1,8 @@
-about_resource: attrs-16.3.0-py2.py3-none-any.whl
-version: 16.3.0
+about_resource: attrs-17.4.0-py2.py3-none-any.whl
+version: 17.4.0
 name: attrs
 home_url: http://attrs.org
-download_url: https://pypi.python.org/packages/bb/6c/730710c765ab6d4493f460196ab003671d27b38568412a780fc67532b47c/attrs-16.3.0-py2.py3-none-any.whl#md5=0d188abbbde8c83253cb11e8df890d30
+download_url: https://pypi.python.org/packages/b5/60/4e178c1e790fd60f1229a9b3cb2f8bc2f4cc6ff2c8838054c142c70b5adc/attrs-17.4.0-py2.py3-none-any.whl#md5=5835a573b3f0316e1602dac3fd9c1daf
 license_text_file: attrs.LICENSE
 dje_license: mit
-copyright: Copyright (c) 2015 Hynek Schlawack
\ No newline at end of file
+copyright: Copyright (c) Hynek Schlawack
\ No newline at end of file
diff --git a/thirdparty/prod/typing-3.6.2-py2-none-any.whl b/thirdparty/prod/typing-3.6.2-py2-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..fa13a535f7483de67548699eabe99d76587276a1
GIT binary patch
literal 20226
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
C{9b(k

literal 0
HcmV?d00001

diff --git a/thirdparty/prod/typing.ABOUT b/thirdparty/prod/typing.ABOUT
new file mode 100644
index 00000000000..7d10b8cbe39
--- /dev/null
+++ b/thirdparty/prod/typing.ABOUT
@@ -0,0 +1,9 @@
+about_resource: typing-3.6.2-py2-none-any.whl
+version: 3.6.2
+name: typing
+home_url: https://docs.python.org/3/library/typing.html
+download_url: https://pypi.python.org/packages/1c/15/aeaae0c01afa895ad774cfd408eca17818fd753817d433f55385d8e36364/typing-3.6.2-py2-none-any.whl#md5=c587eaddadb5294a00ca9616336c85ee
+license_text_file: typing.LICENSE
+dje_license: python
+copyright: Copyright (c) Guido van Rossum, Jukka Lehtosalo, Łukasz Langa, Ivan Levkivskyi
+onwer:  Guido van Rossum, Jukka Lehtosalo, Łukasz Langa, Ivan Levkivskyi
\ No newline at end of file
diff --git a/thirdparty/prod/typing.LICENSE b/thirdparty/prod/typing.LICENSE
new file mode 100644
index 00000000000..c073a7b1fd7
--- /dev/null
+++ b/thirdparty/prod/typing.LICENSE
@@ -0,0 +1,254 @@
+A. HISTORY OF THE SOFTWARE
+==========================
+
+Python was created in the early 1990s by Guido van Rossum at Stichting
+Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
+as a successor of a language called ABC.  Guido remains Python's
+principal author, although it includes many contributions from others.
+
+In 1995, Guido continued his work on Python at the Corporation for
+National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
+in Reston, Virginia where he released several versions of the
+software.
+
+In May 2000, Guido and the Python core development team moved to
+BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
+year, the PythonLabs team moved to Digital Creations (now Zope
+Corporation, see http://www.zope.com).  In 2001, the Python Software
+Foundation (PSF, see http://www.python.org/psf/) was formed, a
+non-profit organization created specifically to own Python-related
+Intellectual Property.  Zope Corporation is a sponsoring member of
+the PSF.
+
+All Python releases are Open Source (see http://www.opensource.org for
+the Open Source Definition).  Historically, most, but not all, Python
+releases have also been GPL-compatible; the table below summarizes
+the various releases.
+
+    Release         Derived     Year        Owner       GPL-
+                    from                                compatible? (1)
+
+    0.9.0 thru 1.2              1991-1995   CWI         yes
+    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
+    1.6             1.5.2       2000        CNRI        no
+    2.0             1.6         2000        BeOpen.com  no
+    1.6.1           1.6         2001        CNRI        yes (2)
+    2.1             2.0+1.6.1   2001        PSF         no
+    2.0.1           2.0+1.6.1   2001        PSF         yes
+    2.1.1           2.1+2.0.1   2001        PSF         yes
+    2.1.2           2.1.1       2002        PSF         yes
+    2.1.3           2.1.2       2002        PSF         yes
+    2.2 and above   2.1.1       2001-now    PSF         yes
+
+Footnotes:
+
+(1) GPL-compatible doesn't mean that we're distributing Python under
+    the GPL.  All Python licenses, unlike the GPL, let you distribute
+    a modified version without making your changes open source.  The
+    GPL-compatible licenses make it possible to combine Python with
+    other software that is released under the GPL; the others don't.
+
+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
+    because its license has a choice of law clause.  According to
+    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
+    is "not incompatible" with the GPL.
+
+Thanks to the many outside volunteers who have worked under Guido's
+direction to make these releases possible.
+
+
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are
+retained in Python alone or in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+-------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions.  Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee.  This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party.  As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+---------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee.  Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement.  This Agreement together with
+Python 1.6.1 may be located on the Internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013.  This
+Agreement may also be obtained from a proxy server on the Internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee.  This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+        ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+--------------------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands.  All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file

From f8eabb3bda202c77363bf00e939d8ca4624897e6 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Sat, 6 Jan 2018 23:02:51 +0100
Subject: [PATCH 022/122] Make info a regular scan and other CLI loop reorg
 #787

 * move and other file info code such as get_file_infos and Resource to
   new resource.py module. Make infos a proper, regular scan
 * Do use content checksum for scan cache, instead use plain path
   checksum. This enabled making info a proper scan, since content
   checksums are no longer needed for cache handling.
 * remove info cache and use only one cache file per file for its
   details
 * Reorganize scan steps to make them co-located and explicit: inventory
   pre-scan, scan and post-scan are not a set of clean loops
 * move most of the CLI output in the main scancode function
 * Add name class attribute to plugins to support UI reporting

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/api.py                  | 119 +----------
 src/scancode/cache.py                | 266 ++++++++----------------
 src/scancode/cli.py                  | 292 ++++++++++++---------------
 src/scancode/plugin_ignore.py        |   2 +-
 src/scancode/plugin_mark_source.py   |   2 +
 src/scancode/plugin_only_findings.py |   2 +
 src/scancode/resource.py             | 252 +++++++++++++++++++++++
 tests/scancode/test_scan_cache.py    |   8 +-
 8 files changed, 468 insertions(+), 475 deletions(-)
 create mode 100644 src/scancode/resource.py

diff --git a/src/scancode/api.py b/src/scancode/api.py
index c877f1e53fa..d8dbc830b5e 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -28,11 +28,9 @@
 
 from collections import OrderedDict
 
-from commoncode.fileutils import as_posixpath
-from commoncode.fileutils import path_to_bytes
-from commoncode.fileutils import path_to_unicode
-from commoncode.system import on_linux
-from scancode.utils import get_relative_path
+# exposed as API
+from scancode.resource import Resource  # @UnusedImport
+from scancode.resource import get_file_infos  # @UnusedImport
 
 
 """
@@ -40,36 +38,6 @@
 Note: this API is unstable and still evolving.
 """
 
-class Resource(object):
-    """
-    A resource represent a file or directory with its essential "file
-    information" and the scanned data details.
-    """
-
-    def __init__(self, scans_cache_class, abs_path, base_is_dir, len_base_path):
-        self.scans_cache_class = scans_cache_class()
-        self.is_cached = False
-        self.abs_path = abs_path
-        self.base_is_dir = base_is_dir
-        posix_path = as_posixpath(abs_path)
-        # keep the path as relative to the original base_path, always Unicode
-        self.rel_path = get_relative_path(posix_path, len_base_path, base_is_dir)
-        self.infos = OrderedDict()
-        self.infos['path'] = self.rel_path
-
-    def put_info(self, infos):
-        """
-        Cache file info and set `is_cached` to True if already cached or false otherwise.
-        """
-        self.infos.update(infos)
-        self.is_cached = self.scans_cache_class.put_info(self.rel_path, self.infos)
-
-    def get_info(self):
-        """
-        Retrieve info from cache.
-        """
-        return self.scans_cache_class.get_info(self.rel_path)
-
 
 def extract_archives(location, recurse=True):
     """
@@ -196,87 +164,6 @@ def get_licenses(location, min_score=0, include_text=False, diag=False, license_
             yield result
 
 
-def get_file_infos(location):
-    """
-    Return a mapping of file information collected from the file or
-    directory at `location`.
-    """
-    from commoncode import fileutils
-    from commoncode import filetype
-    from commoncode.hash import multi_checksums
-    from typecode import contenttype
-
-    if on_linux:
-        location = path_to_bytes(location)
-    else:
-        location = path_to_unicode(location)
-
-    infos = OrderedDict()
-    is_file = filetype.is_file(location)
-    is_dir = filetype.is_dir(location)
-
-    T = contenttype.get_type(location)
-
-    infos['type'] = filetype.get_type(location, short=False)
-    name = fileutils.file_name(location)
-    if is_file:
-        base_name, extension = fileutils.splitext(location)
-    else:
-        base_name = name
-        extension = ''
-
-    if on_linux:
-        infos['name'] = path_to_unicode(name)
-        infos['base_name'] = path_to_unicode(base_name)
-        infos['extension'] = path_to_unicode(extension)
-    else:
-        infos['name'] = name
-        infos['base_name'] = base_name
-        infos['extension'] = extension
-
-    infos['date'] = is_file and filetype.get_last_modified_date(location) or None
-    infos['size'] = T.size
-    infos.update(multi_checksums(location, ('sha1', 'md5',)))
-    infos['files_count'] = is_dir and filetype.get_file_count(location) or None
-    infos['mime_type'] = is_file and T.mimetype_file or None
-    infos['file_type'] = is_file and T.filetype_file or None
-    infos['programming_language'] = is_file and T.programming_language or None
-    infos['is_binary'] = bool(is_file and T.is_binary)
-    infos['is_text'] = bool(is_file and T.is_text)
-    infos['is_archive'] = bool(is_file and T.is_archive)
-    infos['is_media'] = bool(is_file and T.is_media)
-    infos['is_source'] = bool(is_file and T.is_source)
-    infos['is_script'] = bool(is_file and T.is_script)
-
-    return infos
-
-
-# FIXME: this smells bad
-def _empty_file_infos():
-    """
-    Return an empty mapping of file info, used in case of failure.
-    """
-    infos = OrderedDict()
-    infos['type'] = None
-    infos['name'] = None
-    infos['extension'] = None
-    infos['date'] = None
-    infos['size'] = None
-    infos['sha1'] = None
-    infos['md5'] = None
-    infos['files_count'] = None
-    infos['mime_type'] = None
-    infos['file_type'] = None
-    infos['programming_language'] = None
-    infos['is_binary'] = False
-    infos['is_text'] = False
-    infos['is_archive'] = False
-    infos['is_media'] = False
-    infos['is_source'] = False
-    infos['is_script'] = False
-    return infos
-
-
 def get_package_infos(location):
     """
     Return a list of mappings of package information collected from the
diff --git a/src/scancode/cache.py b/src/scancode/cache.py
index 6f44e1efc29..3cc1ebd0ffc 100644
--- a/src/scancode/cache.py
+++ b/src/scancode/cache.py
@@ -52,29 +52,21 @@
 Cache scan results for a file or directory disk using a file-based cache.
 
 The approach is to cache the scan of a file using these data structure and files:
-
- - a resource_paths list contains all the paths scanned.
-
- - for each file being scanned, we store a file that contains the corresponding
-   file info data as JSON. This file is named after the hash of the path of a
-   scanned file.
-
- - for each unique file being scanned (e.g. based on its content SHA1), we store
-   a another JSON file that contains the corresponding scan data. This file is
-   named after the hash of the scanned file content.
+ - a resources list contains all the Resource objects scanned.
+ - for each file being scanned, we store a JSON file that contains the
+   corresponding scan data. This file is named after the hash of its path.
 
 Once a scan is completed, we iterate the cache to output the final scan results:
-First iterate the resource_paths, from there collect the cached file info for
-that file and from the path and file info collect the cached scanned result.
+First iterate the resources and from the path collect the cached scanned result.
 This iterator is then streamed to the final JSON output.
 
 Finally once a scan is completed the cache is destroyed to free up disk space.
 
 Internally the cache is organized as a tree of directories named after the first
-few characters or a path hash or file hash. This is to avoid having having too
-many files per directory that can make some filesystems choke as well as having
-directories that are too deep or having file paths that are too long which
-problematic on some OS.
+few characters or a path hash. This is to avoid having having too many files per
+directory that can make some filesystems choke as well as having directories
+that are too deep or having file paths that are too long which problematic on
+some OS.
 """
 
 # Tracing flags
@@ -120,47 +112,16 @@ def get_scans_cache_class(base_cache_dir=scans_cache_dir):
     return partial(ScanFileCache, cache_dir)
 
 
-def info_keys(path, seed=None):
+def scan_keys(path):
     """
-    Return a file info cache "keys" tripple for a path composed of three
+    Return a cache "keys" tripple for a path composed of three
     paths segments derived from a checksum.
 
     For example:
     >>> expected = 'fb87db2bb28e9501ac7fdc4812782118f4c94a0f'
     >>> assert expected == sha1('/w421/scancode-toolkit2').hexdigest()
-    >>> expected = ('f', 'b', '87db2bb28e9501ac7fdc4812782118f4c94a0f')
-    >>> assert expected == info_keys('/w421/scancode-toolkit2')
-    """
-    # ensure that we always pass bytes to the hash function
-    if isinstance(path, unicode):
-        path = path_to_bytes(path)
-    if seed:
-        if isinstance(seed, unicode):
-            seed = path_to_bytes(seed)
-        path = seed + path
-    return keys_from_hash(sha1(path).hexdigest())
-
-
-def scan_keys(path, file_info):
-    """
-    Return a scan cache keys tripple for a path and file_info. If the file_info
-    sha1 is empty (e.g. such as a directory), return a key based on the path
-    instead.
-    """
-    # we "get" because in some off cases getting file info may have failed
-    # or there may be none for a directory
-    sha1_digest = file_info.get('sha1')
-    if sha1_digest:
-        return keys_from_hash(sha1_digest)
-    else:
-        # we may eventually store directories, in which case we use the
-        # path as a key with some extra seed
-        return  info_keys(path, seed=b'empty hash')
-
-
-def keys_from_hash(hexdigest):
-    """
-    Return a cache keys triple for a hash hexdigest string.
+    >>> expected = ('0', 'c', 'a4f74d39ecbf551b1acfc63dc37bf2c8b9482c')
+    >>> assert expected == scan_keys('/w421/scancode-toolkit2')
 
     NOTE: since we use the first character and next two characters as
     directories, we create at most 16 dir at the first level and 16 dir at the
@@ -169,33 +130,15 @@ def keys_from_hash(hexdigest):
     directory on average with this scheme which should keep most file systems
     happy and avoid some performance issues when there are too many files in a
     single directory.
-
-    For example:
-    >>> expected = ('f', 'b', '87db2bb28e9501ac7fdc4812782118f4c94a0f')
-    >>> assert expected == keys_from_hash('fb87db2bb28e9501ac7fdc4812782118f4c94a0f')
     """
+    # ensure that we always pass bytes to the hash function
+    path = path_to_bytes(path)
+    hexdigest = sha1(path + b'empty hash').hexdigest()
     if on_linux:
         hexdigest = bytes(hexdigest)
-    return hexdigest[0], hexdigest[1], hexdigest[2:]
-
-
-def paths_from_keys(base_path, keys):
-    """
-    Return a tuple of (parent dir path, filename) for a cache entry built from a
-    cache keys triple and a base_directory. Ensure that the parent directory
-    exist.
-    """
-    if on_linux:
-        keys = [path_to_bytes(k) for k in keys]
-        base_path = path_to_bytes(base_path)
     else:
-        keys = [path_to_unicode(k) for k in keys]
-        base_path = path_to_unicode(base_path)
-
-    dir1, dir2, file_name = keys
-    parent = os.path.join(base_path, dir1, dir2)
-    create_dir(parent)
-    return parent, file_name
+        hexdigest = unicode(hexdigest)
+    return hexdigest[0], hexdigest[1], hexdigest[2:]
 
 
 class ScanFileCache(object):
@@ -206,98 +149,61 @@ class ScanFileCache(object):
     times.
     """
     def __init__(self, cache_dir):
-        # subdirs for info and scans_dir caches
         if on_linux:
-            infos_dir = b'infos_dir/'
-            scans_dir = b'scans_dir/'
             self.cache_base_dir = path_to_bytes(cache_dir)
-
         else:
-            infos_dir = u'infos_dir/'
-            scans_dir = u'scans_dir/'
             self.cache_base_dir = cache_dir
-
-        self.cache_infos_dir = as_posixpath(os.path.join(self.cache_base_dir, infos_dir))
-        self.cache_scans_dir = as_posixpath(os.path.join(self.cache_base_dir, scans_dir))
+        self.cache_scans_dir = as_posixpath(self.cache_base_dir)
 
     def setup(self):
         """
         Setup the cache: must be called at least once globally after cache
         initialization.
         """
-        create_dir(self.cache_infos_dir)
         create_dir(self.cache_scans_dir)
 
-    def get_cached_info_path(self, path):
+    def get_cached_scan_path(self, path):
         """
-        Return the path where to store a file info in the cache given a path.
+        Return the path where to store a scan in the cache given a path.
         """
-        keys = info_keys(path)
-        paths = paths_from_keys(self.cache_infos_dir, keys)
-        return posixpath.join(*paths)
+        dir1, dir2, file_name = scan_keys(path)
 
-    def put_info(self, path, file_info):
-        """
-        Put file_info for path in the cache and return True if the file
-        referenced in file_info has already been scanned or False otherwise.
-        """
-        info_path = self.get_cached_info_path(path)
-        with codecs.open(info_path, 'wb', encoding='utf-8') as cached_infos:
-            json.dump(file_info, cached_infos, check_circular=False)
-        scan_path = self.get_cached_scan_path(path, file_info)
-        is_scan_cached = os.path.exists(scan_path)
-        if TRACE:
-            logger_debug(
-                'put_infos:', 'path:', path, 'is_scan_cached:', is_scan_cached,
-                'file_info:', file_info, '\n')
-        return is_scan_cached
+        if on_linux:
+            base_path = path_to_bytes(self.cache_scans_dir)
+        else:
+            base_path = path_to_unicode(self.cache_scans_dir)
 
-    def get_info(self, path):
-        """
-        Return file info from the cache for a path.
-        Return None on failure to find the info in the cache.
-        """
-        info_path = self.get_cached_info_path(path)
-        if os.path.exists(info_path):
-            with codecs.open(info_path, 'r', encoding='utf-8') as ci:
-                return json.load(ci, object_pairs_hook=OrderedDict)
+        parent = os.path.join(base_path, dir1, dir2)
+        create_dir(parent)
 
-    def get_cached_scan_path(self, path, file_info):
-        """
-        Return the path where to store a scan in the cache given a path and
-        file_info.
-        """
-        keys = scan_keys(path, file_info)
-        paths = paths_from_keys(self.cache_scans_dir, keys)
-        return posixpath.join(*paths)
+        return posixpath.join(parent, file_name)
 
-    def put_scan(self, path, file_info, scan_result):
+    def put_scan(self, path, scan_result):
         """
         Put scan_result in the cache if not already cached.
         """
-        scan_path = self.get_cached_scan_path(path, file_info)
+        scan_path = self.get_cached_scan_path(path)
         if not os.path.exists(scan_path):
             with codecs.open(scan_path, 'wb', encoding='utf-8') as cached_scan:
                 json.dump(scan_result, cached_scan, check_circular=False)
         if TRACE:
             logger_debug(
-                'put_scan:', 'scan_path:', scan_path, 'file_info:', file_info,
-                'scan_result:', scan_result, '\n')
+                'put_scan:', 'scan_path:', scan_path, 'scan_result:', scan_result, '\n')
 
-    def get_scan(self, path, file_info):
+    def get_scan(self, path):
         """
-        Return scan results from the cache for a path and file_info.
+        Return scan results from the cache for a path.
         Return None on failure to find the scan results in the cache.
         """
-        scan_path = self.get_cached_scan_path(path, file_info)
+        scan_path = self.get_cached_scan_path(path)
         if os.path.exists(scan_path):
             with codecs.open(scan_path, 'r', encoding='utf-8') as cached_scan:
                 return json.load(cached_scan, object_pairs_hook=OrderedDict)
 
-    def iterate(self, resource_paths, scan_names, root_dir=None, paths_subset=tuple()):
+    def iterate(self, resources, scan_names, root_dir=None, paths_subset=tuple()):
         """
         Yield scan data for all cached scans e.g. the whole cache given a list
-        of `resource_paths` and `scan_names`.
+        of `resources` Resource objects and `scan_names`.
 
         If a `paths_subset` sequence of paths is provided, then only these paths
         are iterated.
@@ -307,66 +213,35 @@ def iterate(self, resource_paths, scan_names, root_dir=None, paths_subset=tuple(
         else:
             paths_subset = set(path_to_unicode(p) for p in paths_subset)
 
-        for resource_path in resource_paths:
+        for resource in resources:
+            resource_path = resource.rel_path
             if paths_subset and resource_path not in paths_subset:
                 continue
-            file_info = self.get_info(resource_path)
-
-            if on_linux:
-                unicode_path = path_to_unicode(resource_path)
-            else:
-                unicode_path = resource_path
-
-            if root_dir:
-                # must be unicode
-                if on_linux:
-                    root_dir = path_to_unicode(root_dir)
-                rooted_path = posixpath.join(root_dir, unicode_path)
-            else:
-                rooted_path = unicode_path
-            rooted_path = as_posixpath(rooted_path)
-            logger_debug('iterate:', 'rooted_path:', rooted_path)
-
-            # rare but possible corner case
-            if file_info is None:
-                no_info = ('ERROR: file info unavailable in cache: '
-                           'This is either a bug or processing was aborted '
-                           'with CTRL-C.')
-                scan_result = OrderedDict(path=rooted_path)
-                scan_result['scan_errors'] = [no_info]
-                if TRACE:
-                    logger_debug(
-                        'iterate:', 'scan_result:', scan_result,
-                        'for resource_path:', rooted_path, '\n')
-                yield scan_result
-                continue
 
-            _unicode_path_from_file_info = file_info.pop('path')
-            scan_result = OrderedDict(path=rooted_path)
+            scan_result = OrderedDict()
+
+            # always set the path to what was expected based on strip/full/root args
+            rooted_path = get_scan_path(resource, root_dir)
+            scan_result['path'] = rooted_path
+
+            scan_details = self.get_scan(resource_path)
 
-            if 'infos' in scan_names:
+            if scan_details is None:
+                no_scan_details = (
+                    'ERROR: scan details unavailable in cache: '
+                    'This is either a bug or processing was aborted with '
+                    'CTRL-C.')
+                scan_result['scan_errors'] = [no_scan_details]
+                continue
+
+            infos = scan_details.pop('infos', None)
+            if 'infos' in scan_names and infos:
                 # info are always collected but only returned if requested
                 # we flatten these as direct attributes of a file object
-                scan_result.update(file_info.items())
-
-            if not scan_result.get('scan_errors'):
-                scan_result['scan_errors'] = []
-
-            # check if we have more than just infos
-            if ['infos'] != scan_names:
-                errors = scan_result['scan_errors']
-                scan_details = self.get_scan(resource_path, file_info)
-                if scan_details is None:
-                    no_scan_details = (
-                        'ERROR: scan details unavailable in cache: '
-                        'This is either a bug or processing was aborted with '
-                        'CTRL-C.')
-                    errors.append(no_scan_details)
-                else:
-                    # append errors to other top level errors if any
-                    scan_errors = scan_details.pop('scan_errors', [])
-                    errors.extend(scan_errors)
-                    scan_result.update(scan_details)
+                # FIXME: this should be done in the scan looo NOT HERE!!!
+                scan_result.update(infos)
+
+            scan_result.update(scan_details)
 
             if TRACE:
                 logger_debug(
@@ -379,3 +254,26 @@ def clear(self, *args):
         Purge the cache by deleting the corresponding cached data files.
         """
         delete(self.cache_base_dir)
+
+
+def get_scan_path(resource, root_dir):
+    """
+    Return a path to use in the scan results
+    """
+    # FIXME: Resource should handle this paths thingies
+    resource_path = resource.rel_path
+    if on_linux:
+        unicode_path = path_to_unicode(resource_path)
+    else:
+        unicode_path = resource_path
+
+    if root_dir:
+        # must be unicode
+        if on_linux:
+            root_dir = path_to_unicode(root_dir)
+        rooted_path = posixpath.join(root_dir, unicode_path)
+    else:
+        rooted_path = unicode_path
+    rooted_path = as_posixpath(rooted_path)
+    logger_debug('get_scan_path:', 'rooted_path:', rooted_path)
+    return rooted_path
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 6cc34767373..ba553a508ed 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -66,7 +66,6 @@
 from scancode import __version__ as version
 from scancode import ScanOption
 from scancode.api import DEJACODE_LICENSE_URL
-from scancode.api import _empty_file_infos
 from scancode.api import get_copyrights
 from scancode.api import get_emails
 from scancode.api import get_file_infos
@@ -400,7 +399,9 @@ def validate_exclusive(ctx, exclusive_options):
 @click.option('--timeout', is_flag=False, default=DEFAULT_TIMEOUT, type=float, show_default=True, help='Stop scanning a file if scanning takes longer than a timeout in seconds.', group=CORE, cls=ScanOption)
 @click.option('--reindex-licenses', is_flag=True, default=False, is_eager=True, callback=reindex_licenses, help='Force a check and possible reindexing of the cached license index.', group=MISC, cls=ScanOption)
 
-def scancode(ctx, input, output_file, *args, **kwargs):
+def scancode(ctx, input, output_file, infos,
+             verbose, quiet, processes, diag, timeout,
+             *args, **kwargs):
     """scan the <input> file or directory for license, origin and packages and save results to <output_file(s)>.
 
     The scan results are printed to stdout if <output_file> is not provided.
@@ -414,17 +415,10 @@ def scancode(ctx, input, output_file, *args, **kwargs):
     packages = kwargs.get('packages')
     emails = kwargs.get('emails')
     urls = kwargs.get('urls')
-    infos = kwargs.get('infos')
 
     strip_root = kwargs.get('strip_root')
     full_root = kwargs.get('full_root')
     format = kwargs.get('format')
-
-    verbose = kwargs.get('verbose')
-    quiet = kwargs.get('quiet')
-    processes = kwargs.get('processes')
-    diag = kwargs.get('diag')
-    timeout = kwargs.get('timeout')
     # ## TODO: END FIX when plugins are used everywhere
 
     # Use default scan options when no scan option is provided
@@ -444,7 +438,7 @@ def scancode(ctx, input, output_file, *args, **kwargs):
     scanners = [
         # FIXME: For "infos" there is no separate scan function, they are always
         # gathered, though not always exposed.
-        Scanner('infos', None, infos or is_spdx),
+        Scanner('infos', get_file_infos, infos or is_spdx),
         Scanner('licenses', get_licenses_with_score, licenses or use_default_scans),
         Scanner('copyrights', get_copyrights, copyrights or use_default_scans),
         Scanner('packages', get_package_infos, packages or use_default_scans),
@@ -472,19 +466,14 @@ def scancode(ctx, input, output_file, *args, **kwargs):
         if opt.value != opt.default:
             options.append(opt)
 
-    # Find all scans that are both enabled and have a valid function
-    # reference. This deliberately filters out the "info" scan
-    # (which always has a "None" function reference) as there is no
-    # dedicated "infos" key in the results that "plugin_only_findings.has_findings()"
-    # could check.
     active_scans = [scan.name for scan in scanners if scan.is_enabled]
+    _scans = ', '.join(active_scans)
 
+    if not quiet:
+        echo_stderr('Scanning files for: %(_scans)s with %(processes)d process(es)...' % locals())
 
-    # FIXME: Prescan should happen HERE not as part of the per-file scan
-    pre_scan_plugins = []
-    for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-        if plugin.is_enabled:
-            pre_scan_plugins.append(plugin(all_options, active_scans))
+    if not quiet and not processes:
+        echo_stderr('Disabling multi-processing and multi-threading...', fg='yellow')
 
     # TODO: new loop
     # 1. collect minimally the whole files tree in memory as a Resource tree
@@ -492,36 +481,120 @@ def scancode(ctx, input, output_file, *args, **kwargs):
     # 3. run the scan proper, save scan details on disk
     # 4. apply the post scan plugins to this tree, lazy load as needed the scan
     # details from disk. save back updated details on disk
-
     scans_cache_class = get_scans_cache_class()
+
+    if not quiet:
+        echo_stderr('Collecting file inventory...' % locals(), fg='green')
+    resources = get_resources(base_path=input, diag=diag, scans_cache_class=scans_cache_class)
+    resources = list(resources)
+
+    processing_start = time()
     try:
-        files_count, results, success = scan_all(
+        # WARMUP
+        indexing_time = 0
+        with_licenses = any(sc for sc in scanners if sc.name == 'licenses' and sc.is_enabled)
+        if with_licenses:
+            # build index outside of the main loop for speed
+            # FIXME: REALLY????? this also ensures that forked processes will get the index on POSIX naturally
+            if not quiet:
+                echo_stderr('Building license detection index...', fg='green', nl=False)
+            from licensedcode.cache import get_index
+            get_index(False)
+            indexing_time = time() - processing_start
+            if not quiet:
+                echo_stderr('Done.', fg='green', nl=True)
+
+        # PRE
+        pre_scan_start = time()
+
+        for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
+            plugin = plugin(all_options, active_scans)
+            if plugin.is_enabled():
+                if not quiet:
+                    name = name or plugin.__class__.__name__
+                    echo_stderr('Running pre-scan plugin: %(name)s...' % locals(), fg='green')
+                resources = plugin.process_resources(resources)
+
+        pre_scan_time = time() - pre_scan_start
+
+        resources = list(resources)
+
+        # SCAN
+        scan_start = time()
+
+        if not quiet:
+            echo_stderr('Scanning files...', fg='green')
+
+        files_count, results, success, paths_with_error = scan_all(
             input_path=input,
             scanners=scanners,
+            resources=resources,
             verbose=verbose, quiet=quiet,
             processes=processes, timeout=timeout, diag=diag,
             scans_cache_class=scans_cache_class,
-            strip_root=strip_root, full_root=full_root,
-            # FIXME: this should not be part of the of scan_all!!!!
-            pre_scan_plugins=pre_scan_plugins)
-
-        # FIXME!!!
-        for pname, plugin in plugincode.post_scan.get_post_scan_plugins().items():
-            plug = plugin(all_options, active_scans)
-            if plug.is_enabled():
+            strip_root=strip_root, full_root=full_root)
+
+        scan_time = time() - scan_start
+        files_scanned_per_second = round(float(files_count) / scan_time , 2)
+
+        # POST
+        post_scan_start = time()
+
+        for name, plugin in plugincode.post_scan.get_post_scan_plugins().items():
+            plugin = plugin(all_options, active_scans)
+            if plugin.is_enabled():
                 if not quiet:
-                    echo_stderr('Running post-scan plugin: %(pname)s...' % locals(), fg='green')
+                    name = name or plugin.__class__.__name__
+                    echo_stderr('Running post-scan plugin: %(name)s...' % locals(), fg='green')
                 # FIXME: we should always catch errors from plugins properly
-                results = plug.process_resources(results)
+                results = plugin.process_resources(results)
+
+        post_scan_time = time() - post_scan_start
 
-        # FIXME: computing len needs a list and therefore needs loading it all ahead of time
-        # this should NOT be needed with a better cache architecture!!!
+        # FIXME: computing len needs a list and therefore needs loading it all
+        # ahead of time this should NOT be needed with a better cache
+        # architecture!!!
         results = list(results)
         files_count = len(results)
 
-        if not quiet:
-            echo_stderr('Saving results.', fg='green')
+        total_time = time() - processing_start
+
+        # SCAN SUMMARY
 
+        if not quiet:
+            echo_stderr('Scanning done.', fg=paths_with_error and 'red' or 'green')
+
+            # Display errors
+            if paths_with_error:
+                if diag:
+                    echo_stderr('Some files failed to scan properly:', fg='red')
+                    # iterate cached results to collect all scan errors
+                    cached_scan = scans_cache_class()
+                    root_dir = _get_root_dir(input, strip_root, full_root)
+                    scan_results = cached_scan.iterate(resources, active_scans, root_dir, paths_subset=paths_with_error)
+                    for scan_result in scan_results:
+                        errored_path = scan_result.get('path', '')
+                        echo_stderr('Path: ' + errored_path, fg='red')
+                        for error in scan_result.get('scan_errors', []):
+                            for emsg in error.splitlines(False):
+                                echo_stderr('  ' + emsg)
+                        echo_stderr('')
+                else:
+                    echo_stderr('Some files failed to scan properly. Use the --diag option for additional details:', fg='red')
+                    for errored_path in paths_with_error:
+                        echo_stderr(' ' + errored_path, fg='red')
+
+            echo_stderr('Scan statistics: %(files_count)d files scanned in %(total_time)ds.' % locals())
+            echo_stderr('Scan options:    %(_scans)s with %(processes)d process(es).' % locals())
+            echo_stderr('Scanning speed:  %(files_scanned_per_second)s files per sec.' % locals())
+            echo_stderr('Scanning in:     %(scan_time)ds. ' % locals(), nl=False)
+            echo_stderr('Indexing in: %(indexing_time)ds. ' % locals(), nl=False)
+            echo_stderr('Pre-scan in: %(pre_scan_time)ds. ' % locals(), nl=False)
+            echo_stderr('Post-scan in: %(post_scan_time)ds.' % locals(), reset=True)
+
+        # REPORT
+        if not quiet:
+            echo_stderr('Saving results...', fg='green')
         # FIXME: we should have simpler args: a scan "header" and scan results
         save_results(scanners, files_count, results, format, options, input, output_file)
 
@@ -534,13 +607,12 @@ def scancode(ctx, input, output_file, *args, **kwargs):
     ctx.exit(rc)
 
 
-def scan_all(input_path, scanners,
-         verbose=False, quiet=False, processes=1, timeout=DEFAULT_TIMEOUT,
-         diag=False, scans_cache_class=None,
-         strip_root=False, full_root=False,
-         pre_scan_plugins=None):
+def scan_all(input_path, scanners, resources,
+             verbose=False, quiet=False, processes=1, timeout=DEFAULT_TIMEOUT,
+             diag=False, scans_cache_class=None,
+             strip_root=False, full_root=False):
     """
-    Return a tuple of (files_count, scan_results, success) where
+    Return a tupple of (files_count, scan_results, success, summary mapping) where
     scan_results is an iterable and success is a boolean.
 
     Run each requested scan proper: each individual file scan is cached
@@ -548,46 +620,9 @@ def scan_all(input_path, scanners,
     the cache and streamed at the end.
     """
     assert scans_cache_class
-    scan_summary = OrderedDict()
-    scan_summary['scanned_path'] = input_path
-    scan_summary['processes'] = processes
-
-    # Display scan start details
-    ############################
     scans = [scan.name for scan in scanners if scan.is_enabled]
-    _scans = ', '.join(scans)
-    if not quiet:
-        echo_stderr('Scanning files for: %(_scans)s with %(processes)d process(es)...' % locals())
-
-    scan_summary['scans'] = scans[:]
-    scan_start = time()
-    indexing_time = 0
-
-    # FIXME:  THIS SHOULD NOT TAKE PLACE HERE!!!!!!
-    with_licenses = any(sc for sc in scanners if sc.name == 'licenses' and sc.is_enabled)
-    if with_licenses:
-        # build index outside of the main loop for speed
-        # REALLY????? this also ensures that forked processes will get the index on POSIX naturally
-        if not quiet:
-            echo_stderr('Building license detection index...', fg='green', nl=False)
-        from licensedcode.cache import get_index
-        get_index(False)
-        indexing_time = time() - scan_start
-        if not quiet:
-            echo_stderr('Done.', fg='green', nl=True)
-
-    scan_summary['indexing_time'] = indexing_time
-
     pool = None
 
-    resources = get_resources(input_path, diag, scans_cache_class)
-
-    # FIXME: we should try/catch here
-    for plugin in pre_scan_plugins:
-        resources = plugin.process_resources(resources)
-
-    resources = list(resources)
-
     paths_with_error = []
     files_count = 0
 
@@ -609,11 +644,6 @@ def scan_all(input_path, scanners,
         else:
             # no multiprocessing with processes=0
             scanned_files = imap(scanit, resources)
-            if not quiet:
-                echo_stderr('Disabling multi-processing and multi-threading...', fg='yellow')
-
-        if not quiet:
-            echo_stderr('Scanning files...', fg='green')
 
         def scan_event(item):
             """Progress event displayed each time a file is scanned"""
@@ -627,7 +657,6 @@ def scan_event(item):
                 _progress_line = fixed_width_file_name(_scanned_path, max_file_name_len)
             return style('Scanned: ') + style(_progress_line, fg=_scan_success and 'green' or 'red')
 
-        scanning_errors = []
         files_count = 0
         with progressmanager(
             scanned_files, item_show_func=scan_event, show_pos=True,
@@ -642,7 +671,7 @@ def scan_event(item):
                 except StopIteration:
                     break
                 except KeyboardInterrupt:
-                    print('\nAborted with Ctrl+C!')
+                    echo_stderr('\nAborted with Ctrl+C!', fg='red')
                     if pool:
                         pool.terminate()
                     break
@@ -652,63 +681,14 @@ def scan_event(item):
             # http://bugs.python.org/issue15101
             pool.terminate()
 
-    # TODO: add stats to results somehow
-
-    # Compute stats
-    ##########################
-    scan_summary['files_count'] = files_count
-    scan_summary['files_with_errors'] = paths_with_error
-    total_time = time() - scan_start
-    scanning_time = total_time - indexing_time
-    scan_summary['total_time'] = total_time
-    scan_summary['scanning_time'] = scanning_time
-
-    files_scanned_per_second = round(float(files_count) / scanning_time , 2)
-    scan_summary['files_scanned_per_second'] = files_scanned_per_second
-
-    if not quiet:
-        # Display stats
-        ##########################
-        echo_stderr('Scanning done.', fg=paths_with_error and 'red' or 'green')
-        if paths_with_error:
-            if diag:
-                echo_stderr('Some files failed to scan properly:', fg='red')
-                # iterate cached results to collect all scan errors
-                cached_scan = scans_cache_class()
-                root_dir = _get_root_dir(input_path, strip_root, full_root)
-                resource_paths = (r.rel_path for r in resources)
-                scan_results = cached_scan.iterate(resource_paths, scans, root_dir, paths_subset=paths_with_error)
-                for scan_result in scan_results:
-                    errored_path = scan_result.get('path', '')
-                    echo_stderr('Path: ' + errored_path, fg='red')
-                    for error in scan_result.get('scan_errors', []):
-                        for emsg in error.splitlines(False):
-                            echo_stderr('  ' + emsg)
-                    echo_stderr('')
-            else:
-                echo_stderr('Some files failed to scan properly. Use the --diag option for additional details:', fg='red')
-                for errored_path in paths_with_error:
-                    echo_stderr(' ' + errored_path, fg='red')
-
-        echo_stderr('Scan statistics: %(files_count)d files scanned in %(total_time)ds.' % locals())
-        echo_stderr('Scan options:    %(_scans)s with %(processes)d process(es).' % locals())
-        echo_stderr('Scanning speed:  %(files_scanned_per_second)s files per sec.' % locals())
-        echo_stderr('Scanning time:   %(scanning_time)ds.' % locals())
-        echo_stderr('Indexing time:   %(indexing_time)ds.' % locals(), reset=True)
-
     success = not paths_with_error
     # finally return an iterator on cached results
     cached_scan = scans_cache_class()
     root_dir = _get_root_dir(input_path, strip_root, full_root)
     #############################################
-    #############################################
-    #############################################
     # FIXME: we must return Resources here!!!!
     #############################################
-    #############################################
-    #############################################
-    resource_paths = (r.rel_path for r in resources)
-    return files_count, cached_scan.iterate(resource_paths, scans, root_dir), success
+    return files_count, cached_scan.iterate(resources, scans, root_dir), success, paths_with_error
 
 
 def _get_root_dir(input_path, strip_root=False, full_root=False):
@@ -748,12 +728,11 @@ def _scanit(resource, scanners, scans_cache_class, diag, timeout=DEFAULT_TIMEOUT
         # fake, non inteerrupting used for debugging when processes=0
         interrupter = fake_interruptible
 
-    scanners = [scanner for scanner in scanners
-                if scanner.is_enabled and scanner.function]
+    scanners = [scanner for scanner in scanners if scanner.is_enabled]
     if not scanners:
         return success, resource.rel_path
 
-    # Skip other scans if already cached
+    # DUH???? Skip other scans if already cached
     # FIXME: ENSURE we only do this for files not directories
     if not resource.is_cached:
         # run the scan as an interruptiple task
@@ -765,7 +744,7 @@ def _scanit(resource, scanners, scans_cache_class, diag, timeout=DEFAULT_TIMEOUT
             # "scan" key is used for these errors
             scan_result = {'scan_errors': [scan_result]}
 
-        scans_cache.put_scan(resource.rel_path, resource.get_info(), scan_result)
+        scans_cache.put_scan(resource.rel_path, scan_result)
 
         # do not report success if some other errors happened
         if scan_result.get('scan_errors'):
@@ -797,37 +776,14 @@ def get_resources(base_path, diag, scans_cache_class):
 
     locations = resource_iter(base_path, ignored=ignorer, with_dirs=True)
     for abs_path in locations:
-        resource = Resource(scans_cache_class, abs_path, base_is_dir, len_base_path)
-        # FIXME: they should be kept in memory instead
-        # always fetch infos and cache them.
-        infos = scan_infos(abs_path, diag=diag)
-        resource.put_info(infos)
+        resource = Resource(
+            scans_cache_class=scans_cache_class,
+            abs_path=abs_path,
+            base_is_dir=base_is_dir,
+            len_base_path=len_base_path)
         yield resource
 
 
-def scan_infos(input_file, diag=False):
-    """
-    Scan one file or directory and return file_infos data. This always
-    contains an extra 'errors' key with a list of error messages,
-    possibly empty. If `diag` is True, additional diagnostic messages
-    are included.
-    """
-    # FIXME: WE SHOULD PROCESS THIS IS MEMORY AND AS PART OF THE SCAN PROPER... and BOTTOM UP!!!!
-    # THE PROCESSING TIME OF SIZE AGGREGATION ON DIRECTORY IS WAY WAY TOO HIGH!!!
-    errors = []
-    try:
-        infos = get_file_infos(input_file)
-    except Exception as e:
-        # never fail but instead add an error message.
-        infos = _empty_file_infos()
-        errors = ['ERROR: infos: ' + e.message]
-        if diag:
-            errors.append('ERROR: infos: ' + traceback.format_exc())
-    # put errors last
-    infos['scan_errors'] = errors
-    return infos
-
-
 def scan_one(location, scanners, diag=False):
     """
     Scan one file or directory at `location` and return a scan result
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index cf0286438d4..67531791c8c 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -46,7 +46,7 @@ class ProcessIgnore(PreScanPlugin):
     """
     Ignore files matching the supplied pattern.
     """
-
+    name = 'ignore'
     def __init__(self, selected_options, active_scan_names=None):
         PreScanPlugin.__init__(
             self, selected_options, active_scan_names=active_scan_names)
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 9fddafe6ae3..ac5c615f35d 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -41,6 +41,8 @@ class MarkSource(PostScanPlugin):
     Has no effect unless the --info scan is requested.
     """
 
+    name = 'mark-source'
+
     @classmethod
     def get_plugin_options(cls):
         return [
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index 870696bc335..dbc2d11e888 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -38,6 +38,8 @@ class OnlyFindings(PostScanPlugin):
     considering basic file information as findings).
     """
 
+    name = 'only-findings'
+
     @classmethod
     def get_plugin_options(cls):
         return [
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
new file mode 100644
index 00000000000..fdb2b0648e9
--- /dev/null
+++ b/src/scancode/resource.py
@@ -0,0 +1,252 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
+
+from collections import OrderedDict
+import os
+import traceback
+
+import attr
+
+from commoncode.filetype import is_dir
+from commoncode.filetype import is_file
+from commoncode.fileutils import as_posixpath
+from commoncode.fileutils import path_to_bytes
+from commoncode.fileutils import path_to_unicode
+from commoncode.system import on_linux
+
+from scancode.cache import get_cache_dir
+from scancode.utils import get_relative_path
+
+# Python 2 and 3 support
+try:
+    # Python 2
+    unicode
+    str_orig = str
+    bytes = str
+    str = unicode
+except NameError:
+    # Python 3
+    unicode = str
+
+
+"""
+An abstraction for files and directories used throughout ScanCode. ScanCode
+deals with a lot of these as they are the basic unit of processing. They are
+eventually cached or stored and this module hides all the details of iterating
+files, path handling, caching or storing the file and directoy medatata.
+"""
+
+
+@attr.attributes(slots=True)
+class Resource(object):
+    """
+    A resource represent a file or directory with essential "file
+    information" and the scanned data details.
+    """
+    # LEGACY: TODO: remove
+    scans_cache_class = attr.attrib(default=None)
+    is_cached = attr.attrib(default=False, type=bool)
+    abs_path = attr.attrib(default=None)
+    base_is_dir = attr.attrib(default=True, type=bool)
+    len_base_path = attr.attrib(default=0, type=int)
+    rel_path = attr.attrib(default=None)
+    # END LEGACY
+
+    name = attr.attrib(default=None)
+    parent = attr.attrib(default=None)
+    children = attr.attrib(default=attr.Factory(list))
+
+    has_infos = attr.attrib(default=False)
+    infos = attr.attrib(default=attr.Factory(OrderedDict))
+    scans = attr.attrib(default=attr.Factory(OrderedDict))
+
+    def __attrs_post_init__(self):
+        self.scans_cache_class = self.scans_cache_class()
+        posix_path = as_posixpath(self.abs_path)
+        # keep the path as relative to the original base_path, always Unicode
+        self.rel_path = get_relative_path(posix_path, self.len_base_path, self.base_is_dir)
+        self.infos['path'] = self.rel_path
+
+    def get_infos(self):
+        if not self.has_infos:
+            self.infos.update(scan_infos(self.abs_path))
+            self.has_infos = True
+        return self.infos
+
+    def walk(self, topdown=True):
+        """
+        Walk this Resource in a manner similar to os.walk
+        """
+        if topdown:
+            yield self, self.children
+        for child in self.children:
+            for sc in child.walk(topdown):
+                yield sc
+        if not topdown:
+            yield self, self.children
+
+
+def scan_infos(location):
+    """
+    Scan one file or directory and return file_infos data. This always
+    contains an extra 'errors' key with a list of error messages,
+    possibly empty. If `diag` is True, additional diagnostic messages
+    are included.
+    """
+    # FIXME: WE SHOULD PROCESS THIS IS MEMORY AND AS PART OF THE SCAN PROPER... and BOTTOM UP!!!!
+    # THE PROCESSING TIME OF SIZE AGGREGATION ON DIRECTORY IS WAY WAY TOO HIGH!!!
+    errors = []
+    try:
+        infos = get_file_infos(location)
+    except Exception as e:
+        # never fail but instead add an error message.
+        infos = _empty_file_infos()
+        errors = ['ERROR: infos: ' + e.message]
+        errors.append('ERROR: infos: ' + traceback.format_exc())
+    # put errors last
+    infos['scan_errors'] = errors
+    return infos
+
+
+def get_file_infos(location):
+    """
+    Return a mapping of file information collected from the file or
+    directory at `location`.
+    """
+    from commoncode import fileutils
+    from commoncode import filetype
+    from commoncode.hash import multi_checksums
+    from typecode import contenttype
+
+    if on_linux:
+        location = path_to_bytes(location)
+    else:
+        location = path_to_unicode(location)
+
+    infos = OrderedDict()
+    is_file = filetype.is_file(location)
+    is_dir = filetype.is_dir(location)
+
+    T = contenttype.get_type(location)
+
+    infos['type'] = filetype.get_type(location, short=False)
+    name = fileutils.file_name(location)
+    if is_file:
+        base_name, extension = fileutils.splitext(location)
+    else:
+        base_name = name
+        extension = ''
+
+    if on_linux:
+        infos['name'] = path_to_unicode(name)
+        infos['base_name'] = path_to_unicode(base_name)
+        infos['extension'] = path_to_unicode(extension)
+    else:
+        infos['name'] = name
+        infos['base_name'] = base_name
+        infos['extension'] = extension
+
+    infos['date'] = is_file and filetype.get_last_modified_date(location) or None
+    infos['size'] = T.size
+    infos.update(multi_checksums(location, ('sha1', 'md5',)))
+    infos['files_count'] = is_dir and filetype.get_file_count(location) or None
+    infos['mime_type'] = is_file and T.mimetype_file or None
+    infos['file_type'] = is_file and T.filetype_file or None
+    infos['programming_language'] = is_file and T.programming_language or None
+    infos['is_binary'] = bool(is_file and T.is_binary)
+    infos['is_text'] = bool(is_file and T.is_text)
+    infos['is_archive'] = bool(is_file and T.is_archive)
+    infos['is_media'] = bool(is_file and T.is_media)
+    infos['is_source'] = bool(is_file and T.is_source)
+    infos['is_script'] = bool(is_file and T.is_script)
+
+    return infos
+
+
+# FIXME: this smells bad
+def _empty_file_infos():
+    """
+    Return an empty mapping of file info, used in case of failure.
+    """
+    infos = OrderedDict()
+    infos['type'] = None
+    infos['name'] = None
+    infos['extension'] = None
+    infos['date'] = None
+    infos['size'] = None
+    infos['sha1'] = None
+    infos['md5'] = None
+    infos['files_count'] = None
+    infos['mime_type'] = None
+    infos['file_type'] = None
+    infos['programming_language'] = None
+    infos['is_binary'] = False
+    infos['is_text'] = False
+    infos['is_archive'] = False
+    infos['is_media'] = False
+    infos['is_source'] = False
+    infos['is_script'] = False
+    return infos
+
+
+class Codebase(object):
+    """
+    Represent a codebase being scanned. A Codebase is a tree of Resources.
+    """
+    def __init__(self, root_location):
+        """
+        Initialize a new codebase rooted as the `root_location` existing
+        file or directory.
+        NOTE: no check is made on the location and it must be an existing location.
+        """
+
+        self.location = root_location
+        # FIXME: encoding???
+        self.location_native = path_to_bytes(root_location)
+        self.is_file = is_file(self.location_native)
+        self.is_dir = is_dir(self.location_native)
+        self.cache_dir = get_cache_dir()
+        self.root = None
+
+    def collect(self):
+        """
+        Return a root Resource for this codebase by walking its root_location.
+        """
+        location = self.location
+        if on_linux:
+            location = self.location_native
+
+        def on_error(error):
+            raise error
+
+        root_dir = Resource()
+        for top, dirs, files in os.walk(
+            location, topdown=True, onerror=on_error, followlinks=False):
+            for dr in dirs:
+                pass
diff --git a/tests/scancode/test_scan_cache.py b/tests/scancode/test_scan_cache.py
index f934d550914..13ec47bd2a1 100644
--- a/tests/scancode/test_scan_cache.py
+++ b/tests/scancode/test_scan_cache.py
@@ -41,11 +41,7 @@ def test_can_cache(self):
         test_file = self.get_test_loc('cache/package/package.json')
         from scancode import api
         package = api.get_package_infos(test_file)
-        file_info = dict(sha1='def')
-
         test_dir = self.get_temp_dir()
         cache = ScanFileCache(test_dir)
-        cache.put_info(path='abc', file_info=file_info)
-        cache.put_scan(path='abc', file_info=file_info, scan_result=package)
-        assert file_info == cache.get_info(path='abc')
-        assert package == cache.get_scan(path='abc', file_info=file_info)
+        cache.put_scan(path='abc', scan_result=package)
+        assert package == cache.get_scan(path='abc')

From 40835fd4d07f69f019f4f79273d4b29d07967cec Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Sat, 6 Jan 2018 23:05:48 +0100
Subject: [PATCH 023/122] Remove diag arg from get_resources() #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py                 |  4 ++--
 tests/scancode/test_ignore_files.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index ba553a508ed..e528dc19e19 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -485,7 +485,7 @@ def scancode(ctx, input, output_file, infos,
 
     if not quiet:
         echo_stderr('Collecting file inventory...' % locals(), fg='green')
-    resources = get_resources(base_path=input, diag=diag, scans_cache_class=scans_cache_class)
+    resources = get_resources(base_path=input, scans_cache_class=scans_cache_class)
     resources = list(resources)
 
     processing_start = time()
@@ -753,7 +753,7 @@ def _scanit(resource, scanners, scans_cache_class, diag, timeout=DEFAULT_TIMEOUT
     return success, resource.rel_path
 
 
-def get_resources(base_path, diag, scans_cache_class):
+def get_resources(base_path, scans_cache_class):
     """
     Yield `Resource` objects for all the files found at base_path (either a
     directory or file) given an absolute base_path.
diff --git a/tests/scancode/test_ignore_files.py b/tests/scancode/test_ignore_files.py
index 020d7ff9974..6e7a36ccf03 100644
--- a/tests/scancode/test_ignore_files.py
+++ b/tests/scancode/test_ignore_files.py
@@ -87,7 +87,7 @@ def test_resource_paths_with_single_file(self):
             'user/src/test/sample.txt'
         ]
 
-        resources = get_resources(test_dir, False, scan_cache_class)
+        resources = get_resources(test_dir, scan_cache_class)
         for plugin in test_plugins:
             resources = plugin.process_resources(resources)
 
@@ -107,7 +107,7 @@ def test_resource_paths_with_multiple_files(self):
             'user/src/test/sample.doc',
             'user/src/test/sample.txt'
         ]
-        resources = get_resources(test_dir, False, scan_cache_class)
+        resources = get_resources(test_dir, scan_cache_class)
         for plugin in test_plugins:
             resources = plugin.process_resources(resources)
 
@@ -126,7 +126,7 @@ def test_resource_paths_with_glob_file(self):
             'user/src/test',
             'user/src/test/sample.txt'
         ]
-        resources = get_resources(test_dir, False, scan_cache_class)
+        resources = get_resources(test_dir, scan_cache_class)
         for plugin in test_plugins:
             resources = plugin.process_resources(resources)
 
@@ -145,7 +145,7 @@ def test_resource_paths_with_glob_path(self):
             'user/src',
             'user/src/ignore.doc'
         ]
-        resources = get_resources(test_dir, False, scan_cache_class)
+        resources = get_resources(test_dir, scan_cache_class)
         for plugin in test_plugins:
             resources = plugin.process_resources(resources)
 
@@ -168,7 +168,7 @@ def test_resource_paths_with_multiple_plugins(self):
             'user/src',
             'user/src/test'
         ]
-        resources = get_resources(test_dir, False, scan_cache_class)
+        resources = get_resources(test_dir, scan_cache_class)
         for plugin in test_plugins:
             resources = plugin.process_resources(resources)
 

From 3be45778ba8ef8da6c0a4ad7ad0848c810e6470f Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 10 Jan 2018 19:06:10 +0100
Subject: [PATCH 024/122] Add function to skip first or last iterable item #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/functional.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/commoncode/functional.py b/src/commoncode/functional.py
index 1175f98fd6c..abe0226a80e 100644
--- a/src/commoncode/functional.py
+++ b/src/commoncode/functional.py
@@ -215,3 +215,34 @@ def memoized(*args, **kwargs):
             return memos[args]
 
     return functools.update_wrapper(memoized, fun)
+
+
+def iter_skip(iterable, skip_first=False, skip_last=False):
+    """
+    Given an iterable, return an iterable skipping the first item if skip_first
+    is True or the last item if skip_last is True.
+    For example:
+    >>> a = iter(range(10))
+    >>> list(iter_skip(a, skip_first=True, skip_last=False))
+    [1, 2, 3, 4, 5, 6, 7, 8, 9]
+    >>> a = iter(range(10))
+    >>> list(iter_skip(a, skip_first=False, skip_last=True))
+    [0, 1, 2, 3, 4, 5, 6, 7, 8]
+    >>> a = iter(range(10))
+    >>> list(iter_skip(a, skip_first=True, skip_last=True))
+    [1, 2, 3, 4, 5, 6, 7, 8]
+    >>> a = iter(range(10))
+    >>> list(iter_skip(a, skip_first=False, skip_last=False))
+    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    >>> a = iter(range(10))
+    >>> list(iter_skip(a))
+    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    """
+    current = next(iterable)
+    if skip_first:
+        current = next(iterable)
+    for item in iterable:
+        yield current
+        current = item
+    if not skip_last:
+        yield current

From b5e627cda7d1f87c6255431be9e9488a99d94851 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 11 Jan 2018 10:53:11 +0100
Subject: [PATCH 025/122] Change interruptible returned values #787

 * now return (error string or None, value or None)
 * this is cleaner than (success, value) where the value could be
   either the callble result or the error string

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/interrupt.py        | 66 +++++++++++++-------------------
 tests/scancode/test_interrupt.py | 14 ++++---
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/src/scancode/interrupt.py b/src/scancode/interrupt.py
index c67b0c2d30e..286ae438ccf 100644
--- a/src/scancode/interrupt.py
+++ b/src/scancode/interrupt.py
@@ -17,36 +17,40 @@
 
 from commoncode.system import on_windows
 
-DEFAULT_TIMEOUT = 120  # seconds
-
 
 """
-This modules povides an interruptible() function to run a callable and
-stop it after a timeout with a windows and POSIX implementation.
+This modules povides an interruptible() function to run a callable and stop it
+after a timeout with a windows and POSIX implementation.
 
-Call `func` function with `args` and `kwargs` arguments and return a
-tuple of (success, return value). `func` is invoked through an OS-
-specific wrapper and will be interrupted if it does not return within
-`timeout` seconds.
+interruptible() calls the `func` function with `args` and `kwargs` arguments and
+return a tuple of (error, value). `func` is invoked through an OS- specific
+wrapper and will be interrupted if it does not return within `timeout` seconds.
 
 `func` returned results must be pickable.
 `timeout` in seconds defaults to DEFAULT_TIMEOUT.
-
 `args` and `kwargs` are passed to `func` as *args and **kwargs.
 
-In the returned tuple of (success, value), success is True or False. If
-success is True, the call was successful and the second item in the
-tuple is the returned value of `func`.
+In the returned tuple of (`error`, `value`), `error` is an error string or None.
+The error message is verbose with a full traceback.
+`value` is the returned value of `func` or None.
 
-If success is False, the call did not complete within `timeout`
-seconds and was interrupted. In this case, the second item in the
-tuple is an error message string.
+If `error` is not None, the call did not complete within `timeout`
+seconds and was interrupted. In this case, the returned `value` is None.
 """
 
+
 class TimeoutError(Exception):
     pass
 
 
+DEFAULT_TIMEOUT = 120  # seconds
+
+TIMEOUT_MSG = 'ERROR: Processing interrupted: timeout after %(timeout)d seconds.'
+ERROR_MSG = 'ERROR: Unknown error:\n'
+NO_ERROR = None
+NO_VALUE = None
+
+
 if not on_windows:
     """
     Some code based in part and inspired from the RobotFramework and
@@ -81,14 +85,14 @@ def handler(signum, frame):
         try:
             signal.signal(signal.SIGALRM, handler)
             signal.setitimer(signal.ITIMER_REAL, timeout)
-            return True, func(*(args or ()), **(kwargs or {}))
+            return NO_ERROR, func(*(args or ()), **(kwargs or {}))
+
         except TimeoutError:
-            return False, ('ERROR: Processing interrupted: timeout after '
-                           '%(timeout)d seconds.' % locals())
+            return TIMEOUT_MSG % locals(), NO_VALUE
 
         except Exception:
             import traceback
-            return False, ('ERROR: Unknown error:\n' + traceback.format_exc())
+            return ERROR_MSG + traceback.format_exc(), NO_VALUE
 
         finally:
             signal.setitimer(signal.ITIMER_REAL, 0)
@@ -115,7 +119,7 @@ def interruptible(func, args=None, kwargs=None, timeout=DEFAULT_TIMEOUT):
         Windows, threads-based interruptible runner. It can work also on
         POSIX, but is not reliable and works only if everything is pickable.
         """
-        # We run `func` in a thread and run a loop until timeout
+        # We run `func` in a thread and block on a queue until timeout
         results = Queue.Queue()
 
         def runner():
@@ -124,14 +128,12 @@ def runner():
         tid = thread.start_new_thread(runner, ())
 
         try:
-            res = results.get(timeout=timeout)
-            return True, res
+            return NO_ERROR, results.get(timeout=timeout)
         except (Queue.Empty, multiprocessing.TimeoutError):
-            return False, ('ERROR: Processing interrupted: timeout after '
-                           '%(timeout)d seconds.' % locals())
+            return TIMEOUT_MSG % locals(), NO_VALUE
         except Exception:
             import traceback
-            return False, ('ERROR: Unknown error:\n' + traceback.format_exc())
+            return ERROR_MSG + traceback.format_exc(), NO_VALUE
         finally:
             try:
                 async_raise(tid, Exception)
@@ -160,17 +162,3 @@ def async_raise(tid, exctype=Exception):
             # and you should call it again with exc=NULL to revert the effect
             ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, 0)
             raise SystemError('PyThreadState_SetAsyncExc failed.')
-
-
-def fake_interruptible(func, args=None, kwargs=None, timeout=DEFAULT_TIMEOUT):
-    """
-    Fake, non-interruptible, using no threads and no signals
-    implementation used for debugging. This ignores the timeout and just
-    the function as-is.
-    """
-
-    try:
-        return True, func(*(args or ()), **(kwargs or {}))
-    except Exception:
-        import traceback
-        return False, ('ERROR: Unknown error:\n' + traceback.format_exc())
diff --git a/tests/scancode/test_interrupt.py b/tests/scancode/test_interrupt.py
index de76a172495..738195ab51b 100644
--- a/tests/scancode/test_interrupt.py
+++ b/tests/scancode/test_interrupt.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -23,8 +23,8 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 import os
@@ -51,8 +51,9 @@ def some_long_function(exec_time):
             sleep(exec_time)
             return 'OK'
 
-        result = interrupt.interruptible(some_long_function, args=(0.01,), timeout=10)
-        assert (True, 'OK') == result
+        results = interrupt.interruptible(some_long_function, args=(0.01,), timeout=10)
+        expected = None, 'OK'
+        assert expected == results
 
         after = threading.active_count()
         assert before == after
@@ -65,8 +66,9 @@ def some_long_function(exec_time):
                 sleep(i)
             return 'OK'
 
-        result = interrupt.interruptible(some_long_function, args=(20,), timeout=0.00001)
-        assert (False, 'ERROR: Processing interrupted: timeout after 0 seconds.') == result
+        results = interrupt.interruptible(some_long_function, args=(20,), timeout=0.00001)
+        expected = 'ERROR: Processing interrupted: timeout after 0 seconds.', None
+        assert expected == results
 
         after = threading.active_count()
         assert before == after

From e9cd4e5f72a810cdcf6fc5c311ad7d42662af5f4 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 11 Jan 2018 11:34:18 +0100
Subject: [PATCH 026/122] Ensure api function return a list #787

 * and not a generator, so they can serialize OK without wrapping

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/api.py        | 123 +++++++++++++++++++++++++++----------
 tests/scancode/test_api.py |  28 +++++----
 2 files changed, 106 insertions(+), 45 deletions(-)

diff --git a/src/scancode/api.py b/src/scancode/api.py
index d8dbc830b5e..75c02efb29e 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -27,14 +27,24 @@
 from __future__ import unicode_literals
 
 from collections import OrderedDict
+from os.path import getsize
 
-# exposed as API
-from scancode.resource import Resource  # @UnusedImport
-from scancode.resource import get_file_infos  # @UnusedImport
+from commoncode.hash import multi_checksums
+from commoncode.filetype import get_last_modified_date
+from commoncode.filetype import get_type as get_simple_type
+from commoncode.filetype import is_file as filetype_is_file
+from commoncode.fileutils import file_name
+from commoncode.fileutils import splitext
+from commoncode.system import on_linux
+from typecode.contenttype import get_type
 
 
 """
 Main scanning functions.
+
+Each scanner is a function that accepts a location and returns an iterable of
+results.
+
 Note: this API is unstable and still evolving.
 """
 
@@ -53,68 +63,72 @@ def extract_archives(location, recurse=True):
 
 def get_copyrights(location):
     """
-    Yield mappings of copyright data detected in the file at `location`.
+    Return a list of mappings for copyright detected in the file at `location`.
     """
     from cluecode.copyrights import detect_copyrights
-
+    results = []
     for copyrights, authors, _years, holders, start_line, end_line in detect_copyrights(location):
         result = OrderedDict()
+        results.append(result)
         # FIXME: we should call this copyright instead, and yield one item per statement
         result['statements'] = copyrights
         result['holders'] = holders
         result['authors'] = authors
         result['start_line'] = start_line
         result['end_line'] = end_line
-        yield result
+    return results
 
 
 def get_emails(location):
     """
-    Yield mappings of emails detected in the file at `location`.
+    Return a list of mappings for emails detected in the file at `location`.
     """
     from cluecode.finder import find_emails
+    results = []
     for email, line_num  in find_emails(location):
         if not email:
             continue
-        misc = OrderedDict()
-        misc['email'] = email
-        misc['start_line'] = line_num
-        misc['end_line'] = line_num
-        yield misc
+        result = OrderedDict()
+        results.append(result)
+        result['email'] = email
+        result['start_line'] = line_num
+        result['end_line'] = line_num
+    return results
 
 
 def get_urls(location):
     """
-    Yield mappings of urls detected in the file at `location`.
+    Return a list of mappings for urls detected in the file at `location`.
     """
     from cluecode.finder import find_urls
+    results = []
     for urls, line_num  in find_urls(location):
         if not urls:
             continue
-        misc = OrderedDict()
-        misc['url'] = urls
-        misc['start_line'] = line_num
-        misc['end_line'] = line_num
-        yield misc
+        result = OrderedDict()
+        results.append(result)
+        result['url'] = urls
+        result['start_line'] = line_num
+        result['end_line'] = line_num
+    return results
 
 
 DEJACODE_LICENSE_URL = 'https://enterprise.dejacode.com/urn/urn:dje:license:{}'
 SPDX_LICENSE_URL = 'https://spdx.org/licenses/{}'
 
 
-def get_licenses(location, min_score=0, include_text=False, diag=False, license_url_template=DEJACODE_LICENSE_URL):
+def get_licenses(location, min_score=0, include_text=False, diag=False,
+                 license_url_template=DEJACODE_LICENSE_URL):
     """
-    Yield mappings of license data detected in the file at `location`.
+    Return a list of mappings for licenses detected in the file at `location`.
 
-    `minimum_score` is a minimum score threshold from 0 to 100. The
-    default is 0 means that all license matches will be returned. With
-    any other value matches that have a score below minimum score with
-    not be returned.
+    `minimum_score` is a minimum score threshold from 0 to 100. The default is 0
+    means that all license matches are returned. Otherwise, matches with a score
+    below `minimum_score` are returned.
 
-    if `include_text` is True, the matched text is included in the
-    returned data.
+    if `include_text` is True, matched text is included in the returned data.
 
-    If `diag` is True, additional match details are returned with the
+    If `diag` is True, additional license match details are returned with the
     matched_rule key of the returned mapping.
     """
     from licensedcode.cache import get_index
@@ -123,12 +137,15 @@ def get_licenses(location, min_score=0, include_text=False, diag=False, license_
     idx = get_index()
     licenses = get_licenses_db()
 
+    results = []
     for match in idx.match(location=location, min_score=min_score):
         if include_text:
             matched_text = match.matched_text(whole_lines=False)
+
         for license_key in match.rule.licenses:
             lic = licenses.get(license_key)
             result = OrderedDict()
+            results.append(result)
             result['key'] = lic.key
             result['score'] = match.score()
             result['short_name'] = lic.short_name
@@ -161,16 +178,56 @@ def get_licenses(location, min_score=0, include_text=False, diag=False, license_
             # FIXME: for sanity this should always be included?????
             if include_text:
                 result['matched_text'] = matched_text
-            yield result
+
+    return results
 
 
 def get_package_infos(location):
     """
-    Return a list of mappings of package information collected from the
-    `location` or an empty list.
+    Return a list of mappings for package information detected in the file at
+    `location`.
     """
     from packagedcode.recognize import recognize_package
     package = recognize_package(location)
-    if not package:
-        return []
-    return [package.to_dict()]
+    results = []
+    if package:
+        results.append(package.to_dict())
+    return results
+
+
+def get_file_info(location):
+    """
+    Return a list of mappings for file information collected for the file or
+    directory at `location`.
+    """
+    result = OrderedDict()
+    results = [result]
+
+    collector = get_type(location)
+    result['type'] = get_simple_type(location, short=False)
+    is_file = filetype_is_file(location)
+
+    if is_file:
+        base_name, extension = splitext(location)
+    else:
+        # directories have no extension
+        base_name = file_name(location)
+        extension = b'' if on_linux else ''
+    result['base_name'] = base_name
+    result['extension'] = extension
+
+    if is_file:
+        result['date'] = get_last_modified_date(location) or None
+        result['size'] = getsize(location) or 0
+        result.update(multi_checksums(location, ('sha1', 'md5',)))
+        result['mime_type'] = collector.mimetype_file or None
+        result['file_type'] = collector.filetype_file or None
+        result['programming_language'] = collector.programming_language or None
+        result['is_binary'] = bool(collector.is_binary)
+        result['is_text'] = bool(collector.is_text)
+        result['is_archive'] = bool(collector.is_archive)
+        result['is_media'] = bool(collector.is_media)
+        result['is_source'] = bool(collector.is_source)
+        result['is_script'] = bool(collector.is_script)
+
+    return results
diff --git a/tests/scancode/test_api.py b/tests/scancode/test_api.py
index 1e743154bbf..796378bad84 100644
--- a/tests/scancode/test_api.py
+++ b/tests/scancode/test_api.py
@@ -51,35 +51,39 @@ def test_get_package_infos_can_pickle(self):
             _pickled = pickle.dumps(package)
             _cpickled = cPickle.dumps(package)
 
-    def test_get_file_infos_flag_are_not_null(self):
+    def test_get_file_info_flag_are_not_null(self):
         # note the test file is EMPTY on purpose to generate all False is_* flags
         test_dir = self.get_test_loc('api/info')
-        info = api.get_file_infos(test_dir)
-        is_key_values = [v for k, v in info.items() if k.startswith('is_')]
-        assert all(v is not None for v in is_key_values)
+        infos = api.get_file_info(test_dir)
+        assert len(infos) == 1
+        for info in infos:
+            is_key_values = [v for k, v in info.items() if k.startswith('is_')]
+            assert all(v is not None for v in is_key_values)
 
     def test_get_package_infos_works_for_maven_dot_pom(self):
         test_file = self.get_test_loc('api/package/p6spy-1.3.pom')
         packages = api.get_package_infos(test_file)
         assert len(packages) == 1
-        package = packages[0]
-        assert package['version'] == '1.3'
+        for package in packages:
+            assert package['version'] == '1.3'
 
     def test_get_package_infos_works_for_maven_pom_dot_xml(self):
         test_file = self.get_test_loc('api/package/pom.xml')
         packages = api.get_package_infos(test_file)
         assert len(packages) == 1
-        package = packages[0]
-        assert package['version'] == '1.3'
+        for package in packages:
+            assert package['version'] == '1.3'
 
-    def test_get_file_infos_include_base_name(self):
+    def test_get_file_info_include_base_name(self):
         test_dir = self.get_test_loc('api/info/test.txt')
-        info = api.get_file_infos(test_dir)
-        assert 'test' == info['base_name']
+        infos = api.get_file_info(test_dir)
+        assert len(infos) == 1
+        for info in infos:
+            assert 'test' == info['base_name']
 
     def test_get_copyrights_include_copyrights_and_authors(self):
         test_file = self.get_test_loc('api/copyright/iproute.c')
-        cops = list(api.get_copyrights(test_file))
+        cops = api.get_copyrights(test_file)
         expected = [
             OrderedDict([
                 (u'statements', [u'Copyright (c) 2010 Patrick McHardy']),

From 59bef89f1ac55ed5fae42e213a0b4813fbaba446 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 11 Jan 2018 19:07:46 +0100
Subject: [PATCH 027/122] Use latest attrs and typing #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 00f23102337..cfb4b883a09 100644
--- a/setup.py
+++ b/setup.py
@@ -161,7 +161,6 @@ def read(*names, **kwargs):
         'pygments >= 2.0.1, <3.0.0',
 
         # packagedcode
-        'attrs >=16.0, < 17.0',
         'pymaven-patch >= 0.2.4',
         'requests >= 2.7.0, < 3.0.0',
         'schematics_patched',
@@ -170,6 +169,8 @@ def read(*names, **kwargs):
         'click >= 6.0.0, < 7.0.0',
         'colorama >= 0.3.9',
         'pluggy >= 0.4.0, < 1.0',
+        'attrs >=17.0, < 18.0',
+        'typing >=3.6, < 3.7',
 
         # scancode outputs
         'jinja2 >= 2.7.0, < 3.0.0',

From 683ca2611fca6a8e500127050fd82739c3f570e0 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 09:01:39 +0100
Subject: [PATCH 028/122] Add file base_name to info scans #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/scripts/testdata/livescan/expected.csv | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/etc/scripts/testdata/livescan/expected.csv b/etc/scripts/testdata/livescan/expected.csv
index 1e1003996a2..6a8b9ae74f4 100644
--- a/etc/scripts/testdata/livescan/expected.csv
+++ b/etc/scripts/testdata/livescan/expected.csv
@@ -1,14 +1,5 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
-/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
-/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1599,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Resource,type,name,extension,date,size,sha1,md5,files_count,dirs_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+/json2csv.rb,file,json2csv.rb,.rb,2017-10-03,2017-10-03,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
@@ -16,5 +7,14 @@ Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,file,license,,2017-10-03,2017-10-03,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+/package.json,file,package.json,.json,2017-10-03,2017-10-03,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,

From 0279764a6750f9a4014370ed7667da5933394538 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 09:09:22 +0100
Subject: [PATCH 029/122] Replace path_to_bytes/unicode by fsen/decode #787

 * This was a useless wrapper
 * Also improve imports locality and other minor refactorings

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/command.py          | 76 +++++++++++++++---------------
 src/commoncode/fileutils.py        | 66 +++++++++-----------------
 src/commoncode/ignore.py           |  2 +-
 src/commoncode/testcase.py         | 46 +++++++++---------
 src/commoncode/timeutils.py        |  5 +-
 src/extractcode/__init__.py        | 45 ++++++++++--------
 src/extractcode/archive.py         | 13 +++--
 src/packagedcode/recognize.py      |  6 +--
 tests/commoncode/test_fileutils.py | 17 ++++---
 tests/commoncode/test_ignore.py    | 40 +++++-----------
 10 files changed, 143 insertions(+), 173 deletions(-)

diff --git a/src/commoncode/command.py b/src/commoncode/command.py
index ba1b6fd8e53..de922b6fb0c 100644
--- a/src/commoncode/command.py
+++ b/src/commoncode/command.py
@@ -27,14 +27,21 @@
 from __future__ import unicode_literals
 
 import ctypes
-import os
+import os as _os_module
+from os.path import abspath
+from os.path import exists
+from os.path import dirname
+from os.path import join
+
 import logging
 import signal
 import subprocess
 
-from commoncode import fileutils
-from commoncode.fileutils import path_to_bytes
-from commoncode.fileutils import path_to_unicode
+from commoncode.fileutils import chmod
+from commoncode.fileutils import fsencode
+from commoncode.fileutils import fsdecode
+from commoncode.fileutils import get_temp_dir
+from commoncode.fileutils import RX
 from commoncode import text
 from commoncode import system
 from commoncode.system import current_os_arch
@@ -48,15 +55,10 @@
 try:
     # Python 2
     unicode
-    str = unicode
+    str = unicode  # @ReservedAssignment
 except NameError:
     # Python 3
-    unicode = str
-
-try:
-    from os import fsencode
-except ImportError:
-    from backports.os import fsencode
+    unicode = str  # @ReservedAssignment
 
 
 """
@@ -81,7 +83,7 @@
 # logger.setLevel(logging.DEBUG)
 
 # current directory is the root dir of this library
-curr_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+curr_dir = dirname(dirname(abspath(__file__)))
 
 
 def execute(cmd, args, root_dir=None, cwd=None, env=None, to_files=False):
@@ -108,9 +110,9 @@ def execute(cmd, args, root_dir=None, cwd=None, env=None, to_files=False):
     cwd = cwd or curr_dir
 
     # temp files for stderr and stdout
-    tmp_dir = fileutils.get_temp_dir(base_dir='cmd')
-    sop = os.path.join(tmp_dir, 'stdout')
-    sep = os.path.join(tmp_dir, 'stderr')
+    tmp_dir = get_temp_dir(base_dir='cmd')
+    sop = join(tmp_dir, 'stdout')
+    sep = join(tmp_dir, 'stderr')
 
     # shell==True is DANGEROUS but we are not running arbitrary commands
     # though we can execute command that just happen to be in the path
@@ -144,7 +146,7 @@ def os_arch_dir(root_dir, _os_arch=current_os_arch):
     Return a sub-directory of `root_dir` tailored for the current OS and
     current processor architecture.
     """
-    return os.path.join(root_dir, _os_arch)
+    return join(root_dir, _os_arch)
 
 
 def os_noarch_dir(root_dir, _os_noarch=current_os_noarch):
@@ -152,7 +154,7 @@ def os_noarch_dir(root_dir, _os_noarch=current_os_noarch):
     Return a sub-directory of `root_dir` tailored for the current OS and NOT
     specific to a processor architecture.
     """
-    return os.path.join(root_dir, _os_noarch)
+    return join(root_dir, _os_noarch)
 
 
 def noarch_dir(root_dir, _noarch=noarch):
@@ -160,7 +162,7 @@ def noarch_dir(root_dir, _noarch=noarch):
     Return a sub-directory of `root_dir` that is NOT specific to an OS or
     processor architecture.
     """
-    return os.path.join(root_dir, _noarch)
+    return join(root_dir, _noarch)
 
 
 def get_base_dirs(root_dir,
@@ -185,14 +187,14 @@ def get_base_dirs(root_dir,
     binary  of any given binary. This function resolves to an actual OS/arch
     location in this context.
     """
-    if not root_dir or not os.path.exists(root_dir):
+    if not root_dir or not exists(root_dir):
         return []
 
     dirs = []
 
     def find_loc(fun, arg):
         loc = fun(root_dir, arg)
-        if os.path.exists(loc):
+        if exists(loc):
             dirs.append(loc)
 
     if _os_arch:
@@ -217,17 +219,17 @@ def get_bin_lib_dirs(base_dir):
     if not base_dir:
         return None, None
 
-    bin_dir = os.path.join(base_dir, 'bin')
+    bin_dir = join(base_dir, 'bin')
 
-    if os.path.exists(bin_dir):
-        fileutils.chmod(bin_dir, fileutils.RX, recurse=True)
+    if exists(bin_dir):
+        chmod(bin_dir, RX, recurse=True)
     else:
         bin_dir = None
 
-    lib_dir = os.path.join(base_dir, 'lib')
+    lib_dir = join(base_dir, 'lib')
 
-    if os.path.exists(lib_dir):
-        fileutils.chmod(bin_dir, fileutils.RX, recurse=True)
+    if exists(lib_dir):
+        chmod(bin_dir, RX, recurse=True)
     else:
         # default to bin for lib if it exists
         lib_dir = bin_dir or None
@@ -291,9 +293,9 @@ def get_locations(cmd, root_dir,
 
         for base_dir in get_base_dirs(root_dir, _os_arch, _os_noarch, _noarch):
             bin_dir, lib_dir = get_bin_lib_dirs(base_dir)
-            cmd_loc = os.path.join(bin_dir, cmd)
-            if os.path.exists(cmd_loc):
-                fileutils.chmod(cmd_loc, fileutils.RX, recurse=False)
+            cmd_loc = join(bin_dir, cmd)
+            if exists(cmd_loc):
+                chmod(cmd_loc, RX, recurse=False)
                 return cmd_loc, bin_dir, lib_dir
     else:
         # we just care for getting the dirs and grab the first one
@@ -341,12 +343,12 @@ def load_lib(libname, root_dir):
     """
     os_dir = get_base_dirs(root_dir)[0]
     _bin_dir, lib_dir = get_bin_lib_dirs(os_dir)
-    so = os.path.join(lib_dir, libname + system.lib_ext)
+    so = join(lib_dir, libname + system.lib_ext)
 
     # add lib path to the front of the PATH env var
     update_path_environment(lib_dir)
 
-    if os.path.exists(so):
+    if exists(so):
         if not isinstance(so, bytes):
             # ensure that the path is not Unicode...
             so = fsencode(so)
@@ -356,7 +358,7 @@ def load_lib(libname, root_dir):
     raise ImportError('Failed to load %(libname)s from %(so)r' % locals())
 
 
-def update_path_environment(new_path, _os_module=os):
+def update_path_environment(new_path, _os_module=_os_module):
     """
     Update the PATH environment variable by adding `new_path` to the front
     of PATH if `new_path` is not alreday in the PATH.
@@ -379,12 +381,12 @@ def update_path_environment(new_path, _os_module=os):
 
     # ensure we use unicode or bytes depending on OSes
     if on_linux:
-        new_path = path_to_bytes(new_path)
-        path_env = path_to_bytes(path_env)
+        new_path = fsencode(new_path)
+        path_env = fsencode(path_env)
         sep = _os_module.pathsep
     else:
-        new_path = path_to_unicode(new_path)
-        path_env = path_to_unicode(path_env)
+        new_path = fsdecode(new_path)
+        path_env = fsdecode(path_env)
         sep = unicode(_os_module.pathsep)
 
     path_segments = path_env.split(sep)
@@ -399,6 +401,6 @@ def update_path_environment(new_path, _os_module=os):
 
         if not on_linux:
             # recode to bytes using FS encoding
-            new_path_env = path_to_bytes(new_path_env)
+            new_path_env = fsencode(new_path_env)
         # ... and set the variable back as bytes
         _os_module.environ[b'PATH'] = new_path_env
diff --git a/src/commoncode/fileutils.py b/src/commoncode/fileutils.py
index e9dedaf9da9..2d61487b4f0 100644
--- a/src/commoncode/fileutils.py
+++ b/src/commoncode/fileutils.py
@@ -30,17 +30,17 @@
 try:
     # Python 2
     unicode
-    str = unicode
+    str = unicode  # @ReservedAssignment
 except NameError:
     # Python 3
-    unicode = str
+    unicode = str  # @ReservedAssignment
 
 try:
     from os import fsencode
     from os import fsdecode
 except ImportError:
     from backports.os import fsencode
-    from backports.os import fsdecode
+    from backports.os import fsdecode  # @UnusedImport
 
 
 import codecs
@@ -53,7 +53,6 @@
 import sys
 import tempfile
 
-
 from commoncode import filetype
 from commoncode.filetype import is_rwx
 from commoncode import system
@@ -116,7 +115,7 @@ def create_dir(location):
         # FIXME: consider using UNC ?\\ paths
 
         if on_linux:
-            location = path_to_bytes(location)
+            location = fsencode(location)
         try:
             os.makedirs(location)
             chmod(location, RW, recurse=False)
@@ -147,20 +146,20 @@ def system_temp_dir():
         sc = text.python_safe_name('scancode_' + system.username)
         temp_dir = os.path.join(tempfile.gettempdir(), sc)
     if on_linux:
-        temp_dir = path_to_bytes(temp_dir)
+        temp_dir = fsencode(temp_dir)
     create_dir(temp_dir)
     return temp_dir
 
 
 def get_temp_dir(base_dir, prefix=''):
     """
-    Return the path to a new unique temporary directory, created under
-    the system-wide `system_temp_dir` temp directory as a subdir of the
-    base_dir path (a path relative to the `system_temp_dir`).
+    Return the path to a new existing unique temporary directory, created under
+    the system-wide `system_temp_dir` temp directory as a subdir of the base_dir
+    path (a path relative to the `system_temp_dir`).
     """
     if on_linux:
-        base_dir = path_to_bytes(base_dir)
-        prefix = path_to_bytes(prefix)
+        base_dir = fsencode(base_dir)
+        prefix = fsencode(prefix)
     base = os.path.join(system_temp_dir(), base_dir)
     create_dir(base)
     return tempfile.mkdtemp(prefix=prefix, dir=base)
@@ -191,7 +190,7 @@ def _text(location, encoding, universal_new_lines=True):
     Python2.6 see http://bugs.python.org/issue691291
     """
     if on_linux:
-        location = path_to_bytes(location)
+        location = fsencode(location)
     with codecs.open(location, 'r', encoding) as f:
         text = f.read()
         if universal_new_lines:
@@ -216,25 +215,6 @@ def read_text_file(location, universal_new_lines=True):
 
 # TODO: move these functions to paths.py or codecs.py
 
-def path_to_unicode(path):
-    """
-    Return a path string `path` as a unicode string.
-    """
-    if isinstance(path, unicode):
-        return path
-    if TRACE: logger_debug('path_to_unicode:', fsdecode(path))
-    return fsdecode(path)
-
-
-def path_to_bytes(path):
-    """
-    Return a `path` string as a byte string using the filesystem encoding.
-    """
-    if isinstance(path, bytes):
-        return path
-    if TRACE: logger_debug('path_to_bytes:' , repr(fsencode(path)))
-    return fsencode(path)
-
 
 def is_posixpath(location):
     """
@@ -398,7 +378,7 @@ def walk(location, ignored=ignore_nothing):
      - location is a directory or a file: for a file, the file is returned.
     """
     if on_linux:
-        location = path_to_bytes(location)
+        location = fsencode(location)
 
     # TODO: consider using the new "scandir" module for some speed-up.
     if TRACE:
@@ -443,7 +423,7 @@ def resource_iter(location, ignored=ignore_nothing, with_dirs=True):
     :return: an iterable of file and directory locations.
     """
     if on_linux:
-        location = path_to_bytes(location)
+        location = fsencode(location)
     for top, dirs, files in walk(location, ignored):
         if with_dirs:
             for d in dirs:
@@ -469,8 +449,8 @@ def copytree(src, dst):
     function. See fileutils.py.ABOUT for details.
     """
     if on_linux:
-        src = path_to_bytes(src)
-        dst = path_to_bytes(dst)
+        src = fsencode(src)
+        dst = fsencode(dst)
 
     if not filetype.is_readable(src):
         chmod(src, R, recurse=False)
@@ -518,8 +498,8 @@ def copyfile(src, dst):
     for details.
     """
     if on_linux:
-        src = path_to_bytes(src)
-        dst = path_to_bytes(dst)
+        src = fsencode(src)
+        dst = fsencode(dst)
 
     if not filetype.is_regular(src):
         return
@@ -539,8 +519,8 @@ def copytime(src, dst):
     for details.
     """
     if on_linux:
-        src = path_to_bytes(src)
-        dst = path_to_bytes(dst)
+        src = fsencode(src)
+        dst = fsencode(dst)
 
     errors = []
     st = os.stat(src)
@@ -576,7 +556,7 @@ def chmod(location, flags, recurse=False):
     if not location or not os.path.exists(location):
         return
     if on_linux:
-        location = path_to_bytes(location)
+        location = fsencode(location)
 
     location = os.path.abspath(location)
 
@@ -606,7 +586,7 @@ def chmod_tree(location, flags):
     Update permissions recursively in a directory tree `location`.
     """
     if on_linux:
-        location = path_to_bytes(location)
+        location = fsencode(location)
     if filetype.is_dir(location):
         for top, dirs, files in walk(location):
             for d in dirs:
@@ -624,7 +604,7 @@ def _rm_handler(function, path, excinfo):  # @UnusedVariable
     This retries deleting once before giving up.
     """
     if on_linux:
-        path = path_to_bytes(path)
+        path = fsencode(path)
     if function == os.rmdir:
         try:
             chmod(path, RW, recurse=True)
@@ -654,7 +634,7 @@ def delete(location, _err_handler=_rm_handler):
         return
 
     if on_linux:
-        location = path_to_bytes(location)
+        location = fsencode(location)
 
     if os.path.exists(location) or filetype.is_broken_link(location):
         chmod(os.path.dirname(location), RW, recurse=False)
diff --git a/src/commoncode/ignore.py b/src/commoncode/ignore.py
index c4a86be930b..111a70166a8 100644
--- a/src/commoncode/ignore.py
+++ b/src/commoncode/ignore.py
@@ -36,7 +36,7 @@
 """
 
 
-def is_ignored(location, ignores, unignores, skip_special=True):
+def is_ignored(location, ignores, unignores=None, skip_special=True):
     """
     Return a tuple of (pattern , message) if a file at location is ignored
     or False otherwise.
diff --git a/src/commoncode/testcase.py b/src/commoncode/testcase.py
index 096f39727bd..73907b1a327 100644
--- a/src/commoncode/testcase.py
+++ b/src/commoncode/testcase.py
@@ -39,7 +39,7 @@
 import zipfile
 
 from commoncode import fileutils
-from commoncode.fileutils import path_to_bytes
+from commoncode.fileutils import fsencode
 from commoncode import filetype
 from commoncode.system import on_linux
 from commoncode.system import on_posix
@@ -100,7 +100,7 @@ def to_os_native_path(path):
     Normalize a path to use the native OS path separator.
     """
     if on_linux:
-        path = path_to_bytes(path)
+        path = fsencode(path)
     path = path.replace(POSIX_PATH_SEP, OS_PATH_SEP)
     path = path.replace(WIN_PATH_SEP, OS_PATH_SEP)
     path = path.rstrip(OS_PATH_SEP)
@@ -113,8 +113,8 @@ def get_test_loc(test_path, test_data_dir, debug=False, exists=True):
     location to a test file or directory for this path. No copy is done.
     """
     if on_linux:
-        test_path = path_to_bytes(test_path)
-        test_data_dir = path_to_bytes(test_data_dir)
+        test_path = fsencode(test_path)
+        test_data_dir = fsencode(test_data_dir)
 
     if debug:
         import inspect
@@ -154,8 +154,8 @@ def get_test_loc(self, test_path, copy=False, debug=False):
         """
         test_data_dir = self.test_data_dir
         if on_linux:
-            test_path = path_to_bytes(test_path)
-            test_data_dir = path_to_bytes(test_data_dir)
+            test_path = fsencode(test_path)
+            test_data_dir = fsencode(test_data_dir)
 
         if debug:
             import inspect
@@ -189,9 +189,9 @@ def get_temp_file(self, extension=None, dir_name='td', file_name='tf'):
             extension = '.txt'
 
         if on_linux:
-            extension = path_to_bytes(extension)
-            dir_name = path_to_bytes(dir_name)
-            file_name = path_to_bytes(file_name)
+            extension = fsencode(extension)
+            dir_name = fsencode(dir_name)
+            file_name = fsencode(file_name)
 
         if extension and not extension.startswith(DOT):
                 extension = DOT + extension
@@ -213,7 +213,7 @@ def get_temp_dir(self, sub_dir_path=None):
         if not test_run_temp_dir:
             test_run_temp_dir = fileutils.get_temp_dir(base_dir='tst', prefix=' ')
         if on_linux:
-            test_run_temp_dir = path_to_bytes(test_run_temp_dir)
+            test_run_temp_dir = fsencode(test_run_temp_dir)
 
         new_temp_dir = fileutils.get_temp_dir(base_dir=test_run_temp_dir)
 
@@ -230,8 +230,8 @@ def remove_vcs(self, test_dir):
         """
         vcses = ('CVS', '.svn', '.git', '.hg')
         if on_linux:
-            vcses = tuple(path_to_bytes(p) for p in vcses)
-            test_dir = path_to_bytes(test_dir)
+            vcses = tuple(fsencode(p) for p in vcses)
+            test_dir = fsencode(test_dir)
 
         for root, dirs, files in os.walk(test_dir):
             for vcs_dir in vcses:
@@ -256,14 +256,14 @@ def __extract(self, test_path, extract_func=None, verbatim=False):
         """
         assert test_path and test_path != ''
         if on_linux:
-            test_path = path_to_bytes(test_path)
+            test_path = fsencode(test_path)
         test_path = to_os_native_path(test_path)
         target_path = os.path.basename(test_path)
         target_dir = self.get_temp_dir(target_path)
         original_archive = self.get_test_loc(test_path)
         if on_linux:
-            target_dir = path_to_bytes(target_dir)
-            original_archive = path_to_bytes(original_archive)
+            target_dir = fsencode(target_dir)
+            original_archive = fsencode(original_archive)
         extract_func(original_archive, target_dir,
                      verbatim=verbatim)
         return target_dir
@@ -291,8 +291,8 @@ def _extract_tar_raw(test_path, target_dir, to_bytes, *args, **kwargs):
     """
     if to_bytes:
         # use bytes for paths on ALL OSes (though this may fail on macOS)
-        target_dir = path_to_bytes(target_dir)
-        test_path = path_to_bytes(test_path)
+        target_dir = fsencode(target_dir)
+        test_path = fsencode(test_path)
     tar = tarfile.open(test_path)
     tar.extractall(path=target_dir)
     tar.close()
@@ -309,8 +309,8 @@ def extract_tar(location, target_dir, verbatim=False, *args, **kwargs):
     """
     # always for using bytes for paths on all OSses... tar seems to use bytes internally
     # and get confused otherwise
-    location = path_to_bytes(location)
-    target_dir = path_to_bytes(target_dir)
+    location = fsencode(location)
+    target_dir = fsencode(target_dir)
 
     with open(location, 'rb') as input_tar:
         tar = None
@@ -337,8 +337,8 @@ def extract_zip(location, target_dir, *args, **kwargs):
         raise Exception('Incorrect zip file %(location)r' % locals())
 
     if on_linux:
-        location = path_to_bytes(location)
-        target_dir = path_to_bytes(target_dir)
+        location = fsencode(location)
+        target_dir = fsencode(target_dir)
 
     with zipfile.ZipFile(location) as zipf:
         for info in zipf.infolist():
@@ -364,8 +364,8 @@ def extract_zip_raw(location, target_dir, *args, **kwargs):
         raise Exception('Incorrect zip file %(location)r' % locals())
 
     if on_linux:
-        location = path_to_bytes(location)
-        target_dir = path_to_bytes(target_dir)
+        location = fsencode(location)
+        target_dir = fsencode(target_dir)
 
     with zipfile.ZipFile(location) as zipf:
         zipf.extractall(path=target_dir)
diff --git a/src/commoncode/timeutils.py b/src/commoncode/timeutils.py
index 9db6613508d..643d141f8a5 100644
--- a/src/commoncode/timeutils.py
+++ b/src/commoncode/timeutils.py
@@ -24,9 +24,9 @@
 
 from __future__ import absolute_import, print_function
 
-
 from datetime import datetime, tzinfo
 
+
 """
 Time is of the essence: path safe time stamps creation and conversion to
 datetime objects.
@@ -60,7 +60,8 @@ def time2tstamp(dt=None):
 
     For times, the ISO 8601 format specifies either a colon : (extended format)
     or nothing as a separator (basic format). Here Python defaults to using a
-    colon. We therefore remove all the colons to be file system safe.
+    colon. We therefore remove all the colons to be safe across filesystems. (a
+    colon is not a valid path char on Windows)
 
     Another character may show up in the ISO representation such as / for time
     intervals. We could replace the forward slash with a double hyphen (--) as
diff --git a/src/extractcode/__init__.py b/src/extractcode/__init__.py
index 6c6ed472ac9..ea885fe269c 100644
--- a/src/extractcode/__init__.py
+++ b/src/extractcode/__init__.py
@@ -33,11 +33,16 @@
 import shutil
 import sys
 
-from commoncode import fileutils
+from commoncode.fileutils import as_posixpath
+from commoncode.fileutils import create_dir
+from commoncode.fileutils import file_name
+from commoncode.fileutils import fsencode
+from commoncode.fileutils import parent_directory
 from commoncode.text import toascii
 from commoncode.system import on_linux
-from commoncode.fileutils import path_to_bytes
-from commoncode.system import on_linux
+from os.path import dirname
+from os.path import join
+from os.path import exists
 
 
 logger = logging.getLogger(__name__)
@@ -47,7 +52,7 @@
 # logger.setLevel(logging.DEBUG)
 
 
-root_dir = os.path.join(os.path.dirname(__file__), 'bin')
+root_dir = join(dirname(__file__), 'bin')
 
 
 POSIX_PATH_SEP = b'/' if on_linux else '/'
@@ -103,7 +108,7 @@ def is_extraction_path(path):
     Return True is the path points to an extraction path.
     """
     if on_linux:
-        path = path_to_bytes(path)
+        path = fsencode(path)
 
     return path and path.rstrip(PATHS_SEPS).endswith(EXTRACT_SUFFIX)
 
@@ -114,8 +119,8 @@ def is_extracted(location):
     extraction location.
     """
     if on_linux:
-        location = path_to_bytes(location)
-    return location and os.path.exists(get_extraction_path(location))
+        location = fsencode(location)
+    return location and exists(get_extraction_path(location))
 
 
 def get_extraction_path(path):
@@ -123,7 +128,7 @@ def get_extraction_path(path):
     Return a path where to extract.
     """
     if on_linux:
-        path = path_to_bytes(path)
+        path = fsencode(path)
     return path.rstrip(PATHS_SEPS) + EXTRACT_SUFFIX
 
 
@@ -132,7 +137,7 @@ def remove_archive_suffix(path):
     Remove all the extracted suffix from a path.
     """
     if on_linux:
-        path = path_to_bytes(path)
+        path = fsencode(path)
     return re.sub(EXTRACT_SUFFIX, EMPTY_STRING, path)
 
 
@@ -142,25 +147,25 @@ def remove_backslashes_and_dotdots(directory):
     Return a list of errors if any.
     """
     if on_linux:
-        directory = path_to_bytes(directory)
+        directory = fsencode(directory)
     errors = []
     for top, _, files in os.walk(directory):
         for filename in files:
             if not (WIN_PATH_SEP in filename or DOTDOT in filename):
                 continue
             try:
-                new_path = fileutils.as_posixpath(filename)
+                new_path = as_posixpath(filename)
                 new_path = new_path.strip(POSIX_PATH_SEP)
                 new_path = posixpath.normpath(new_path)
                 new_path = new_path.replace(DOTDOT, POSIX_PATH_SEP)
                 new_path = new_path.strip(POSIX_PATH_SEP)
                 new_path = posixpath.normpath(new_path)
                 segments = new_path.split(POSIX_PATH_SEP)
-                directory = os.path.join(top, *segments[:-1])
-                fileutils.create_dir(directory)
-                shutil.move(os.path.join(top, filename), os.path.join(top, *segments))
+                directory = join(top, *segments[:-1])
+                create_dir(directory)
+                shutil.move(join(top, filename), join(top, *segments))
             except Exception:
-                errors.append(os.path.join(top, filename))
+                errors.append(join(top, filename))
     return errors
 
 
@@ -180,16 +185,16 @@ def new_name(location, is_dir=False):
     """
     assert location
     if on_linux:
-        location = path_to_bytes(location)
+        location = fsencode(location)
     location = location.rstrip(PATHS_SEPS)
     assert location
 
-    parent = fileutils.parent_directory(location)
+    parent = parent_directory(location)
 
     # all existing files or directory as lower case
     siblings_lower = set(s.lower() for s in os.listdir(parent))
 
-    filename = fileutils.file_name(location)
+    filename = file_name(location)
 
     # corner case
     if filename in (DOT, DOT):
@@ -197,7 +202,7 @@ def new_name(location, is_dir=False):
 
     # if unique, return this
     if filename.lower() not in siblings_lower:
-        return os.path.join(parent, filename)
+        return join(parent, filename)
 
     # otherwise seek a unique name
     if is_dir:
@@ -219,7 +224,7 @@ def new_name(location, is_dir=False):
         if filename.lower() not in siblings_lower:
             break
         counter += 1
-    return os.path.join(parent, filename)
+    return join(parent, filename)
 
 
 # TODO: use attrs and slots
diff --git a/src/extractcode/archive.py b/src/extractcode/archive.py
index 436d5441675..e0a170be59d 100644
--- a/src/extractcode/archive.py
+++ b/src/extractcode/archive.py
@@ -33,6 +33,7 @@
 
 from commoncode import fileutils
 from commoncode import filetype
+from commoncode.system import on_linux
 import typecode
 
 from extractcode import all_kinds
@@ -49,8 +50,6 @@
 from extractcode import libarchive2
 from extractcode.uncompress import uncompress_gzip
 from extractcode.uncompress import uncompress_bzip2
-from commoncode.system import on_linux
-from commoncode.fileutils import path_to_bytes
 
 
 logger = logging.getLogger(__name__)
@@ -150,7 +149,7 @@ def get_best_handler(location, kinds=all_kinds):
     Return the best handler of None for the file at location.
     """
     if on_linux:
-        location = path_to_bytes(location)
+        location = fileutils.fsencode(location)
     location = os.path.abspath(os.path.expanduser(location))
     if not filetype.is_file(location):
         return
@@ -166,7 +165,7 @@ def get_handlers(location):
     extension_matched,) for this `location`.
     """
     if on_linux:
-        location = path_to_bytes(location)
+        location = fileutils.fsencode(location)
 
     if filetype.is_file(location):
         T = typecode.contenttype.get_type(location)
@@ -187,7 +186,7 @@ def get_handlers(location):
             exts = handler.extensions
             if exts:
                 if on_linux:
-                    exts = tuple(path_to_bytes(e) for e in exts)
+                    exts = tuple(fileutils.fsencode(e) for e in exts)
                 extension_matched = exts and location.lower().endswith(exts)
 
             if TRACE_DEEP:
@@ -311,8 +310,8 @@ def extract_twice(location, target_dir, extractor1, extractor2):
     covers most common cases.
     """
     if on_linux:
-        location = path_to_bytes(location)
-        target_dir = path_to_bytes(target_dir)
+        location = fileutils.fsencode(location)
+        target_dir = fileutils.fsencode(target_dir)
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = unicode(os.path.abspath(os.path.expanduser(target_dir)))
     # extract first the intermediate payload to a temp dir
diff --git a/src/packagedcode/recognize.py b/src/packagedcode/recognize.py
index a8a78f265e2..220d0164f6d 100644
--- a/src/packagedcode/recognize.py
+++ b/src/packagedcode/recognize.py
@@ -29,8 +29,8 @@
 import sys
 
 from commoncode import filetype
+from commoncode.fileutils import fsencode
 from commoncode.system import on_linux
-from commoncode.fileutils import path_to_bytes
 from packagedcode import PACKAGE_TYPES
 from typecode import contenttype
 
@@ -72,7 +72,7 @@ def recognize_package(location):
         # Note: default to True if there is nothing to match against
         metafiles = package_type.metafiles
         if on_linux:
-            metafiles = (path_to_bytes(m) for m in metafiles)
+            metafiles = (fsencode(m) for m in metafiles)
         if location.endswith(tuple(metafiles)):
             logger_debug('metafile matching: package_type is of type:', package_type)
             return package_type.recognize(location)
@@ -89,7 +89,7 @@ def recognize_package(location):
         extensions = package_type.extensions
         if extensions:
             if on_linux:
-                extensions = tuple(path_to_bytes(e) for e in extensions)
+                extensions = tuple(fsencode(e) for e in extensions)
             extension_matched = location.lower().endswith(extensions)
         else:
             extension_matched = False
diff --git a/tests/commoncode/test_fileutils.py b/tests/commoncode/test_fileutils.py
index cd6b4ed1c87..c5942b59a42 100644
--- a/tests/commoncode/test_fileutils.py
+++ b/tests/commoncode/test_fileutils.py
@@ -32,8 +32,8 @@
 from commoncode import filetype
 from commoncode import fileutils
 from commoncode.fileutils import as_posixpath
-from commoncode.fileutils import path_to_bytes
-from commoncode.fileutils import path_to_unicode
+from commoncode.fileutils import fsencode
+from commoncode.fileutils import fsdecode
 from commoncode.system import on_linux
 from commoncode.system import on_posix
 from commoncode.system import on_mac
@@ -306,15 +306,14 @@ def test_resource_name(self):
         assert 'f.a' == fileutils.resource_name('a/b/d/f/f.a')
         assert 'f.a' == fileutils.resource_name('f.a')
 
-    @skipIf(on_windows, 'Windows FS encoding is ... different')
-    def test_path_to_unicode_and_path_to_bytes_are_idempotent(self):
+    @skipIf(on_windows, 'Windows FS encoding is ... different!')
+    def test_fsdecode_and_fsencode_are_idempotent(self):
         a = b'foo\xb1bar'
         b = u'foo\udcb1bar'
-        assert a == path_to_bytes(path_to_unicode(a))
-        assert a == path_to_bytes(path_to_unicode(b))
-        assert b == path_to_unicode(path_to_bytes(a))
-        assert b == path_to_unicode(path_to_bytes(b))
-
+        assert a == fsencode(fsdecode(a))
+        assert a == fsencode(fsdecode(b))
+        assert b == fsdecode(fsencode(a))
+        assert b == fsdecode(fsencode(b))
 
 class TestFileUtilsWalk(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
diff --git a/tests/commoncode/test_ignore.py b/tests/commoncode/test_ignore.py
index aafd363023b..cc4fb868543 100644
--- a/tests/commoncode/test_ignore.py
+++ b/tests/commoncode/test_ignore.py
@@ -38,24 +38,8 @@
 class IgnoreTest(commoncode.testcase.FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
-    def check_default(self, test_dir, expected_message):
-        for top, dirs, files in os.walk(test_dir, topdown=True):
-            not_ignored = []
-            for d in dirs:
-                p = os.path.join(top, d)
-                ign = ignore.is_ignored(p, ignore.default_ignores, {})
-                if not ign:
-                    not_ignored.append(d)
-            dirs[:] = not_ignored
-
-            for f in files:
-                p = os.path.join(top, f)
-                ign = ignore.is_ignored(p, ignore.default_ignores, {})
-                if ign:
-                    assert ign == expected_message
-
     @skipIf(on_mac, 'Return different result on Mac for reasons to investigate')
-    def test_default_ignores_eclipse1(self):
+    def test_is_ignored_default_ignores_eclipse1(self):
         test_dir = self.extract_test_tar('ignore/excludes/eclipse.tgz')
         test_base = os.path.join(test_dir, 'eclipse')
 
@@ -63,7 +47,7 @@ def test_default_ignores_eclipse1(self):
         result = ignore.is_ignored(test, ignore.default_ignores, {})
         assert 'Default ignore: Eclipse IDE artifact' == result
 
-    def test_default_ignores_eclipse2(self):
+    def test_is_ignored_default_ignores_eclipse2(self):
         test_dir = self.extract_test_tar('ignore/excludes/eclipse.tgz')
         test_base = os.path.join(test_dir, 'eclipse')
 
@@ -71,7 +55,7 @@ def test_default_ignores_eclipse2(self):
         result = ignore.is_ignored(test, ignore.default_ignores, {})
         assert 'Default ignore: Eclipse IDE artifact' == result
 
-    def test_default_ignores_eclipse3(self):
+    def test_is_ignored_default_ignores_eclipse3(self):
         test_dir = self.extract_test_tar('ignore/excludes/eclipse.tgz')
         test_base = os.path.join(test_dir, 'eclipse')
 
@@ -79,7 +63,7 @@ def test_default_ignores_eclipse3(self):
         result = ignore.is_ignored(test, ignore.default_ignores, {})
         assert 'Default ignore: Eclipse IDE artifact' == result
 
-    def test_default_ignores_eclipse4(self):
+    def test_is_ignored_default_ignores_eclipse4(self):
         test_dir = self.extract_test_tar('ignore/excludes/eclipse.tgz')
         test_base = os.path.join(test_dir, 'eclipse')
 
@@ -87,7 +71,7 @@ def test_default_ignores_eclipse4(self):
         result = ignore.is_ignored(test, ignore.default_ignores, {})
         assert 'Default ignore: Eclipse IDE artifact' == result
 
-    def test_default_ignores_mac1(self):
+    def test_is_ignored_default_ignores_mac1(self):
         test_dir = self.extract_test_tar('ignore/excludes/mac.tgz')
         test_base = os.path.join(test_dir, 'mac')
 
@@ -95,7 +79,7 @@ def test_default_ignores_mac1(self):
         result = ignore.is_ignored(test, ignore.default_ignores, {})
         assert 'Default ignore: MacOSX artifact' == result
 
-    def test_default_ignores_mac2(self):
+    def test_is_ignored_default_ignores_mac2(self):
         test_dir = self.extract_test_tar('ignore/excludes/mac.tgz')
         test_base = os.path.join(test_dir, 'mac')
 
@@ -103,7 +87,7 @@ def test_default_ignores_mac2(self):
         result = ignore.is_ignored(test, ignore.default_ignores, {})
         assert 'Default ignore: MacOSX artifact' == result
 
-    def test_default_ignores_mac3(self):
+    def test_is_ignored_default_ignores_mac3(self):
         test_dir = self.extract_test_tar('ignore/excludes/mac.tgz')
         test_base = os.path.join(test_dir, 'mac')
 
@@ -111,7 +95,7 @@ def test_default_ignores_mac3(self):
         result = ignore.is_ignored(test, ignore.default_ignores, {})
         assert 'Default ignore: MacOSX artifact' == result
 
-    def test_default_ignores_mac4(self):
+    def test_is_ignored_default_ignores_mac4(self):
         test_dir = self.extract_test_tar('ignore/excludes/mac.tgz')
         test_base = os.path.join(test_dir, 'mac')
 
@@ -120,7 +104,7 @@ def test_default_ignores_mac4(self):
         assert 'Default ignore: MacOSX artifact' == result
 
     @skipIf(on_mac, 'Return different result on Mac for reasons to investigate')
-    def test_default_ignores_mac5(self):
+    def test_is_ignored_default_ignores_mac5(self):
         test_dir = self.extract_test_tar('ignore/excludes/mac.tgz')
         test_base = os.path.join(test_dir, 'mac')
 
@@ -130,14 +114,14 @@ def test_default_ignores_mac5(self):
         assert 'Default ignore: MacOSX artifact' == result
 
     @skipIf(on_mac, 'Return different result on Mac for reasons to investigate')
-    def test_default_ignores_msft(self):
+    def test_is_ignored_default_ignores_msft(self):
         test_dir = self.extract_test_tar('ignore/excludes/msft-vs.tgz')
         test = os.path.join(test_dir, 'msft-vs/tst.sluo')
         result = ignore.is_ignored(test, ignore.default_ignores, {})
         assert 'Default ignore: Microsoft VS project artifact' == result
 
     @skipIf(on_mac, 'Return different result on Mac for reasons to investigate')
-    def test_skip_vcs_files_and_dirs(self):
+    def test_is_ignored_skip_vcs_files_and_dirs(self):
         test_dir = self.extract_test_tar('ignore/vcs.tgz')
         result = []
         for top, dirs, files in os.walk(test_dir, topdown=True):
@@ -178,7 +162,7 @@ def test_skip_vcs_files_and_dirs(self):
         ]
         assert sorted(expected) == sorted(result)
 
-    def test_default_ignore_does_not_skip_one_char_names(self):
+    def test_fileset_match_default_ignore_does_not_skip_one_char_names(self):
         # use fileset directly to work on strings not locations
         from commoncode import fileset
         tests = [c for c in 'HFS+ Private Data'] + 'HFS+ Private Data'.split()

From 4ba3b7760162ec9aa0dcfe8d0fd4e393cb7c73ec Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 09:18:13 +0100
Subject: [PATCH 030/122] Improve base plugins design #787

 * use generic get_plugins for all plugin types rather than
   a function with a unique name
 * use Resource objects throughout (except for format plugins)
 * enhance BasePlugin base class: the methods are now setup() and
   teardown() to be executed at init/exit time, process_resource() to
   process a single Resource and process_codebase() to process a whole
   Codebase

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/__init__.py  | 48 ++++++++++++++++++++++++-------------
 src/plugincode/output.py    |  2 +-
 src/plugincode/post_scan.py |  5 ++--
 src/plugincode/pre_scan.py  | 13 ++++++----
 4 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 2ef741012d1..1a41f4aa467 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -30,15 +30,20 @@
 
 class BasePlugin(object):
     """
-    A base class for all scancode plugins.
+    A base class for all ScanCode plugins.
     """
-    # a short string describing this plugin. Subclass must override
+    # A short string describing this plugin, used for GUI display. The class
+    # name is used if not provided. Subclass should override
     name = None
 
+    # Tuple of scanner names that this plugin requires to run its own run
+    requires = tuple()
+
     def __init__(self, selected_options, active_scan_names=None):
         """
         Initialize a new plugin with a mapping of user `selected_options` (e.g.
-        keyword arguments) and a list of `active_scan_names`.
+        CommandOption tuples based on keyword arguments) and a list of
+        `active_scan_names`.
         """
         self.selected_options = selected_options or {}
         self.active_scan_names = active_scan_names or []
@@ -54,26 +59,37 @@ def get_plugin_options(cls):
     def is_enabled(self):
         """
         Return True is this plugin is enabled by user-selected options.
-        Subclasses must override and implement.
+        Subclasses must override.
         """
         raise NotImplementedError
 
-    def process_one(self, resource):
+    def setup(self):
+        """
+        Execute some setup for this plugin. This is guaranteed to be called
+        exactly one time after initialization. Must return True on sucess or
+        False otherwise. Subclasses can override as needed.
+        """
+        return True
+
+    def teardown(self):
+        """
+        Execute some teardown for this plugin. This is guaranteed to be called
+        exactly one time when ScanCode exists. Must return True on sucess or
+        False otherwise. Subclasses can override as needed.
+        """
+        return True
+
+    def process_resource(self, resource):
         """
-        Yield zero, one or more Resource objects from a single `resource`
-        Resource object.
+        Process a single `resource` Resource object.
         Subclasses should override.
         """
-        yield resource
+        pass
 
-    def process_resources(self, resources):
+    def process_codebase(self, codebase):
         """
-        Return an iterable of Resource objects, possibly transformed, filtered
-        or enhanced by this plugin from  a `resources` iterable of Resource
-        objects.
+        Process a `codebase` Codebase object updating its Reousrce as needed.
         Subclasses should override.
         """
-        for resource in resources:
-            for res in self.process_one(resource):
-                if res:
-                    yield res
+        for resource in codebase.walk():
+            self.process_resource(resource)
diff --git a/src/plugincode/output.py b/src/plugincode/output.py
index 824911e406a..59afd10090e 100644
--- a/src/plugincode/output.py
+++ b/src/plugincode/output.py
@@ -69,7 +69,7 @@ def initialize():
     output_plugins.load_setuptools_entrypoints('scancode_output_writers')
 
 
-def get_format_plugins():
+def get_plugins():
     """
     Return an ordered mapping of format name --> plugin callable for all
     the output plugins. The mapping is ordered by sorted key.
diff --git a/src/plugincode/post_scan.py b/src/plugincode/post_scan.py
index ffe367b5135..ed155f6a198 100644
--- a/src/plugincode/post_scan.py
+++ b/src/plugincode/post_scan.py
@@ -52,15 +52,16 @@ class PostScanPlugin(BasePlugin):
 
 def initialize():
     """
+    Load and validates plugins.
     NOTE: this defines the entry points for use in setup.py
     """
     post_scan_plugins.load_setuptools_entrypoints('scancode_post_scan')
-    for name, plugin in get_post_scan_plugins().items():
+    for name, plugin in get_plugins().items():
         if not issubclass(plugin, PostScanPlugin):
             raise Exception('Invalid post-scan plugin "%(name)s": does not extend "plugincode.post_scan.PostScanPlugin".' % locals())
 
 
-def get_post_scan_plugins():
+def get_plugins():
     """
     Return an ordered mapping of
         "command line option name" --> "plugin callable"
diff --git a/src/plugincode/pre_scan.py b/src/plugincode/pre_scan.py
index d28b61673ec..c720fe53d5a 100644
--- a/src/plugincode/pre_scan.py
+++ b/src/plugincode/pre_scan.py
@@ -51,14 +51,19 @@ class PreScanPlugin(BasePlugin):
 
 
 def initialize():
-    # NOTE: this defines the entry points for use in setup.py
+    """
+    NOTE: this defines the entry points for use in setup.py
+    Load and validates plugins.
+    """
     pre_scan_plugins.load_setuptools_entrypoints('scancode_pre_scan')
-    for name, plugin in get_pre_scan_plugins().items():
+    for name, plugin in get_plugins().items():
         if not issubclass(plugin, PreScanPlugin):
-            raise Exception('Invalid pre-scan plugin "%(name)s": does not extend "plugincode.pre_scan.PreScanPlugin".' % locals())
+            raise Exception(
+                'Invalid pre-scan plugin "%(name)s": '
+                'does not extend "plugincode.pre_scan.PreScanPlugin".' % locals())
 
 
-def get_pre_scan_plugins():
+def get_plugins():
     """
     Return an ordered mapping of plugin "name" --> plugin object
     for all the pre-scan plugins. The mapping is sorted by name.

From 9613d653accefec2eddda429c9a9254eda6d6663 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 09:23:49 +0100
Subject: [PATCH 031/122] Refine scan utilities

 * remove NoOpProgressBar which is not needed when no progress is
   requested
 * streamline scan progress event reporting with fixed width file names
   including moving to utils all functions dealing with progress bars
 * update tests accordingly including moving cli.py tests to proper util
   module

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/utils.py                   | 145 ++++++++++++------------
 tests/scancode/test_scan_help_groups.py |  82 --------------
 tests/scancode/test_scan_utils.py       | 118 ++++++++++++++++---
 3 files changed, 176 insertions(+), 169 deletions(-)
 delete mode 100644 tests/scancode/test_scan_help_groups.py

diff --git a/src/scancode/utils.py b/src/scancode/utils.py
index 4af4170c473..ee2f35c3a8a 100644
--- a/src/scancode/utils.py
+++ b/src/scancode/utils.py
@@ -23,29 +23,36 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 import click
+click.disable_unicode_literals_warning = True
 from click.utils import echo
+from click.termui import style
 from click._termui_impl import ProgressBar
 
-from commoncode import fileutils
-from commoncode.fileutils import path_to_unicode
+from commoncode.fileutils import file_name
+from commoncode.fileutils import fsdecode
+from commoncode.fileutils import splitext
 
 
-"""
-Various CLI UI utilities, many related to Click and progress reporting.
-"""
-
 # Python 2 and 3 support
 try:
     # Python 2
     unicode
+    str_orig = str
+    bytes = str  # @ReservedAssignment
+    str = unicode  # @ReservedAssignment
 except NameError:
     # Python 3
-    unicode = str
+    unicode = str  # @ReservedAssignment
+
+
+"""
+Command line UI utilities for help and and progress reporting.
+"""
 
 
 class BaseCommand(click.Command):
@@ -83,15 +90,6 @@ def render_progress(self):
             return super(EnhancedProgressBar, self).render_progress()
 
 
-class NoOpProgressBar(EnhancedProgressBar):
-    """
-    A ProgressBar-like object that does not show any progress.
-    """
-    def __init__(self, *args, **kwargs):
-        super(NoOpProgressBar, self).__init__(*args, **kwargs)
-        self.is_hidden = True
-
-
 class ProgressLogger(ProgressBar):
     """
     A subclass of Click ProgressBar providing a verbose line-by-line progress
@@ -135,88 +133,74 @@ def render_finish(self):
 BAR_SEP_LEN = len(BAR_SEP)
 
 def progressmanager(iterable=None, length=None, label=None, show_eta=True,
-                    show_percent=None, show_pos=False, item_show_func=None,
+                    show_percent=None, show_pos=True, item_show_func=None,
                     fill_char='#', empty_char='-', bar_template=None,
                     info_sep=BAR_SEP, width=BAR_WIDTH, file=None, color=None,
-                    verbose=False, quiet=False):
+                    verbose=False):
 
-    """This function creates an iterable context manager showing progress as a
-    bar (default) or line-by-line log (if verbose is True) while iterating.
+    """
+    Return an iterable context manager showing progress as a progress bar
+    (default) or item-by-item log (if verbose is True) while iterating.
 
-    Its arguments are similar to Click.termui.progressbar with
-    these new arguments added at the end of the signature:
+    Its arguments are similar to Click.termui.progressbar with these new
+    arguments added at the end of the signature:
 
-    :param verbose:          if False, display a progress bar, otherwise a progress log
-    :param quiet:            If True, do not display any progress message.
+    :param verbose:  if True, display a progress log. Otherwise, a progress bar.
     """
-    if quiet:
-        progress_class = NoOpProgressBar
-    elif verbose:
+    if verbose:
         progress_class = ProgressLogger
     else:
         progress_class = EnhancedProgressBar
         bar_template = ('[%(bar)s]' + BAR_SEP + '%(info)s'
                         if bar_template is None else bar_template)
 
-    return progress_class(iterable=iterable, length=length, show_eta=show_eta,
-                          show_percent=show_percent, show_pos=show_pos,
-                          item_show_func=item_show_func, fill_char=fill_char,
-                          empty_char=empty_char, bar_template=bar_template,
-                          info_sep=info_sep, file=file, label=label,
-                          width=width, color=color)
-
-
-def get_relative_path(path, len_base_path, base_is_dir):
-    """
-    Return a posix relative path from the posix 'path' relative to a
-    base path of `len_base_path` length where the base is a directory if
-    `base_is_dir` True or a file otherwise.
-    """
-    path = path_to_unicode(path)
-    if base_is_dir:
-        rel_path = path[len_base_path:]
-    else:
-        rel_path = fileutils.file_name(path)
-
-    return rel_path.lstrip('/')
+    return progress_class(iterable=iterable, length=length,
+            show_eta=show_eta, show_percent=show_percent, show_pos=show_pos,
+            item_show_func=item_show_func, fill_char=fill_char,
+            empty_char=empty_char, bar_template=bar_template, info_sep=info_sep,
+            file=file, label=label, width=width, color=color)
 
 
 def fixed_width_file_name(path, max_length=25):
     """
-    Return a fixed width file name of at most `max_length` characters
-    extracted from the `path` string and usable for fixed width display.
-    If the file_name is longer than `max_length`, it is truncated in the
-    middle with using three dots "..." as an ellipsis and the extension
-    is kept.
+    Return a fixed width file name of at most `max_length` characters computed
+    from the `path` string and usable for fixed width display. If the `path`
+    file name is longer than `max_length`, the file name is truncated in the
+    middle using three dots "..." as an ellipsis and the ext is kept.
 
     For example:
-    >>> short = fixed_width_file_name('0123456789012345678901234.c')
-    >>> assert '0123456789...5678901234.c' == short
+    >>> fwfn = fixed_width_file_name('0123456789012345678901234.c')
+    >>> assert '0123456789...5678901234.c' == fwfn
+    >>> fwfn = fixed_width_file_name('some/path/0123456789012345678901234.c')
+    >>> assert '0123456789...5678901234.c' == fwfn
+    >>> fwfn = fixed_width_file_name('some/sort.c')
+    >>> assert 'sort.c' == fwfn
+    >>> fwfn = fixed_width_file_name('some/123456', max_length=5)
+    >>> assert '' == fwfn
     """
     if not path:
         return ''
 
     # get the path as unicode for display!
-    path = path_to_unicode(path)
-    filename = fileutils.file_name(path)
+    filename = file_name(path)
     if len(filename) <= max_length:
         return filename
-    base_name, extension = fileutils.splitext(filename)
-    number_of_dots = 3
-    len_extension = len(extension)
-    remaining_length = max_length - len_extension - number_of_dots
+    base_name, ext = splitext(filename)
+    dots = 3
+    len_ext = len(ext)
+    remaining_length = max_length - len_ext - dots
 
-    if remaining_length < (len_extension + number_of_dots) or remaining_length < 5:
+    if remaining_length < 5  or remaining_length < (len_ext + dots):
         return ''
 
     prefix_and_suffix_length = abs(remaining_length // 2)
     prefix = base_name[:prefix_and_suffix_length]
-    ellipsis = number_of_dots * '.'
+    ellipsis = dots * '.'
     suffix = base_name[-prefix_and_suffix_length:]
-    return '{prefix}{ellipsis}{suffix}{extension}'.format(**locals())
+    return '{prefix}{ellipsis}{suffix}{ext}'.format(**locals())
 
 
-def compute_fn_max_len(used_width=BAR_WIDTH + BAR_SEP_LEN + 7 + BAR_SEP_LEN + 8 + BAR_SEP_LEN):
+def file_name_max_len(used_width=BAR_WIDTH + BAR_SEP_LEN + 7 + BAR_SEP_LEN + 8 + BAR_SEP_LEN):
     """
     Return the max length of a path given the current terminal width.
 
@@ -229,12 +213,31 @@ def compute_fn_max_len(used_width=BAR_WIDTH + BAR_SEP_LEN + 7 + BAR_SEP_LEN + 8
     - the word Scanned: 8 chars
     - one BAR_SEP
     - the file name proper
-    The space usage is therefore: BAR_WIDTH + BAR_SEP_LEN + 7 + BAR_SEP_LEN + 8 + BAR_SEP_LEN + the file name length
+    The space usage is therefore:
+        BAR_WIDTH + BAR_SEP_LEN + 7 + BAR_SEP_LEN + 8 + BAR_SEP_LEN
+        + the file name length
     """
     term_width, _height = click.get_terminal_size()
     max_filename_length = term_width - used_width
-#     if term_width < 70:
-#         # if we have a small term width that is less than 70 column, we
-#         # may spill over and damage the progress bar...
-#         max_filename_length = 10
     return max_filename_length
+
+
+def path_progress_message(item, verbose=False, prefix='Scanned: '):
+    """
+    Return a styled message suitable for progress display when processing a path
+    for an `item` tuple of (location, rid, scan_errors, scan_results)
+    """
+    if not item:
+        return ''
+    location, _rid, errors, _results = item
+    location = fsdecode(location)
+    progress_line = location
+    if not verbose:
+        max_file_name_len = file_name_max_len()
+        # do not display a file name in progress bar if there is no space available
+        if max_file_name_len <= 10:
+            return ''
+        progress_line = fixed_width_file_name(location, max_file_name_len)
+
+    color = 'red' if errors else 'green'
+    return style(prefix) + style(progress_line, fg=color)
diff --git a/tests/scancode/test_scan_help_groups.py b/tests/scancode/test_scan_help_groups.py
deleted file mode 100644
index a3fbc20746f..00000000000
--- a/tests/scancode/test_scan_help_groups.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
-# http://nexb.com and https://github.com/nexB/scancode-toolkit/
-# The ScanCode software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode require an acknowledgment.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# When you publish or redistribute any data created with ScanCode or any ScanCode
-# derivative work, you must accompany this data with the following acknowledgment:
-#
-#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-#  ScanCode should be considered or used as legal advice. Consult an Attorney
-#  for any legal advice.
-#  ScanCode is a free software code scanning tool from nexB Inc. and others.
-#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from os import path
-
-import click
-click.disable_unicode_literals_warning = True
-from click.testing import CliRunner
-
-from commoncode.testcase import FileBasedTesting
-from scancode.cli import ScanCommand
-from scancode.cli import ScanOption
-from scancode.cli_test_utils import run_scan_click
-
-
-class TestHelpGroups(FileBasedTesting):
-
-    test_data_dir = path.join(path.dirname(__file__), 'data')
-
-    def test_scan_help_without_custom_class(self):
-        @click.command(name='scan', cls=ScanCommand)
-        @click.option('--opt', is_flag=True, help='Help text for option')
-        def scan(opt):
-            pass
-
-        runner = CliRunner()
-        result = runner.invoke(scan, ['--help'])
-        assert 'misc:\n    --opt   Help text for option\n' in result.output
-
-    def test_scan_help_with_custom_class(self):
-        @click.command(name='scan', cls=ScanCommand)
-        @click.option('--opt', is_flag=True, help='Help text for option', cls=ScanOption)
-        def scan(opt):
-            pass
-
-        runner = CliRunner()
-        result = runner.invoke(scan, ['--help'])
-        assert 'misc:\n    --opt   Help text for option\n' in result.output
-
-    def test_scan_help_with_group(self):
-        @click.command(name='scan', cls=ScanCommand)
-        @click.option('--opt', is_flag=True, help='Help text for option', group='core', cls=ScanOption)
-        def scan(opt):
-            pass
-
-        runner = CliRunner()
-        result = runner.invoke(scan, ['--help'])
-        assert 'core:\n    --opt  Help text for option\n' in result.output
-
-    def test_scan_cli_help(self):
-        expected_file = self.get_test_loc('help/help.txt')
-        result = run_scan_click(['--help'])
-        regen = False
-        if regen:
-            with open(expected_file, 'wb') as ef:
-                ef.write(result.output)
-        assert open(expected_file).read() == result.output
diff --git a/tests/scancode/test_scan_utils.py b/tests/scancode/test_scan_utils.py
index 2ae75ec962f..ced5dee1a9a 100644
--- a/tests/scancode/test_scan_utils.py
+++ b/tests/scancode/test_scan_utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -23,22 +23,25 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 import os
 
 import click
-from click.testing import CliRunner
-from click.termui import progressbar
+click.disable_unicode_literals_warning = True
 
-from commoncode.testcase import FileBasedTesting
+from click.termui import progressbar
+from click.testing import CliRunner
 
-from scancode import utils
+from commoncode.testcase import FileDrivenTesting
+from scancode import ScanOption
+from scancode.cli import ScanCommand
+from scancode.utils import fixed_width_file_name
 
 
-class TestUtils(FileBasedTesting):
+class TestUtils(FileDrivenTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
     def test_click_progressbar_with_labels(self):
@@ -61,13 +64,96 @@ def mycli():
 '''
         assert expected == result.output
 
-    def test_get_relative_path(self):
-        # plain file without parent
-        assert 'file' == utils.get_relative_path(path='/file', len_base_path=5, base_is_dir=False)
-        # plain file in a deep path
-        assert 'that' == utils.get_relative_path(path='/this/file/that', len_base_path=5, base_is_dir=False)
 
-        # plain path with directories
-        assert 'file/that' == utils.get_relative_path(path='/this/file/that', len_base_path=5, base_is_dir=True)
-        assert 'that' == utils.get_relative_path(path='/this/file/that', len_base_path=10, base_is_dir=True)
-        assert 'this/file/that' == utils.get_relative_path(path='/foo//this/file/that', len_base_path=4, base_is_dir=True)
+class TestFixedWidthFilename(FileDrivenTesting):
+
+    def test_fixed_width_file_name_with_file_name_larger_than_max_length_is_shortened(self):
+        test = fixed_width_file_name('0123456789012345678901234.c', 25)
+        expected = '0123456789...5678901234.c'
+        assert expected == test
+
+    def test_fixed_width_file_name_with_file_name_smaller_than_max_length_is_not_shortened(self):
+        file_name = '0123456789012345678901234.c'
+        test = fixed_width_file_name(file_name, max_length=50)
+        assert file_name == test
+
+    def test_fixed_width_file_name_with_file_name_at_max_length_is_not_shortened(self):
+        test = fixed_width_file_name('01234567890123456789012.c', 25)
+        expected = '01234567890123456789012.c'
+        assert expected == test
+
+    def test_fixed_width_file_name_with_file_name_smaller_than_max_length_not_shortened(self):
+        test = fixed_width_file_name('0123456789012345678901.c', 25)
+        expected = '0123456789012345678901.c'
+        assert expected == test
+
+    def test_fixed_width_file_name_with_none_filename_return_empty_string(self):
+        test = fixed_width_file_name(None, 25)
+        expected = ''
+        assert expected == test
+
+    def test_fixed_width_file_name_without_extension(self):
+        test = fixed_width_file_name('012345678901234567890123456', 25)
+        expected = '01234567890...67890123456'
+        assert expected == test
+
+    def test_fixed_width_file_name_with_posix_path_without_shortening(self):
+        test = fixed_width_file_name('C/Documents_and_Settings/Boki/Desktop/head/patches/drupal6/drupal.js', 25)
+        expected = 'drupal.js'
+        assert expected == test
+
+    def test_fixed_width_file_name_with_posix_path_with_shortening(self):
+        test = fixed_width_file_name('C/Documents_and_Settings/Boki/Desktop/head/patches/drupal6/012345678901234567890123.c', 25)
+        expected = '0123456789...4567890123.c'
+        assert expected == test
+
+    def test_fixed_width_file_name_with_win_path_without_shortening(self):
+        test = fixed_width_file_name('C\\:Documents_and_Settings\\Boki\\Desktop\\head\\patches\\drupal6\\drupal.js', 25)
+        expected = 'drupal.js'
+        assert expected == test
+
+    def test_fixed_width_file_name_with_win_path_with_shortening(self):
+        test = fixed_width_file_name('C\\:Documents_and_Settings\\Boki\\Desktop\\head\\patches\\drupal6\\012345678901234567890123.c', 25)
+        expected = '0123456789...4567890123.c'
+        assert expected == test
+
+    def test_fixed_width_file_name_with_very_small_file_name_and_long_extension(self):
+        test = fixed_width_file_name('abc.abcdef', 5)
+        # FIXME: what is expected is TBD
+        expected = ''
+        assert expected == test
+
+
+class TestHelpGroups(FileDrivenTesting):
+
+    test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
+
+    def test_scan_help_without_custom_class(self):
+        @click.command(name='scan', cls=ScanCommand)
+        @click.option('--opt', is_flag=True, help='Help text for option')
+        def scan(opt):
+            pass
+
+        runner = CliRunner()
+        result = runner.invoke(scan, ['--help'])
+        assert 'misc:\n    --opt   Help text for option\n' in result.output
+
+    def test_scan_help_with_custom_class(self):
+        @click.command(name='scan', cls=ScanCommand)
+        @click.option('--opt', is_flag=True, help='Help text for option', cls=ScanOption)
+        def scan(opt):
+            pass
+
+        runner = CliRunner()
+        result = runner.invoke(scan, ['--help'])
+        assert 'misc:\n    --opt   Help text for option\n' in result.output
+
+    def test_scan_help_with_group(self):
+        @click.command(name='scan', cls=ScanCommand)
+        @click.option('--opt', is_flag=True, help='Help text for option', group='core', cls=ScanOption)
+        def scan(opt):
+            pass
+
+        runner = CliRunner()
+        result = runner.invoke(scan, ['--help'])
+        assert 'core:\n    --opt  Help text for option\n' in result.output

From e891d07bdf01c4f9c4e0397669227519d48b338b Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 09:25:53 +0100
Subject: [PATCH 032/122] Use fsencode/fsdecode throughout #787

 * also use plain iterable when no progress is requested
 * relocate get_relative_path to extract_cli since this is now the only
   place it is still used

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/extract_cli.py        | 42 +++++++++++++++++++++---------
 tests/scancode/test_extract_cli.py |  6 ++---
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/scancode/extract_cli.py b/src/scancode/extract_cli.py
index d0dc23edccf..cac6fc02e4d 100644
--- a/src/scancode/extract_cli.py
+++ b/src/scancode/extract_cli.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -33,9 +33,7 @@
 click.disable_unicode_literals_warning = True
 
 from commoncode import fileutils
-from commoncode.fileutils import path_to_unicode
 from commoncode import filetype
-from commoncode.system import on_linux
 from commoncode.text import toascii
 
 from scancode.api import extract_archives
@@ -54,7 +52,6 @@
     unicode = str
 
 
-
 echo_stderr = partial(click.secho, err=True)
 
 
@@ -130,7 +127,7 @@ def extract_event(item):
         if verbose:
             if item.done:
                 return ''
-            line = source and utils.get_relative_path(path=source, len_base_path=len_base_path, base_is_dir=base_is_dir) or ''
+            line = source and get_relative_path(path=source, len_base_path=len_base_path, base_is_dir=base_is_dir) or ''
         else:
             line = source and fileutils.file_name(source) or ''
         if not isinstance(line, unicode):
@@ -150,7 +147,7 @@ def display_extract_summary():
             source = fileutils.as_posixpath(xev.source)
             if not isinstance(source, unicode):
                 source = toascii(source, translit=True).decode('utf-8', 'replace')
-                source = utils.get_relative_path(path=source, len_base_path=len_base_path, base_is_dir=base_is_dir)
+                source = get_relative_path(path=source, len_base_path=len_base_path, base_is_dir=base_is_dir)
             for e in xev.errors:
                 echo_stderr('ERROR extracting: %(source)s: %(e)s' % locals(), fg='red')
             for warn in xev.warnings:
@@ -171,18 +168,39 @@ def display_extract_summary():
 
     extract_results = []
     has_extract_errors = False
+    extractibles = extract_archives(abs_location, recurse=not shallow)
+
     if not quiet:
         echo_stderr('Extracting archives...', fg='green')
+        with utils.progressmanager(extractibles,
+            item_show_func=extract_event, verbose=verbose) as extraction_events:
+
+            for xev in extraction_events:
+                if xev.done and (xev.warnings or xev.errors):
+                    has_extract_errors = has_extract_errors or xev.errors
+                    extract_results.append(xev)
 
-    with utils.progressmanager(extract_archives(abs_location, recurse=not shallow), item_show_func=extract_event,
-                               verbose=verbose, quiet=quiet) as extraction_events:
-        for xev in extraction_events:
+        display_extract_summary()
+    else:
+        for xev in extractibles:
             if xev.done and (xev.warnings or xev.errors):
                 has_extract_errors = has_extract_errors or xev.errors
                 extract_results.append(xev)
 
-    if not quiet:
-        display_extract_summary()
-
     rc = 1 if has_extract_errors else 0
     ctx.exit(rc)
+
+
+def get_relative_path(path, len_base_path, base_is_dir):
+    """
+    Return a posix relative path from the posix 'path' relative to a
+    base path of `len_base_path` length where the base is a directory if
+    `base_is_dir` True or a file otherwise.
+    """
+    path = fileutils.fsdecode(path)
+    if base_is_dir:
+        rel_path = path[len_base_path:]
+    else:
+        rel_path = fileutils.file_name(path)
+
+    return rel_path.lstrip('/')
diff --git a/tests/scancode/test_extract_cli.py b/tests/scancode/test_extract_cli.py
index 4c3e07ee01f..faf5f886e40 100644
--- a/tests/scancode/test_extract_cli.py
+++ b/tests/scancode/test_extract_cli.py
@@ -38,7 +38,7 @@
 from commoncode.system import on_windows
 from scancode import extract_cli
 from commoncode.system import on_linux
-from commoncode.fileutils import path_to_bytes
+from commoncode.fileutils import fsencode
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -189,7 +189,7 @@ def test_extractcode_command_can_extract_archive_with_unicode_names_verbose(monk
     monkeypatch.setattr(click._termui_impl, 'isatty', lambda _: True)
     test_dir = test_env.get_test_loc('unicodearch', copy=True)
     if on_linux:
-        test_dir = path_to_bytes(test_dir)
+        test_dir = fsencode(test_dir)
     runner = CliRunner()
     result = runner.invoke(extract_cli.extractcode, ['--verbose', test_dir], catch_exceptions=False)
     assert result.exit_code == 0
@@ -214,7 +214,7 @@ def test_extractcode_command_can_extract_archive_with_unicode_names(monkeypatch)
     monkeypatch.setattr(click._termui_impl, 'isatty', lambda _: True)
     test_dir = test_env.get_test_loc('unicodearch', copy=True)
     if on_linux:
-        test_dir = path_to_bytes(test_dir)
+        test_dir = fsencode(test_dir)
     runner = CliRunner()
     result = runner.invoke(extract_cli.extractcode, [test_dir], catch_exceptions=False)
     assert result.exit_code == 0

From 261fcb91e878b197af707452bcd320d2b5a1e047 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 10:42:45 +0100
Subject: [PATCH 033/122] Improve Codebase and Resource implementation #787

 * Add Codebase asbstraction as an in-memory tree of Resource objects
 * Codebase and Resources can be walked, queried, added, removed as
   needed topdown and bottom up with sorted children.
 * Root Resource can now have/has scans and info for #543
 * Codebase Resource have correct counts of children for #607 and #598
 * Files can also have children (this is in preparation for transparent
   archives extraction/walking for #14)
 * Initial inventory collection is based on walking the file system once
   All other accesses are through the Codebase object
 * Resource hold a scans mapping and have file info directly attached as
   attributes.
 * To support simple serialization of Resource, these are not holding
   references to their parent and children: instead they hold numeric
   ids, including a Codebase id that can be accessed through a global
   cache, which is a poor man weak references implementation.
 * Remove and fold caching into resource.py at the Resource level. Each
   resource can put_scans and get_scans. This is either using the
   on-disk cache or just attached in memory to the resource object.
 * Add minimal resource cache tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cache.py             | 279 ----------
 src/scancode/resource.py          | 843 ++++++++++++++++++++++++------
 tests/scancode/test_resource.py   |  99 ++++
 tests/scancode/test_scan_cache.py |  47 --
 4 files changed, 773 insertions(+), 495 deletions(-)
 delete mode 100644 src/scancode/cache.py
 create mode 100644 tests/scancode/test_resource.py
 delete mode 100644 tests/scancode/test_scan_cache.py

diff --git a/src/scancode/cache.py b/src/scancode/cache.py
deleted file mode 100644
index 3cc1ebd0ffc..00000000000
--- a/src/scancode/cache.py
+++ /dev/null
@@ -1,279 +0,0 @@
-#
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
-# http://nexb.com and https://github.com/nexB/scancode-toolkit/
-# The ScanCode software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode require an acknowledgment.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# When you publish or redistribute any data created with ScanCode or any ScanCode
-# derivative work, you must accompany this data with the following acknowledgment:
-#
-#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-#  ScanCode should be considered or used as legal advice. Consult an Attorney
-#  for any legal advice.
-#  ScanCode is a free software code scanning tool from nexB Inc. and others.
-#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import codecs
-from collections import OrderedDict
-from functools import partial
-import json
-from hashlib import sha1
-import os
-import posixpath
-import sys
-
-# from commoncode import fileutils
-from commoncode.fileutils import as_posixpath
-from commoncode.fileutils import create_dir
-from commoncode.fileutils import delete
-from commoncode.fileutils import get_temp_dir
-from commoncode.fileutils import path_to_bytes
-from commoncode.fileutils import path_to_unicode
-from commoncode.system import on_linux
-from commoncode.timeutils import time2tstamp
-
-from scancode import scans_cache_dir
-
-
-"""
-Cache scan results for a file or directory disk using a file-based cache.
-
-The approach is to cache the scan of a file using these data structure and files:
- - a resources list contains all the Resource objects scanned.
- - for each file being scanned, we store a JSON file that contains the
-   corresponding scan data. This file is named after the hash of its path.
-
-Once a scan is completed, we iterate the cache to output the final scan results:
-First iterate the resources and from the path collect the cached scanned result.
-This iterator is then streamed to the final JSON output.
-
-Finally once a scan is completed the cache is destroyed to free up disk space.
-
-Internally the cache is organized as a tree of directories named after the first
-few characters or a path hash. This is to avoid having having too many files per
-directory that can make some filesystems choke as well as having directories
-that are too deep or having file paths that are too long which problematic on
-some OS.
-"""
-
-# Tracing flags
-TRACE = False
-
-def logger_debug(*args):
-    pass
-
-if TRACE:
-    import logging
-
-    logger = logging.getLogger(__name__)
-    # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
-    logging.basicConfig(stream=sys.stdout)
-    logger.setLevel(logging.DEBUG)
-
-    def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, unicode)
-                                     and a or repr(a) for a in args))
-
-
-def get_cache_dir(base_cache_dir=scans_cache_dir):
-    """
-    Return a new, created and unique cache storage directory.
-    """
-    create_dir(base_cache_dir)
-    # create a unique temp directory in cache_dir
-    prefix = time2tstamp() + u'-'
-    cache_dir = get_temp_dir(base_cache_dir, prefix=prefix)
-    if on_linux:
-        cache_dir = path_to_bytes(cache_dir)
-    return cache_dir
-
-
-def get_scans_cache_class(base_cache_dir=scans_cache_dir):
-    """
-    Return a new persistent cache class configured with a unique storage
-    directory.
-    """
-    cache_dir = get_cache_dir(base_cache_dir=base_cache_dir)
-    sc = ScanFileCache(cache_dir)
-    sc.setup()
-    return partial(ScanFileCache, cache_dir)
-
-
-def scan_keys(path):
-    """
-    Return a cache "keys" tripple for a path composed of three
-    paths segments derived from a checksum.
-
-    For example:
-    >>> expected = 'fb87db2bb28e9501ac7fdc4812782118f4c94a0f'
-    >>> assert expected == sha1('/w421/scancode-toolkit2').hexdigest()
-    >>> expected = ('0', 'c', 'a4f74d39ecbf551b1acfc63dc37bf2c8b9482c')
-    >>> assert expected == scan_keys('/w421/scancode-toolkit2')
-
-    NOTE: since we use the first character and next two characters as
-    directories, we create at most 16 dir at the first level and 16 dir at the
-    second level for each first level directory for a maximum total of 16*16 =
-    256 directories. For a million files we would have about 4000 files per
-    directory on average with this scheme which should keep most file systems
-    happy and avoid some performance issues when there are too many files in a
-    single directory.
-    """
-    # ensure that we always pass bytes to the hash function
-    path = path_to_bytes(path)
-    hexdigest = sha1(path + b'empty hash').hexdigest()
-    if on_linux:
-        hexdigest = bytes(hexdigest)
-    else:
-        hexdigest = unicode(hexdigest)
-    return hexdigest[0], hexdigest[1], hexdigest[2:]
-
-
-class ScanFileCache(object):
-    """
-    A file-based cache for scan results saving results in files and using no
-    locking. This is NOT thread-safe and NOT multi-process safe but works OK in
-    our context: we cache the scan for a given file once and read it only a few
-    times.
-    """
-    def __init__(self, cache_dir):
-        if on_linux:
-            self.cache_base_dir = path_to_bytes(cache_dir)
-        else:
-            self.cache_base_dir = cache_dir
-        self.cache_scans_dir = as_posixpath(self.cache_base_dir)
-
-    def setup(self):
-        """
-        Setup the cache: must be called at least once globally after cache
-        initialization.
-        """
-        create_dir(self.cache_scans_dir)
-
-    def get_cached_scan_path(self, path):
-        """
-        Return the path where to store a scan in the cache given a path.
-        """
-        dir1, dir2, file_name = scan_keys(path)
-
-        if on_linux:
-            base_path = path_to_bytes(self.cache_scans_dir)
-        else:
-            base_path = path_to_unicode(self.cache_scans_dir)
-
-        parent = os.path.join(base_path, dir1, dir2)
-        create_dir(parent)
-
-        return posixpath.join(parent, file_name)
-
-    def put_scan(self, path, scan_result):
-        """
-        Put scan_result in the cache if not already cached.
-        """
-        scan_path = self.get_cached_scan_path(path)
-        if not os.path.exists(scan_path):
-            with codecs.open(scan_path, 'wb', encoding='utf-8') as cached_scan:
-                json.dump(scan_result, cached_scan, check_circular=False)
-        if TRACE:
-            logger_debug(
-                'put_scan:', 'scan_path:', scan_path, 'scan_result:', scan_result, '\n')
-
-    def get_scan(self, path):
-        """
-        Return scan results from the cache for a path.
-        Return None on failure to find the scan results in the cache.
-        """
-        scan_path = self.get_cached_scan_path(path)
-        if os.path.exists(scan_path):
-            with codecs.open(scan_path, 'r', encoding='utf-8') as cached_scan:
-                return json.load(cached_scan, object_pairs_hook=OrderedDict)
-
-    def iterate(self, resources, scan_names, root_dir=None, paths_subset=tuple()):
-        """
-        Yield scan data for all cached scans e.g. the whole cache given a list
-        of `resources` Resource objects and `scan_names`.
-
-        If a `paths_subset` sequence of paths is provided, then only these paths
-        are iterated.
-        """
-        if on_linux:
-            paths_subset = set(path_to_bytes(p) for p in paths_subset)
-        else:
-            paths_subset = set(path_to_unicode(p) for p in paths_subset)
-
-        for resource in resources:
-            resource_path = resource.rel_path
-            if paths_subset and resource_path not in paths_subset:
-                continue
-
-            scan_result = OrderedDict()
-
-            # always set the path to what was expected based on strip/full/root args
-            rooted_path = get_scan_path(resource, root_dir)
-            scan_result['path'] = rooted_path
-
-            scan_details = self.get_scan(resource_path)
-
-            if scan_details is None:
-                no_scan_details = (
-                    'ERROR: scan details unavailable in cache: '
-                    'This is either a bug or processing was aborted with '
-                    'CTRL-C.')
-                scan_result['scan_errors'] = [no_scan_details]
-                continue
-
-            infos = scan_details.pop('infos', None)
-            if 'infos' in scan_names and infos:
-                # info are always collected but only returned if requested
-                # we flatten these as direct attributes of a file object
-                # FIXME: this should be done in the scan looo NOT HERE!!!
-                scan_result.update(infos)
-
-            scan_result.update(scan_details)
-
-            if TRACE:
-                logger_debug(
-                    'iterate:', 'scan_result:', scan_result,
-                    'for resource_path:', rooted_path, '\n')
-            yield scan_result
-
-    def clear(self, *args):
-        """
-        Purge the cache by deleting the corresponding cached data files.
-        """
-        delete(self.cache_base_dir)
-
-
-def get_scan_path(resource, root_dir):
-    """
-    Return a path to use in the scan results
-    """
-    # FIXME: Resource should handle this paths thingies
-    resource_path = resource.rel_path
-    if on_linux:
-        unicode_path = path_to_unicode(resource_path)
-    else:
-        unicode_path = resource_path
-
-    if root_dir:
-        # must be unicode
-        if on_linux:
-            root_dir = path_to_unicode(root_dir)
-        rooted_path = posixpath.join(root_dir, unicode_path)
-    else:
-        rooted_path = unicode_path
-    rooted_path = as_posixpath(rooted_path)
-    logger_debug('get_scan_path:', 'rooted_path:', rooted_path)
-    return rooted_path
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index fdb2b0648e9..403bd581f43 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -23,230 +23,735 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
+import codecs
 from collections import OrderedDict
-import os
+from functools import partial
+import json
+from os import walk as os_walk
+from os.path import abspath
+from os.path import exists
+from os.path import expanduser
+from os.path import join
+from os.path import normpath
 import traceback
+import sys
 
 import attr
+import yg.lockfile  # @UnresolvedImport
+
+from commoncode.filetype import is_file as filetype_is_file
+from commoncode.filetype import is_special
 
-from commoncode.filetype import is_dir
-from commoncode.filetype import is_file
 from commoncode.fileutils import as_posixpath
-from commoncode.fileutils import path_to_bytes
-from commoncode.fileutils import path_to_unicode
+from commoncode.fileutils import create_dir
+from commoncode.fileutils import delete
+from commoncode.fileutils import file_name
+from commoncode.fileutils import fsdecode
+from commoncode.fileutils import fsencode
+from commoncode.fileutils import get_temp_dir
+from commoncode.fileutils import parent_directory
+from commoncode.functional import iter_skip
+from commoncode.timeutils import time2tstamp
+from commoncode import ignore
 from commoncode.system import on_linux
 
-from scancode.cache import get_cache_dir
-from scancode.utils import get_relative_path
+from scancode import cache_dir
+from scancode import scans_cache_dir
 
 # Python 2 and 3 support
 try:
     # Python 2
     unicode
     str_orig = str
-    bytes = str
-    str = unicode
+    bytes = str  # @ReservedAssignment
+    str = unicode  # @ReservedAssignment
 except NameError:
     # Python 3
-    unicode = str
+    unicode = str  # @ReservedAssignment
 
 
 """
 An abstraction for files and directories used throughout ScanCode. ScanCode
 deals with a lot of these as they are the basic unit of processing. They are
 eventually cached or stored and this module hides all the details of iterating
-files, path handling, caching or storing the file and directoy medatata.
+files, path handling, caching or storing the file and directory medatata.
 """
 
 
-@attr.attributes(slots=True)
-class Resource(object):
-    """
-    A resource represent a file or directory with essential "file
-    information" and the scanned data details.
-    """
-    # LEGACY: TODO: remove
-    scans_cache_class = attr.attrib(default=None)
-    is_cached = attr.attrib(default=False, type=bool)
-    abs_path = attr.attrib(default=None)
-    base_is_dir = attr.attrib(default=True, type=bool)
-    len_base_path = attr.attrib(default=0, type=int)
-    rel_path = attr.attrib(default=None)
-    # END LEGACY
-
-    name = attr.attrib(default=None)
-    parent = attr.attrib(default=None)
-    children = attr.attrib(default=attr.Factory(list))
-
-    has_infos = attr.attrib(default=False)
-    infos = attr.attrib(default=attr.Factory(OrderedDict))
-    scans = attr.attrib(default=attr.Factory(OrderedDict))
+# Tracing flags
+TRACE = False
 
-    def __attrs_post_init__(self):
-        self.scans_cache_class = self.scans_cache_class()
-        posix_path = as_posixpath(self.abs_path)
-        # keep the path as relative to the original base_path, always Unicode
-        self.rel_path = get_relative_path(posix_path, self.len_base_path, self.base_is_dir)
-        self.infos['path'] = self.rel_path
+def logger_debug(*args):
+    pass
 
-    def get_infos(self):
-        if not self.has_infos:
-            self.infos.update(scan_infos(self.abs_path))
-            self.has_infos = True
-        return self.infos
+if TRACE:
+    import logging
 
-    def walk(self, topdown=True):
-        """
-        Walk this Resource in a manner similar to os.walk
-        """
-        if topdown:
-            yield self, self.children
-        for child in self.children:
-            for sc in child.walk(topdown):
-                yield sc
-        if not topdown:
-            yield self, self.children
+    logger = logging.getLogger(__name__)
+    # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
+
+    def logger_debug(*args):
+        return logger.debug(' '.join(isinstance(a, unicode)
+                                     and a or repr(a) for a in args))
 
+# A global cache of codebase objects, keyed by a unique integer ID.
 
-def scan_infos(location):
+# We use this weird structure such that a Resource object can reference its
+# parent codebase object without actually storing it as an instance variable.
+# Instead a Resource only has a pointer to a codebase id and can fetch it from
+# this cache with an id lookup.
+# This cache is updated when a new codebase object is created or destroyed
+# TODO: consider using a class variable instead of a module variable?
+_CODEBASES = {}
+
+_cache_lock_file = join(cache_dir, 'codebases-lockfile')
+
+
+def add_codebase(codebase, cache_lock_file=_cache_lock_file):
     """
-    Scan one file or directory and return file_infos data. This always
-    contains an extra 'errors' key with a list of error messages,
-    possibly empty. If `diag` is True, additional diagnostic messages
-    are included.
+    Add codebase to codebase cache in a thread- and multiprocess-safe way.
+    Return the codebase integer id.
     """
-    # FIXME: WE SHOULD PROCESS THIS IS MEMORY AND AS PART OF THE SCAN PROPER... and BOTTOM UP!!!!
-    # THE PROCESSING TIME OF SIZE AGGREGATION ON DIRECTORY IS WAY WAY TOO HIGH!!!
-    errors = []
     try:
-        infos = get_file_infos(location)
-    except Exception as e:
-        # never fail but instead add an error message.
-        infos = _empty_file_infos()
-        errors = ['ERROR: infos: ' + e.message]
-        errors.append('ERROR: infos: ' + traceback.format_exc())
-    # put errors last
-    infos['scan_errors'] = errors
-    return infos
-
-
-def get_file_infos(location):
+        # acquire lock and wait until timeout to get a lock or die
+        with yg.lockfile.FileLock(cache_lock_file, timeout=10):
+            global _CODEBASES
+            if _CODEBASES:
+                for cid, cached_codebase in _CODEBASES.items():
+                    if codebase is cached_codebase:
+                        return cid
+                # get a new cid
+                new_cid = max(_CODEBASES.viewkeys()) + 1
+            else:
+                # or create a new cid
+                new_cid = 1
+
+            _CODEBASES[new_cid] = codebase
+            return new_cid
+
+    except yg.lockfile.FileLockTimeout:
+        raise
+
+
+def del_codebase(cid, cache_lock_file=_cache_lock_file):
     """
-    Return a mapping of file information collected from the file or
-    directory at `location`.
+    Delete codebase from the codebase cache in a thread- and multiprocess-safe way.
+    Return the deleted codebase object or None.
     """
-    from commoncode import fileutils
-    from commoncode import filetype
-    from commoncode.hash import multi_checksums
-    from typecode import contenttype
-
-    if on_linux:
-        location = path_to_bytes(location)
-    else:
-        location = path_to_unicode(location)
-
-    infos = OrderedDict()
-    is_file = filetype.is_file(location)
-    is_dir = filetype.is_dir(location)
-
-    T = contenttype.get_type(location)
+    try:
+        # acquire lock and wait until timeout to get a lock or die
+        with yg.lockfile.FileLock(cache_lock_file, timeout=10):
+            global _CODEBASES
+            return _CODEBASES.pop(cid, None)
+    except yg.lockfile.FileLockTimeout:
+        raise
 
-    infos['type'] = filetype.get_type(location, short=False)
-    name = fileutils.file_name(location)
-    if is_file:
-        base_name, extension = fileutils.splitext(location)
-    else:
-        base_name = name
-        extension = ''
 
-    if on_linux:
-        infos['name'] = path_to_unicode(name)
-        infos['base_name'] = path_to_unicode(base_name)
-        infos['extension'] = path_to_unicode(extension)
-    else:
-        infos['name'] = name
-        infos['base_name'] = base_name
-        infos['extension'] = extension
-
-    infos['date'] = is_file and filetype.get_last_modified_date(location) or None
-    infos['size'] = T.size
-    infos.update(multi_checksums(location, ('sha1', 'md5',)))
-    infos['files_count'] = is_dir and filetype.get_file_count(location) or None
-    infos['mime_type'] = is_file and T.mimetype_file or None
-    infos['file_type'] = is_file and T.filetype_file or None
-    infos['programming_language'] = is_file and T.programming_language or None
-    infos['is_binary'] = bool(is_file and T.is_binary)
-    infos['is_text'] = bool(is_file and T.is_text)
-    infos['is_archive'] = bool(is_file and T.is_archive)
-    infos['is_media'] = bool(is_file and T.is_media)
-    infos['is_source'] = bool(is_file and T.is_source)
-    infos['is_script'] = bool(is_file and T.is_script)
-
-    return infos
-
-
-# FIXME: this smells bad
-def _empty_file_infos():
+def get_codebase(cid):
     """
-    Return an empty mapping of file info, used in case of failure.
+    Return a codebase object with a `cid` codebaset id or None.
     """
-    infos = OrderedDict()
-    infos['type'] = None
-    infos['name'] = None
-    infos['extension'] = None
-    infos['date'] = None
-    infos['size'] = None
-    infos['sha1'] = None
-    infos['md5'] = None
-    infos['files_count'] = None
-    infos['mime_type'] = None
-    infos['file_type'] = None
-    infos['programming_language'] = None
-    infos['is_binary'] = False
-    infos['is_text'] = False
-    infos['is_archive'] = False
-    infos['is_media'] = False
-    infos['is_source'] = False
-    infos['is_script'] = False
-    return infos
+    global _CODEBASES
+    return _CODEBASES.get(cid)
 
 
 class Codebase(object):
     """
     Represent a codebase being scanned. A Codebase is a tree of Resources.
     """
-    def __init__(self, root_location):
+
+    def __init__(self, location, cache_base_dir=scans_cache_dir):
         """
-        Initialize a new codebase rooted as the `root_location` existing
-        file or directory.
-        NOTE: no check is made on the location and it must be an existing location.
+        Initialize a new codebase rooted at the `location` existing file or
+        directory.
         """
+        self.original_location = location
+
+        if on_linux:
+            location = fsencode(location)
+        else:
+            location = fsdecode(location)
+        location = abspath(normpath(expanduser(location)))
+
+        # TODO: we should also accept to create "virtual" codebase without a
+        # backing filesystem location
+        assert exists(location)
 
-        self.location = root_location
-        # FIXME: encoding???
-        self.location_native = path_to_bytes(root_location)
-        self.is_file = is_file(self.location_native)
-        self.is_dir = is_dir(self.location_native)
-        self.cache_dir = get_cache_dir()
+        self.location = location
+        self.base_location = parent_directory(location)
+
+        self.is_file = filetype_is_file(location)
+
+        # list of resources in topdown order where the position is the index of
+        # the resource. The first index, 0, is also the root
+        self.resources = []
         self.root = None
 
-    def collect(self):
+        # list of errors from collecting the codebase details (such as
+        # unreadable file, etc)
+        self.errors = []
+
+        # setup cache
+        self.cache_base_dir = cache_base_dir
+
+        # this is unique to this run and valid for the lifetime of this codebase
+        self.cache_dir = get_cache_dir(cache_base_dir)
+        create_dir(self.cache_dir)
+
+        self.cid = add_codebase(self)
+        self.populate()
+
+    def walk(self, topdown=True, sort=False, skip_root=False):
+        """
+        Yield all Resources for this Codebase.
+        Walks the tree top-down in pre-order traversal if `topdown` is True.
+        Walks the tree bottom-up in post-order traversal if `topdown` is False.
+        If `sort` is True, each level is sorted by Resource name, directories
+        first then files.
+        If `skip_root` is True, the root resource is not returned.
+        """
+        # single resources without children
+        if not self.root.children_rids:
+            return [self.root]
+
+        return self.root.walk(topdown, sort, skip_root)
+
+    def get_resource(self, rid):
+        """
+        Return the Resource with `rid` or None if it does not exists.
+        """
+        try:
+            return self.resources[rid]
+        except IndexError:
+            pass
+
+    def add_resource(self, name, parent, is_file=False):
+        """
+        Create and return a new Resource object as a child of the
+        `parent` resource.
+        """
+        return parent.add_child(name, is_file)
+
+    def remove_resource(self, resource):
+        """
+        Remove the `resource` Resource object and all its children from the
+        resource tree. Return a list of the removed Resource ids.
+        """
+        if resource.pid is None:
+            raise Exception(
+                'Cannot remove the root resource from codebase:', repr(resource))
+        rids = [res.rid for res in resource.walk(topdown=True)]
+        resources = self.resources
+        for rid in rids:
+            resources[rid] = None
+
+        parent = resource.parent()
+        if parent:
+            try:
+                parent.children_rids.remove(resource.rid)
+            except ValueError:
+                if TRACE:
+                    logger_debug(
+                        'Codebase.remove_resource() failed for Resource:', resource,
+                        'at location:', resource.get_path(absolute=True, decode=True))
+        return rids
+
+    def counts(self, update=True, skip_root=False):
+        """
+        Return a tuple of counters (files_count, dirs_count, size) for this
+        codebase.
+        If `update` is True, update the codebase counts before returning.
+        Do not include the root Resource in the counts if `skip_root` is True.
+        """
+        if update:
+            self.update_counts()
+        root = self.root
+
+        if skip_root and not self.is_file:
+            counts = [(c.files_count, c.dirs_count, c.size) for c in root.children()]
+            files_count, dirs_count, size = map(sum, zip(*counts))
+        else:
+            files_count = root.files_count
+            dirs_count = root.dirs_count
+            size = root.size
+            if self.is_file:
+                files_count += 1
+            else:
+                dirs_count += 1
+        return files_count, dirs_count, size
+
+    def update_counts(self):
         """
-        Return a root Resource for this codebase by walking its root_location.
+        Update files_count, dirs_count and size attributes of each Resource in
+        this codebase based on the current state.
         """
-        location = self.location
+        # note: we walk bottom up to update things in the proper order
+        for resource in self.walk(topdown=False):
+            resource._update_children_counts()
+
+    def clear(self):
+        """
+        Purge the codebase cache(s) by deleting the corresponding cached data
+        files and in-memodyr structures.
+        """
+        delete(self.cache_dir)
+        del_codebase(self.cid)
+
+    def populate(self):
+        """
+        Populate this codebase with Resource objects.
+        """
+        self.resources = self._collect()
+        self.root = self.resources[0]
+
+    def _collect(self):
+        """
+        Return a sequence of Resource objects for this codebase by walking its
+        `location`. The sequence is in topdown order. The first item is the root.
+        """
+        def err(error):
+            self.errors.append(
+                'ERROR: cannot collect files: %(error)s\n' % dict(error=error) + traceback.format_exc()
+            )
+
+        cid = self.cid
+        rloc = self.location
+        rid = 0
+        root = Resource(name=file_name(rloc), rid=rid, pid=None, cid=cid, is_file=self.is_file)
+
+        if TRACE: logger_debug('Codebase.collect: root:', root)
+
+        res_by_loc = {rloc: root}
+        resources = [root]
+
+        if self.is_file:
+            # there is nothing else to do
+            return resources
+
+        # we always ignore VCS and some filetypes.
+        ignored = partial(ignore.is_ignored, ignores=ignore.ignores_VCS)
+
+        # TODO: this is where we would plug archive walking??
+        resources_append = resources.append
+        for top, dirs, files in os_walk(rloc, topdown=True, onerror=err):
+
+            if is_special(top) or ignored(top):
+                if TRACE: logger_debug(
+                    'Codebase.collect: walk: top ignored:', top, 'ignored:',
+                    ignored(top), 'is_special:', is_special(top))
+                continue
+
+            parent = res_by_loc[top]
+
+            if TRACE: logger_debug('Codebase.collect: parent:', parent)
+
+            for name in dirs:
+                loc = join(top, name)
+
+                if is_special(loc) or ignored(loc):
+                    if TRACE: logger_debug(
+                        'Codebase.collect: walk: dir ignored:', loc, 'ignored:',
+                        ignored(loc), 'is_special:', is_special(loc))
+                    continue
+                rid += 1
+                res = parent._add_child(name, rid, is_file=False)
+                res_by_loc[loc] = res
+                resources_append(res)
+                if TRACE: logger_debug('Codebase.collect: dir:', res)
+
+            for name in files:
+                loc = join(top, name)
+
+                if is_special(loc) or ignored(loc):
+                    if TRACE: logger_debug(
+                        'Codebase.collect: walk: file ignored:', loc, 'ignored:',
+                        ignored(loc), 'is_special:', is_special(loc))
+                    continue
+                rid += 1
+                res = parent._add_child(name, rid, is_file=True)
+                res_by_loc[loc] = res
+                resources_append(res)
+                if TRACE: logger_debug('Codebase.collect: file:', res)
+        return resources
+
+
+@attr.attributes(slots=True)
+class Resource(object):
+    """
+    A resource represent a file or directory with essential "file information"
+    and the scanned data details.
+
+    A Resource is a tree that models the fileystem tree structure.
+
+    In order to support lightweight and smaller objects that can be serialized
+    and deserialized (such as pickled in multiprocessing) without pulling in a
+    whole object tree, a Resource does not store its related objects directly:
+    the Codebase it belongs to, its parent Resource and its Resource children
+    objects are stored only as integer ids. Querying the Resource relationships
+    and walking the Resources tree requires to lookup the corresponding object
+    by id in the codebase object.
+    """
+    # the file or directory name in the OS preferred representation (either
+    # bytes on Linux and Unicode elsewhere)
+    name = attr.ib()
+
+    # a integer resource id
+    rid = attr.ib(type=int, repr=False)
+    # a integer codebase id
+    cid = attr.ib(type=int, repr=False)
+    # the root of a Resource tree has a pid==None by convention
+    pid = attr.ib(type=int, repr=False)
+
+    is_file = attr.ib(default=False, type=bool)
+
+    # a list of rids
+    children_rids = attr.ib(default=attr.Factory(list), repr=False)
+
+    errors = attr.ib(default=attr.Factory(list), repr=False)
+
+    # a mapping of scan result. Used when scan result is not cached
+    _scans = attr.ib(default=attr.Factory(OrderedDict), repr=False)
+
+    # tuple of cache keys: dir and file name
+    cache_keys = attr.ib(default=None, repr=False)
+
+    # external data to serialize
+    type = attr.ib(default=None, repr=False)
+    base_name = attr.ib(default=None, repr=False)
+    extension = attr.ib(default=None, repr=False)
+    date = attr.ib(default=None, repr=False)
+    sha1 = attr.ib(default=None, repr=False)
+    md5 = attr.ib(default=None, repr=False)
+    mime_type = attr.ib(default=None, repr=False)
+    file_type = attr.ib(default=None, repr=False)
+    programming_language = attr.ib(default=None, repr=False)
+    is_binary = attr.ib(default=False, type=bool, repr=False)
+    is_text = attr.ib(default=False, type=bool, repr=False)
+    is_archive = attr.ib(default=False, type=bool, repr=False)
+    is_media = attr.ib(default=False, type=bool, repr=False)
+    is_source = attr.ib(default=False, type=bool, repr=False)
+    is_script = attr.ib(default=False, type=bool, repr=False)
+
+    # These attributes are re/computed for directories and files with children
+    size = attr.ib(default=0, type=int, repr=False)
+    files_count = attr.ib(default=0, type=int, repr=False)
+    dirs_count = attr.ib(default=0, type=int, repr=False)
+
+    def __attrs_post_init__(self):
+        # build simple cache keys for this resource based on the hex
+        # representation of the resource id: they are guaranteed to be unique
+        # within a codebase.
+        hx = '%08x' % self.rid
         if on_linux:
-            location = self.location_native
+            hx = fsencode(hx)
+        self.cache_keys = hx[-2:], hx
+
+    def is_root(self):
+        return self.pid is None
+
+    def _update_children_counts(self):
+        """
+        Compute counts and update self with these counts from direct children.
+        """
+        files, dirs, size = self._children_counts()
+        if not self.is_file:
+            # only set the size for directories
+            self.size = size
+        self.files_count = files
+        self.dirs_count = dirs
+
+    def _children_counts(self):
+        """
+        Return a tuple of counters (files_count, dirs_count, size) for the
+        direct children of this Resource.
+
+        Note: because certain files such as archives can have children, they may
+        have a files and dirs counts. The size of a directory is aggregated size
+        of its files (including the count of files inside archives).
+        """
+        files_count = dirs_count = size = 0
+        if not self.children_rids:
+            return files_count, dirs_count, size
+
+        for res in self.children():
+            files_count += res.files_count
+            dirs_count += res.dirs_count
+            if res.is_file:
+                files_count += 1
+            else:
+                dirs_count += 1
+            size += res.size
+        return files_count, dirs_count, size
+
+    @property
+    def codebase(self):
+        """
+        Return the codebase that contains this Resource.
+        """
+        return get_codebase(self.cid)
+
+    def get_cached_path(self, create=False):
+        """
+        Return the path where to get/put a data in the cache given a path.
+        Create the directories if requested.
+        """
+        cache_sub_dir, cache_file_name = self.cache_keys
+        parent = join(self.codebase.cache_dir, cache_sub_dir)
+        if create and not exists(parent):
+            create_dir(parent)
+        return join(parent, cache_file_name)
+
+    def get_scans(self, cache=True, _cached_path=None):
+        """
+        Return a `scans` mapping. Ftech from the cache if `cache` is True.
+        """
+        if not cache:
+            return self._scans
+
+        if not _cached_path:
+            _cached_path = self.get_cached_path(create=False)
+
+        if not exists(_cached_path):
+            return OrderedDict()
+
+        # TODO: consider messagepack or protobuf for compact/faster processing
+        with codecs.open(_cached_path, 'r', encoding='utf-8') as cached:
+            return json.load(cached, object_pairs_hook=OrderedDict)
+
+    def put_scans(self, scans, update=True, cache=True):
+        """
+        Save the `scans` mapping of scan results for this resource. Does nothing if
+        `scans` is empty or None.
+        Return the saved mapping of `scans`, possibly updated or empty.
+        If `update` is True, existing scans are updated with `scans`.
+        If `update` is False, `scans` overwrites existing scans.
+
+        If `cache` is True, `scans` are saved in the cache. Otherwise they are
+        saved in this resource object.
+        """
+        if TRACE:
+            logger_debug('put_scans: scans:', scans, 'update:', update, 'cache:', cache)
+
+        if not scans:
+            return OrderedDict()
+
+        if not cache:
+            if update:
+                self._scans.update(scans)
+            else:
+                self._scans.clear()
+                self._scans.update(scans)
+
+            if TRACE: logger_debug('put_scans: merged:', self._scans)
+            return self._scans
+
+        self._scans.clear()
+        cached_path = self.get_cached_path(create=True)
+        if update:
+            existing = self.get_scans(cache, cached_path)
+            if TRACE: logger_debug(
+                'put_scans: cached_path:', cached_path, 'existing:', existing)
+            existing.update(scans)
+
+            if TRACE: logger_debug('put_scans: merged:', existing)
+        else:
+            existing = scans
+
+        # TODO: consider messagepack or protobuf for compact/faster processing
+        with codecs.open(cached_path, 'wb', encoding='utf-8') as cached_file:
+            json.dump(existing, cached_file, check_circular=False)
+
+        return existing
+
+    def walk(self, topdown=True, sort=False, skip_root=False):
+        """
+        Yield Resources for this Resource tree.
+        Walks the tree top-down in pre-order traversal if `topdown` is True.
+        Walks the tree bottom-up in post-order traversal if `topdown` is False.
+        If `sort` is True, each level is sorted by Resource name, directories
+        first then files.
+        If `skip_root` is True, the root resource is not returned.
+        """
+        # single root resource without children
+        if self.pid == None and not self.children_rids:
+            return [self]
+
+        walked = self._walk(topdown, sort)
+        if skip_root:
+            skip_first = skip_last = False
+            if topdown:
+                skip_first = True
+            else:
+                skip_last = True
+            walked = iter_skip(walked, skip_first, skip_last)
+        return walked
+
+    def _walk(self, topdown=True, sort=False):
+        if topdown:
+            yield self
 
-        def on_error(error):
-            raise error
+        children = self.children()
+        if sort and children:
+            sorter = lambda r: (r.is_file, r.name)
+            children.sort(key=sorter)
 
-        root_dir = Resource()
-        for top, dirs, files in os.walk(
-            location, topdown=True, onerror=on_error, followlinks=False):
-            for dr in dirs:
-                pass
+        for child in children:
+            for subchild in child.walk(topdown, sort):
+                yield subchild
+
+        if not topdown:
+            yield self
+
+    def add_child(self, name, is_file=False):
+        """
+        Create and return a child Resource. Add this child to the codebase
+        resources and to this Resource children.
+        """
+        rid = len(self.codebase.resources)
+        child = self._add_child(name, rid, is_file)
+        self.codebse.resources.append(rid)
+        return child
+
+    def _add_child(self, name, rid, is_file=False):
+        """
+        Create a child Resource with `name` and a `rid` Resource id and add its
+        id to this Resource children. Return the created child.
+        """
+        res = Resource(name=name, rid=rid, pid=self.rid, cid=self.cid, is_file=is_file)
+        self.children_rids.append(rid)
+        return res
+
+    def children(self):
+        """
+        Return a sequence of direct children Resource objects for this Resource
+        or None.
+        """
+        resources = self.codebase.resources
+        return [resources[rid] for rid in self.children_rids]
+
+    def parent(self):
+        """
+        Return the parent Resource object for this Resource or None.
+        """
+        if self.pid is not None:
+            return self.codebase.resources[self.pid]
+
+    def ancestors(self):
+        """
+        Return a sequence of ancestor Resource objects from root to self.
+        """
+        resources = self.codebase.resources
+        ancestors = []
+        ancestors_append = ancestors.append
+        current = self
+        # walk up the tree: only the root as a pid==None
+        while current.pid is not None:
+            ancestors_append(current)
+            current = resources[current.pid]
+        ancestors_append(current)
+        ancestors.reverse()
+        return ancestors
+
+    def get_path(self, absolute=False, strip_root=False, decode=False, posix=False):
+        """
+        Return a path to self using the preferred OS encoding (bytes on Linux,
+        Unicode elsewhere) or Unicode is decode=True.
+
+        - If `absolute` is True, return an absolute path. Otherwise return a
+          relative path where the first segment is the root name.
+
+        - If `strip_root` is True, return a relative path without the first root
+          segment. Ignored if `absolute` is True.
+
+        - If `decode` is True, return a Unicode path decoded using the filesytem
+          encoding.
+
+        - If `posix` is True, ensure that the path uses POSIX slash as
+        separators, otherwise use the native path separators.
+        """
+        ancestors = self.ancestors()
+        segments = [a.name for a in ancestors]
+        if absolute:
+            base_location = self.codebase.base_location
+            if posix:
+                base_location = as_posixpath(base_location)
+            segments.insert(0, base_location)
+
+        elif strip_root:
+            if len(segments) > 1:
+                # we cannot strip the root from the root!
+                segments = segments[1:]
+
+        path = join(*segments)
+        if posix:
+            path = as_posixpath(path)
+
+        if decode:
+            path = fsdecode(path)
+        return path
+
+    def set_info(self, info):
+        """
+        Set `info` file information for this Resource.
+        Info is a list of mappings of file information.
+        """
+        if not info:
+            return
+        for inf in info:
+            for key, value in inf.items():
+                setattr(self, key, value)
+
+    def to_dict(self, full_root=False, strip_root=False, with_info=False):
+        """
+        Return a mapping of representing this Resource and its scans.
+        """
+        res = OrderedDict()
+        res['path'] = fsdecode(
+            self.get_path(absolute=full_root, strip_root=strip_root,
+                          decode=True, posix=True))
+        if with_info:
+            res['type'] = self.type
+            res['name'] = fsdecode(self.name)
+            res['base_name'] = fsdecode(self.base_name)
+            res['extension'] = self.extension and fsdecode(self.extension)
+            res['date'] = self.date
+            res['size'] = self.date
+            res['sha1'] = self.sha1
+            res['md5'] = self.md5
+            res['files_count'] = self.files_count
+            res['dirs_count'] = self.dirs_count
+            res['mime_type'] = self.mime_type
+            res['file_type'] = self.file_type
+            res['programming_language'] = self.programming_language
+            res['is_binary'] = self.is_binary
+            res['is_text'] = self.is_text
+            res['is_archive'] = self.is_archive
+            res['is_media'] = self.is_media
+            res['is_source'] = self.is_source
+            res['is_script'] = self.is_script
+        res['scan_errors'] = self.errors
+        res.update(self.get_scans())
+        return res
+
+
+def get_cache_dir(cache_base_dir):
+    """
+    Return a new, created and unique cache storage directory path rooted at the
+    `cache_base_dir` in the OS- preferred representation (either bytes on Linux
+    and Unicode elsewhere).
+    """
+    create_dir(cache_base_dir)
+    # create a unique temp directory in cache_dir
+    prefix = time2tstamp() + u'-'
+    cache_dir = get_temp_dir(cache_base_dir, prefix=prefix)
+    if on_linux:
+        cache_dir = fsencode(cache_dir)
+    else:
+        cache_dir = fsdecode(cache_dir)
+    return cache_dir
diff --git a/tests/scancode/test_resource.py b/tests/scancode/test_resource.py
new file mode 100644
index 00000000000..c7b11f7b865
--- /dev/null
+++ b/tests/scancode/test_resource.py
@@ -0,0 +1,99 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from collections import OrderedDict
+from os.path import dirname
+from os.path import exists
+from os.path import join
+
+from commoncode.testcase import FileBasedTesting
+
+from scancode.resource import Codebase
+from commoncode.fileutils import parent_directory
+
+
+class TestCodebaseCache(FileBasedTesting):
+    test_data_dir = join(dirname(__file__), 'data')
+
+    def test_codebase_cache_basic(self):
+        test_codebase = self.get_test_loc('cache/package')
+        codebase = Codebase(test_codebase)
+        assert codebase.cache_base_dir
+        assert codebase.cache_dir
+        root = codebase.root
+        assert ('00', '00000000') == root.cache_keys
+        cp = root.get_cached_path(create=False)
+        assert not exists(cp)
+        cp = root.get_cached_path(create=True)
+        assert not exists(cp)
+        assert exists(parent_directory(cp))
+
+        assert not root.get_scans(cache=True)
+        assert not root.get_scans(cache=True)
+
+        scans = OrderedDict(this='that')
+        scans_put = root.put_scans(scans, cache=True)
+        assert scans == scans_put
+        assert scans == root.get_scans(cache=True)
+        assert not root.get_scans(cache=False)
+        assert exists (root.get_cached_path(create=False))
+
+        scans_put = root.put_scans(scans, cache=True)
+        assert scans == scans_put
+        assert scans == root.get_scans(cache=True)
+        assert scans is not root.get_scans(cache=True)
+        assert exists (root.get_cached_path(create=False))
+
+        scans = OrderedDict(food='bar')
+        scans_put = root.put_scans(scans, update=False, cache=True)
+        assert scans == scans_put
+        assert scans == root.get_scans(cache=True)
+        assert scans is not root.get_scans(cache=True)
+
+        scans2 = OrderedDict(this='that')
+        scans_put = root.put_scans(scans2, update=True, cache=True)
+        expected = OrderedDict(this='that', food='bar')
+        assert expected == root.get_scans(cache=True)
+        assert expected is not root.get_scans(cache=True)
+
+        scans = OrderedDict(food='bar')
+        scans_put = root.put_scans(scans, update=False, cache=True)
+        assert scans == scans_put
+        assert scans == root.get_scans(cache=True)
+        assert not root.get_scans(cache=False)
+        assert scans is not root.get_scans(cache=True)
+        assert exists (root.get_cached_path(create=False))
+
+        scans2 = OrderedDict(this='that')
+        scans_put = root.put_scans(scans2, update=True, cache=True)
+        assert not root.get_scans(cache=False)
+        expected = OrderedDict(this='that', food='bar')
+        assert expected == root.get_scans(cache=True)
+        assert expected is not root.get_scans(cache=True)
+        assert exists (root.get_cached_path(create=False))
diff --git a/tests/scancode/test_scan_cache.py b/tests/scancode/test_scan_cache.py
deleted file mode 100644
index 13ec47bd2a1..00000000000
--- a/tests/scancode/test_scan_cache.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2016 nexB Inc. and others. All rights reserved.
-# http://nexb.com and https://github.com/nexB/scancode-toolkit/
-# The ScanCode software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode require an acknowledgment.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# When you publish or redistribute any data created with ScanCode or any ScanCode
-# derivative work, you must accompany this data with the following acknowledgment:
-#
-#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-#  ScanCode should be considered or used as legal advice. Consult an Attorney
-#  for any legal advice.
-#  ScanCode is a free software code scanning tool from nexB Inc. and others.
-#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-
-import os
-
-from commoncode.testcase import FileBasedTesting
-
-from scancode.cache import ScanFileCache
-
-
-class TestCache(FileBasedTesting):
-    test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
-
-    def test_can_cache(self):
-        test_file = self.get_test_loc('cache/package/package.json')
-        from scancode import api
-        package = api.get_package_infos(test_file)
-        test_dir = self.get_temp_dir()
-        cache = ScanFileCache(test_dir)
-        cache.put_scan(path='abc', scan_result=package)
-        assert package == cache.get_scan(path='abc')

From 45cf069a58d965aa55eb58098462a1eab32a1f45 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 12:33:24 +0100
Subject: [PATCH 034/122] Use a Codebase in pre-scan and post-scan plugins #787

 * Update pre and post scan plugins to implement process_codebase()
 * rename and update test modules to match latest code and plugin names
  * plugin_ignore now removes ignored Resources from the Codebase
  * plugin_mark_source walks the Codebase tree bottom-up and updates
    the is_source attribute of directories as needed
  * plugin_only_findings walks the Codebase tree bottom-up and prunes
    the Codebase tree from Resource without findings. It also always
    keeps directory or file nodes in the tree that have children with
    findings even if they do not have findings themselves: with the new
    codebase structure, removing a parent would remove the children too.
    And a child cannot exisy without its parent resource (unless this is
    the codebase root)

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/plugin_ignore.py                 |  42 ++-
 src/scancode/plugin_mark_source.py            |  47 ++--
 src/scancode/plugin_only_findings.py          |  43 ++-
 .../data/{ignore => plugin_ignore}/user.tgz   | Bin
 .../data/{ignore => plugin_ignore}/vcs.tgz    | Bin
 .../JGroups.tgz                               | Bin
 .../with_info.expected.json                   |  94 +++++--
 .../without_info.expected.json                |  10 +-
 .../data/plugin_only_findings/basic.tgz       | Bin 0 -> 17425 bytes
 .../expected.json                             |  36 +++
 tests/scancode/test_ignore_files.py           | 176 ------------
 tests/scancode/test_mark_source.py            |  44 ---
 tests/scancode/test_plugin_ignore.py          | 254 ++++++++++++++++++
 tests/scancode/test_plugin_mark_source.py     |  65 +++++
 ...ndings.py => test_plugin_only_findings.py} |  35 ++-
 15 files changed, 513 insertions(+), 333 deletions(-)
 rename tests/scancode/data/{ignore => plugin_ignore}/user.tgz (100%)
 rename tests/scancode/data/{ignore => plugin_ignore}/vcs.tgz (100%)
 rename tests/scancode/data/{mark_source => plugin_mark_source}/JGroups.tgz (100%)
 rename tests/scancode/data/{mark_source => plugin_mark_source}/with_info.expected.json (85%)
 rename tests/scancode/data/{mark_source => plugin_mark_source}/without_info.expected.json (98%)
 create mode 100644 tests/scancode/data/plugin_only_findings/basic.tgz
 rename tests/scancode/data/{only_findings => plugin_only_findings}/expected.json (88%)
 delete mode 100644 tests/scancode/test_ignore_files.py
 delete mode 100644 tests/scancode/test_mark_source.py
 create mode 100644 tests/scancode/test_plugin_ignore.py
 create mode 100644 tests/scancode/test_plugin_mark_source.py
 rename tests/scancode/{test_has_findings.py => test_plugin_only_findings.py} (60%)

diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 67531791c8c..c5d94dff041 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -25,12 +25,9 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from commoncode import fileset
-from commoncode.fileutils import parent_directory
-from commoncode.system import on_linux
+from commoncode.fileset import match
 from plugincode.pre_scan import PreScanPlugin
 from plugincode.pre_scan import pre_scan_impl
-from scancode.cli import ScanOption
 
 
 def is_ignored(location, ignores):
@@ -38,7 +35,7 @@ def is_ignored(location, ignores):
     Return a tuple of (pattern , message) if a file at location is ignored or
     False otherwise. `ignores` is a mappings of patterns to a reason.
     """
-    return fileset.match(location, includes=ignores, excludes={})
+    return match(location, includes=ignores, excludes={})
 
 
 @pre_scan_impl
@@ -48,8 +45,7 @@ class ProcessIgnore(PreScanPlugin):
     """
     name = 'ignore'
     def __init__(self, selected_options, active_scan_names=None):
-        PreScanPlugin.__init__(
-            self, selected_options, active_scan_names=active_scan_names)
+        PreScanPlugin.__init__(self, selected_options, active_scan_names)
 
         ignores = []
         for se in selected_options:
@@ -60,9 +56,9 @@ def __init__(self, selected_options, active_scan_names=None):
             pattern: 'User ignore: Supplied by --ignore' for pattern in ignores
         }
 
-
     @classmethod
     def get_plugin_options(cls):
+        from scancode.cli import ScanOption
         return [
             ScanOption(('--ignore',),
                    multiple=True,
@@ -70,19 +66,21 @@ def get_plugin_options(cls):
                    help='Ignore files matching <pattern>.')
         ]
 
-    def process_resources(self, resources):
-        # FIXME: this is hacksih at best
-        ignored_paths = set()
-        seps = b'/\\' if on_linux else '/\\'
-        for resource in resources:
-            abs_path = resource.abs_path.strip(seps)
+    def process_codebase(self, codebase):
+        """
+        Remove ignored Resources from the resource tree.
+        """
+        resources_to_remove = []
+        for resource in codebase.walk(topdown=True):
+            abs_path = resource.get_path(absolute=True)
             if is_ignored(abs_path, ignores=self.ignores):
-                ignored_paths.add(abs_path)
-            else:
-                parent = parent_directory(abs_path).strip(seps)
-                if parent not in ignored_paths:
-                    yield resource
+                resources_to_remove.append(resource)
+        removed_rids = set()
+        for resource in resources_to_remove:
+            if resource.rid in removed_rids:
+                continue
+            pruned_rids = codebase.remove_resource(resource)
+            removed_rids.update(pruned_rids)
 
     def is_enabled(self):
-        return any(se.value for se in self.selected_options
-                   if se.name == 'ignore')
+        return any(se.value for se in self.selected_options if se.name == 'ignore')
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index ac5c615f35d..2f6f51271c4 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -24,13 +24,11 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
-from os import path
-
 from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
-from scancode.cli import ScanOption
 
 
 @post_scan_impl
@@ -45,6 +43,7 @@ class MarkSource(PostScanPlugin):
 
     @classmethod
     def get_plugin_options(cls):
+        from scancode.cli import ScanOption
         return [
             ScanOption(('--mark-source',), is_flag=True,
                 help='''
@@ -60,30 +59,24 @@ def is_enabled(self):
         return all(se.value for se in self.selected_options
                       if se.name in ('mark_source', 'infos'))
 
-    def process_resources(self, results):
-        # FIXME: we need to process Resources NOT results mappings!!!
-        # FIXME: this is forcing all the scan results to be loaded in memory
-        # and defeats lazy loading from cache
-        results = list(results)
-
-        # FIXME: this is an nested loop, looping twice on results
-        # TODO: this may not recursively roll up the is_source flag, as we
-        # may not iterate bottom up.
-        for scanned_file in results:
-            if scanned_file['type'] == 'directory' and scanned_file['files_count'] > 0:
-                source_files_count = 0
-                for scanned_file2 in results:
-                    if path.dirname(scanned_file2['path']) == scanned_file['path']:
-                        if scanned_file2['is_source']:
-                            source_files_count += 1
-                mark_source(source_files_count, scanned_file)
-            yield scanned_file
+    def process_codebase(self, codebase):
+        """
+        Set the `is_source` to True in directories if they contain over 90% of
+        source code files at full depth.
+        """
+        codebase.update_counts()
+        # TODO: these two nested walk() calls are not super efficient
+        for resource in codebase.walk(topdown=False):
+            if resource.is_file:
+                continue
+            src_count = sum(1 for c in resource.walk(topdown=True) if c.is_file and c.is_source)
+            files_count = resource.files_count
+            resource.is_source = is_source_directory(src_count, files_count)
 
 
-def mark_source(source_files_count, scanned_file):
+def is_source_directory(src_count, files_count):
     """
-    Set `is_source` to True for a `scanned_file` directory if
-    `source_files_count` is >=90% of files_count for this directory.
+    Return True is this resource is a source directory with at least over 90% of
+    source code files at full depth.
     """
-    if source_files_count / scanned_file['files_count'] >= 0.9:
-        scanned_file['is_source'] = True
+    return src_count / files_count >= 0.9
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index dbc2d11e888..8e4f3a4d5d8 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -27,51 +27,48 @@
 
 from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
-from scancode.cli import ScanOption
 
 
 @post_scan_impl
 class OnlyFindings(PostScanPlugin):
     """
-    Only return files or directories with findings for the requested
-    scans. Files and directories without findings are omitted (not
-    considering basic file information as findings).
+    Prune files or directories without scan findings for the requested scans.
     """
 
     name = 'only-findings'
 
     @classmethod
     def get_plugin_options(cls):
+        from scancode.cli import ScanOption
         return [
             ScanOption(('--only-findings',), is_flag=True,
                 help='''
                 Only return files or directories with findings for the requested
                 scans. Files and directories without findings are omitted (not
-                considering basic file information as findings).
-                ''')
+                considering basic file information as findings).''')
         ]
 
     def is_enabled(self):
         return any(se.value == True for se in self.selected_options
                       if se.name == 'only_findings')
 
-    def process_resources(self, results):
-        # FIXME: this is forcing all the scan results to be loaded in memory
-        # and defeats lazy loading from cache. Only a different caching
-        # (e.g. DB) could work here.
-        # FIXME: We should instead use a generator or use a filter function
-        # that pass to the scan results loader iterator
-        active_scan_names = self.active_scan_names
-        for scanned_file in results:
-            if has_findings(active_scan_names, scanned_file):
-                yield scanned_file
+    def process_codebase(self, codebase):
+        """
+        Remove Resources from codebase bottom-up if they have no scan data, no
+        errors and no children.
+        """
+        for resource in codebase.walk(topdown=False):
+            if not has_findings(resource):
+                # TODO: test me, this is likely a source of bugs???
+                codebase.remove_resource(resource)
 
 
-def has_findings(active_scans, scanned_file):
+def has_findings(resource):
     """
-    Return True if the `scanned_file` has findings for any of the
-    `active_scans` names list (excluding basic file information)
-    or any errors occured when scanning the file.
+    Return True if this resource has findings.
     """
-    findings = active_scans + ['scan_errors']
-    return any(scanned_file.get(scan_name) for scan_name in findings)
+    return (resource.errors
+            or resource.children_rids
+            or any(resource.get_scans().values())
+            # NEVER remove the root resource
+            or resource.is_root())
diff --git a/tests/scancode/data/ignore/user.tgz b/tests/scancode/data/plugin_ignore/user.tgz
similarity index 100%
rename from tests/scancode/data/ignore/user.tgz
rename to tests/scancode/data/plugin_ignore/user.tgz
diff --git a/tests/scancode/data/ignore/vcs.tgz b/tests/scancode/data/plugin_ignore/vcs.tgz
similarity index 100%
rename from tests/scancode/data/ignore/vcs.tgz
rename to tests/scancode/data/plugin_ignore/vcs.tgz
diff --git a/tests/scancode/data/mark_source/JGroups.tgz b/tests/scancode/data/plugin_mark_source/JGroups.tgz
similarity index 100%
rename from tests/scancode/data/mark_source/JGroups.tgz
rename to tests/scancode/data/plugin_mark_source/JGroups.tgz
diff --git a/tests/scancode/data/mark_source/with_info.expected.json b/tests/scancode/data/plugin_mark_source/with_info.expected.json
similarity index 85%
rename from tests/scancode/data/mark_source/with_info.expected.json
rename to tests/scancode/data/plugin_mark_source/with_info.expected.json
index 5de62945398..38eaaf66b78 100644
--- a/tests/scancode/data/mark_source/with_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/with_info.expected.json
@@ -4,8 +4,31 @@
     "--infos": true,
     "--mark-source": true
   },
-  "files_count": 15,
+  "files_count": 12,
   "files": [
+    {
+      "path": "JGroups.tgz",
+      "type": "directory",
+      "name": "JGroups.tgz",
+      "base_name": "JGroups.tgz",
+      "extension": "",
+      "date": null,
+      "size": null,
+      "sha1": null,
+      "md5": null,
+      "files_count": 12,
+      "dirs_count": 3,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
+    },
     {
       "path": "JGroups.tgz/JGroups",
       "type": "directory",
@@ -13,10 +36,11 @@
       "base_name": "JGroups",
       "extension": "",
       "date": null,
-      "size": 206642,
+      "size": null,
       "sha1": null,
       "md5": null,
       "files_count": 12,
+      "dirs_count": 2,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -35,10 +59,11 @@
       "base_name": "licenses",
       "extension": "",
       "date": null,
-      "size": 54552,
+      "size": null,
       "sha1": null,
       "md5": null,
       "files_count": 5,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -57,10 +82,11 @@
       "base_name": "apache-1.1",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": 2885,
+      "size": "2017-08-05",
       "sha1": "6b5608d35c3e304532af43db8bbfc5947bef46a6",
       "md5": "276982197c941f4cbf3d218546e17ae2",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -79,10 +105,11 @@
       "base_name": "apache-2.0",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": 11560,
+      "size": "2017-08-05",
       "sha1": "47b573e3824cd5e02a1a3ae99e2735b49e0256e4",
       "md5": "d273d63619c9aeaf15cdaf76422c4f87",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -101,10 +128,11 @@
       "base_name": "bouncycastle",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": 1186,
+      "size": "2017-08-05",
       "sha1": "74facb0e9a734479f9cd893b5be3fe1bf651b760",
       "md5": "9fffd8de865a5705969f62b128381f85",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -123,10 +151,11 @@
       "base_name": "cpl-1.0",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": 11987,
+      "size": "2017-08-05",
       "sha1": "681cf776bcd79752543d42490ec7ed22a29fd888",
       "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -145,10 +174,11 @@
       "base_name": "lgpl",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": 26934,
+      "size": "2017-08-05",
       "sha1": "8f1a637d2e2ed1bdb9eb01a7dccb5c12cc0557e1",
       "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -167,10 +197,11 @@
       "base_name": "src",
       "extension": "",
       "date": null,
-      "size": 152090,
+      "size": null,
       "sha1": null,
       "md5": null,
       "files_count": 7,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -189,10 +220,11 @@
       "base_name": "FixedMembershipToken",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": 5144,
+      "size": "2017-08-05",
       "sha1": "5901f73dcc78155a1a2c7b5663a3a11fba400b19",
       "md5": "aca9640ec8beee21b098bcf8ecc91442",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -211,10 +243,11 @@
       "base_name": "GuardedBy",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": 813,
+      "size": "2017-08-05",
       "sha1": "981d67087e65e9a44957c026d4b10817cf77d966",
       "md5": "c5064400f759d3e81771005051d17dc1",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -233,10 +266,11 @@
       "base_name": "ImmutableReference",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": 1838,
+      "size": "2017-08-05",
       "sha1": "30f56b876d5576d9869e2c5c509b08db57110592",
       "md5": "48ca3c72fb9a65c771a321222f118b88",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -255,10 +289,11 @@
       "base_name": "RATE_LIMITER",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": 3692,
+      "size": "2017-08-05",
       "sha1": "a8087e5d50da3273536ebda9b87b77aa4ff55deb",
       "md5": "4626bdbc48871b55513e1a12991c61a8",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -277,10 +312,11 @@
       "base_name": "RouterStub",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": 9913,
+      "size": "2017-08-05",
       "sha1": "c1f6818f8ee7bddcc9f444bc94c099729d716d52",
       "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -299,10 +335,11 @@
       "base_name": "RouterStubManager",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": 8162,
+      "size": "2017-08-05",
       "sha1": "eb419dc94cfe11ca318a3e743a7f9f080e70c751",
       "md5": "20bee9631b7c82a45c250e095352aec7",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -321,10 +358,11 @@
       "base_name": "S3_PING",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": 122528,
+      "size": "2017-08-05",
       "sha1": "08dba9986f69719970ead3592dc565465164df0d",
       "md5": "83d8324f37d0e3f120bc89865cf0bd39",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
diff --git a/tests/scancode/data/mark_source/without_info.expected.json b/tests/scancode/data/plugin_mark_source/without_info.expected.json
similarity index 98%
rename from tests/scancode/data/mark_source/without_info.expected.json
rename to tests/scancode/data/plugin_mark_source/without_info.expected.json
index 5d639c1d296..124268ffdad 100644
--- a/tests/scancode/data/mark_source/without_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/without_info.expected.json
@@ -4,10 +4,18 @@
     "--copyrights": true,
     "--licenses": true,
     "--packages": true,
+    "--infos": true,
     "--mark-source": true
   },
-  "files_count": 15,
+  "files_count": 12,
   "files": [
+    {
+      "path": "JGroups.tgz",
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": []
+    },
     {
       "path": "JGroups.tgz/JGroups",
       "scan_errors": [],
diff --git a/tests/scancode/data/plugin_only_findings/basic.tgz b/tests/scancode/data/plugin_only_findings/basic.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..e9a24f937b4fd4fdd4fd5ef8fb13a85e182103b6
GIT binary patch
literal 17425
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
UKnt`$`>SgI52prP!vGio0L{N1WB>pF

literal 0
HcmV?d00001

diff --git a/tests/scancode/data/only_findings/expected.json b/tests/scancode/data/plugin_only_findings/expected.json
similarity index 88%
rename from tests/scancode/data/only_findings/expected.json
rename to tests/scancode/data/plugin_only_findings/expected.json
index d9377448de4..d4f29e463fd 100644
--- a/tests/scancode/data/only_findings/expected.json
+++ b/tests/scancode/data/plugin_only_findings/expected.json
@@ -4,10 +4,32 @@
     "--copyrights": true,
     "--licenses": true,
     "--packages": true,
+    "--infos": true,
     "--only-findings": true
   },
   "files_count": 3,
   "files": [
+    {
+      "path": "basic.tgz",
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": []
+    },
+    {
+      "path": "basic.tgz/basic",
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": []
+    },
+    {
+      "path": "basic.tgz/basic/dir",
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": []
+    },
     {
       "path": "basic.tgz/basic/dir/e.tar",
       "scan_errors": [],
@@ -60,6 +82,20 @@
         }
       ]
     },
+    {
+      "path": "basic.tgz/basic/dir2",
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": []
+    },
+    {
+      "path": "basic.tgz/basic/dir2/subdir",
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": []
+    },
     {
       "path": "basic.tgz/basic/dir2/subdir/bcopy.s",
       "scan_errors": [],
diff --git a/tests/scancode/test_ignore_files.py b/tests/scancode/test_ignore_files.py
deleted file mode 100644
index 6e7a36ccf03..00000000000
--- a/tests/scancode/test_ignore_files.py
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
-# http://nexb.com and https://github.com/nexB/scancode-toolkit/
-# The ScanCode software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode require an acknowledgment.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# When you publish or redistribute any data created with ScanCode or any ScanCode
-# derivative work, you must accompany this data with the following acknowledgment:
-#
-#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-#  ScanCode should be considered or used as legal advice. Consult an Attorney
-#  for any legal advice.
-#  ScanCode is a free software code scanning tool from nexB Inc. and others.
-#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-from os import path
-
-from commoncode.testcase import FileBasedTesting
-from commoncode.ignore import is_ignored
-from scancode.cache import get_scans_cache_class
-from scancode.cli import CommandOption
-from scancode.cli import get_resources
-from scancode.plugin_ignore import ProcessIgnore
-
-
-class TestIgnoreFiles(FileBasedTesting):
-
-    test_data_dir = path.join(path.dirname(__file__), 'data')
-
-    def test_ignore_glob_path(self):
-        test = (
-            'common/src/test/sample.txt',
-            {'*/src/test/*': 'test ignore'},
-            {}
-        )
-        assert is_ignored(*test)
-
-    def test_ignore_single_path(self):
-        test = (
-            'common/src/test/sample.txt',
-            {'src/test/sample.txt': 'test ignore'},
-            {}
-        )
-        assert is_ignored(*test)
-
-    def test_ignore_single_file(self):
-        test = (
-            'common/src/test/sample.txt',
-            {'sample.txt': 'test ignore'},
-            {}
-        )
-        assert is_ignored(*test)
-
-    def test_ignore_glob_file(self):
-        test = (
-            'common/src/test/sample.txt',
-            {'*.txt': 'test ignore'},
-            {}
-        )
-        assert is_ignored(*test)
-
-    def test_resource_paths_with_single_file(self):
-
-        test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugins = [ProcessIgnore(
-            [CommandOption(group=None, name='ignore', option='--ignore', value=('sample.doc',), default=None)]
-        )]
-        scan_cache_class = get_scans_cache_class(self.get_temp_dir())
-        expected = [
-            'user',
-            'user/ignore.doc',
-            'user/src',
-            'user/src/ignore.doc',
-            'user/src/test',
-            'user/src/test/sample.txt'
-        ]
-
-        resources = get_resources(test_dir, scan_cache_class)
-        for plugin in test_plugins:
-            resources = plugin.process_resources(resources)
-
-        resources = [resource.rel_path for resource in resources]
-        assert expected == sorted(resources)
-
-    def test_resource_paths_with_multiple_files(self):
-        test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugins = [ProcessIgnore(
-            [CommandOption(group=None, name='ignore', option='--ignore', value=('ignore.doc',), default=None)]
-        )]
-        scan_cache_class = get_scans_cache_class(self.get_temp_dir())
-        expected = [
-            'user',
-            'user/src',
-            'user/src/test',
-            'user/src/test/sample.doc',
-            'user/src/test/sample.txt'
-        ]
-        resources = get_resources(test_dir, scan_cache_class)
-        for plugin in test_plugins:
-            resources = plugin.process_resources(resources)
-
-        resources = [resource.rel_path for resource in resources]
-        assert expected == sorted(resources)
-
-    def test_resource_paths_with_glob_file(self):
-        test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugins = [ProcessIgnore(
-            [CommandOption(group=None, name='ignore', option='--ignore', value=('*.doc',), default=None)]
-        )]
-        scan_cache_class = get_scans_cache_class(self.get_temp_dir())
-        expected = [
-            'user',
-            'user/src',
-            'user/src/test',
-            'user/src/test/sample.txt'
-        ]
-        resources = get_resources(test_dir, scan_cache_class)
-        for plugin in test_plugins:
-            resources = plugin.process_resources(resources)
-
-        resources = [resource.rel_path for resource in resources]
-        assert expected == sorted(resources)
-
-    def test_resource_paths_with_glob_path(self):
-        test_dir = self.extract_test_tar('ignore/user.tgz')
-        test_plugins = [ProcessIgnore(
-            [CommandOption(group=None, name='ignore', option='--ignore', value=('*/src/test',), default=None)]
-        )]
-        scan_cache_class = get_scans_cache_class(self.get_temp_dir())
-        expected = [
-            'user',
-            'user/ignore.doc',
-            'user/src',
-            'user/src/ignore.doc'
-        ]
-        resources = get_resources(test_dir, scan_cache_class)
-        for plugin in test_plugins:
-            resources = plugin.process_resources(resources)
-
-        resources = [resource.rel_path for resource in resources]
-        assert expected == sorted(resources)
-
-    def test_resource_paths_with_multiple_plugins(self):
-        test_dir = self.extract_test_tar('ignore/user.tgz')
-        scan_cache_class = get_scans_cache_class(self.get_temp_dir())
-        test_plugins = [
-            ProcessIgnore(
-                [CommandOption(group=None, name='ignore', option='--ignore', value=('*.doc',), default=None)]
-            ),
-            ProcessIgnore(
-                [CommandOption(group=None, name='ignore', option='--ignore', value=('*/src/test/*',), default=None)]
-            ),
-        ]
-        expected = [
-            'user',
-            'user/src',
-            'user/src/test'
-        ]
-        resources = get_resources(test_dir, scan_cache_class)
-        for plugin in test_plugins:
-            resources = plugin.process_resources(resources)
-
-        resources = [resource.rel_path for resource in resources]
-        assert expected == sorted(resources)
diff --git a/tests/scancode/test_mark_source.py b/tests/scancode/test_mark_source.py
deleted file mode 100644
index 03dff2460ca..00000000000
--- a/tests/scancode/test_mark_source.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
-# http://nexb.com and https://github.com/nexB/scancode-toolkit/
-# The ScanCode software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode require an acknowledgment.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# When you publish or redistribute any data created with ScanCode or any ScanCode
-# derivative work, you must accompany this data with the following acknowledgment:
-#
-#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-#  ScanCode should be considered or used as legal advice. Consult an Attorney
-#  for any legal advice.
-#  ScanCode is a free software code scanning tool from nexB Inc. and others.
-#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-from unittest import TestCase
-from scancode.plugin_mark_source import mark_source
-
-
-class TestMarkSource(TestCase):
-
-    def test_mark_source_above_threshold(self):
-        test_dict = dict(files_count=10, is_source=False)
-        test_source_file_count = 9
-        mark_source(test_source_file_count, test_dict)
-        assert test_dict['is_source']
-
-    def test_mark_source_below_threshold(self):
-        test_dict = dict(files_count=10, is_source=False)
-        test_source_file_count = 5
-        mark_source(test_source_file_count, test_dict)
-        assert not test_dict['is_source']
diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
new file mode 100644
index 00000000000..73716a824ab
--- /dev/null
+++ b/tests/scancode/test_plugin_ignore.py
@@ -0,0 +1,254 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from os.path import dirname
+from os.path import join
+
+from commoncode.testcase import FileDrivenTesting
+from scancode.cli import CommandOption
+from scancode.plugin_ignore import is_ignored
+from scancode.plugin_ignore import ProcessIgnore
+from scancode.cli_test_utils import run_scan_click
+from scancode.cli_test_utils import _load_json_result
+from scancode.resource import Codebase
+
+
+class TestPluginIgnoreFiles(FileDrivenTesting):
+
+    test_data_dir = join(dirname(__file__), 'data')
+
+    def test_is_ignored_glob_path(self):
+        location = 'common/src/test/sample.txt'
+        ignores = {'*/src/test/*': 'test ignore'}
+        assert is_ignored(location=location, ignores=ignores)
+
+    def test_is_ignored_single_path(self):
+        location = 'common/src/test/sample.txt'
+        ignores = {'common/src/test/sample.txt': 'test ignore'}
+        assert is_ignored(location=location, ignores=ignores)
+
+    def test_is_ignored_single_path_not_matching(self):
+        location = 'common/src/test/sample.txt'
+        ignores = {'src/test/sample.txt': 'test ignore'}
+        assert not is_ignored(location=location, ignores=ignores)
+
+    def test_is_ignored_single_file(self):
+        location = 'common/src/test/sample.txt'
+        ignores = {'sample.txt': 'test ignore'}
+        assert is_ignored(location=location, ignores=ignores)
+
+    def test_is_ignored_glob_file(self):
+        location = 'common/src/test/sample.txt'
+        ignores = {'*.txt': 'test ignore'}
+        assert is_ignored(location=location, ignores=ignores)
+
+    def test_ProcessIgnore_with_single_file(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        option = CommandOption(group=None, name='ignore', option='--ignore',
+                               value=('sample.doc',), default=None)
+        test_plugin = ProcessIgnore([option])
+        expected = [
+            'user',
+            'user/ignore.doc',
+            'user/src',
+            'user/src/ignore.doc',
+            'user/src/test',
+            'user/src/test/sample.txt'
+        ]
+
+        codebase = Codebase(test_dir)
+        test_plugin.process_codebase(codebase)
+        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
+        assert expected == sorted(resources)
+
+    def test_ProcessIgnore_with_multiple_files(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        option = CommandOption(group=None, name='ignore', option='--ignore',
+                               value=('ignore.doc', 'sample.doc',), default=None)
+        test_plugin = ProcessIgnore([option])
+        expected = [
+            'user',
+            'user/src',
+            'user/src/test',
+            'user/src/test/sample.txt'
+        ]
+
+        codebase = Codebase(test_dir)
+        test_plugin.process_codebase(codebase)
+        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
+        assert expected == sorted(resources)
+
+    def test_ProcessIgnore_with_glob_for_extension(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        option = CommandOption(group=None, name='ignore', option='--ignore',
+                               value=('*.doc',), default=None)
+        test_plugin = ProcessIgnore([option])
+
+        expected = [
+            'user',
+            'user/src',
+            'user/src/test',
+            'user/src/test/sample.txt'
+        ]
+
+        codebase = Codebase(test_dir)
+        test_plugin.process_codebase(codebase)
+        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
+        assert expected == sorted(resources)
+
+    def test_ProcessIgnore_with_glob_for_path(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        option = CommandOption(group=None, name='ignore', option='--ignore',
+                               value=('*/src/test',), default=None)
+        test_plugin = ProcessIgnore([option])
+
+        expected = [
+            'user',
+            'user/ignore.doc',
+            'user/src',
+            'user/src/ignore.doc'
+        ]
+
+        codebase = Codebase(test_dir)
+        test_plugin.process_codebase(codebase)
+        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
+        assert expected == sorted(resources)
+
+    def test_ProcessIgnore_with_multiple_plugins(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        test_plugins = [
+            ProcessIgnore([CommandOption(group=None, name='ignore', option='--ignore',
+                               value=('*.doc',), default=None)]),
+            ProcessIgnore([CommandOption(group=None, name='ignore', option='--ignore',
+                               value=('*/src/test/*',), default=None)]),
+        ]
+
+        expected = [
+            'user',
+            'user/src',
+            'user/src/test'
+        ]
+
+        codebase = Codebase(test_dir)
+        for plugin in test_plugins:
+            plugin.process_codebase(codebase)
+
+        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
+        assert expected == sorted(resources)
+
+
+class TestScanPluginIgnoreFiles(FileDrivenTesting):
+
+    test_data_dir = join(dirname(__file__), 'data')
+
+    def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
+        test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
+        result_file = self.get_temp_file('json')
+
+        result = run_scan_click(['--copyright', '--strip-root', test_dir, result_file])
+        assert result.exit_code == 0
+        scan_result = _load_json_result(result_file)
+        # a single test.tst file and its directory that is not a VCS file should be listed
+        assert 1 == scan_result['files_count']
+        scan_locs = [x['path'] for x in scan_result['files']]
+        assert [u'vcs', u'vcs/test.txt'] == scan_locs
+    def test_scancode_ignore_vcs_files_and_dirs_by_default_no_multiprocess(self):
+        test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
+        result_file = self.get_temp_file('json')
+        result = run_scan_click(['--copyright', '--strip-root', '--processes', '0', test_dir, result_file],
+            catch_exceptions=False)
+        assert result.exit_code == 0
+        scan_result = _load_json_result(result_file)
+        # a single test.tst file and its directory that is not a VCS file should be listed
+        assert 1 == scan_result['files_count']
+        scan_locs = [x['path'] for x in scan_result['files']]
+        assert [u'vcs', u'vcs/test.txt'] == scan_locs
+
+    def test_scancode_ignore_single_file(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        result_file = self.get_temp_file('json')
+
+        result = run_scan_click(
+            ['--copyright', '--strip-root', '--ignore', 'sample.doc', test_dir, result_file])
+        assert result.exit_code == 0
+        scan_result = _load_json_result(result_file)
+        assert 3 == scan_result['files_count']
+        # FIXME: add assert 3 == scan_result['dirs_count']
+        scan_locs = [x['path'] for x in scan_result['files']]
+        expected = [
+            'user',
+            'user/ignore.doc',
+            'user/src',
+            'user/src/ignore.doc',
+            'user/src/test',
+            'user/src/test/sample.txt'
+        ]
+        assert expected == scan_locs
+
+    def test_scancode_ignore_multiple_files(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        result_file = self.get_temp_file('json')
+
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', 'ignore.doc', test_dir, result_file])
+        assert result.exit_code == 0
+        scan_result = _load_json_result(result_file)
+        assert 2 == scan_result['files_count']
+        scan_locs = [x['path'] for x in scan_result['files']]
+        assert [u'user', u'user/src', u'user/src/test', u'user/src/test/sample.doc', u'user/src/test/sample.txt'] == scan_locs
+
+    def test_scancode_ignore_glob_files(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        result_file = self.get_temp_file('json')
+
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*.doc', test_dir, result_file])
+        assert result.exit_code == 0
+        scan_result = _load_json_result(result_file)
+        assert 1 == scan_result['files_count']
+        scan_locs = [x['path'] for x in scan_result['files']]
+        assert [u'user', u'user/src', u'user/src/test', u'user/src/test/sample.txt'] == scan_locs
+
+    def test_scancode_ignore_glob_path(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        result_file = self.get_temp_file('json')
+
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test/*', test_dir, result_file])
+        assert result.exit_code == 0
+        scan_result = _load_json_result(result_file)
+        assert 2 == scan_result['files_count']
+        scan_locs = [x['path'] for x in scan_result['files']]
+        assert [u'user', u'user/ignore.doc', u'user/src', u'user/src/ignore.doc', u'user/src/test'] == scan_locs
+
+    def test_scancode_multiple_ignores(self):
+        test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
+        result_file = self.get_temp_file('json')
+
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test', '--ignore', '*.doc', test_dir, result_file])
+        assert result.exit_code == 0
+        scan_result = _load_json_result(result_file)
+        assert 0 == scan_result['files_count']
+        scan_locs = [x['path'] for x in scan_result['files']]
+        assert [u'user', u'user/src'] == scan_locs
diff --git a/tests/scancode/test_plugin_mark_source.py b/tests/scancode/test_plugin_mark_source.py
new file mode 100644
index 00000000000..86a4c442ca6
--- /dev/null
+++ b/tests/scancode/test_plugin_mark_source.py
@@ -0,0 +1,65 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from os.path import dirname
+from os.path import join
+
+from commoncode.testcase import FileDrivenTesting
+from scancode.cli_test_utils import check_json_scan
+from scancode.cli_test_utils import run_scan_click
+from scancode.plugin_mark_source import is_source_directory
+
+
+class TestMarkSource(FileDrivenTesting):
+
+    test_data_dir = join(dirname(__file__), 'data')
+
+    def test_is_source_directory_above_threshold(self):
+        files_count = 10
+        src_count = 9
+        assert is_source_directory(src_count, files_count)
+
+    def test_is_source_directory_below_threshold(self):
+        files_count = 10
+        src_count = 5
+        assert not is_source_directory(src_count, files_count)
+
+    def test_scan_mark_source_without_info(self):
+        test_dir = self.extract_test_tar('plugin_mark_source/JGroups.tgz')
+        result_file = self.get_temp_file('json')
+        expected_file = self.get_test_loc('plugin_mark_source/without_info.expected.json')
+
+        _result = run_scan_click(['--mark-source', test_dir, result_file])
+        check_json_scan(expected_file, result_file, regen=False)
+
+    def test_scan_mark_source_with_info(self):
+        test_dir = self.extract_test_tar('plugin_mark_source/JGroups.tgz')
+        result_file = self.get_temp_file('json')
+        expected_file = self.get_test_loc('plugin_mark_source/with_info.expected.json')
+
+        _result = run_scan_click(['--info', '--mark-source', test_dir, result_file])
+        check_json_scan(expected_file, result_file)
diff --git a/tests/scancode/test_has_findings.py b/tests/scancode/test_plugin_only_findings.py
similarity index 60%
rename from tests/scancode/test_has_findings.py
rename to tests/scancode/test_plugin_only_findings.py
index be0bd00646f..bc8f2e8ce5a 100644
--- a/tests/scancode/test_has_findings.py
+++ b/tests/scancode/test_plugin_only_findings.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -25,25 +25,36 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from unittest import TestCase
+from os.path import dirname
+from os.path import join
+
+from commoncode.testcase import FileDrivenTesting
+from scancode.cli_test_utils import run_scan_click
+from scancode.cli_test_utils import check_json_scan
 from scancode.plugin_only_findings import has_findings
+from scancode.resource import Resource
 
 
-class TestHasFindings(TestCase):
+class TestHasFindings(FileDrivenTesting):
 
-    def test_has_findings(self):
-        scanned_file = {'licenses': ['MIT']}
-        active_scans = ['licenses']
+    test_data_dir = join(dirname(__file__), 'data')
 
-        assert has_findings(active_scans, scanned_file)
+    def test_has_findings(self):
+        resource = Resource('name', 1, 2, 3)
+        resource.put_scans({'licenses': ['MIT']}, cache=False)
+        assert has_findings(resource)
 
     def test_has_findings_includes_errors(self):
-        active_scans = []
-        scanned_file = {
-            'scan_errors': [
+        resource = Resource('name', 1, 2, 3)
+        resource.errors = [
                 'ERROR: Processing interrupted: timeout after 10 seconds.'
             ]
-        }
+        assert has_findings(resource)
 
-        assert has_findings(active_scans, scanned_file)
+    def test_scan_only_findings(self):
+        test_dir = self.extract_test_tar('plugin_only_findings/basic.tgz')
+        result_file = self.get_temp_file('json')
+        expected_file = self.get_test_loc('plugin_only_findings/expected.json')
 
+        _result = run_scan_click(['--only-findings', test_dir, result_file])
+        check_json_scan(expected_file, result_file)

From b1949e984e9b0bf850dcfcdbd8fc146f41a51f27 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 12:41:52 +0100
Subject: [PATCH 035/122] Resources are now topdown and sorted by name in
 outputs #787

 * also the root resource has scans and info

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .../data/csv/livescan/expected.csv            | 22 ++---
 tests/formattedcode/data/csv/srp.csv          |  7 +-
 .../formattedcode/data/csv/tree/expected.csv  | 25 +++---
 .../data/json/simple-expected.json            | 30 ++++++-
 .../data/json/simple-expected.jsonlines       | 31 ++++++-
 .../data/json/simple-expected.jsonpp          | 30 ++++++-
 .../data/json/tree/expected.json              | 48 +++++-----
 .../data/spdx/license_known/expected.rdf      | 36 ++++----
 .../spdx/license_known/expected_with_text.rdf | 26 +++---
 .../data/spdx/license_ref/expected.rdf        | 46 +++++-----
 .../spdx/license_ref/expected_with_text.rdf   |  4 +-
 .../data/spdx/or_later/expected.rdf           | 26 +++---
 .../data/spdx/simple/expected.rdf             | 18 ++--
 .../data/spdx/simple/expected.tv              |  2 +-
 .../formattedcode/data/spdx/tree/expected.rdf | 88 +++++++++----------
 .../data/spdx/unicode/expected.rdf            | 10 +--
 16 files changed, 262 insertions(+), 187 deletions(-)

diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv
index aeaaa9d531d..0a69702c836 100644
--- a/tests/formattedcode/data/csv/livescan/expected.csv
+++ b/tests/formattedcode/data/csv/livescan/expected.csv
@@ -1,5 +1,14 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
-/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Resource,type,name,extension,date,size,sha1,md5,files_count,dirs_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+/json2csv.rb,file,json2csv.rb,.rb,2017-10-03,2017-10-03,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
+/license,file,license,,2017-10-03,2017-10-03,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+/package.json,file,package.json,.json,2017-10-03,2017-10-03,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
@@ -8,12 +17,3 @@ Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
-/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1014,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
diff --git a/tests/formattedcode/data/csv/srp.csv b/tests/formattedcode/data/csv/srp.csv
index 25a06299727..965ced7a341 100644
--- a/tests/formattedcode/data/csv/srp.csv
+++ b/tests/formattedcode/data/csv/srp.csv
@@ -1,8 +1,9 @@
 Resource,scan_errors,copyright,start_line,end_line,copyright_holder
-/srp/srp_vfy.c,,,,,
-/srp/srp_vfy.c,,Copyright 2011-2016 The OpenSSL Project,2,2,
-/srp/srp_vfy.c,,,2,2,The OpenSSL Project
+/srp,,,,,
 /srp/build.info,,,,,
 /srp/srp_lib.c,,,,,
 /srp/srp_lib.c,,Copyright 2011-2016 The OpenSSL Project,2,2,
 /srp/srp_lib.c,,,2,2,The OpenSSL Project
+/srp/srp_vfy.c,,,,,
+/srp/srp_vfy.c,,Copyright 2011-2016 The OpenSSL Project,2,2,
+/srp/srp_vfy.c,,,2,2,The OpenSSL Project
diff --git a/tests/formattedcode/data/csv/tree/expected.csv b/tests/formattedcode/data/csv/tree/expected.csv
index f785fa5f70e..7ec9a67980f 100644
--- a/tests/formattedcode/data/csv/tree/expected.csv
+++ b/tests/formattedcode/data/csv/tree/expected.csv
@@ -1,23 +1,24 @@
 Resource,scan_errors,copyright,start_line,end_line,copyright_holder
-/scan/copy1.c,,,,,
-/scan/copy1.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
-/scan/copy1.c,,,1,1,"ACME, Inc."
-/scan/copy2.c,,,,,
-/scan/copy2.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
-/scan/copy2.c,,,1,1,"ACME, Inc."
-/scan/copy3.c,,,,,
-/scan/copy3.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
-/scan/copy3.c,,,1,1,"ACME, Inc."
+/scan,,,,,
 /scan/subdir,,,,,
 /scan/subdir/copy1.c,,,,,
 /scan/subdir/copy1.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
 /scan/subdir/copy1.c,,,1,1,"ACME, Inc."
-/scan/subdir/copy4.c,,,,,
-/scan/subdir/copy4.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
-/scan/subdir/copy4.c,,,1,1,"ACME, Inc."
 /scan/subdir/copy2.c,,,,,
 /scan/subdir/copy2.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
 /scan/subdir/copy2.c,,,1,1,"ACME, Inc."
 /scan/subdir/copy3.c,,,,,
 /scan/subdir/copy3.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
 /scan/subdir/copy3.c,,,1,1,"ACME, Inc."
+/scan/subdir/copy4.c,,,,,
+/scan/subdir/copy4.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
+/scan/subdir/copy4.c,,,1,1,"ACME, Inc."
+/scan/copy1.c,,,,,
+/scan/copy1.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
+/scan/copy1.c,,,1,1,"ACME, Inc."
+/scan/copy2.c,,,,,
+/scan/copy2.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
+/scan/copy2.c,,,1,1,"ACME, Inc."
+/scan/copy3.c,,,,,
+/scan/copy3.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
+/scan/copy3.c,,,1,1,"ACME, Inc."
diff --git a/tests/formattedcode/data/json/simple-expected.json b/tests/formattedcode/data/json/simple-expected.json
index 90169700f96..fb14aa63eb4 100644
--- a/tests/formattedcode/data/json/simple-expected.json
+++ b/tests/formattedcode/data/json/simple-expected.json
@@ -8,16 +8,40 @@
   },
   "files_count": 1,
   "files": [
+    {
+      "path": "simple",
+      "type": "directory",
+      "name": "simple",
+      "extension": "",
+      "size": null,
+      "sha1": null,
+      "md5": null,
+      "files_count": 1,
+      "dirs_count": 0,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": []
+    },
     {
       "path": "simple/copyright_acme_c-c.c",
       "type": "file",
       "name": "copyright_acme_c-c.c",
-      "base_name": "copyright_acme_c-c",
       "extension": ".c",
-      "size": 55,
+      "size": "2017-10-03",
       "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index 8665f431ebc..7d18e4abcfa 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -9,18 +9,43 @@
       "files_count": 1
     }
   },
+  {
+    "files": [
+      {
+        "path": "simple",
+        "type": "directory",
+        "name": "simple",
+        "extension": "",
+        "size": null,
+        "sha1": null,
+        "md5": null,
+        "files_count": 1,
+        "dirs_count": 0,
+        "mime_type": null,
+        "file_type": null,
+        "programming_language": null,
+        "is_binary": false,
+        "is_text": false,
+        "is_archive": false,
+        "is_media": false,
+        "is_source": false,
+        "is_script": false,
+        "scan_errors": []
+      }
+    ]
+  },
   {
     "files": [
       {
         "path": "simple/copyright_acme_c-c.c",
         "type": "file",
         "name": "copyright_acme_c-c.c",
-        "base_name": "copyright_acme_c-c",
         "extension": ".c",
-        "size": 55,
+        "size": "2017-10-03",
         "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
         "md5": "bdf7c572beb4094c2059508fa73c05a4",
-        "files_count": null,
+        "files_count": 0,
+        "dirs_count": 0,
         "mime_type": "text/plain",
         "file_type": "UTF-8 Unicode text, with no line terminators",
         "programming_language": "C",
diff --git a/tests/formattedcode/data/json/simple-expected.jsonpp b/tests/formattedcode/data/json/simple-expected.jsonpp
index cb66fa72c88..dbe99ac1684 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonpp
+++ b/tests/formattedcode/data/json/simple-expected.jsonpp
@@ -9,16 +9,40 @@
   },
   "files_count": 1,
   "files": [
+    {
+      "path": "simple",
+      "type": "directory",
+      "name": "simple",
+      "extension": "",
+      "size": null,
+      "sha1": null,
+      "md5": null,
+      "files_count": 1,
+      "dirs_count": 0,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": []
+    },
     {
       "path": "simple/copyright_acme_c-c.c",
       "type": "file",
       "name": "copyright_acme_c-c.c",
-      "base_name": "copyright_acme_c-c",
       "extension": ".c",
-      "size": 55,
+      "size": "2017-10-03",
       "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
index 2fcc3244780..07bd8812eb6 100644
--- a/tests/formattedcode/data/json/tree/expected.json
+++ b/tests/formattedcode/data/json/tree/expected.json
@@ -7,18 +7,18 @@
     "--infos": true,
     "--strip-root": true
   },
-  "files_count": 8,
+  "files_count": 4,
   "files": [
     {
       "path": "copy1.c",
       "type": "file",
       "name": "copy1.c",
-      "base_name": "copy1",
       "extension": ".c",
-      "size": 91,
+      "size": "2017-10-03",
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -49,12 +49,12 @@
       "path": "copy2.c",
       "type": "file",
       "name": "copy2.c",
-      "base_name": "copy2",
       "extension": ".c",
-      "size": 91,
+      "size": "2017-10-03",
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -85,12 +85,12 @@
       "path": "copy3.c",
       "type": "file",
       "name": "copy3.c",
-      "base_name": "copy3",
       "extension": ".c",
-      "size": 91,
+      "size": "2017-10-03",
       "sha1": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f",
       "md5": "e999e21c9d7de4d0f943aefbb6f21b99",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -121,12 +121,12 @@
       "path": "subdir",
       "type": "directory",
       "name": "subdir",
-      "base_name": "subdir",
       "extension": "",
-      "size": 361,
+      "size": null,
       "sha1": null,
       "md5": null,
       "files_count": 4,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -145,12 +145,12 @@
       "path": "subdir/copy1.c",
       "type": "file",
       "name": "copy1.c",
-      "base_name": "copy1",
       "extension": ".c",
-      "size": 91,
+      "size": "2017-10-03",
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -181,12 +181,12 @@
       "path": "subdir/copy2.c",
       "type": "file",
       "name": "copy2.c",
-      "base_name": "copy2",
       "extension": ".c",
-      "size": 91,
+      "size": "2017-10-03",
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -217,12 +217,12 @@
       "path": "subdir/copy3.c",
       "type": "file",
       "name": "copy3.c",
-      "base_name": "copy3",
       "extension": ".c",
-      "size": 84,
+      "size": "2017-10-03",
       "sha1": "389af7e629a9853056e42b262d5e30bf4579a74f",
       "md5": "290627a1387288ef77ae7e07946f3ecf",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -253,12 +253,12 @@
       "path": "subdir/copy4.c",
       "type": "file",
       "name": "copy4.c",
-      "base_name": "copy4",
       "extension": ".c",
-      "size": 95,
+      "size": "2017-10-03",
       "sha1": "58748872d25374160692f1ed7075d0fe80a544b1",
       "md5": "88e46475db9b1a68f415f6a3544eeb16",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
diff --git a/tests/formattedcode/data/spdx/license_known/expected.rdf b/tests/formattedcode/data/spdx/license_known/expected.rdf
index 03d7afda23c..cbd3387e37f 100644
--- a/tests/formattedcode/data/spdx/license_known/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected.rdf
@@ -3,19 +3,22 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:hasFile": [
-            null, 
-            null
-          ], 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "scan", 
+          "ns1:hasFile": [
+            null, 
+            null
+          ], 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -24,18 +27,15 @@
               "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }
+          "ns1:name": "scan"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:referencesFile": [
         {
           "ns1:File": {
@@ -51,10 +51,10 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE", 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
+            }
           }
         }, 
         {
@@ -68,13 +68,13 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+            }, 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }
+            "ns1:fileName": "./scan/apache-2.0.LICENSE"
           }
         }
       ], 
diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
index ce83519f92e..c40d21c6c85 100644
--- a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
@@ -6,18 +6,20 @@
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:describesPackage": {
         "ns1:Package": {
+          "ns1:hasFile": [
+            null, 
+            null
+          ], 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": [
-            null, 
-            null
-          ], 
+          "ns1:name": "scan", 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -26,16 +28,14 @@
               "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "scan"
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": [
         {
           "ns1:File": {
@@ -59,9 +59,7 @@
         }, 
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }, 
+            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:checksum": {
               "ns1:Checksum": {
                 "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
@@ -71,7 +69,9 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+            }, 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
diff --git a/tests/formattedcode/data/spdx/license_ref/expected.rdf b/tests/formattedcode/data/spdx/license_ref/expected.rdf
index 3be5b00f4b4..c710b4990a3 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected.rdf
@@ -11,9 +11,17 @@
           "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
         }
       }, 
-      "ns1:referencesFile": {
-        "ns1:File": {
-          "ns1:licenseInfoInFile": [
+      "ns1:describesPackage": {
+        "ns1:Package": {
+          "ns1:hasFile": null, 
+          "ns1:downloadLocation": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:name": "scan", 
+          "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
@@ -28,34 +36,19 @@
               }
             }
           ], 
-          "ns1:checksum": {
-            "ns1:Checksum": {
-              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
-              "ns1:algorithm": "SHA1"
-            }
-          }, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:fileName": "./scan/NOTICE"
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
         }
       }, 
       "ns1:specVersion": "SPDX-2.1", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
-      "ns1:describesPackage": {
-        "ns1:Package": {
-          "ns1:name": "scan", 
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:hasFile": null, 
-          "ns1:licenseInfoFromFiles": [
+      "ns1:referencesFile": {
+        "ns1:File": {
+          "ns1:licenseInfoInFile": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
@@ -70,10 +63,17 @@
               }
             }
           ], 
+          "ns1:checksum": {
+            "ns1:Checksum": {
+              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
+              "ns1:algorithm": "SHA1"
+            }
+          }, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:fileName": "./scan/NOTICE"
         }
       }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
index 4590e71c31a..2c0f8c378d4 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
@@ -13,14 +13,14 @@
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:hasFile": null, 
+          "ns1:name": "scan", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "scan", 
+          "ns1:hasFile": null, 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
diff --git a/tests/formattedcode/data/spdx/or_later/expected.rdf b/tests/formattedcode/data/spdx/or_later/expected.rdf
index c723b8e20bb..2d43fe9f430 100644
--- a/tests/formattedcode/data/spdx/or_later/expected.rdf
+++ b/tests/formattedcode/data/spdx/or_later/expected.rdf
@@ -3,6 +3,10 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:describesPackage": {
         "ns1:Package": {
           "ns1:downloadLocation": {
@@ -11,23 +15,22 @@
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
+          "ns1:name": "or_later", 
           "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
           }, 
-          "ns1:name": "or_later"
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:hasFile": null
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:referencesFile": {
         "ns1:File": {
+          "ns1:licenseInfoInFile": {
+            "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
+          }, 
           "ns1:checksum": {
             "ns1:Checksum": {
               "ns1:checksumValue": "0c5bf934430394112921e7a1a8128176606d32ca", 
@@ -37,9 +40,6 @@
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseInfoInFile": {
-            "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
-          }, 
           "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
           "ns1:fileName": "./test.java"
         }
diff --git a/tests/formattedcode/data/spdx/simple/expected.rdf b/tests/formattedcode/data/spdx/simple/expected.rdf
index d3b0af43363..7dcc02e8d93 100644
--- a/tests/formattedcode/data/spdx/simple/expected.rdf
+++ b/tests/formattedcode/data/spdx/simple/expected.rdf
@@ -3,12 +3,9 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:describesPackage": {
         "ns1:Package": {
+          "ns1:hasFile": null, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
@@ -19,15 +16,18 @@
           "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }
         }
       }, 
+      "ns1:specVersion": "SPDX-2.1", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:referencesFile": {
         "ns1:File": {
           "ns1:checksum": {
@@ -45,7 +45,7 @@
           "ns1:copyrightText": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
-          "ns1:fileName": "./simple/test.txt"
+          "ns1:fileName": "./test.txt"
         }
       }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
diff --git a/tests/formattedcode/data/spdx/simple/expected.tv b/tests/formattedcode/data/spdx/simple/expected.tv
index 3f5fe575a66..7ef5f485fd7 100644
--- a/tests/formattedcode/data/spdx/simple/expected.tv
+++ b/tests/formattedcode/data/spdx/simple/expected.tv
@@ -17,7 +17,7 @@ PackageLicenseConcluded: NOASSERTION
 PackageLicenseInfoFromFiles: NONE
 PackageCopyrightText: NONE
 # File
-FileName: ./simple/test.txt
+FileName: ./test.txt
 FileChecksum: SHA1: b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8
 LicenseConcluded: NOASSERTION
 LicenseInfoInFile: NONE
diff --git a/tests/formattedcode/data/spdx/tree/expected.rdf b/tests/formattedcode/data/spdx/tree/expected.rdf
index ad2c421eb1e..ab0787bb801 100644
--- a/tests/formattedcode/data/spdx/tree/expected.rdf
+++ b/tests/formattedcode/data/spdx/tree/expected.rdf
@@ -3,20 +3,15 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:name": "scan", 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseInfoFromFiles": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-          "ns1:licenseConcluded": {
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:hasFile": [
@@ -27,19 +22,22 @@
             null, 
             null, 
             null
-          ]
+          ], 
+          "ns1:licenseInfoFromFiles": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:name": "scan"
         }
       }, 
       "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:referencesFile": [
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
+            "ns1:fileName": "./scan/subdir/copy3.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
                 "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f", 
@@ -49,31 +47,32 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy3.c"
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
           }
         }, 
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/copy1.c", 
-            "ns1:licenseConcluded": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-            }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
                 "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
                 "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
+            "ns1:licenseConcluded": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+            }, 
+            "ns1:fileName": "./scan/copy1.c", 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }
           }
         }, 
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/copy2.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
                 "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
@@ -83,10 +82,11 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:fileName": "./scan/copy2.c", 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
+            }
           }
         }, 
         {
@@ -101,15 +101,17 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
+            }
           }
         }, 
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/subdir/copy2.c", 
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
                 "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
@@ -119,14 +121,15 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy2.c"
           }
         }, 
         {
           "ns1:File": {
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
                 "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1", 
@@ -136,18 +139,12 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/subdir/copy4.c", 
             "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            "ns1:fileName": "./scan/subdir/copy4.c"
           }
         }, 
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
                 "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f", 
@@ -157,8 +154,11 @@
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:fileName": "./scan/copy3.c", 
             "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy3.c"
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }
           }
         }
       ], 
diff --git a/tests/formattedcode/data/spdx/unicode/expected.rdf b/tests/formattedcode/data/spdx/unicode/expected.rdf
index fb927092f95..3d83d4ed444 100644
--- a/tests/formattedcode/data/spdx/unicode/expected.rdf
+++ b/tests/formattedcode/data/spdx/unicode/expected.rdf
@@ -13,14 +13,14 @@
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:name": "unicode", 
+          "ns1:hasFile": null, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
+          "ns1:name": "unicode", 
           "ns1:licenseInfoFromFiles": {
             "ns1:ExtractedLicensingInfo": {
               "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
@@ -40,7 +40,6 @@
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
-          "ns1:fileName": "./et131x.h", 
           "ns1:checksum": {
             "ns1:Checksum": {
               "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90", 
@@ -50,14 +49,15 @@
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
           "ns1:licenseInfoInFile": {
             "ns1:ExtractedLicensingInfo": {
               "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
               "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
               "ns1:licenseId": "LicenseRef-agere-bsd"
             }
-          }
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
+          "ns1:fileName": "./et131x.h"
         }
       }, 
       "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"

From da79dc2452ec6d2e3ab810c29e2c3ff8c473832b Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 16:14:58 +0100
Subject: [PATCH 036/122] Improve plugins and codebase handling in cli #787

 * Use a Codebase and Resources throughout, adding new codebase-driven
   caching
 * Remove code no longer needed from using a Codebase
 * Refactor and simplify scan_all() in scan_codebase() as a UI free
   function. Saving results to cache takes place there now.
 * Refactor and simplify scan_one(), _scanit() in a single simpler
   scan_resource() function.
   Each scanner function is now called in its own interruptible thread
 * Simplify and improve scan errors handling: error strings now include
   which scan they are from.
 * Do not use dummy progressbar if --quiet, just a plain iterator.
   Do not use a context manager when using a progress bar.
 * Display an improved scan summary with correct timings and counts for
   each processing stage
 * Add new experimental "--no-cache" option to bypass caching scan
   results on disk and use in-memory storage instead
 * Walk codebase when calling save_results (format plugins are not using
   a Codebase yet)
 * JSON outputs now include dirs_count which is a Resource attribute
   files_count is never null. The counts are correct.
   Size is never null. Reintroduce base_name that was removed by
   mistake.
 * Fix bug where the size was returned as a date in outputs
 * Ensure ordering of SPDX format tests is stable

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/scripts/testdata/livescan/expected.csv    |  40 +-
 src/scancode/cli.py                           | 645 ++++++++----------
 src/scancode/resource.py                      | 272 ++++----
 .../data/csv/livescan/expected.csv            |  38 +-
 .../data/json/simple-expected.json            |   6 +-
 .../data/json/simple-expected.jsonlines       |   6 +-
 .../data/json/simple-expected.jsonpp          |   6 +-
 .../data/json/tree/expected.json              |  24 +-
 .../data/spdx/license_known/expected.rdf      |  52 +-
 .../spdx/license_known/expected_with_text.rdf |  50 +-
 .../data/spdx/license_ref/expected.rdf        |  66 +-
 .../spdx/license_ref/expected_with_text.rdf   |  66 +-
 .../data/spdx/or_later/expected.rdf           |  30 +-
 .../data/spdx/simple/expected.rdf             |  40 +-
 .../formattedcode/data/spdx/tree/expected.rdf |  88 +--
 .../data/spdx/unicode/expected.rdf            |  52 +-
 tests/formattedcode/test_format_spdx.py       |  30 +-
 .../data/altpath/copyright.expected.json      |   3 +-
 .../data/composer/composer.expected.json      |   5 +-
 .../data/failing/patchelf.expected.json       |   3 +-
 tests/scancode/data/help/help.txt             |   2 +
 tests/scancode/data/info/all.expected.json    |  25 +-
 .../data/info/all.rooted.expected.json        |  13 +-
 tests/scancode/data/info/basic.expected.json  |  25 +-
 .../data/info/basic.rooted.expected.json      |  48 +-
 .../data/info/email_url_info.expected.json    |  25 +-
 .../scancode/data/license_text/test.expected  |   1 +
 .../data/non_utf8/expected-linux.json         |  57 +-
 .../with_info.expected.json                   |  32 +-
 ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json |   5 +-
 tests/scancode/data/single/iproute.c          |  12 +
 .../data/single/iproute.expected.json         |  33 +
 .../unicodepath.expected-linux.json           |  12 +-
 .../data/weird_file_name/expected-linux.json  |  17 +-
 tests/scancode/test_cli.py                    | 292 +++-----
 tests/scancode/test_plugin_only_findings.py   |  11 +-
 tests/scancode/test_resource.py               |  96 ++-
 37 files changed, 1164 insertions(+), 1064 deletions(-)
 create mode 100644 tests/scancode/data/single/iproute.c
 create mode 100644 tests/scancode/data/single/iproute.expected.json

diff --git a/etc/scripts/testdata/livescan/expected.csv b/etc/scripts/testdata/livescan/expected.csv
index 6a8b9ae74f4..a3e69945d13 100644
--- a/etc/scripts/testdata/livescan/expected.csv
+++ b/etc/scripts/testdata/livescan/expected.csv
@@ -1,20 +1,20 @@
-Resource,type,name,extension,date,size,sha1,md5,files_count,dirs_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
-/json2csv.rb,file,json2csv.rb,.rb,2017-10-03,2017-10-03,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,,2017-10-03,2017-10-03,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
-/package.json,file,package.json,.json,2017-10-03,2017-10-03,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
+Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1599,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
+/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index e528dc19e19..da9de92d2cc 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -23,8 +23,8 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 # Import early because this import has monkey-patching side effects
@@ -40,24 +40,12 @@
 import sys
 from time import time
 import traceback
-from types import GeneratorType
 
 import click
 click.disable_unicode_literals_warning = True
-from click.termui import style
 
-from commoncode.filetype import is_dir
-from commoncode.fileutils import as_posixpath
 from commoncode.fileutils import create_dir
-from commoncode.fileutils import file_name
-from commoncode.fileutils import parent_directory
 from commoncode.fileutils import PATH_TYPE
-from commoncode.fileutils import path_to_bytes
-from commoncode.fileutils import path_to_unicode
-from commoncode.fileutils import resource_iter
-from commoncode import ignore
-from commoncode.system import on_linux
-from commoncode.text import toascii
 
 import plugincode.output
 import plugincode.post_scan
@@ -68,38 +56,33 @@
 from scancode.api import DEJACODE_LICENSE_URL
 from scancode.api import get_copyrights
 from scancode.api import get_emails
-from scancode.api import get_file_infos
+from scancode.api import get_file_info
 from scancode.api import get_licenses
 from scancode.api import get_package_infos
 from scancode.api import get_urls
-from scancode.api import Resource
-from scancode.cache import get_scans_cache_class
 from scancode.interrupt import DEFAULT_TIMEOUT
-from scancode.interrupt import fake_interruptible
 from scancode.interrupt import interruptible
-from scancode.interrupt import TimeoutError
+from scancode.resource import Codebase
+from scancode.resource import Resource
 from scancode.utils import BaseCommand
-from scancode.utils import compute_fn_max_len
-from scancode.utils import fixed_width_file_name
 from scancode.utils import progressmanager
-
-
-echo_stderr = partial(click.secho, err=True)
-
+from scancode.utils import path_progress_message
 
 # Python 2 and 3 support
 try:
     # Python 2
     unicode
     str_orig = str
-    bytes = str
-    str = unicode
+    bytes = str  # @ReservedAssignment
+    str = unicode  # @ReservedAssignment
 except NameError:
     # Python 3
-    unicode = str
+    unicode = str  # @ReservedAssignment
 
 
-# this will init the plugins
+echo_stderr = partial(click.secho, err=True)
+
+# this discovers and validates avialable plugins
 plugincode.pre_scan.initialize()
 plugincode.output.initialize()
 plugincode.post_scan.initialize()
@@ -259,8 +242,9 @@ class ScanCommand(BaseCommand):
     short_usage_help = '''
 Try 'scancode --help' for help on options and arguments.'''
 
-    def __init__(self, name, context_settings=None, callback=None,
-                 params=None, help=None, epilog=None, short_help=None,
+    def __init__(self, name, context_settings=None, callback=None, params=None,
+                 help=None,  # @ReservedAssignment
+                 epilog=None, short_help=None,
                  options_metavar='[OPTIONS]', add_help_option=True,
                  plugins_by_group=()):
 
@@ -319,7 +303,7 @@ def validate_formats(ctx, param, value):
     Validate formats and template files. Raise a BadParameter on errors.
     """
     value_lower = value.lower()
-    if value_lower in plugincode.output.get_format_plugins():
+    if value_lower in plugincode.output.get_plugins():
         return value_lower
     # render using a user-provided custom format template
     if not os.path.isfile(value):
@@ -345,8 +329,8 @@ def validate_exclusive(ctx, exclusive_options):
 # collect plugins for each group and add plugins options to the command
 # params
 _plugins_by_group = [
-    (PRE_SCAN, plugincode.pre_scan.get_pre_scan_plugins()),
-    (POST_SCAN, plugincode.post_scan.get_post_scan_plugins()),
+    (PRE_SCAN, plugincode.pre_scan.get_plugins()),
+    (POST_SCAN, plugincode.post_scan.get_plugins()),
 ]
 
 @click.command(name='scancode', epilog=epilog_text, cls=ScanCommand, plugins_by_group=_plugins_by_group)
@@ -383,7 +367,7 @@ def validate_exclusive(ctx, exclusive_options):
 
 @click.option('-f', '--format', is_flag=False, default='json', show_default=True, metavar='<format>',
               help=('Set <output_file> format to one of: %s or use <format> '
-                    'as the path to a custom template file' % ', '.join(plugincode.output.get_format_plugins())),
+                    'as the path to a custom template file' % ', '.join(plugincode.output.get_plugins())),
                      callback=validate_formats, group=OUTPUT, cls=ScanOption)
 
 @click.option('--verbose', is_flag=True, default=False, help='Print verbose file-by-file progress messages.', group=OUTPUT, cls=ScanOption)
@@ -397,10 +381,13 @@ def validate_exclusive(ctx, exclusive_options):
 
 @click.option('--diag', is_flag=True, default=False, help='Include additional diagnostic information such as error messages or result details.', group=CORE, cls=ScanOption)
 @click.option('--timeout', is_flag=False, default=DEFAULT_TIMEOUT, type=float, show_default=True, help='Stop scanning a file if scanning takes longer than a timeout in seconds.', group=CORE, cls=ScanOption)
+@click.option('--no-cache', is_flag=True, default=False, is_eager=False, help='Do not use on-disk cache for scan results. Faster but uses more memory.', group=CORE, cls=ScanOption)
 @click.option('--reindex-licenses', is_flag=True, default=False, is_eager=True, callback=reindex_licenses, help='Force a check and possible reindexing of the cached license index.', group=MISC, cls=ScanOption)
 
-def scancode(ctx, input, output_file, infos,
-             verbose, quiet, processes, diag, timeout,
+def scancode(ctx,
+             input,  # @ReservedAssignment
+             output_file, infos,
+             verbose, quiet, processes, diag, timeout, no_cache,
              *args, **kwargs):
     """scan the <input> file or directory for license, origin and packages and save results to <output_file(s)>.
 
@@ -418,9 +405,15 @@ def scancode(ctx, input, output_file, infos,
 
     strip_root = kwargs.get('strip_root')
     full_root = kwargs.get('full_root')
-    format = kwargs.get('format')
+    format = kwargs.get('format')  # @ReservedAssignment
     # ## TODO: END FIX when plugins are used everywhere
 
+    get_licenses_with_score = partial(get_licenses,
+        diag=diag,
+        min_score=kwargs.get('license_score'),
+        include_text=kwargs.get('license_text'),
+        license_url_template=kwargs.get('license_url_template'))
+
     # Use default scan options when no scan option is provided
     # FIXME: this should be removed?
     use_default_scans = not any([infos, licenses, copyrights, packages, emails, urls])
@@ -429,32 +422,34 @@ def scancode(ctx, input, output_file, infos,
     # reuse calculated file SHA1s.
     is_spdx = format in ('spdx-tv', 'spdx-rdf')
 
-    get_licenses_with_score = partial(get_licenses,
-        diag=diag,
-        min_score=kwargs.get('license_score'),
-        include_text=kwargs.get('license_text'),
-        license_url_template=kwargs.get('license_url_template'))
 
-    scanners = [
-        # FIXME: For "infos" there is no separate scan function, they are always
-        # gathered, though not always exposed.
-        Scanner('infos', get_file_infos, infos or is_spdx),
-        Scanner('licenses', get_licenses_with_score, licenses or use_default_scans),
-        Scanner('copyrights', get_copyrights, copyrights or use_default_scans),
-        Scanner('packages', get_package_infos, packages or use_default_scans),
-        Scanner('emails', get_emails, emails),
-        Scanner('urls', get_urls, urls)
+    scanners = [scan for scan in [
+            # FIXME: we enable infos at all times!!!
+            Scanner('infos', get_file_info, True),
+            Scanner('licenses', get_licenses_with_score, licenses or use_default_scans),
+            Scanner('copyrights', get_copyrights, copyrights or use_default_scans),
+            Scanner('packages', get_package_infos, packages or use_default_scans),
+            Scanner('emails', get_emails, emails),
+            Scanner('urls', get_urls, urls)]
+        if scan.is_enabled
     ]
 
     ignored_options = 'verbose', 'quiet', 'processes', 'timeout'
     all_options = list(get_command_options(ctx, ignores=ignored_options, skip_no_group=True))
 
+    scanner_names = [scan.name for scan in scanners if scan.is_enabled]
+    scan_names = ', '.join(scanner_names)
+    if not quiet:
+        echo_stderr('Scanning files for: %(scan_names)s with %(processes)d process(es)...' % locals())
+
+    if not quiet and not processes:
+        echo_stderr('Disabling multi-processing and multi-threading...', fg='yellow')
+
     # FIXME: this is terribly hackish :|
     # FIXUP OPTIONS FOR DEFAULT SCANS
     options = []
-    enabled_scans = {sc.name: sc.is_enabled for sc in scanners}
     for opt in all_options:
-        if enabled_scans.get(opt.name):
+        if opt.name in scanner_names:
             options.append(opt._replace(value=True))
             continue
 
@@ -466,172 +461,225 @@ def scancode(ctx, input, output_file, infos,
         if opt.value != opt.default:
             options.append(opt)
 
-    active_scans = [scan.name for scan in scanners if scan.is_enabled]
-    _scans = ', '.join(active_scans)
-
-    if not quiet:
-        echo_stderr('Scanning files for: %(_scans)s with %(processes)d process(es)...' % locals())
-
-    if not quiet and not processes:
-        echo_stderr('Disabling multi-processing and multi-threading...', fg='yellow')
-
-    # TODO: new loop
-    # 1. collect minimally the whole files tree in memory as a Resource tree
-    # 2. apply the pre scan plugins to this tree
-    # 3. run the scan proper, save scan details on disk
-    # 4. apply the post scan plugins to this tree, lazy load as needed the scan
-    # details from disk. save back updated details on disk
-    scans_cache_class = get_scans_cache_class()
-
+    processing_start = time()
     if not quiet:
         echo_stderr('Collecting file inventory...' % locals(), fg='green')
-    resources = get_resources(base_path=input, scans_cache_class=scans_cache_class)
-    resources = list(resources)
+    # TODO: add progress indicator
+    codebase = Codebase(location=input, use_cache=not no_cache)
+    collect_time = time() - processing_start
 
-    processing_start = time()
+    license_indexing_start = time()
     try:
-        # WARMUP
-        indexing_time = 0
+        ###############################################################
+        # SCANNERS SETUP
+        ###############################################################
+        license_indexing_time = 0
+        # FIXME: this should be moved as the setup() for a license plugin
         with_licenses = any(sc for sc in scanners if sc.name == 'licenses' and sc.is_enabled)
         if with_licenses:
             # build index outside of the main loop for speed
             # FIXME: REALLY????? this also ensures that forked processes will get the index on POSIX naturally
             if not quiet:
-                echo_stderr('Building license detection index...', fg='green', nl=False)
+                echo_stderr('Building/Loading license detection index...', fg='green', nl=False)
+            # TODO: add progress indicator
             from licensedcode.cache import get_index
             get_index(False)
-            indexing_time = time() - processing_start
+            license_indexing_time = time() - license_indexing_start
             if not quiet:
-                echo_stderr('Done.', fg='green', nl=True)
+                echo_stderr('Done.', fg='green')
 
-        # PRE
+        ###############################################################
+        # PRE-SCAN
+        ###############################################################
         pre_scan_start = time()
-
-        for name, plugin in plugincode.pre_scan.get_pre_scan_plugins().items():
-            plugin = plugin(all_options, active_scans)
+        # TODO: add progress indicator
+        for name, plugin in plugincode.pre_scan.get_plugins().items():
+            plugin = plugin(all_options, scanner_names)
             if plugin.is_enabled():
                 if not quiet:
                     name = name or plugin.__class__.__name__
                     echo_stderr('Running pre-scan plugin: %(name)s...' % locals(), fg='green')
-                resources = plugin.process_resources(resources)
+                # FIXME: we should always catch errors from plugins properly
+                plugin.process_codebase(codebase)
+                codebase.update_counts()
 
         pre_scan_time = time() - pre_scan_start
 
-        resources = list(resources)
-
-        # SCAN
+        ###############################################################
+        # SCANS RUN
+        ###############################################################
         scan_start = time()
-
         if not quiet:
             echo_stderr('Scanning files...', fg='green')
 
-        files_count, results, success, paths_with_error = scan_all(
-            input_path=input,
-            scanners=scanners,
-            resources=resources,
-            verbose=verbose, quiet=quiet,
-            processes=processes, timeout=timeout, diag=diag,
-            scans_cache_class=scans_cache_class,
-            strip_root=strip_root, full_root=full_root)
+        progress_manager = None
+        if not quiet:
+            item_show_func = partial(path_progress_message, verbose=verbose)
+            progress_manager = partial(progressmanager,
+                item_show_func=item_show_func, verbose=verbose, file=sys.stderr)
+
+        # TODO: add CLI option to bypass cache entirely
+        success = scan_codebase(codebase, scanners, processes, timeout,
+                                progress_manager=progress_manager)
 
         scan_time = time() - scan_start
-        files_scanned_per_second = round(float(files_count) / scan_time , 2)
 
-        # POST
+        scanned_count, _, scanned_size = codebase.counts(update=True, skip_root=False)
+
+        ###############################################################
+        # POST-SCAN
+        ###############################################################
+        # TODO: add progress indicator
         post_scan_start = time()
 
-        for name, plugin in plugincode.post_scan.get_post_scan_plugins().items():
-            plugin = plugin(all_options, active_scans)
+        for name, plugin in plugincode.post_scan.get_plugins().items():
+            plugin = plugin(all_options, scanner_names)
             if plugin.is_enabled():
                 if not quiet:
                     name = name or plugin.__class__.__name__
                     echo_stderr('Running post-scan plugin: %(name)s...' % locals(), fg='green')
                 # FIXME: we should always catch errors from plugins properly
-                results = plugin.process_resources(results)
+                plugin.process_codebase(codebase)
+                codebase.update_counts()
 
         post_scan_time = time() - post_scan_start
 
-        # FIXME: computing len needs a list and therefore needs loading it all
-        # ahead of time this should NOT be needed with a better cache
-        # architecture!!!
-        results = list(results)
-        files_count = len(results)
 
+        ###############################################################
+        # SUMMARY
+        ###############################################################
         total_time = time() - processing_start
 
-        # SCAN SUMMARY
+        files_count, dirs_count, size = codebase.counts(
+            update=True, skip_root=strip_root)
 
         if not quiet:
-            echo_stderr('Scanning done.', fg=paths_with_error and 'red' or 'green')
-
-            # Display errors
-            if paths_with_error:
-                if diag:
-                    echo_stderr('Some files failed to scan properly:', fg='red')
-                    # iterate cached results to collect all scan errors
-                    cached_scan = scans_cache_class()
-                    root_dir = _get_root_dir(input, strip_root, full_root)
-                    scan_results = cached_scan.iterate(resources, active_scans, root_dir, paths_subset=paths_with_error)
-                    for scan_result in scan_results:
-                        errored_path = scan_result.get('path', '')
-                        echo_stderr('Path: ' + errored_path, fg='red')
-                        for error in scan_result.get('scan_errors', []):
-                            for emsg in error.splitlines(False):
-                                echo_stderr('  ' + emsg)
-                        echo_stderr('')
-                else:
-                    echo_stderr('Some files failed to scan properly. Use the --diag option for additional details:', fg='red')
-                    for errored_path in paths_with_error:
-                        echo_stderr(' ' + errored_path, fg='red')
-
-            echo_stderr('Scan statistics: %(files_count)d files scanned in %(total_time)ds.' % locals())
-            echo_stderr('Scan options:    %(_scans)s with %(processes)d process(es).' % locals())
-            echo_stderr('Scanning speed:  %(files_scanned_per_second)s files per sec.' % locals())
-            echo_stderr('Scanning in:     %(scan_time)ds. ' % locals(), nl=False)
-            echo_stderr('Indexing in: %(indexing_time)ds. ' % locals(), nl=False)
-            echo_stderr('Pre-scan in: %(pre_scan_time)ds. ' % locals(), nl=False)
-            echo_stderr('Post-scan in: %(post_scan_time)ds.' % locals(), reset=True)
-
-        # REPORT
+            display_summary(codebase, scan_names, processes,
+                            total_time, license_indexing_time,
+                            pre_scan_time,
+                            scanned_count, scanned_size, scan_time,
+                            post_scan_time,
+                            files_count, dirs_count, size,
+                            verbose)
+
+        ###############################################################
+        # FORMATTED REPORTS OUTPUT
+        ###############################################################
         if not quiet:
             echo_stderr('Saving results...', fg='green')
+
         # FIXME: we should have simpler args: a scan "header" and scan results
-        save_results(scanners, files_count, results, format, options, input, output_file)
+        # FIXME: we should use Codebase.resources instead of results
+        with_info = infos or is_spdx
+        serializer = partial(Resource.to_dict, full_root=full_root, strip_root=strip_root, with_info=with_info)
+        results = [serializer(res) for res in codebase.walk(topdown=True, sort=True, skip_root=strip_root)]
+        save_results(results, files_count, format, options, input, output_file)
 
     finally:
         # cleanup
-        cache = scans_cache_class()
-        cache.clear()
+        codebase.clear()
 
     rc = 0 if success else 1
     ctx.exit(rc)
 
 
-def scan_all(input_path, scanners, resources,
-             verbose=False, quiet=False, processes=1, timeout=DEFAULT_TIMEOUT,
-             diag=False, scans_cache_class=None,
-             strip_root=False, full_root=False):
+def display_summary(codebase, scan_names, processes,
+                    total_time,
+                    license_indexing_time,
+                    pre_scan_time,
+                    scanned_count, scanned_size, scan_time,
+                    post_scan_time,
+                    files_count, dirs_count, size,
+                    verbose):
     """
-    Return a tupple of (files_count, scan_results, success, summary mapping) where
-    scan_results is an iterable and success is a boolean.
-
-    Run each requested scan proper: each individual file scan is cached
-    on disk to free memory. Then the whole set of scans is loaded from
-    the cache and streamed at the end.
+    Display a scan summary.
     """
-    assert scans_cache_class
-    scans = [scan.name for scan in scanners if scan.is_enabled]
-    pool = None
+    top_errors = codebase.errors
+    path_errors = [(r.get_path(decode=True, posix=True), r.errors) for r in codebase.walk() if r.errors]
+
+    has_errors = top_errors or path_errors
+    echo_stderr('Scanning done.', fg=has_errors and 'red' or 'green')
+
+    errors_count = 0
+    if has_errors:
+        echo_stderr('Some files failed to scan properly:', fg='red')
+        for error in top_errors:
+            echo_stderr(error)
+            errors_count += 1
+        for errored_path, errors in path_errors:
+            echo_stderr('Path: ' + errored_path, fg='red')
+            if not verbose:
+                continue
+            for error in errors:
+                for emsg in error.splitlines(False):
+                    echo_stderr('  ' + emsg, fg='red')
+                errors_count += 1
+
+    sym = 'Bytes'
+    if size >= 1024 * 1024 * 1024:
+        sym = 'GB'
+        size = size / (1024 * 1024 * 1024)
+    elif size >= 1024 * 1024:
+        sym = 'MB'
+        size = size / (1024 * 1024)
+    elif size >= 1024:
+        sym = 'KB'
+        size = size / 1024
+    size = round(size, 2)
+
+    scan_sym = 'Bytes'
+    if scanned_size >= 1024 * 1024 * 1024:
+        scan_sym = 'GB'
+        scanned_size = scanned_size / (1024 * 1024 * 1024)
+    elif scanned_size >= 1024 * 1024:
+        scan_sym = 'MB'
+        scanned_size = scanned_size / (1024 * 1024)
+    elif scanned_size >= 1024:
+        scan_sym = 'KB'
+        scanned_size = scanned_size / 1024
+    size_speed = round(scanned_size / scan_time, 2)
+    scanned_size = round(scanned_size, 2)
+
+    file_speed = round(float(scanned_count) / scan_time , 2)
+
+    res_count = files_count + dirs_count
+    echo_stderr('Summary:        %(scan_names)s with %(processes)d process(es)' % locals())
+    echo_stderr('Total time:     %(scanned_count)d files, %(scanned_size).2f %(scan_sym)s '
+                                 'scanned in %(total_time)d total (excluding format)' % locals())
+    echo_stderr('Scan Speed:     %(file_speed).2f files/s, %(size_speed).2f %(scan_sym)s/s' % locals())
+    echo_stderr('Results:        %(res_count)d resources: %(files_count)d files, %(dirs_count)d directories for %(size).2f %(sym)s' % locals())
+    echo_stderr('Timings:        Indexing: %(license_indexing_time).2fs, '
+                                'Pre-scan: %(pre_scan_time).2fs, '
+                                'Scan: %(scan_time).2fs, '
+                                'Post-scan: %(post_scan_time).2fs' % locals())
+    echo_stderr('Errors count:   %(errors_count)d' % locals())
+
+
+def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
+                  progress_manager=None):
+    """
+    Run the `scanners` on the `codebase`. Return True on success or False
+    otherwise. Provides optional progress feedback in the UI using the
+    `progress_manager` callable that accepts an iterable of tuple of (location,
+    rid, scan_errors, scan_result ) as argument.
+    """
+
+    # FIXME: this path computation is super inefficient
+    # tuples of  (absolute location, resource id)
+    # TODO: should we alk topdown or not???
+    resources = ((r.get_path(absolute=True), r.rid) for r in codebase.walk())
+
+    runner = partial(scan_resource, scanners=scanners, timeout=timeout)
 
-    paths_with_error = []
-    files_count = 0
+    has_info_scanner = any(sc.name == 'infos' for sc in scanners)
+    lscan = len(scanners)
+    has_other_scanners = lscan > 1 if has_info_scanner else lscan
 
-    scanit = partial(_scanit, scanners=scanners, scans_cache_class=scans_cache_class,
-                     diag=diag, timeout=timeout, processes=processes)
+    get_resource = codebase.get_resource
 
-    max_file_name_len = compute_fn_max_len()
-    # do not display a file name in progress bar if there is less than 5 chars available.
-    display_fn = bool(max_file_name_len > 10)
+    success = True
+    pool = None
+    scans = None
     try:
         if processes:
             # maxtasksperchild helps with recycling processes in case of leaks
@@ -639,191 +687,96 @@ def scan_all(input_path, scanners, resources,
             # Using chunksize is documented as much more efficient in the Python doc.
             # Yet "1" still provides a better and more progressive feedback.
             # With imap_unordered, results are returned as soon as ready and out of order.
-            scanned_files = pool.imap_unordered(scanit, resources, chunksize=1)
+            scans = pool.imap_unordered(runner, resources, chunksize=1)
             pool.close()
         else:
             # no multiprocessing with processes=0
-            scanned_files = imap(scanit, resources)
-
-        def scan_event(item):
-            """Progress event displayed each time a file is scanned"""
-            if quiet or not item or not display_fn:
-                return ''
-            _scan_success, _scanned_path = item
-            _scanned_path = unicode(toascii(_scanned_path))
-            if verbose:
-                _progress_line = _scanned_path
-            else:
-                _progress_line = fixed_width_file_name(_scanned_path, max_file_name_len)
-            return style('Scanned: ') + style(_progress_line, fg=_scan_success and 'green' or 'red')
-
-        files_count = 0
-        with progressmanager(
-            scanned_files, item_show_func=scan_event, show_pos=True,
-            verbose=verbose, quiet=quiet, file=sys.stderr) as scanned:
-            while True:
-                try:
-                    result = scanned.next()
-                    scan_success, scanned_rel_path = result
-                    if not scan_success:
-                        paths_with_error.append(scanned_rel_path)
-                    files_count += 1
-                except StopIteration:
-                    break
-                except KeyboardInterrupt:
-                    echo_stderr('\nAborted with Ctrl+C!', fg='red')
-                    if pool:
-                        pool.terminate()
-                    break
+            scans = imap(runner, resources)
+
+        if progress_manager:
+            scans = progress_manager(scans)
+            # hack to avoid using a context manager
+            if hasattr(scans, '__enter__'):
+                scans.__enter__()
+
+        while True:
+            try:
+                location, rid, scan_errors, scan_result = scans.next()
+
+                resource = get_resource(rid)
+                if not resource:
+                    # this should never happen
+                    msg = ('ERROR: Internal error in scan_codebase: Resource '
+                           'at %(location)r is missing from codebase.\n'
+                           'Scan result not saved:\n%(scan_result)r.' % locals())
+                    codebase.errors.append(msg)
+                    success = False
+                    continue
+
+                if scan_errors:
+                    success = False
+                    resource.errors.extend(scan_errors)
+
+                if has_info_scanner:
+                    # always set info directly on resources
+                    info = scan_result.pop('infos', [])
+                    resource.set_info(info)
+                if has_info_scanner and scan_result:
+                    resource.put_scans(scan_result, update=True)
+
+            except StopIteration:
+                break
+            except KeyboardInterrupt:
+                echo_stderr('\nAborted with Ctrl+C!', fg='red')
+                success = False
+                if pool:
+                    pool.terminate()
+                break
+
     finally:
         if pool:
             # ensure the pool is really dead to work around a Python 2.7.3 bug:
             # http://bugs.python.org/issue15101
             pool.terminate()
 
-    success = not paths_with_error
-    # finally return an iterator on cached results
-    cached_scan = scans_cache_class()
-    root_dir = _get_root_dir(input_path, strip_root, full_root)
-    #############################################
-    # FIXME: we must return Resources here!!!!
-    #############################################
-    return files_count, cached_scan.iterate(resources, scans, root_dir), success, paths_with_error
-
-
-def _get_root_dir(input_path, strip_root=False, full_root=False):
-    """
-    Return a root dir name or None.
-    On Windows, the path uses POSIX (forward slash) separators.
-    """
-    if strip_root:
-        return
-
-    scanned_path = os.path.abspath(os.path.normpath(os.path.expanduser(input_path)))
-    scanned_path = as_posixpath(scanned_path)
-    if is_dir(scanned_path):
-        root_dir = scanned_path
-    else:
-        root_dir = parent_directory(scanned_path)
-        root_dir = as_posixpath(root_dir)
-
-    if full_root:
-        return root_dir
-    else:
-        return file_name(root_dir)
-
-
-def _scanit(resource, scanners, scans_cache_class, diag, timeout=DEFAULT_TIMEOUT, processes=1):
-    """
-    Run scans and cache results on disk. Return a tuple of (success, scanned relative
-    path) where sucess is True on success, False on error. Note that this is really
-    only a wrapper function used as an execution unit for parallel processing.
-    """
-    success = True
-    scans_cache = scans_cache_class()
-
-    if processes:
-        interrupter = interruptible
-    else:
-        # fake, non inteerrupting used for debugging when processes=0
-        interrupter = fake_interruptible
-
-    scanners = [scanner for scanner in scanners if scanner.is_enabled]
-    if not scanners:
-        return success, resource.rel_path
-
-    # DUH???? Skip other scans if already cached
-    # FIXME: ENSURE we only do this for files not directories
-    if not resource.is_cached:
-        # run the scan as an interruptiple task
-        scans_runner = partial(scan_one, resource.abs_path, scanners, diag)
-        success, scan_result = interrupter(scans_runner, timeout=timeout)
-        if not success:
-            # Use scan errors as the scan result for that file on failure this is
-            # a top-level error not attachedd to a specific scanner, hence the
-            # "scan" key is used for these errors
-            scan_result = {'scan_errors': [scan_result]}
-
-        scans_cache.put_scan(resource.rel_path, scan_result)
-
-        # do not report success if some other errors happened
-        if scan_result.get('scan_errors'):
-            success = False
-
-    return success, resource.rel_path
-
-
-def get_resources(base_path, scans_cache_class):
-    """
-    Yield `Resource` objects for all the files found at base_path (either a
-    directory or file) given an absolute base_path.
-    """
-    if on_linux:
-        base_path = base_path and path_to_bytes(base_path)
-    else:
-        base_path = base_path and path_to_unicode(base_path)
-
-    base_path = os.path.abspath(os.path.normpath(os.path.expanduser(base_path)))
-    base_is_dir = is_dir(base_path)
-    len_base_path = len(base_path)
-
-    ignores = ignore.ignores_VCS
-    if on_linux:
-        ignores = {path_to_bytes(k): v for k, v in ignores.items()}
-    else:
-        ignores = {path_to_unicode(k): v for k, v in ignores.items()}
-    ignorer = partial(ignore.is_ignored, ignores=ignores, unignores={}, skip_special=True)
-
-    locations = resource_iter(base_path, ignored=ignorer, with_dirs=True)
-    for abs_path in locations:
-        resource = Resource(
-            scans_cache_class=scans_cache_class,
-            abs_path=abs_path,
-            base_is_dir=base_is_dir,
-            len_base_path=len_base_path)
-        yield resource
+        if scans and hasattr(scans, 'render_finish'):
+            # hack to avoid using a context manager
+            scans.render_finish()
+    return success
 
 
-def scan_one(location, scanners, diag=False):
+def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT):
     """
-    Scan one file or directory at `location` and return a scan result
-    mapping, calling every scanner callable in the `scanners` list of Scanners.
-
-    The scan result mapping contain a 'scan_errors' key with a list of
-    error messages. If `diag` is True, 'scan_errors' error messages also
-    contain detailed diagnostic information such as a traceback if
-    available.
+    Return a tuple of (location, rid, list or errors, mapping of scan results) by running
+    the `scanners` Scanner objects for the file or directory resource with id
+    `rid` at `location` provided as a `location_rid` tuple (location, rid).
     """
-    if on_linux:
-        location = path_to_bytes(location)
-    else:
-        location = path_to_unicode(location)
+    location, rid = location_rid
+    errors = []
+    results = OrderedDict((scanner.name, []) for scanner in scanners)
 
-    scan_result = OrderedDict()
-    scan_errors = []
-    for scanner in scanners:
+    # run each scanner in sequence in its own interruptible
+    for scanner, scanner_result in zip(scanners, results.values()):
         try:
-            scan_details = scanner.function(location)
-            # consume generators
-            if isinstance(scan_details, GeneratorType):
-                scan_details = list(scan_details)
-            scan_result[scanner.name] = scan_details
-        except TimeoutError:
-            raise
-        except Exception as e:
-            # never fail but instead add an error message and keep an empty scan:
-            scan_result[scanner.name] = []
-            messages = ['ERROR: ' + scanner.name + ': ' + e.message]
-            if diag:
-                messages.append('ERROR: ' + scanner.name + ': ' + traceback.format_exc())
-            scan_errors.extend(messages)
-
-    # put errors last, after scans proper
-    scan_result['scan_errors'] = scan_errors
-    return scan_result
-
-
-def save_results(scanners, files_count, results, format, options, input, output_file):
+            runner = partial(scanner.function, location)
+            error, value = interruptible(runner, timeout=timeout)
+            if error:
+                msg = 'ERROR: for scanner: ' + scanner.name + ':\n' + error
+                errors.append(msg)
+            if value:
+                # a scanner function MUST return a sequence
+                scanner_result.extend(value)
+        except Exception:
+            msg = 'ERROR: for scanner: ' + scanner.name + ':\n' + traceback.format_exc()
+            errors.append(msg)
+    return location, rid, errors, results
+
+
+def save_results(results, files_count,
+                 format,  # @ReservedAssignment
+                 options,
+                 input,  # @ReservedAssignment
+                 output_file):
     """
     Save scan results to file or screen.
     """
@@ -842,21 +795,10 @@ def save_results(scanners, files_count, results, format, options, input, output_
 
     # Write scan results to file or screen as a formatted output ...
     # ... using a user-provided custom format template
-    format_plugins = plugincode.output.get_format_plugins()
-    if format not in format_plugins:
-        # format may be a custom template file path
-        if not os.path.isfile(format):
-            # this check was done before in the CLI validation, but this
-            # is done again if the function is used directly
-            echo_stderr('\nInvalid template: must be a file.', fg='red')
-        else:
-            from formattedcode import format_templated
-            # FIXME: carrying an echo function does not make sense
-            format_templated.write_custom(
-                results, output_file, _echo=echo_stderr, version=version, template_path=format)
+    format_plugins = plugincode.output.get_plugins()
 
-    # ... or  using the selected format plugin
-    else:
+    if format in format_plugins:
+    # use the selected format plugin
         writer = format_plugins[format]
         # FIXME: carrying an echo function does not make sense
         # FIXME: do not use input as a variable name
@@ -866,6 +808,19 @@ def save_results(scanners, files_count, results, format, options, input, output_
                scanned_files=results,
                options=opts,
                input=input, output_file=output_file, _echo=echo_stderr)
+        return
+
+    # format may be a custom template file path
+    if not os.path.isfile(format):
+        # this check was done before in the CLI validation, but this
+        # is done again if the function is used directly
+        echo_stderr('\nInvalid template: must be a file.', fg='red')
+    else:
+        from formattedcode import format_templated
+        # FIXME: carrying an echo function does not make sense
+        format_templated.write_custom(
+            results, output_file,
+            _echo=echo_stderr, version=version, template_path=format)
 
 
 def get_command_options(ctx, ignores=(), skip_default=False, skip_no_group=False):
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index 403bd581f43..a6fb06a4be6 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -28,6 +28,7 @@
 from __future__ import unicode_literals
 
 import codecs
+from collections import deque
 from collections import OrderedDict
 from functools import partial
 import json
@@ -75,10 +76,14 @@
 
 
 """
-An abstraction for files and directories used throughout ScanCode. ScanCode
-deals with a lot of these as they are the basic unit of processing. They are
-eventually cached or stored and this module hides all the details of iterating
-files, path handling, caching or storing the file and directory medatata.
+This module provides Codebase and Resource objects as an abstraction for files
+and directories used throughout ScanCode. ScanCode deals with a lot of these as
+they are the basic unit of processing.
+
+A Codebase is a tree of Resource. A Resource represents a file or directory and
+holds file information as attributes and scans (optionally cached on-disk). This
+module handles all the details of walking files, path handling and caching
+scans.
 """
 
 
@@ -100,8 +105,8 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, unicode)
                                      and a or repr(a) for a in args))
 
-# A global cache of codebase objects, keyed by a unique integer ID.
 
+# A global cache of codebase objects, keyed by a unique integer ID.
 # We use this weird structure such that a Resource object can reference its
 # parent codebase object without actually storing it as an instance variable.
 # Instead a Resource only has a pointer to a codebase id and can fetch it from
@@ -166,10 +171,14 @@ class Codebase(object):
     Represent a codebase being scanned. A Codebase is a tree of Resources.
     """
 
-    def __init__(self, location, cache_base_dir=scans_cache_dir):
+    def __init__(self, location, use_cache=True, cache_base_dir=scans_cache_dir):
         """
         Initialize a new codebase rooted at the `location` existing file or
         directory.
+
+        If `use_cache` is True, scans will be cached on-disk in a file for each
+        Resource in a new unique directory under `cache_base_dir`. Otherwise,
+        scans are kept as Resource attributes.
         """
         self.original_location = location
 
@@ -183,6 +192,7 @@ def __init__(self, location, cache_base_dir=scans_cache_dir):
         # backing filesystem location
         assert exists(location)
 
+        # FIXME: what if is_special(location)???
         self.location = location
         self.base_location = parent_directory(location)
 
@@ -198,15 +208,99 @@ def __init__(self, location, cache_base_dir=scans_cache_dir):
         self.errors = []
 
         # setup cache
+        self.use_cache = use_cache
+        self.cache_base_dir = self.cache_dir = None
         self.cache_base_dir = cache_base_dir
+        if use_cache:
+            # this is unique to this run and valid for the lifetime of this codebase
+            self.cache_dir = get_cache_dir(cache_base_dir)
+            create_dir(self.cache_dir)
 
-        # this is unique to this run and valid for the lifetime of this codebase
-        self.cache_dir = get_cache_dir(cache_base_dir)
-        create_dir(self.cache_dir)
-
+        # this updates the global cache using a file lock
         self.cid = add_codebase(self)
+
         self.populate()
 
+    def populate(self):
+        """
+        Populate this codebase with Resource objects for this codebase by
+        walking its `self.location` in topdown order.
+        """
+        # clear things
+        self.resources = []
+        resources = self.resources
+
+        resources_append = resources.append
+
+        cid = self.cid
+        rloc = self.location
+        rid = 0
+        self.root = root = Resource(
+            name=file_name(rloc), rid=rid, pid=None, cid=cid,
+            is_file=self.is_file, use_cache=self.use_cache)
+        resources_append(root)
+        if TRACE: logger_debug('Codebase.collect: root:', root)
+
+        if self.is_file:
+            # there is nothing else to do
+            return
+
+        res_by_loc = {rloc: root}
+
+        def err(error):
+            self.errors.append(
+                'ERROR: cannot collect files: %(error)s\n' % dict(error=error)
+                + traceback.format_exc()
+            )
+
+        # we always ignore VCS and some filetypes.
+        ignored = partial(ignore.is_ignored, ignores=ignore.ignores_VCS)
+
+        # TODO: this is where we would plug archive walking??
+        for top, dirs, files in os_walk(rloc, topdown=True, onerror=err):
+
+            if is_special(top) or ignored(top):
+                # note: by design the root location is NEVER ignored
+                if TRACE: logger_debug(
+                    'Codebase.collect: walk: top ignored:', top, 'ignored:',
+                    ignored(top), 'is_special:', is_special(top))
+                continue
+
+            parent = res_by_loc[top]
+
+            if TRACE: logger_debug('Codebase.collect: parent:', parent)
+
+            for name in dirs:
+                loc = join(top, name)
+
+                if is_special(loc) or ignored(loc):
+                    if TRACE: logger_debug(
+                        'Codebase.collect: walk: dir ignored:', loc, 'ignored:',
+                        ignored(loc), 'is_special:', is_special(loc))
+                    continue
+
+                rid += 1
+                res = parent._add_child(name, rid, is_file=False)
+                res_by_loc[loc] = res
+                resources_append(res)
+                if TRACE: logger_debug('Codebase.collect: dir:', res)
+
+            for name in files:
+                loc = join(top, name)
+
+                if is_special(loc) or ignored(loc):
+                    if TRACE: logger_debug(
+                        'Codebase.collect: walk: file ignored:', loc, 'ignored:',
+                        ignored(loc), 'is_special:', is_special(loc))
+                    continue
+
+                rid += 1
+                res = parent._add_child(name, rid, is_file=True)
+                res_by_loc[loc] = res
+                resources_append(res)
+                if TRACE: logger_debug('Codebase.collect: file:', res)
+
+
     def walk(self, topdown=True, sort=False, skip_root=False):
         """
         Yield all Resources for this Codebase.
@@ -238,6 +332,12 @@ def add_resource(self, name, parent, is_file=False):
         """
         return parent.add_child(name, is_file)
 
+    def _get_next_rid(self):
+        """
+        Return the next available resource id.
+        """
+        return len([r for r in self.resources if r is not None])
+
     def remove_resource(self, resource):
         """
         Remove the `resource` Resource object and all its children from the
@@ -303,83 +403,6 @@ def clear(self):
         delete(self.cache_dir)
         del_codebase(self.cid)
 
-    def populate(self):
-        """
-        Populate this codebase with Resource objects.
-        """
-        self.resources = self._collect()
-        self.root = self.resources[0]
-
-    def _collect(self):
-        """
-        Return a sequence of Resource objects for this codebase by walking its
-        `location`. The sequence is in topdown order. The first item is the root.
-        """
-        def err(error):
-            self.errors.append(
-                'ERROR: cannot collect files: %(error)s\n' % dict(error=error) + traceback.format_exc()
-            )
-
-        cid = self.cid
-        rloc = self.location
-        rid = 0
-        root = Resource(name=file_name(rloc), rid=rid, pid=None, cid=cid, is_file=self.is_file)
-
-        if TRACE: logger_debug('Codebase.collect: root:', root)
-
-        res_by_loc = {rloc: root}
-        resources = [root]
-
-        if self.is_file:
-            # there is nothing else to do
-            return resources
-
-        # we always ignore VCS and some filetypes.
-        ignored = partial(ignore.is_ignored, ignores=ignore.ignores_VCS)
-
-        # TODO: this is where we would plug archive walking??
-        resources_append = resources.append
-        for top, dirs, files in os_walk(rloc, topdown=True, onerror=err):
-
-            if is_special(top) or ignored(top):
-                if TRACE: logger_debug(
-                    'Codebase.collect: walk: top ignored:', top, 'ignored:',
-                    ignored(top), 'is_special:', is_special(top))
-                continue
-
-            parent = res_by_loc[top]
-
-            if TRACE: logger_debug('Codebase.collect: parent:', parent)
-
-            for name in dirs:
-                loc = join(top, name)
-
-                if is_special(loc) or ignored(loc):
-                    if TRACE: logger_debug(
-                        'Codebase.collect: walk: dir ignored:', loc, 'ignored:',
-                        ignored(loc), 'is_special:', is_special(loc))
-                    continue
-                rid += 1
-                res = parent._add_child(name, rid, is_file=False)
-                res_by_loc[loc] = res
-                resources_append(res)
-                if TRACE: logger_debug('Codebase.collect: dir:', res)
-
-            for name in files:
-                loc = join(top, name)
-
-                if is_special(loc) or ignored(loc):
-                    if TRACE: logger_debug(
-                        'Codebase.collect: walk: file ignored:', loc, 'ignored:',
-                        ignored(loc), 'is_special:', is_special(loc))
-                    continue
-                rid += 1
-                res = parent._add_child(name, rid, is_file=True)
-                res_by_loc[loc] = res
-                resources_append(res)
-                if TRACE: logger_debug('Codebase.collect: file:', res)
-        return resources
-
 
 @attr.attributes(slots=True)
 class Resource(object):
@@ -403,11 +426,13 @@ class Resource(object):
 
     # a integer resource id
     rid = attr.ib(type=int, repr=False)
-    # a integer codebase id
-    cid = attr.ib(type=int, repr=False)
+
     # the root of a Resource tree has a pid==None by convention
     pid = attr.ib(type=int, repr=False)
 
+    # a integer codebase id
+    cid = attr.ib(default=None, type=int, repr=False)
+
     is_file = attr.ib(default=False, type=bool)
 
     # a list of rids
@@ -418,6 +443,8 @@ class Resource(object):
     # a mapping of scan result. Used when scan result is not cached
     _scans = attr.ib(default=attr.Factory(OrderedDict), repr=False)
 
+    # True is the cache is used. Set at creation time from the codebase settings
+    use_cache = attr.ib(default=None, type=bool, repr=False)
     # tuple of cache keys: dir and file name
     cache_keys = attr.ib(default=None, repr=False)
 
@@ -447,6 +474,8 @@ def __attrs_post_init__(self):
         # build simple cache keys for this resource based on the hex
         # representation of the resource id: they are guaranteed to be unique
         # within a codebase.
+        if self.use_cache is None:
+            self.use_cache = self.codebase.use_cache
         hx = '%08x' % self.rid
         if on_linux:
             hx = fsencode(hx)
@@ -496,26 +525,29 @@ def codebase(self):
         """
         return get_codebase(self.cid)
 
-    def get_cached_path(self, create=False):
+    def _get_cached_path(self, create=False):
         """
         Return the path where to get/put a data in the cache given a path.
         Create the directories if requested.
+        Will fail with an Exception if the codebase `use_cache` is False.
         """
-        cache_sub_dir, cache_file_name = self.cache_keys
-        parent = join(self.codebase.cache_dir, cache_sub_dir)
-        if create and not exists(parent):
-            create_dir(parent)
-        return join(parent, cache_file_name)
+        if self.use_cache:
+            cache_sub_dir, cache_file_name = self.cache_keys
+            parent = join(self.codebase.cache_dir, cache_sub_dir)
+            if create and not exists(parent):
+                create_dir(parent)
+            return join(parent, cache_file_name)
 
-    def get_scans(self, cache=True, _cached_path=None):
+    def get_scans(self, _cached_path=None):
         """
-        Return a `scans` mapping. Ftech from the cache if `cache` is True.
+        Return a `scans` mapping. Fetch from the cache if the codebase
+        `use_cache` is True.
         """
-        if not cache:
+        if not self.use_cache:
             return self._scans
 
         if not _cached_path:
-            _cached_path = self.get_cached_path(create=False)
+            _cached_path = self._get_cached_path(create=False)
 
         if not exists(_cached_path):
             return OrderedDict()
@@ -524,24 +556,24 @@ def get_scans(self, cache=True, _cached_path=None):
         with codecs.open(_cached_path, 'r', encoding='utf-8') as cached:
             return json.load(cached, object_pairs_hook=OrderedDict)
 
-    def put_scans(self, scans, update=True, cache=True):
+    def put_scans(self, scans, update=True):
         """
-        Save the `scans` mapping of scan results for this resource. Does nothing if
-        `scans` is empty or None.
+        Save the `scans` mapping of scan results for this resource. Does nothing
+        if `scans` is empty or None.
         Return the saved mapping of `scans`, possibly updated or empty.
         If `update` is True, existing scans are updated with `scans`.
         If `update` is False, `scans` overwrites existing scans.
-
-        If `cache` is True, `scans` are saved in the cache. Otherwise they are
-        saved in this resource object.
+        If `self.use_cache` is True, `scans` are saved in the cache.
+        Otherwise they are saved in this resource object.
         """
         if TRACE:
-            logger_debug('put_scans: scans:', scans, 'update:', update, 'cache:', cache)
+            logger_debug('put_scans: scans:', scans, 'update:', update,
+                         'use_cache:', self.use_cache)
 
         if not scans:
             return OrderedDict()
 
-        if not cache:
+        if not self.use_cache:
             if update:
                 self._scans.update(scans)
             else:
@@ -552,11 +584,12 @@ def put_scans(self, scans, update=True, cache=True):
             return self._scans
 
         self._scans.clear()
-        cached_path = self.get_cached_path(create=True)
+        cached_path = self._get_cached_path(create=True)
         if update:
-            existing = self.get_scans(cache, cached_path)
+            existing = self.get_scans(cached_path)
             if TRACE: logger_debug(
                 'put_scans: cached_path:', cached_path, 'existing:', existing)
+
             existing.update(scans)
 
             if TRACE: logger_debug('put_scans: merged:', existing)
@@ -613,9 +646,9 @@ def add_child(self, name, is_file=False):
         Create and return a child Resource. Add this child to the codebase
         resources and to this Resource children.
         """
-        rid = len(self.codebase.resources)
+        rid = self.codebase._get_next_rid()
         child = self._add_child(name, rid, is_file)
-        self.codebse.resources.append(rid)
+        self.codebase.resources.append(rid)
         return child
 
     def _add_child(self, name, rid, is_file=False):
@@ -623,7 +656,8 @@ def _add_child(self, name, rid, is_file=False):
         Create a child Resource with `name` and a `rid` Resource id and add its
         id to this Resource children. Return the created child.
         """
-        res = Resource(name=name, rid=rid, pid=self.rid, cid=self.cid, is_file=is_file)
+        res = Resource(name=name, rid=rid, pid=self.rid, cid=self.cid,
+                       is_file=is_file, use_cache=self.use_cache)
         self.children_rids.append(rid)
         return res
 
@@ -647,16 +681,15 @@ def ancestors(self):
         Return a sequence of ancestor Resource objects from root to self.
         """
         resources = self.codebase.resources
-        ancestors = []
-        ancestors_append = ancestors.append
+        ancestors = deque()
+        ancestors_append = ancestors.appendleft
         current = self
-        # walk up the tree: only the root as a pid==None
+        # walk up the tree parent tree: only the root as a pid==None
         while current.pid is not None:
             ancestors_append(current)
             current = resources[current.pid]
         ancestors_append(current)
-        ancestors.reverse()
-        return ancestors
+        return list(ancestors)
 
     def get_path(self, absolute=False, strip_root=False, decode=False, posix=False):
         """
@@ -685,7 +718,8 @@ def get_path(self, absolute=False, strip_root=False, decode=False, posix=False):
 
         elif strip_root:
             if len(segments) > 1:
-                # we cannot strip the root from the root!
+                # we cannot ever strip the root from the root when there is only
+                # one resource!
                 segments = segments[1:]
 
         path = join(*segments)
@@ -721,7 +755,7 @@ def to_dict(self, full_root=False, strip_root=False, with_info=False):
             res['base_name'] = fsdecode(self.base_name)
             res['extension'] = self.extension and fsdecode(self.extension)
             res['date'] = self.date
-            res['size'] = self.date
+            res['size'] = self.size
             res['sha1'] = self.sha1
             res['md5'] = self.md5
             res['files_count'] = self.files_count
diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv
index 0a69702c836..6e6ffc0c478 100644
--- a/tests/formattedcode/data/csv/livescan/expected.csv
+++ b/tests/formattedcode/data/csv/livescan/expected.csv
@@ -1,19 +1,19 @@
-Resource,type,name,extension,date,size,sha1,md5,files_count,dirs_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
-/json2csv.rb,file,json2csv.rb,.rb,2017-10-03,2017-10-03,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,,2017-10-03,2017-10-03,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
-/package.json,file,package.json,.json,2017-10-03,2017-10-03,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
+Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1014,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
+/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
diff --git a/tests/formattedcode/data/json/simple-expected.json b/tests/formattedcode/data/json/simple-expected.json
index fb14aa63eb4..354179c2a27 100644
--- a/tests/formattedcode/data/json/simple-expected.json
+++ b/tests/formattedcode/data/json/simple-expected.json
@@ -12,8 +12,9 @@
       "path": "simple",
       "type": "directory",
       "name": "simple",
+      "base_name": "simple",
       "extension": "",
-      "size": null,
+      "size": 55,
       "sha1": null,
       "md5": null,
       "files_count": 1,
@@ -36,8 +37,9 @@
       "path": "simple/copyright_acme_c-c.c",
       "type": "file",
       "name": "copyright_acme_c-c.c",
+      "base_name": "copyright_acme_c-c",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 55,
       "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
       "files_count": 0,
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index 7d18e4abcfa..e05565127e3 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -15,8 +15,9 @@
         "path": "simple",
         "type": "directory",
         "name": "simple",
+        "base_name": "simple",
         "extension": "",
-        "size": null,
+        "size": 55,
         "sha1": null,
         "md5": null,
         "files_count": 1,
@@ -40,8 +41,9 @@
         "path": "simple/copyright_acme_c-c.c",
         "type": "file",
         "name": "copyright_acme_c-c.c",
+        "base_name": "copyright_acme_c-c",
         "extension": ".c",
-        "size": "2017-10-03",
+        "size": 55,
         "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
         "md5": "bdf7c572beb4094c2059508fa73c05a4",
         "files_count": 0,
diff --git a/tests/formattedcode/data/json/simple-expected.jsonpp b/tests/formattedcode/data/json/simple-expected.jsonpp
index dbe99ac1684..218effa36ce 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonpp
+++ b/tests/formattedcode/data/json/simple-expected.jsonpp
@@ -13,8 +13,9 @@
       "path": "simple",
       "type": "directory",
       "name": "simple",
+      "base_name": "simple",
       "extension": "",
-      "size": null,
+      "size": 55,
       "sha1": null,
       "md5": null,
       "files_count": 1,
@@ -37,8 +38,9 @@
       "path": "simple/copyright_acme_c-c.c",
       "type": "file",
       "name": "copyright_acme_c-c.c",
+      "base_name": "copyright_acme_c-c",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 55,
       "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
       "files_count": 0,
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
index 07bd8812eb6..4a0dd6bfa78 100644
--- a/tests/formattedcode/data/json/tree/expected.json
+++ b/tests/formattedcode/data/json/tree/expected.json
@@ -13,8 +13,9 @@
       "path": "copy1.c",
       "type": "file",
       "name": "copy1.c",
+      "base_name": "copy1",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 91,
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "files_count": 0,
@@ -49,8 +50,9 @@
       "path": "copy2.c",
       "type": "file",
       "name": "copy2.c",
+      "base_name": "copy2",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 91,
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "files_count": 0,
@@ -85,8 +87,9 @@
       "path": "copy3.c",
       "type": "file",
       "name": "copy3.c",
+      "base_name": "copy3",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 91,
       "sha1": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f",
       "md5": "e999e21c9d7de4d0f943aefbb6f21b99",
       "files_count": 0,
@@ -121,8 +124,9 @@
       "path": "subdir",
       "type": "directory",
       "name": "subdir",
+      "base_name": "subdir",
       "extension": "",
-      "size": null,
+      "size": 361,
       "sha1": null,
       "md5": null,
       "files_count": 4,
@@ -145,8 +149,9 @@
       "path": "subdir/copy1.c",
       "type": "file",
       "name": "copy1.c",
+      "base_name": "copy1",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 91,
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "files_count": 0,
@@ -181,8 +186,9 @@
       "path": "subdir/copy2.c",
       "type": "file",
       "name": "copy2.c",
+      "base_name": "copy2",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 91,
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "files_count": 0,
@@ -217,8 +223,9 @@
       "path": "subdir/copy3.c",
       "type": "file",
       "name": "copy3.c",
+      "base_name": "copy3",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 84,
       "sha1": "389af7e629a9853056e42b262d5e30bf4579a74f",
       "md5": "290627a1387288ef77ae7e07946f3ecf",
       "files_count": 0,
@@ -253,8 +260,9 @@
       "path": "subdir/copy4.c",
       "type": "file",
       "name": "copy4.c",
+      "base_name": "copy4",
       "extension": ".c",
-      "size": "2017-10-03",
+      "size": 95,
       "sha1": "58748872d25374160692f1ed7075d0fe80a544b1",
       "md5": "88e46475db9b1a68f415f6a3544eeb16",
       "files_count": 0,
diff --git a/tests/formattedcode/data/spdx/license_known/expected.rdf b/tests/formattedcode/data/spdx/license_known/expected.rdf
index cbd3387e37f..d4e4521afbe 100644
--- a/tests/formattedcode/data/spdx/license_known/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected.rdf
@@ -3,22 +3,28 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
-          "ns1:licenseDeclared": {
+          "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:hasFile": [
             null, 
             null
           ], 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -27,33 +33,27 @@
               "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:name": "scan"
         }
       }, 
       "ns1:referencesFile": [
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada"
               }
             }, 
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE", 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           }
         }, 
@@ -61,24 +61,24 @@
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890"
               }
             }, 
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }, 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:fileName": "./scan/apache-2.0.LICENSE"
+            }
           }
         }
       ], 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
index c40d21c6c85..d4e4521afbe 100644
--- a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
@@ -3,23 +3,28 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:describesPackage": {
         "ns1:Package": {
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:downloadLocation": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:hasFile": [
             null, 
             null
           ], 
-          "ns1:downloadLocation": {
+          "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "scan", 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -28,57 +33,52 @@
               "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }
+          "ns1:name": "scan"
         }
       }, 
       "ns1:referencesFile": [
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada"
               }
             }, 
-            "ns1:licenseConcluded": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-            }, 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE", 
+            "ns1:licenseConcluded": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+            }, 
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+            }
           }
         }, 
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890"
               }
             }, 
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }, 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
           }
         }
       ], 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_ref/expected.rdf b/tests/formattedcode/data/spdx/license_ref/expected.rdf
index c710b4990a3..ff18de2701b 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected.rdf
@@ -1,26 +1,26 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
+    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "ns1:SpdxDocument": {
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-          "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
-        }
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:hasFile": null, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "scan", 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -31,23 +31,34 @@
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
               }
             }
           ], 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
+          "ns1:name": "scan"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+          "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
+        }
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
+          "ns1:checksum": {
+            "ns1:Checksum": {
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831"
+            }
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:fileName": "./scan/NOTICE", 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseInfoInFile": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -58,25 +69,14 @@
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
               }
             }
-          ], 
-          "ns1:checksum": {
-            "ns1:Checksum": {
-              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
-              "ns1:algorithm": "SHA1"
-            }
-          }, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:fileName": "./scan/NOTICE"
+          ]
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
index 2c0f8c378d4..757e7ea506f 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
@@ -1,26 +1,26 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
+    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "ns1:SpdxDocument": {
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-          "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
-        }
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:name": "scan", 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -31,23 +31,34 @@
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
               }
             }
           ], 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
+          "ns1:name": "scan"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
+          "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
+        }
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
+          "ns1:checksum": {
+            "ns1:Checksum": {
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831"
+            }
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:fileName": "./scan/NOTICE", 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseInfoInFile": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -58,25 +69,14 @@
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
               }
             }
-          ], 
-          "ns1:checksum": {
-            "ns1:Checksum": {
-              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
-              "ns1:algorithm": "SHA1"
-            }
-          }, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:fileName": "./scan/NOTICE"
+          ]
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/or_later/expected.rdf b/tests/formattedcode/data/spdx/or_later/expected.rdf
index 2d43fe9f430..ba15c1fa3f1 100644
--- a/tests/formattedcode/data/spdx/or_later/expected.rdf
+++ b/tests/formattedcode/data/spdx/or_later/expected.rdf
@@ -3,48 +3,48 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:describesPackage": {
         "ns1:Package": {
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "or_later", 
           "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
           }, 
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:hasFile": null
+          "ns1:name": "or_later"
         }
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
-          "ns1:licenseInfoInFile": {
-            "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
-          }, 
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:checksumValue": "0c5bf934430394112921e7a1a8128176606d32ca", 
-              "ns1:algorithm": "SHA1"
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "0c5bf934430394112921e7a1a8128176606d32ca"
             }
           }, 
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
+          "ns1:fileName": "./test.java", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
-          "ns1:fileName": "./test.java"
+          "ns1:licenseInfoInFile": {
+            "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
+          }
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/simple/expected.rdf b/tests/formattedcode/data/spdx/simple/expected.rdf
index 7dcc02e8d93..cd628e1e064 100644
--- a/tests/formattedcode/data/spdx/simple/expected.rdf
+++ b/tests/formattedcode/data/spdx/simple/expected.rdf
@@ -3,52 +3,52 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:hasFile": null, 
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "simple", 
           "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }
+          "ns1:name": "simple"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:referencesFile": {
         "ns1:File": {
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:checksumValue": "b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8", 
-              "ns1:algorithm": "SHA1"
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8"
             }
           }, 
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:fileName": "./test.txt", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoInFile": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:fileName": "./test.txt"
+          }
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/tree/expected.rdf b/tests/formattedcode/data/spdx/tree/expected.rdf
index ab0787bb801..fdcf8aabf9b 100644
--- a/tests/formattedcode/data/spdx/tree/expected.rdf
+++ b/tests/formattedcode/data/spdx/tree/expected.rdf
@@ -3,17 +3,16 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
+          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:hasFile": [
             null, 
             null, 
@@ -23,49 +22,50 @@
             null, 
             null
           ], 
-          "ns1:licenseInfoFromFiles": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseInfoFromFiles": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
           "ns1:name": "scan"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": [
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/subdir/copy3.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy3.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc."
+            }
           }
         }, 
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/copy1.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/copy1.c", 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -75,15 +75,15 @@
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy1.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/copy2.c", 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -91,17 +91,17 @@
         }, 
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/subdir/copy1.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy2.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -109,60 +109,60 @@
         }, 
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/copy2.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy2.c"
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }
           }
         }, 
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy4.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy4.c"
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }
           }
         }, 
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/copy3.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/copy3.c", 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
           }
         }
       ], 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/unicode/expected.rdf b/tests/formattedcode/data/spdx/unicode/expected.rdf
index 3d83d4ed444..89592719834 100644
--- a/tests/formattedcode/data/spdx/unicode/expected.rdf
+++ b/tests/formattedcode/data/spdx/unicode/expected.rdf
@@ -1,66 +1,66 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
+    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "ns1:SpdxDocument": {
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
-          "ns1:licenseId": "LicenseRef-agere-bsd"
-        }
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:hasFile": null, 
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "unicode", 
           "ns1:licenseInfoFromFiles": {
             "ns1:ExtractedLicensingInfo": {
               "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
-              "ns1:licenseId": "LicenseRef-agere-bsd"
+              "ns1:licenseId": "LicenseRef-agere-bsd", 
+              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
             }
           }, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc."
+          "ns1:name": "unicode"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
+          "ns1:licenseId": "LicenseRef-agere-bsd", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
+        }
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90", 
-              "ns1:algorithm": "SHA1"
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90"
             }
           }, 
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
+          "ns1:fileName": "./et131x.h", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoInFile": {
             "ns1:ExtractedLicensingInfo": {
               "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
-              "ns1:licenseId": "LicenseRef-agere-bsd"
+              "ns1:licenseId": "LicenseRef-agere-bsd", 
+              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
             }
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
-          "ns1:fileName": "./et131x.h"
+          }
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/test_format_spdx.py b/tests/formattedcode/test_format_spdx.py
index 545e64c82d2..56e23eeea83 100644
--- a/tests/formattedcode/test_format_spdx.py
+++ b/tests/formattedcode/test_format_spdx.py
@@ -23,11 +23,12 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 import codecs
+from collections import OrderedDict
 import os
 import re
 
@@ -70,29 +71,32 @@ def load_and_clean_rdf(location):
     """
     content = codecs.open(location, encoding='utf-8').read()
     content = strip_variable_text(content)
-    data = xmltodict.parse(content, dict_constructor=dict)
+    data = xmltodict.parse(content, dict_constructor=OrderedDict)
     return sort_nested(data)
 
 
 def sort_nested(data):
     """
-    Return a new dict with any nested list sorted recursively.
+    Return a new ordered and sorted mapping or sequence from a `data` mapping or
+    sequence with any nested sequences or mappings sorted recursively.
+
     """
-    if isinstance(data, dict):
-        new_data = {}
-        for k, v in data.items():
-            if isinstance(v, list):
-                v = sorted(v)
-            if isinstance(v, dict):
+    seqtypes = list, tuple
+    maptypes = OrderedDict, dict
+    coltypes = seqtypes + maptypes
+
+    if isinstance(data, maptypes):
+        new_data = OrderedDict()
+        for k, v in sorted(data.items()):
+            if isinstance(v, coltypes):
                 v = sort_nested(v)
             new_data[k] = v
         return new_data
-    elif isinstance(data, list):
+
+    elif isinstance(data, seqtypes):
         new_data = []
         for v in sorted(data):
-            if isinstance(v, list):
-                v = sort_nested(v)
-            if isinstance(v, dict):
+            if isinstance(v, coltypes):
                 v = sort_nested(v)
             new_data.append(v)
         return new_data
diff --git a/tests/scancode/data/altpath/copyright.expected.json b/tests/scancode/data/altpath/copyright.expected.json
index d34ecded2b2..5fcde2f2bd3 100644
--- a/tests/scancode/data/altpath/copyright.expected.json
+++ b/tests/scancode/data/altpath/copyright.expected.json
@@ -16,7 +16,8 @@
       "size": 55,
       "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index 2929b1b95bd..4f4006aea81 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -1,12 +1,13 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--packages": true
+    "--packages": true,
+    "--infos": true
   },
   "files_count": 1,
   "files": [
     {
-      "path": "composer/composer.json",
+      "path": "composer.json",
       "scan_errors": [],
       "packages": [
         {
diff --git a/tests/scancode/data/failing/patchelf.expected.json b/tests/scancode/data/failing/patchelf.expected.json
index 8ca24a2fd9c..a20fff0b738 100644
--- a/tests/scancode/data/failing/patchelf.expected.json
+++ b/tests/scancode/data/failing/patchelf.expected.json
@@ -2,6 +2,7 @@
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
     "--copyrights": true,
+    "--infos": true,
     "--strip-root": true
   },
   "files_count": 1,
@@ -9,7 +10,7 @@
     {
       "path": "patchelf.pdf",
       "scan_errors": [
-        "ERROR: copyrights: unpack requires a string argument of length 8"
+        "ERROR: for scanner: copyrights:\nERROR: Unknown error:\nTraceback (most recent call last):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/scancode/interrupt.py\", line 88, in interruptible\n    return NO_ERROR, func(*(args or ()), **(kwargs or {}))\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/scancode/api.py\", line 70, in get_copyrights\n    for copyrights, authors, _years, holders, start_line, end_line in detect_copyrights(location):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/cluecode/copyrights.py\", line 70, in detect_copyrights\n    for numbered_lines in candidate_lines(analysis.text_lines(location)):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/cluecode/copyrights.py\", line 1269, in candidate_lines\n    for line_number, line in enumerate(lines):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/textcode/analysis.py\", line 125, in unicode_text_lines_from_pdf\n    for line in pdf.get_text_lines(location):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/textcode/pdf.py\", line 57, in get_text_lines\n    interpreter.process_page(page)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 852, in process_page\n    self.render_contents(page.resources, page.contents, ctm=ctm)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 862, in render_contents\n    self.init_resources(resources)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 362, in init_resources\n    self.fontmap[fontid] = self.rsrcmgr.get_font(objid, spec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 212, in get_font\n    font = self.get_font(None, subspec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 203, in get_font\n    font = PDFCIDFont(self, spec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdffont.py\", line 667, in __init__\n    BytesIO(self.fontfile.get_data()))\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdffont.py\", line 386, in __init__\n    (ntables, _1, _2, _3) = struct.unpack('>HHHH', fp.read(8))\nerror: unpack requires a string argument of length 8\n"
       ],
       "copyrights": []
     }
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index 7f6c71b97c1..009821a6cd8 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -70,6 +70,8 @@ Options:
                              error messages or result details.
     --timeout FLOAT          Stop scanning a file if scanning takes longer than a
                              timeout in seconds.  [default: 120]
+    --no-cache               Do not use on-disk cache for scan results. Faster but
+                             uses more memory.
 
   Examples (use --examples for more):
 
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 370c4ce6295..6e4cc6adcad 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -6,7 +6,7 @@
     "--infos": true,
     "--strip-root": true
   },
-  "files_count": 11,
+  "files_count": 6,
   "files": [
     {
       "path": "basic",
@@ -19,6 +19,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 6,
+      "dirs_count": 4,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -42,7 +43,8 @@
       "size": 183,
       "sha1": "94f059d6478d5f460e79b6b948a7fa9849d4dfdc",
       "md5": "15240737ec72b9e88b485a663bd045f9",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -67,6 +69,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 1,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -90,7 +93,8 @@
       "size": 10240,
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -115,6 +119,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 1,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -138,7 +143,8 @@
       "size": 8246,
       "sha1": "03cfd28bb49d1dab105dcce1663630be1ddd821a",
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -163,6 +169,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 1,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -187,6 +194,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -210,7 +218,8 @@
       "size": 32452,
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -277,7 +286,8 @@
       "size": 4005,
       "sha1": "4d567dc15d2117445389edfb64ced872329bceaa",
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -301,7 +311,8 @@
       "size": 1940,
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index 1f0ba7c8be5..a3f70e1ded3 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -4,10 +4,19 @@
     "--copyrights": true,
     "--licenses": true,
     "--emails": true,
-    "--urls": true
+    "--urls": true,
+    "--infos": true
   },
-  "files_count": 11,
+  "files_count": 6,
   "files": [
+    {
+      "path": "basic.tgz",
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "emails": [],
+      "urls": []
+    },
     {
       "path": "basic.tgz/basic",
       "scan_errors": [],
diff --git a/tests/scancode/data/info/basic.expected.json b/tests/scancode/data/info/basic.expected.json
index 4c3526d19f1..878f1dfecf7 100644
--- a/tests/scancode/data/info/basic.expected.json
+++ b/tests/scancode/data/info/basic.expected.json
@@ -4,7 +4,7 @@
     "--infos": true,
     "--strip-root": true
   },
-  "files_count": 11,
+  "files_count": 6,
   "files": [
     {
       "path": "basic",
@@ -17,6 +17,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 6,
+      "dirs_count": 4,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -38,7 +39,8 @@
       "size": 183,
       "sha1": "94f059d6478d5f460e79b6b948a7fa9849d4dfdc",
       "md5": "15240737ec72b9e88b485a663bd045f9",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -61,6 +63,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 1,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -82,7 +85,8 @@
       "size": 10240,
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -105,6 +109,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 1,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -126,7 +131,8 @@
       "size": 8246,
       "sha1": "03cfd28bb49d1dab105dcce1663630be1ddd821a",
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -149,6 +155,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 1,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -171,6 +178,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -192,7 +200,8 @@
       "size": 32452,
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -214,7 +223,8 @@
       "size": 4005,
       "sha1": "4d567dc15d2117445389edfb64ced872329bceaa",
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -236,7 +246,8 @@
       "size": 1940,
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/info/basic.rooted.expected.json b/tests/scancode/data/info/basic.rooted.expected.json
index fb3b4f58b95..072fcacad2b 100644
--- a/tests/scancode/data/info/basic.rooted.expected.json
+++ b/tests/scancode/data/info/basic.rooted.expected.json
@@ -3,8 +3,31 @@
   "scancode_options": {
     "--infos": true
   },
-  "files_count": 11,
+  "files_count": 6,
   "files": [
+    {
+      "path": "basic.tgz",
+      "type": "directory",
+      "name": "basic.tgz",
+      "base_name": "basic.tgz",
+      "extension": "",
+      "date": null,
+      "size": 57066,
+      "sha1": null,
+      "md5": null,
+      "files_count": 6,
+      "dirs_count": 5,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
+    },
     {
       "path": "basic.tgz/basic",
       "type": "directory",
@@ -16,6 +39,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 6,
+      "dirs_count": 4,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -37,7 +61,8 @@
       "size": 183,
       "sha1": "94f059d6478d5f460e79b6b948a7fa9849d4dfdc",
       "md5": "15240737ec72b9e88b485a663bd045f9",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -60,6 +85,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 1,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -81,7 +107,8 @@
       "size": 10240,
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -104,6 +131,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 1,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -125,7 +153,8 @@
       "size": 8246,
       "sha1": "03cfd28bb49d1dab105dcce1663630be1ddd821a",
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -148,6 +177,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 1,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -170,6 +200,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -191,7 +222,8 @@
       "size": 32452,
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -213,7 +245,8 @@
       "size": 4005,
       "sha1": "4d567dc15d2117445389edfb64ced872329bceaa",
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -235,7 +268,8 @@
       "size": 1940,
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/info/email_url_info.expected.json b/tests/scancode/data/info/email_url_info.expected.json
index a0508cb1f61..382e83764d7 100644
--- a/tests/scancode/data/info/email_url_info.expected.json
+++ b/tests/scancode/data/info/email_url_info.expected.json
@@ -6,7 +6,7 @@
     "--infos": true,
     "--strip-root": true
   },
-  "files_count": 11,
+  "files_count": 6,
   "files": [
     {
       "path": "basic",
@@ -19,6 +19,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 6,
+      "dirs_count": 4,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -42,7 +43,8 @@
       "size": 183,
       "sha1": "94f059d6478d5f460e79b6b948a7fa9849d4dfdc",
       "md5": "15240737ec72b9e88b485a663bd045f9",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -67,6 +69,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 1,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -90,7 +93,8 @@
       "size": 10240,
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -115,6 +119,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 1,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -138,7 +143,8 @@
       "size": 8246,
       "sha1": "03cfd28bb49d1dab105dcce1663630be1ddd821a",
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -163,6 +169,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 1,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -187,6 +194,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 2,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -210,7 +218,8 @@
       "size": 32452,
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -246,7 +255,8 @@
       "size": 4005,
       "sha1": "4d567dc15d2117445389edfb64ced872329bceaa",
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -276,7 +286,8 @@
       "size": 1940,
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index 1e4d7aa7621..cf9ffd3c49c 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -2,6 +2,7 @@
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
     "--licenses": true,
+    "--infos": true,
     "--license-text": true,
     "--strip-root": true
   },
diff --git a/tests/scancode/data/non_utf8/expected-linux.json b/tests/scancode/data/non_utf8/expected-linux.json
index 59dce226ed2..3808cb10fb2 100644
--- a/tests/scancode/data/non_utf8/expected-linux.json
+++ b/tests/scancode/data/non_utf8/expected-linux.json
@@ -4,7 +4,7 @@
     "--infos": true,
     "--strip-root": true
   },
-  "files_count": 19,
+  "files_count": 18,
   "files": [
     {
       "path": "non_unicode",
@@ -17,6 +17,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 18,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -38,7 +39,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -60,7 +62,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -82,7 +85,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -104,7 +108,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -126,7 +131,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -148,7 +154,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -170,7 +177,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -192,7 +200,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -214,7 +223,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -236,7 +246,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -258,7 +269,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -280,7 +292,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -302,7 +315,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -324,7 +338,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -346,7 +361,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -368,7 +384,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -390,7 +407,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -412,7 +430,8 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
diff --git a/tests/scancode/data/plugin_mark_source/with_info.expected.json b/tests/scancode/data/plugin_mark_source/with_info.expected.json
index 38eaaf66b78..324efa58026 100644
--- a/tests/scancode/data/plugin_mark_source/with_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/with_info.expected.json
@@ -13,7 +13,7 @@
       "base_name": "JGroups.tgz",
       "extension": "",
       "date": null,
-      "size": null,
+      "size": 206642,
       "sha1": null,
       "md5": null,
       "files_count": 12,
@@ -36,7 +36,7 @@
       "base_name": "JGroups",
       "extension": "",
       "date": null,
-      "size": null,
+      "size": 206642,
       "sha1": null,
       "md5": null,
       "files_count": 12,
@@ -59,7 +59,7 @@
       "base_name": "licenses",
       "extension": "",
       "date": null,
-      "size": null,
+      "size": 54552,
       "sha1": null,
       "md5": null,
       "files_count": 5,
@@ -82,7 +82,7 @@
       "base_name": "apache-1.1",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 2885,
       "sha1": "6b5608d35c3e304532af43db8bbfc5947bef46a6",
       "md5": "276982197c941f4cbf3d218546e17ae2",
       "files_count": 0,
@@ -105,7 +105,7 @@
       "base_name": "apache-2.0",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 11560,
       "sha1": "47b573e3824cd5e02a1a3ae99e2735b49e0256e4",
       "md5": "d273d63619c9aeaf15cdaf76422c4f87",
       "files_count": 0,
@@ -128,7 +128,7 @@
       "base_name": "bouncycastle",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 1186,
       "sha1": "74facb0e9a734479f9cd893b5be3fe1bf651b760",
       "md5": "9fffd8de865a5705969f62b128381f85",
       "files_count": 0,
@@ -151,7 +151,7 @@
       "base_name": "cpl-1.0",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 11987,
       "sha1": "681cf776bcd79752543d42490ec7ed22a29fd888",
       "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
       "files_count": 0,
@@ -174,7 +174,7 @@
       "base_name": "lgpl",
       "extension": ".txt",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 26934,
       "sha1": "8f1a637d2e2ed1bdb9eb01a7dccb5c12cc0557e1",
       "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
       "files_count": 0,
@@ -197,7 +197,7 @@
       "base_name": "src",
       "extension": "",
       "date": null,
-      "size": null,
+      "size": 152090,
       "sha1": null,
       "md5": null,
       "files_count": 7,
@@ -220,7 +220,7 @@
       "base_name": "FixedMembershipToken",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 5144,
       "sha1": "5901f73dcc78155a1a2c7b5663a3a11fba400b19",
       "md5": "aca9640ec8beee21b098bcf8ecc91442",
       "files_count": 0,
@@ -243,7 +243,7 @@
       "base_name": "GuardedBy",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 813,
       "sha1": "981d67087e65e9a44957c026d4b10817cf77d966",
       "md5": "c5064400f759d3e81771005051d17dc1",
       "files_count": 0,
@@ -266,7 +266,7 @@
       "base_name": "ImmutableReference",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 1838,
       "sha1": "30f56b876d5576d9869e2c5c509b08db57110592",
       "md5": "48ca3c72fb9a65c771a321222f118b88",
       "files_count": 0,
@@ -289,7 +289,7 @@
       "base_name": "RATE_LIMITER",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 3692,
       "sha1": "a8087e5d50da3273536ebda9b87b77aa4ff55deb",
       "md5": "4626bdbc48871b55513e1a12991c61a8",
       "files_count": 0,
@@ -312,7 +312,7 @@
       "base_name": "RouterStub",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 9913,
       "sha1": "c1f6818f8ee7bddcc9f444bc94c099729d716d52",
       "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
       "files_count": 0,
@@ -335,7 +335,7 @@
       "base_name": "RouterStubManager",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 8162,
       "sha1": "eb419dc94cfe11ca318a3e743a7f9f080e70c751",
       "md5": "20bee9631b7c82a45c250e095352aec7",
       "files_count": 0,
@@ -358,7 +358,7 @@
       "base_name": "S3_PING",
       "extension": ".java",
       "date": "2017-08-05",
-      "size": "2017-08-05",
+      "size": 122528,
       "sha1": "08dba9986f69719970ead3592dc565465164df0d",
       "md5": "83d8324f37d0e3f120bc89865cf0bd39",
       "files_count": 0,
diff --git a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
index 6cb51660901..a34186dd249 100644
--- a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
+++ b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
@@ -1,12 +1,13 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--packages": true
+    "--packages": true,
+    "--infos": true
   },
   "files_count": 1,
   "files": [
     {
-      "path": "rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm",
+      "path": "fping-2.4-0.b2.rhfc1.dag.i386.rpm",
       "scan_errors": [],
       "packages": [
         {
diff --git a/tests/scancode/data/single/iproute.c b/tests/scancode/data/single/iproute.c
new file mode 100644
index 00000000000..5936d16e935
--- /dev/null
+++ b/tests/scancode/data/single/iproute.c
@@ -0,0 +1,12 @@
+/*
+# Copyright (c) 2010 Patrick McHardy All rights reserved.
+
+ * iplink_vlan.c        VLAN device support
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ * Authors:     Patrick McHardy <kaber@trash.net>
+ */
\ No newline at end of file
diff --git a/tests/scancode/data/single/iproute.expected.json b/tests/scancode/data/single/iproute.expected.json
new file mode 100644
index 00000000000..afb88207a71
--- /dev/null
+++ b/tests/scancode/data/single/iproute.expected.json
@@ -0,0 +1,33 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "--infos": true,
+    "--strip-root": true
+  },
+  "files_count": 1,
+  "files": [
+    {
+      "path": "iproute.c",
+      "type": "file",
+      "name": "iproute.c",
+      "base_name": "iproute",
+      "extension": ".c",
+      "date": "2017-10-03",
+      "size": 469,
+      "sha1": "f0f352c14a8d0b0510cbbeae056542ae7f252151",
+      "md5": "b8e7112a6e82921687fd1e008e72058f",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "C",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
index 155e4c9f0a9..a734cce78ef 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
@@ -9,7 +9,7 @@
     "--infos": true,
     "--strip-root": true
   },
-  "files_count": 4,
+  "files_count": 3,
   "files": [
     {
       "path": "unicodepath",
@@ -21,6 +21,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 3,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -46,7 +47,8 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -72,7 +74,8 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -98,7 +101,8 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
diff --git a/tests/scancode/data/weird_file_name/expected-linux.json b/tests/scancode/data/weird_file_name/expected-linux.json
index 60876d55708..77d5bc2aca4 100644
--- a/tests/scancode/data/weird_file_name/expected-linux.json
+++ b/tests/scancode/data/weird_file_name/expected-linux.json
@@ -5,7 +5,7 @@
     "--infos": true,
     "--strip-root": true
   },
-  "files_count": 5,
+  "files_count": 0,
   "files": [
     {
       "path": "some 'file",
@@ -17,7 +17,8 @@
       "size": 20,
       "sha1": "715037088f2582f3fbb7e9492f819987f713a332",
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -40,7 +41,8 @@
       "size": 21,
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -63,7 +65,8 @@
       "size": 38,
       "sha1": "5fbba80b758b93a311369979d8a68f22c4817d37",
       "md5": "41ac81497162f2ff48a0442847238ad7",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -86,7 +89,8 @@
       "size": 39,
       "sha1": "b2016984d073f405f9788fbf6ae270b452ab73b0",
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -109,7 +113,8 @@
       "size": 21,
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index ddc20bea381..5ea7f9ad60b 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -30,25 +30,23 @@
 from collections import OrderedDict
 import json
 import os
-from unittest import TestCase
 from unittest.case import skipIf
 
-# from click.testing import CliRunner
+import click
+click.disable_unicode_literals_warning = True
 
 from commoncode import fileutils
-from commoncode.fileutils import path_to_bytes
+from commoncode.fileutils import fsencode
 from commoncode.testcase import FileDrivenTesting
+# from commoncode.testcase import FileBasedTesting
 from commoncode.system import on_linux
 from commoncode.system import on_mac
 from commoncode.system import on_windows
 
-from scancode.cli_test_utils import _load_json_result
 from scancode.cli_test_utils import check_json_scan
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import run_scan_plain
 
-from scancode import cli
-
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -120,116 +118,6 @@ def test_license_option_detects_licenses():
     assert len(open(result_file).read()) > 10
 
 
-def test_scancode_skip_vcs_files_and_dirs_by_default():
-    test_dir = test_env.extract_test_tar('ignore/vcs.tgz')
-    result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--copyright', '--strip-root', test_dir, result_file])
-    assert result.exit_code == 0
-    scan_result = _load_json_result(result_file)
-    # a single test.tst file and its directory that is not a VCS file should be listed
-    assert 2 == scan_result['files_count']
-    scan_locs = [x['path'] for x in scan_result['files']]
-    assert [u'vcs', u'vcs/test.txt'] == scan_locs
-
-
-def test_scancode_skip_single_file(monkeypatch):
-    test_dir = test_env.extract_test_tar('ignore/user.tgz')
-    result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(
-        ['--copyright', '--strip-root', '--ignore', 'sample.doc', test_dir, result_file],
-        monkeypatch
-    )
-    assert result.exit_code == 0
-    scan_result = _load_json_result(result_file)
-    assert 6 == scan_result['files_count']
-    scan_locs = [x['path'] for x in scan_result['files']]
-    expected = [
-        'user',
-        'user/ignore.doc',
-        'user/src',
-        'user/src/ignore.doc',
-        'user/src/test',
-        'user/src/test/sample.txt'
-    ]
-    assert expected == scan_locs
-
-
-def test_scancode_skip_multiple_files(monkeypatch):
-    test_dir = test_env.extract_test_tar('ignore/user.tgz')
-    result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--copyright', '--strip-root', '--ignore', 'ignore.doc', test_dir, result_file], monkeypatch)
-    assert result.exit_code == 0
-    scan_result = _load_json_result(result_file)
-    assert 5 == scan_result['files_count']
-    scan_locs = [x['path'] for x in scan_result['files']]
-    assert [u'user', u'user/src', u'user/src/test', u'user/src/test/sample.doc', u'user/src/test/sample.txt'] == scan_locs
-
-
-def test_scancode_skip_glob_files(monkeypatch):
-    test_dir = test_env.extract_test_tar('ignore/user.tgz')
-    result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*.doc', test_dir, result_file], monkeypatch)
-    assert result.exit_code == 0
-    scan_result = _load_json_result(result_file)
-    assert 4 == scan_result['files_count']
-    scan_locs = [x['path'] for x in scan_result['files']]
-    assert [u'user', u'user/src', u'user/src/test', u'user/src/test/sample.txt'] == scan_locs
-
-
-def test_scancode_skip_glob_path(monkeypatch):
-    test_dir = test_env.extract_test_tar('ignore/user.tgz')
-    result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test/*', test_dir, result_file], monkeypatch)
-    assert result.exit_code == 0
-    scan_result = _load_json_result(result_file)
-    assert 5 == scan_result['files_count']
-    scan_locs = [x['path'] for x in scan_result['files']]
-    assert [u'user', u'user/ignore.doc', u'user/src', u'user/src/ignore.doc', u'user/src/test'] == scan_locs
-
-def test_scancode_multiple_ignores(monkeypatch):
-    test_dir = test_env.extract_test_tar('ignore/user.tgz')
-    result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test', '--ignore', '*.doc', test_dir, result_file], monkeypatch)
-    assert result.exit_code == 0
-    scan_result = _load_json_result(result_file)
-    assert 2 == scan_result['files_count']
-    scan_locs = [x['path'] for x in scan_result['files']]
-    assert [u'user', u'user/src'] == scan_locs
-
-
-def test_scan_mark_source_without_info(monkeypatch):
-    test_dir = test_env.extract_test_tar('mark_source/JGroups.tgz')
-    result_file = test_env.get_temp_file('json')
-    expected_file = test_env.get_test_loc('mark_source/without_info.expected.json')
-
-    _result = run_scan_click(['--mark-source', test_dir, result_file], monkeypatch)
-    check_json_scan(expected_file, result_file, regen=False)
-
-
-def test_scan_mark_source_with_info(monkeypatch):
-    test_dir = test_env.extract_test_tar('mark_source/JGroups.tgz')
-    result_file = test_env.get_temp_file('json')
-    expected_file = test_env.get_test_loc('mark_source/with_info.expected.json')
-
-    _result = run_scan_click(['--info', '--mark-source', test_dir, result_file], monkeypatch)
-    check_json_scan(expected_file, result_file)
-
-
-def test_scan_only_findings(monkeypatch):
-    test_dir = test_env.extract_test_tar('info/basic.tgz')
-    result_file = test_env.get_temp_file('json')
-    expected_file = test_env.get_test_loc('only_findings/expected.json')
-
-    _result = run_scan_click(['--only-findings', test_dir, result_file], monkeypatch)
-    check_json_scan(expected_file, result_file)
-
-
 def test_usage_and_help_return_a_correct_script_name_on_all_platforms():
     result = run_scan_click(['--help'])
     assert 'Usage: scancode [OPTIONS]' in result.output
@@ -275,7 +163,7 @@ def test_scan_info_returns_full_root():
     assert 'Scanning done' in result.output
     result_data = json.loads(open(result_file, 'rb').read())
     file_paths = [f['path'] for f in result_data['files']]
-    assert 11 == len(file_paths)
+    assert 12 == len(file_paths)
     root = fileutils.as_posixpath(test_dir)
     assert all(p.startswith(root) for p in file_paths)
 
@@ -296,6 +184,14 @@ def test_scan_info_returns_correct_full_root_with_single_file():
     assert fileutils.as_posixpath(test_file) == scanned_file['path']
 
 
+def test_scan_info_returns_does_not_strip_root_with_single_file():
+    test_file = test_env.get_test_loc('single/iproute.c')
+    result_file = test_env.get_temp_file('json')
+    result = run_scan_click(['--info', '--strip-root', test_file, result_file])
+    assert result.exit_code == 0
+    check_json_scan(test_env.get_test_loc('single/iproute.expected.json'), result_file, regen=False)
+
+
 def test_scan_info_license_copyrights():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
@@ -348,20 +244,20 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
     assert 'patchelf.pdf' in result.output
 
 
-def test_scan_with_errors_and_diag_option_includes_full_traceback():
+def test_scan_with_errors_always_includes_full_traceback():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
 
-    result = run_scan_click([ '--copyright', '--diag', test_file, result_file])
+    result = run_scan_click([ '--copyright', test_file, result_file])
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
     assert 'Some files failed to scan' in result.output
     assert 'patchelf.pdf' in result.output
 
     result_json = json.loads(open(result_file).read())
-    expected = 'ERROR: copyrights: unpack requires a string argument of length 8'
-    assert expected == result_json['files'][0]['scan_errors'][0]
-    assert result_json['files'][0]['scan_errors'][1].startswith('ERROR: copyrights: Traceback (most recent call')
+    expected = 'error: unpack requires a string argument of length 8'
+    assert expected in result_json['files'][0]['scan_errors'][-1]
+    assert result_json['files'][0]['scan_errors'][0].startswith('ERROR: for scanner: copyrights')
 
 
 def test_failing_scan_return_proper_exit_code():
@@ -445,9 +341,26 @@ def test_scan_works_with_multiple_processes_and_timeouts():
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
     expected = [
-        [(u'path', u'test1.txt'), (u'scan_errors', [u'ERROR: Processing interrupted: timeout after 0 seconds.'])],
-        [(u'path', u'test2.txt'), (u'scan_errors', [u'ERROR: Processing interrupted: timeout after 0 seconds.'])],
-        [(u'path', u'test3.txt'), (u'scan_errors', [u'ERROR: Processing interrupted: timeout after 0 seconds.'])],
+        [(u'path', u'test1.txt'),
+         (u'scan_errors',
+            [u'ERROR: for scanner: infos:\nERROR: Processing interrupted: timeout after 0 seconds.',
+             u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
+         (u'copyrights', [])
+        ],
+
+        [(u'path', u'test2.txt'),
+         (u'scan_errors',
+            [u'ERROR: for scanner: infos:\nERROR: Processing interrupted: timeout after 0 seconds.',
+             u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
+         (u'copyrights', [])
+        ],
+
+        [(u'path', u'test3.txt'),
+         (u'scan_errors',
+            [u'ERROR: for scanner: infos:\nERROR: Processing interrupted: timeout after 0 seconds.',
+             u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
+         (u'copyrights', [])
+        ]
     ]
 
     result_json = json.loads(open(result_file).read(), object_pairs_hook=OrderedDict)
@@ -459,8 +372,8 @@ def test_scan_does_not_fail_when_scanning_unicode_files_and_paths():
     result_file = test_env.get_temp_file('json')
 
     if on_linux:
-        test_dir = path_to_bytes(test_dir)
-        result_file = path_to_bytes(result_file)
+        test_dir = fsencode(test_dir)
+        result_file = fsencode(result_file)
 
     args = ['--info', '--license', '--copyright',
             '--package', '--email', '--url', '--strip-root',
@@ -496,7 +409,7 @@ def test_scan_does_not_fail_when_scanning_unicode_test_files_from_express():
     # rename the problematic files.
 
     test_dir = test_env.extract_test_tar_raw(b'unicode_fixtures.tar.gz')
-    test_dir = path_to_bytes(test_dir)
+    test_dir = fsencode(test_dir)
 
     args = ['-n0', '--info', '--license', '--copyright',
             '--package', '--email', '--url', '--strip-root',
@@ -586,8 +499,8 @@ def test_scan_can_handle_non_utf8_file_names_on_posix():
     result_file = test_env.get_temp_file('json')
 
     if on_linux:
-        test_dir = path_to_bytes(test_dir)
-        result_file = path_to_bytes(result_file)
+        test_dir = fsencode(test_dir)
+        result_file = fsencode(result_file)
 
     result = run_scan_click(['-i', '--strip-root', test_dir, result_file])
     assert result.exit_code == 0
@@ -628,43 +541,77 @@ def test_scan_can_run_from_other_directory():
     check_json_scan(test_env.get_test_loc(expected_file), result_file, strip_dates=True)
 
 
-def test_scan_logs_errors_messages():
+def test_scan_logs_errors_messages_not_verbosely_on_stderr():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', test_file, ])
+    rc, stdout, stderr = run_scan_plain(['-pi', '-n', '0', test_file])
     assert rc == 1
-    assert 'package.json' in stderr
-    assert 'delimiter: line 5 column 12' in stdout
-    assert 'ValueError: Expecting' not in stdout
+    assert 'Path: errors/package.json' in stderr
+    assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
+    assert "Expecting ':' delimiter: line 5 column 12 (char 143)" not in stderr
 
 
-def test_scan_logs_errors_messages_with_diag():
+def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing():
     test_file = test_env.get_test_loc('errors', copy=True)
+    rc, stdout, stderr = run_scan_plain(['-pi', '-n', '2', test_file])
+    assert rc == 1
+    assert 'Path: errors/package.json' in stderr
+    assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
+    assert "Expecting ':' delimiter: line 5 column 12 (char 143)" not in stderr
 
-    rc, stdout, stderr = run_scan_plain(['-pi', '--diag', test_file, ])
+
+def test_scan_logs_errors_messages_verbosely_with_verbose():
+    test_file = test_env.get_test_loc('errors', copy=True)
+    rc, stdout, stderr = run_scan_plain(['-pi', '--verbose', '-n', '0', test_file, ])
     assert rc == 1
     assert 'package.json' in stderr
+    assert 'delimiter: line 5 column 12' in stdout
     assert 'delimiter: line 5 column 12' in stderr
     assert 'ValueError: Expecting' in stdout
+
+
+def test_scan_logs_errors_messages_verbosely_with_verbose_and_multiprocessing():
+    test_file = test_env.get_test_loc('errors', copy=True)
+    rc, stdout, stderr = run_scan_plain(['-pi', '--verbose', '-n', '2', test_file, ])
+    assert rc == 1
+    assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout
+    assert 'delimiter: line 5 column 12' in stderr
+    assert 'ValueError: Expecting' in stdout
 
 
-def test_scan_progress_display_is_not_damaged_with_long_file_names_orig(monkeypatch):
+def test_scan_progress_display_is_not_damaged_with_long_file_names_plain():
     test_dir = test_env.get_test_loc('long_file_name')
     result_file = test_env.get_temp_file('json')
+    rc, stdout, stderr = run_scan_plain(['--copyright', test_dir, result_file])
+    assert rc == 0
+    expected1 = 'Scanned: abcdefghijklmnopqr...234567890123456789.c'
+    expected2 = 'Scanned: 0123456789012345678901234567890123456789.c'
+    expected3 = 'abcdefghijklmnopqrtu0123456789012345678901234567890123456789abcdefghijklmnopqrtu0123456789012345678901234567890123456789.c'
+    assert expected1 not in stdout
+    assert expected2 not in stdout
+    assert expected3 not in stdout
+    assert expected1 not in stderr
+    assert expected2 not in stderr
+    assert expected3 not in stderr
 
+
+def test_scan_progress_display_is_not_damaged_with_long_file_names(monkeypatch):
+    test_dir = test_env.get_test_loc('long_file_name')
+    result_file = test_env.get_temp_file('json')
     result = run_scan_click(['--copyright', test_dir, result_file], monkeypatch)
     assert result.exit_code == 0
     expected1 = 'Scanned: abcdefghijklmnopqr...234567890123456789.c'
     expected2 = 'Scanned: 0123456789012345678901234567890123456789.c'
+    expected3 = 'abcdefghijklmnopqrtu0123456789012345678901234567890123456789abcdefghijklmnopqrtu0123456789012345678901234567890123456789.c'
     assert expected1 in result.output
     assert expected2 in result.output
+    assert expected3 not in result.output
 
 
 def test_scan_does_scan_php_composer():
     test_file = test_env.get_test_loc('composer/composer.json')
     expected_file = test_env.get_test_loc('composer/composer.expected.json')
     result_file = test_env.get_temp_file('results.json')
-
     result = run_scan_click(['--package', test_file, result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
@@ -675,67 +622,16 @@ def test_scan_does_scan_rpm():
     test_file = test_env.get_test_loc('rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm')
     expected_file = test_env.get_test_loc('rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json')
     result_file = test_env.get_temp_file('results.json')
-
     result = run_scan_click(['--package', test_file, result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(expected_file, result_file, regen=False)
 
 
-class TestFixedWidthFilename(TestCase):
-
-    def test_fixed_width_file_name_with_file_name_larger_than_max_length_is_shortened(self):
-        test = cli.fixed_width_file_name('0123456789012345678901234.c', 25)
-        expected = '0123456789...5678901234.c'
-        assert expected == test
-
-    def test_fixed_width_file_name_with_file_name_smaller_than_max_length_is_not_shortened(self):
-        file_name = '0123456789012345678901234.c'
-        test = cli.fixed_width_file_name(file_name, max_length=50)
-        assert file_name == test
-
-    def test_fixed_width_file_name_with_file_name_at_max_length_is_not_shortened(self):
-        test = cli.fixed_width_file_name('01234567890123456789012.c', 25)
-        expected = '01234567890123456789012.c'
-        assert expected == test
-
-    def test_fixed_width_file_name_with_file_name_smaller_than_max_length_not_shortened(self):
-        test = cli.fixed_width_file_name('0123456789012345678901.c', 25)
-        expected = '0123456789012345678901.c'
-        assert expected == test
-
-    def test_fixed_width_file_name_with_none_filename_return_empty_string(self):
-        test = cli.fixed_width_file_name(None, 25)
-        expected = ''
-        assert expected == test
-
-    def test_fixed_width_file_name_without_extension(self):
-        test = cli.fixed_width_file_name('012345678901234567890123456', 25)
-        expected = '01234567890...67890123456'
-        assert expected == test
-
-    def test_fixed_width_file_name_with_posix_path_without_shortening(self):
-        test = cli.fixed_width_file_name('C/Documents_and_Settings/Boki/Desktop/head/patches/drupal6/drupal.js', 25)
-        expected = 'drupal.js'
-        assert expected == test
-
-    def test_fixed_width_file_name_with_posix_path_with_shortening(self):
-        test = cli.fixed_width_file_name('C/Documents_and_Settings/Boki/Desktop/head/patches/drupal6/012345678901234567890123.c', 25)
-        expected = '0123456789...4567890123.c'
-        assert expected == test
-
-    def test_fixed_width_file_name_with_win_path_without_shortening(self):
-        test = cli.fixed_width_file_name('C\\:Documents_and_Settings\\Boki\\Desktop\\head\\patches\\drupal6\\drupal.js', 25)
-        expected = 'drupal.js'
-        assert expected == test
-
-    def test_fixed_width_file_name_with_win_path_with_shortening(self):
-        test = cli.fixed_width_file_name('C\\:Documents_and_Settings\\Boki\\Desktop\\head\\patches\\drupal6\\012345678901234567890123.c', 25)
-        expected = '0123456789...4567890123.c'
-        assert expected == test
-
-    def test_fixed_width_file_name_with_very_small_file_name_and_long_extension(self):
-        test = cli.fixed_width_file_name('abc.abcdef', 5)
-        # FIXME: what is expected is TBD
-        expected = ''
-        assert expected == test
+def test_scan_cli_help(regen=False):
+    expected_file = test_env.get_test_loc('help/help.txt')
+    result = run_scan_click(['--help'])
+    if regen:
+        with open(expected_file, 'wb') as ef:
+            ef.write(result.output)
+    assert open(expected_file).read() == result.output
diff --git a/tests/scancode/test_plugin_only_findings.py b/tests/scancode/test_plugin_only_findings.py
index bc8f2e8ce5a..b269f078e83 100644
--- a/tests/scancode/test_plugin_only_findings.py
+++ b/tests/scancode/test_plugin_only_findings.py
@@ -40,12 +40,17 @@ class TestHasFindings(FileDrivenTesting):
     test_data_dir = join(dirname(__file__), 'data')
 
     def test_has_findings(self):
-        resource = Resource('name', 1, 2, 3)
-        resource.put_scans({'licenses': ['MIT']}, cache=False)
+        resource = Resource('name', 1, 2, 3, use_cache=False)
+        resource.put_scans({'licenses': ['MIT']})
+        assert has_findings(resource)
+
+    def test_has_findings_with_children(self):
+        resource = Resource('name', 1, 2, 3, use_cache=False)
+        resource.children_rids.append(1)
         assert has_findings(resource)
 
     def test_has_findings_includes_errors(self):
-        resource = Resource('name', 1, 2, 3)
+        resource = Resource('name', 1, 2, 3, use_cache=False)
         resource.errors = [
                 'ERROR: Processing interrupted: timeout after 10 seconds.'
             ]
diff --git a/tests/scancode/test_resource.py b/tests/scancode/test_resource.py
index c7b11f7b865..37b0d277a67 100644
--- a/tests/scancode/test_resource.py
+++ b/tests/scancode/test_resource.py
@@ -41,59 +41,95 @@
 class TestCodebaseCache(FileBasedTesting):
     test_data_dir = join(dirname(__file__), 'data')
 
-    def test_codebase_cache_basic(self):
+    def test_codebase_with_use_cache(self):
         test_codebase = self.get_test_loc('cache/package')
-        codebase = Codebase(test_codebase)
+        codebase = Codebase(test_codebase, use_cache=True)
         assert codebase.cache_base_dir
         assert codebase.cache_dir
+        
         root = codebase.root
+
         assert ('00', '00000000') == root.cache_keys
-        cp = root.get_cached_path(create=False)
+        cp = root._get_cached_path(create=False)
         assert not exists(cp)
-        cp = root.get_cached_path(create=True)
+        cp = root._get_cached_path(create=True)
         assert not exists(cp)
         assert exists(parent_directory(cp))
 
-        assert not root.get_scans(cache=True)
-        assert not root.get_scans(cache=True)
+        assert not root._scans
 
         scans = OrderedDict(this='that')
-        scans_put = root.put_scans(scans, cache=True)
+        scans_put = root.put_scans(scans)
         assert scans == scans_put
-        assert scans == root.get_scans(cache=True)
-        assert not root.get_scans(cache=False)
-        assert exists (root.get_cached_path(create=False))
+        assert scans == root.get_scans()
+        assert not root._scans
+        assert exists (root._get_cached_path(create=False))
 
-        scans_put = root.put_scans(scans, cache=True)
+        scans_put = root.put_scans(scans)
         assert scans == scans_put
-        assert scans == root.get_scans(cache=True)
-        assert scans is not root.get_scans(cache=True)
-        assert exists (root.get_cached_path(create=False))
+        assert not root._scans
+        assert scans == root.get_scans()
+        assert scans is not root.get_scans()
+        assert exists (root._get_cached_path(create=False))
 
         scans = OrderedDict(food='bar')
-        scans_put = root.put_scans(scans, update=False, cache=True)
+        scans_put = root.put_scans(scans, update=False)
         assert scans == scans_put
-        assert scans == root.get_scans(cache=True)
-        assert scans is not root.get_scans(cache=True)
+        assert not root._scans
+        assert scans == root.get_scans()
+        assert scans is not root.get_scans()
 
         scans2 = OrderedDict(this='that')
-        scans_put = root.put_scans(scans2, update=True, cache=True)
+        scans_put = root.put_scans(scans2, update=True)
         expected = OrderedDict(this='that', food='bar')
-        assert expected == root.get_scans(cache=True)
-        assert expected is not root.get_scans(cache=True)
+        assert expected == root.get_scans()
+        assert expected is not root.get_scans()
 
         scans = OrderedDict(food='bar')
-        scans_put = root.put_scans(scans, update=False, cache=True)
+        scans_put = root.put_scans(scans, update=False)
         assert scans == scans_put
-        assert scans == root.get_scans(cache=True)
-        assert not root.get_scans(cache=False)
-        assert scans is not root.get_scans(cache=True)
-        assert exists (root.get_cached_path(create=False))
+        assert scans == root.get_scans()
+        assert not root._scans
+        assert scans is not root.get_scans()
+        assert exists (root._get_cached_path(create=False))
+
+    def test_codebase_without_use_cache(self):
+        test_codebase = self.get_test_loc('cache/package')
+        codebase = Codebase(test_codebase, use_cache=False)
+        assert not codebase.cache_dir
+
+        root = codebase.root
+
+        assert ('00', '00000000') == root.cache_keys
+        assert root._get_cached_path(create=False) is None
+
+        assert not root._scans
+
+        scans = OrderedDict(this='that')
+        scans_put = root.put_scans(scans)
+        assert scans == scans_put
+        assert scans == root.get_scans()
+        assert scans_put is root.get_scans()
+
+        scans_put = root.put_scans(scans)
+        assert scans == scans_put
+        assert scans_put is root.get_scans()
+
+        scans = OrderedDict(food='bar')
+        scans_put = root.put_scans(scans, update=False)
+        assert scans == scans_put
+        assert scans == root.get_scans()
+        assert scans_put is root.get_scans()
 
         scans2 = OrderedDict(this='that')
-        scans_put = root.put_scans(scans2, update=True, cache=True)
-        assert not root.get_scans(cache=False)
+        scans_put = root.put_scans(scans2, update=True)
         expected = OrderedDict(this='that', food='bar')
-        assert expected == root.get_scans(cache=True)
-        assert expected is not root.get_scans(cache=True)
-        assert exists (root.get_cached_path(create=False))
+        assert expected == root.get_scans()
+        assert expected is not root.get_scans()
+
+        scans = OrderedDict(food='bar')
+        scans_put = root.put_scans(scans, update=False)
+        assert scans == scans_put
+        assert scans == root.get_scans()
+        assert scans_put is root.get_scans()
+        assert scans is not root.get_scans()

From 024072ce9cdae4f54d55ed976b2d1620a6e4eb01 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 17:19:49 +0100
Subject: [PATCH 037/122] Ensure SPDX RDF tests are always sorted #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/formattedcode/data/spdx/tree/expected.rdf |  6 +++---
 tests/formattedcode/test_format_spdx.py         | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tests/formattedcode/data/spdx/tree/expected.rdf b/tests/formattedcode/data/spdx/tree/expected.rdf
index fdcf8aabf9b..de1f5843f6f 100644
--- a/tests/formattedcode/data/spdx/tree/expected.rdf
+++ b/tests/formattedcode/data/spdx/tree/expected.rdf
@@ -80,7 +80,7 @@
               }
             }, 
             "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy1.c", 
+            "ns1:fileName": "./scan/copy2.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
@@ -98,7 +98,7 @@
               }
             }, 
             "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy2.c", 
+            "ns1:fileName": "./scan/subdir/copy1.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
@@ -116,7 +116,7 @@
               }
             }, 
             "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy2.c", 
+            "ns1:fileName": "./scan/subdir/copy2.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
diff --git a/tests/formattedcode/test_format_spdx.py b/tests/formattedcode/test_format_spdx.py
index 56e23eeea83..7f1383d41dd 100644
--- a/tests/formattedcode/test_format_spdx.py
+++ b/tests/formattedcode/test_format_spdx.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -79,7 +79,6 @@ def sort_nested(data):
     """
     Return a new ordered and sorted mapping or sequence from a `data` mapping or
     sequence with any nested sequences or mappings sorted recursively.
-
     """
     seqtypes = list, tuple
     maptypes = OrderedDict, dict
@@ -91,7 +90,7 @@ def sort_nested(data):
             if isinstance(v, coltypes):
                 v = sort_nested(v)
             new_data[k] = v
-        return new_data
+        return OrderedDict(sorted(new_data.items()))
 
     elif isinstance(data, seqtypes):
         new_data = []
@@ -99,7 +98,7 @@ def sort_nested(data):
             if isinstance(v, coltypes):
                 v = sort_nested(v)
             new_data.append(v)
-        return new_data
+        return sorted(new_data)
 
 
 def check_rdf_scan(expected_file, result_file, regen=False):
@@ -112,11 +111,13 @@ def check_rdf_scan(expected_file, result_file, regen=False):
     if regen:
         expected = result
         with codecs.open(expected_file, 'w', encoding='utf-8') as o:
-            json.dump(expected, o, indent=2)
+            json.dump(result, o, indent=2)
     else:
         with codecs.open(expected_file, 'r', encoding='utf-8') as i:
-            expected = sort_nested(json.load(i))
-    assert expected == result
+            expected = json.load(i, object_pairs_hook=OrderedDict)
+            expected = load_and_clean_rdf(result_file)
+
+    assert json.dumps(expected, indent=2) == json.dumps(result, indent=2)
 
 
 def load_and_clean_tv(location):

From c5014c752d1ee5e89b34d93f1fb3889ac73a2a48 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 12 Jan 2018 18:33:39 +0100
Subject: [PATCH 038/122] Simplify Plugin init arguments

  * remove active_scan_names from Plugin init arguments
  * rename selected_options to command_options

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/__init__.py           | 12 +++++-------
 src/scancode/plugin_ignore.py        |  8 ++++----
 src/scancode/plugin_mark_source.py   |  2 +-
 src/scancode/plugin_only_findings.py |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 1a41f4aa467..9323c7eb47b 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -39,15 +39,13 @@ class BasePlugin(object):
     # Tuple of scanner names that this plugin requires to run its own run
     requires = tuple()
 
-    def __init__(self, selected_options, active_scan_names=None):
+    def __init__(self, command_options):
         """
-        Initialize a new plugin with a mapping of user `selected_options` (e.g.
-        CommandOption tuples based on keyword arguments) and a list of
-        `active_scan_names`.
+        Initialize a new plugin with a list of user `command_options` (e.g.
+        CommandOption tuples based on CLI keyword arguments).
         """
-        self.selected_options = selected_options or {}
-        self.active_scan_names = active_scan_names or []
-
+        self.command_options = command_options or []
+ 
     @classmethod
     def get_plugin_options(cls):
         """
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index c5d94dff041..285ac8ecc84 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -44,11 +44,11 @@ class ProcessIgnore(PreScanPlugin):
     Ignore files matching the supplied pattern.
     """
     name = 'ignore'
-    def __init__(self, selected_options, active_scan_names=None):
-        PreScanPlugin.__init__(self, selected_options, active_scan_names)
+    def __init__(self, command_options):
+        super(ProcessIgnore, self).__init__(command_options)
 
         ignores = []
-        for se in selected_options:
+        for se in command_options:
             if se.name == 'ignore':
                 ignores = se.value or []
 
@@ -83,4 +83,4 @@ def process_codebase(self, codebase):
             removed_rids.update(pruned_rids)
 
     def is_enabled(self):
-        return any(se.value for se in self.selected_options if se.name == 'ignore')
+        return any(se.value for se in self.command_options if se.name == 'ignore')
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 2f6f51271c4..289bf06cf67 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -56,7 +56,7 @@ def get_plugin_options(cls):
     def is_enabled(self):
         # FIXME: we need infos for this to work, we should use a better way to
         # express dependencies on one or more scan
-        return all(se.value for se in self.selected_options
+        return all(se.value for se in self.command_options
                       if se.name in ('mark_source', 'infos'))
 
     def process_codebase(self, codebase):
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index 8e4f3a4d5d8..c5a4b391624 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -49,7 +49,7 @@ def get_plugin_options(cls):
         ]
 
     def is_enabled(self):
-        return any(se.value == True for se in self.selected_options
+        return any(se.value == True for se in self.command_options
                       if se.name == 'only_findings')
 
     def process_codebase(self, codebase):

From 1095bf35c9513454c629deb69f2d8e2741c0470c Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 16 Jan 2018 14:53:34 +0100
Subject: [PATCH 039/122] Update test data #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .../data/json/simple-expected.json            |  8 +--
 .../data/json/simple-expected.jsonlines       |  2 +-
 .../data/json/simple-expected.jsonpp          |  8 +--
 .../data/json/tree/expected.json              |  8 +--
 .../data/altpath/copyright.expected.json      |  4 +-
 .../data/composer/composer.expected.json      |  3 +-
 .../data/failing/patchelf.expected.json       |  3 +-
 tests/scancode/data/help/help.txt             | 32 +++++-----
 tests/scancode/data/info/all.expected.json    |  6 +-
 .../data/info/all.rooted.expected.json        |  9 ++-
 tests/scancode/data/info/basic.expected.json  |  2 +-
 .../data/info/basic.rooted.expected.json      |  2 +-
 .../data/info/email_url_info.expected.json    |  6 +-
 .../scancode/data/license_text/test.expected  |  3 +-
 .../data/non_utf8/expected-linux.json         |  2 +-
 .../with_info.expected.json                   |  2 +-
 .../without_info.expected.json                |  4 --
 .../data/plugin_only_findings/expected.json   |  4 --
 ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json |  3 +-
 .../data/single/iproute.expected.json         |  2 +-
 .../unicodepath.expected-linux.json           | 12 ++--
 .../data/weird_file_name/expected-linux.json  |  4 +-
 tests/scancode/test_api.py                    | 12 ++--
 tests/scancode/test_cli.py                    | 58 +++++++++----------
 tests/scancode/test_plugin_ignore.py          | 24 ++++----
 tests/scancode/test_plugin_only_findings.py   |  2 +-
 tests/scancode/test_scan_utils.py             | 16 +++--
 27 files changed, 116 insertions(+), 125 deletions(-)

diff --git a/tests/formattedcode/data/json/simple-expected.json b/tests/formattedcode/data/json/simple-expected.json
index 354179c2a27..0b41e30114c 100644
--- a/tests/formattedcode/data/json/simple-expected.json
+++ b/tests/formattedcode/data/json/simple-expected.json
@@ -1,10 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--licenses": true,
-    "--packages": true,
-    "--infos": true
+    "--copyright": true,
+    "--license": true,
+    "--package": true,
+    "--info": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index e05565127e3..1e3a926d925 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -3,7 +3,7 @@
     "header": {
       "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
       "scancode_options": {
-        "--infos": true,
+        "--info": true,
         "--format": "jsonlines"
       },
       "files_count": 1
diff --git a/tests/formattedcode/data/json/simple-expected.jsonpp b/tests/formattedcode/data/json/simple-expected.jsonpp
index 218effa36ce..201735e574d 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonpp
+++ b/tests/formattedcode/data/json/simple-expected.jsonpp
@@ -1,10 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--licenses": true,
-    "--packages": true,
-    "--infos": true,
+    "--copyright": true,
+    "--license": true,
+    "--package": true,
+    "--info": true,
     "--format": "json-pp"
   },
   "files_count": 1,
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
index 4a0dd6bfa78..06031593176 100644
--- a/tests/formattedcode/data/json/tree/expected.json
+++ b/tests/formattedcode/data/json/tree/expected.json
@@ -1,10 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--licenses": true,
-    "--packages": true,
-    "--infos": true,
+    "--copyright": true,
+    "--license": true,
+    "--package": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 4,
diff --git a/tests/scancode/data/altpath/copyright.expected.json b/tests/scancode/data/altpath/copyright.expected.json
index 5fcde2f2bd3..f4f9f7c2670 100644
--- a/tests/scancode/data/altpath/copyright.expected.json
+++ b/tests/scancode/data/altpath/copyright.expected.json
@@ -1,8 +1,8 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--infos": true,
+    "--copyright": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index 4f4006aea81..f2fc3a014af 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -1,8 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--packages": true,
-    "--infos": true
+    "--package": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/scancode/data/failing/patchelf.expected.json b/tests/scancode/data/failing/patchelf.expected.json
index a20fff0b738..55cd16d503d 100644
--- a/tests/scancode/data/failing/patchelf.expected.json
+++ b/tests/scancode/data/failing/patchelf.expected.json
@@ -1,8 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--infos": true,
+    "--copyright": true,
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index 009821a6cd8..ae6f296754d 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -9,22 +9,22 @@ Usage: scancode [OPTIONS] <input> <output_file>
 Options:
 
   scans:
-    -c, --copyright, --copyrights  Scan <input> for copyrights. [default]
-    -l, --license, --licenses      Scan <input> for licenses. [default]
-    -p, --package, --packages      Scan <input> for packages. [default]
-    -e, --email, --emails          Scan <input> for emails.
-    -u, --url, --urls              Scan <input> for urls.
-    -i, --info, --infos            Include information such as size, type, etc.
-    --license-score INTEGER        Do not return license matches with scores lower
-                                   than this score. A number between 0 and 100.
-                                   [default: 0]
-    --license-text                 Include the detected licenses matched text. Has
-                                   no effect unless --license is requested.
-    --license-url-template TEXT    Set the template URL used for the license
-                                   reference URLs. In a template URL, curly braces
-                                   ({}) are replaced by the license key.
-                                   [default: https://enterprise.dejacode.com/urn/u
-                                   rn:dje:license:{}]
+    -c, --copyright              Scan <input> for copyrights. [default]
+    -l, --license                Scan <input> for licenses. [default]
+    -p, --package                Scan <input> for packages. [default]
+    -e, --email                  Scan <input> for emails.
+    -u, --url                    Scan <input> for urls.
+    -i, --info                   Include information such as size, type, etc.
+    --license-score INTEGER      Do not return license matches with scores lower
+                                 than this score. A number between 0 and 100.
+                                 [default: 0]
+    --license-text               Include the detected licenses matched text. Has
+                                 no effect unless --license is requested.
+    --license-url-template TEXT  Set the template URL used for the license
+                                 reference URLs. In a template URL, curly braces
+                                 ({}) are replaced by the license key.  [default: h
+                                 ttps://enterprise.dejacode.com/urn/urn:dje:licens
+                                 e:{}]
 
   output:
     --strip-root           Strip the root directory segment of all paths. The
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 6e4cc6adcad..0be1afecc5c 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -1,9 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--licenses": true,
-    "--infos": true,
+    "--copyright": true,
+    "--license": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index a3f70e1ded3..8b99b4b29c3 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -1,11 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--licenses": true,
-    "--emails": true,
-    "--urls": true,
-    "--infos": true
+    "--copyright": true,
+    "--license": true,
+    "--email": true,
+    "--url": true
   },
   "files_count": 6,
   "files": [
diff --git a/tests/scancode/data/info/basic.expected.json b/tests/scancode/data/info/basic.expected.json
index 878f1dfecf7..57135d53fb4 100644
--- a/tests/scancode/data/info/basic.expected.json
+++ b/tests/scancode/data/info/basic.expected.json
@@ -1,7 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--infos": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/basic.rooted.expected.json b/tests/scancode/data/info/basic.rooted.expected.json
index 072fcacad2b..819be57697b 100644
--- a/tests/scancode/data/info/basic.rooted.expected.json
+++ b/tests/scancode/data/info/basic.rooted.expected.json
@@ -1,7 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--infos": true
+    "--info": true
   },
   "files_count": 6,
   "files": [
diff --git a/tests/scancode/data/info/email_url_info.expected.json b/tests/scancode/data/info/email_url_info.expected.json
index 382e83764d7..62fa81e9689 100644
--- a/tests/scancode/data/info/email_url_info.expected.json
+++ b/tests/scancode/data/info/email_url_info.expected.json
@@ -1,9 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--emails": true,
-    "--urls": true,
-    "--infos": true,
+    "--email": true,
+    "--url": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index cf9ffd3c49c..7b7550a664a 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -1,8 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--licenses": true,
-    "--infos": true,
+    "--license": true,
     "--license-text": true,
     "--strip-root": true
   },
diff --git a/tests/scancode/data/non_utf8/expected-linux.json b/tests/scancode/data/non_utf8/expected-linux.json
index 3808cb10fb2..6e5d76f6f82 100644
--- a/tests/scancode/data/non_utf8/expected-linux.json
+++ b/tests/scancode/data/non_utf8/expected-linux.json
@@ -1,7 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--infos": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 18,
diff --git a/tests/scancode/data/plugin_mark_source/with_info.expected.json b/tests/scancode/data/plugin_mark_source/with_info.expected.json
index 324efa58026..0ff0e0a09a8 100644
--- a/tests/scancode/data/plugin_mark_source/with_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/with_info.expected.json
@@ -1,7 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--infos": true,
+    "--info": true,
     "--mark-source": true
   },
   "files_count": 12,
diff --git a/tests/scancode/data/plugin_mark_source/without_info.expected.json b/tests/scancode/data/plugin_mark_source/without_info.expected.json
index 124268ffdad..e27830c78cc 100644
--- a/tests/scancode/data/plugin_mark_source/without_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/without_info.expected.json
@@ -1,10 +1,6 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--licenses": true,
-    "--packages": true,
-    "--infos": true,
     "--mark-source": true
   },
   "files_count": 12,
diff --git a/tests/scancode/data/plugin_only_findings/expected.json b/tests/scancode/data/plugin_only_findings/expected.json
index d4f29e463fd..f6d45ca951a 100644
--- a/tests/scancode/data/plugin_only_findings/expected.json
+++ b/tests/scancode/data/plugin_only_findings/expected.json
@@ -1,10 +1,6 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--licenses": true,
-    "--packages": true,
-    "--infos": true,
     "--only-findings": true
   },
   "files_count": 3,
diff --git a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
index a34186dd249..f6d11cd19f2 100644
--- a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
+++ b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
@@ -1,8 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--packages": true,
-    "--infos": true
+    "--package": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/scancode/data/single/iproute.expected.json b/tests/scancode/data/single/iproute.expected.json
index afb88207a71..abc79d7e830 100644
--- a/tests/scancode/data/single/iproute.expected.json
+++ b/tests/scancode/data/single/iproute.expected.json
@@ -1,7 +1,7 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--infos": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
index a734cce78ef..e2e088ffed8 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
@@ -1,12 +1,12 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--licenses": true,
-    "--packages": true,
-    "--emails": true,
-    "--urls": true,
-    "--infos": true,
+    "--copyright": true,
+    "--license": true,
+    "--package": true,
+    "--email": true,
+    "--url": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 3,
diff --git a/tests/scancode/data/weird_file_name/expected-linux.json b/tests/scancode/data/weird_file_name/expected-linux.json
index 77d5bc2aca4..938fff328ec 100644
--- a/tests/scancode/data/weird_file_name/expected-linux.json
+++ b/tests/scancode/data/weird_file_name/expected-linux.json
@@ -1,8 +1,8 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--copyrights": true,
-    "--infos": true,
+    "--copyright": true,
+    "--info": true,
     "--strip-root": true
   },
   "files_count": 0,
diff --git a/tests/scancode/test_api.py b/tests/scancode/test_api.py
index 796378bad84..1c048031819 100644
--- a/tests/scancode/test_api.py
+++ b/tests/scancode/test_api.py
@@ -37,9 +37,9 @@
 class TestAPI(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
-    def test_get_package_infos_can_pickle(self):
+    def test_get_package_info_can_pickle(self):
         test_file = self.get_test_loc('api/package/package.json')
-        package = api.get_package_infos(test_file)
+        package = api.get_package_info(test_file)
 
         import pickle
         import cPickle
@@ -60,16 +60,16 @@ def test_get_file_info_flag_are_not_null(self):
             is_key_values = [v for k, v in info.items() if k.startswith('is_')]
             assert all(v is not None for v in is_key_values)
 
-    def test_get_package_infos_works_for_maven_dot_pom(self):
+    def test_get_package_info_works_for_maven_dot_pom(self):
         test_file = self.get_test_loc('api/package/p6spy-1.3.pom')
-        packages = api.get_package_infos(test_file)
+        packages = api.get_package_info(test_file)
         assert len(packages) == 1
         for package in packages:
             assert package['version'] == '1.3'
 
-    def test_get_package_infos_works_for_maven_pom_dot_xml(self):
+    def test_get_package_info_works_for_maven_pom_dot_xml(self):
         test_file = self.get_test_loc('api/package/pom.xml')
-        packages = api.get_package_infos(test_file)
+        packages = api.get_package_info(test_file)
         assert len(packages) == 1
         for package in packages:
             assert package['version'] == '1.3'
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index 5ea7f9ad60b..af9b207ca8d 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -63,7 +63,7 @@ def test_package_option_detects_packages(monkeypatch):
     test_dir = test_env.get_test_loc('package', copy=True)
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--package', test_dir, result_file], monkeypatch)
+    result = run_scan_click(['--package', test_dir, '--json', result_file], monkeypatch)
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     assert os.path.exists(result_file)
@@ -75,7 +75,7 @@ def test_verbose_option_with_packages(monkeypatch):
     test_dir = test_env.get_test_loc('package', copy=True)
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--package', '--verbose', test_dir, result_file], monkeypatch)
+    result = run_scan_click(['--package', '--verbose', test_dir, '--json', result_file], monkeypatch)
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     assert 'package.json' in result.output
@@ -88,7 +88,7 @@ def test_copyright_option_detects_copyrights():
     test_dir = test_env.get_test_loc('copyright', copy=True)
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--copyright', test_dir, result_file])
+    result = run_scan_click(['--copyright', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     assert os.path.exists(result_file)
@@ -98,7 +98,7 @@ def test_copyright_option_detects_copyrights():
 def test_verbose_option_with_copyrights(monkeypatch):
     test_dir = test_env.get_test_loc('copyright', copy=True)
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--copyright', '--verbose', test_dir, result_file], monkeypatch)
+    result = run_scan_click(['--copyright', '--verbose', test_dir, '--json', result_file], monkeypatch)
 
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
@@ -111,7 +111,7 @@ def test_license_option_detects_licenses():
     test_dir = test_env.get_test_loc('license', copy=True)
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--license', test_dir, result_file])
+    result = run_scan_click(['--license', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     assert os.path.exists(result_file)
@@ -138,7 +138,7 @@ def test_scan_info_does_collect_infos():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--info', '--strip-root', test_dir, result_file])
+    result = run_scan_click(['--info', '--strip-root', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(test_env.get_test_loc('info/basic.expected.json'), result_file)
@@ -148,7 +148,7 @@ def test_scan_info_does_collect_infos_with_root():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--info', test_dir, result_file])
+    result = run_scan_click(['--info', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(test_env.get_test_loc('info/basic.rooted.expected.json'), result_file)
@@ -157,7 +157,7 @@ def test_scan_info_does_collect_infos_with_root():
 def test_scan_info_returns_full_root():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--info', '--full-root', test_dir, result_file])
+    result = run_scan_click(['--info', '--full-root', test_dir, '--json', result_file])
 
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
@@ -171,7 +171,7 @@ def test_scan_info_returns_full_root():
 def test_scan_info_returns_correct_full_root_with_single_file():
     test_file = test_env.get_test_loc('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--info', '--full-root', test_file, result_file])
+    result = run_scan_click(['--info', '--full-root', test_file, '--json', result_file])
 
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
@@ -187,7 +187,7 @@ def test_scan_info_returns_correct_full_root_with_single_file():
 def test_scan_info_returns_does_not_strip_root_with_single_file():
     test_file = test_env.get_test_loc('single/iproute.c')
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--info', '--strip-root', test_file, result_file])
+    result = run_scan_click(['--info', '--strip-root', test_file, '--json', result_file])
     assert result.exit_code == 0
     check_json_scan(test_env.get_test_loc('single/iproute.expected.json'), result_file, regen=False)
 
@@ -196,7 +196,7 @@ def test_scan_info_license_copyrights():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--info', '--license', '--copyright', '--strip-root', test_dir, result_file])
+    result = run_scan_click(['--info', '--license', '--copyright', '--strip-root', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(test_env.get_test_loc('info/all.expected.json'), result_file)
@@ -216,7 +216,7 @@ def test_scan_noinfo_license_copyrights_with_root():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--email', '--url', '--license', '--copyright', test_dir, result_file])
+    result = run_scan_click(['--email', '--url', '--license', '--copyright', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(test_env.get_test_loc('info/all.rooted.expected.json'), result_file)
@@ -226,7 +226,7 @@ def test_scan_email_url_info():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--email', '--url', '--info', '--strip-root', test_dir, result_file])
+    result = run_scan_click(['--email', '--url', '--info', '--strip-root', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(test_env.get_test_loc('info/email_url_info.expected.json'), result_file)
@@ -236,7 +236,7 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
 
-    result = run_scan_click([ '--copyright', '--strip-root', test_file, result_file])
+    result = run_scan_click([ '--copyright', '--strip-root', test_file, '--json', result_file])
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
     check_json_scan(test_env.get_test_loc('failing/patchelf.expected.json'), result_file)
@@ -248,7 +248,7 @@ def test_scan_with_errors_always_includes_full_traceback():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
 
-    result = run_scan_click([ '--copyright', test_file, result_file])
+    result = run_scan_click([ '--copyright', test_file, '--json', result_file])
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
     assert 'Some files failed to scan' in result.output
@@ -264,7 +264,7 @@ def test_failing_scan_return_proper_exit_code():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
 
-    result = run_scan_click([ '--copyright', test_file, result_file])
+    result = run_scan_click([ '--copyright', test_file, '--json', result_file])
     assert result.exit_code == 1
 
 
@@ -272,7 +272,7 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.html')
 
-    result = run_scan_click([ '--copyright', '--format', 'html', test_file, result_file])
+    result = run_scan_click([ '--copyright', test_file , '--format-html', result_file])
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
 
@@ -281,7 +281,7 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.app.html')
 
-    result = run_scan_click([ '--copyright', '--format', 'html-app', test_file, result_file])
+    result = run_scan_click([ '--copyright',  test_file, '--format-html-app',result_file])
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
 
@@ -335,7 +335,7 @@ def test_scan_works_with_multiple_processes_and_timeouts():
     result = run_scan_click(
         [ '--copyright', '--processes', '2',
          '--timeout', '0.000001',
-         '--strip-root', '--format', 'json', test_dir, result_file],
+         '--strip-root', '--format', 'json', test_dir, '--json', result_file],
     )
 
     assert result.exit_code == 1
@@ -377,7 +377,7 @@ def test_scan_does_not_fail_when_scanning_unicode_files_and_paths():
 
     args = ['--info', '--license', '--copyright',
             '--package', '--email', '--url', '--strip-root',
-            test_dir , result_file]
+            test_dir , '--json', result_file]
     result = run_scan_click(args)
     if result.exit_code != 0:
         raise Exception(result.output, args)
@@ -424,7 +424,7 @@ def test_scan_can_handle_licenses_with_unicode_metadata():
     test_dir = test_env.get_test_loc('license_with_unicode_meta')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--license', test_dir, result_file])
+    result = run_scan_click(['--license', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -468,7 +468,7 @@ def test_scan_can_return_matched_license_text():
     expected_file = test_env.get_test_loc('license_text/test.expected')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--license', '--license-text', '--strip-root', test_file, result_file])
+    result = run_scan_click(['--license', '--license-text', '--strip-root', test_file, '--json', result_file])
     assert result.exit_code == 0
     check_json_scan(test_env.get_test_loc(expected_file), result_file)
 
@@ -478,7 +478,7 @@ def test_scan_can_handle_weird_file_names():
     test_dir = test_env.extract_test_tar('weird_file_name/weird_file_name.tar.gz')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['-c', '-i', '--strip-root', test_dir, result_file])
+    result = run_scan_click(['-c', '-i', '--strip-root', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert "KeyError: 'sha1'" not in result.output
     assert 'Scanning done' in result.output
@@ -502,7 +502,7 @@ def test_scan_can_handle_non_utf8_file_names_on_posix():
         test_dir = fsencode(test_dir)
         result_file = fsencode(result_file)
 
-    result = run_scan_click(['-i', '--strip-root', test_dir, result_file])
+    result = run_scan_click(['-i', '--strip-root', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -528,7 +528,7 @@ def test_scan_can_run_from_other_directory():
     work_dir = os.path.dirname(result_file)
 
     rc, stdout, stderr = run_scan_plain(
-        ['-ci', '--strip-root', test_file, result_file], cwd=work_dir)
+        ['-ci', '--strip-root', test_file, '--json', result_file], cwd=work_dir)
 
     if rc != 0:
         print()
@@ -582,7 +582,7 @@ def test_scan_logs_errors_messages_verbosely_with_verbose_and_multiprocessing():
 def test_scan_progress_display_is_not_damaged_with_long_file_names_plain():
     test_dir = test_env.get_test_loc('long_file_name')
     result_file = test_env.get_temp_file('json')
-    rc, stdout, stderr = run_scan_plain(['--copyright', test_dir, result_file])
+    rc, stdout, stderr = run_scan_plain(['--copyright', test_dir, '--json', result_file])
     assert rc == 0
     expected1 = 'Scanned: abcdefghijklmnopqr...234567890123456789.c'
     expected2 = 'Scanned: 0123456789012345678901234567890123456789.c'
@@ -598,7 +598,7 @@ def test_scan_progress_display_is_not_damaged_with_long_file_names_plain():
 def test_scan_progress_display_is_not_damaged_with_long_file_names(monkeypatch):
     test_dir = test_env.get_test_loc('long_file_name')
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--copyright', test_dir, result_file], monkeypatch)
+    result = run_scan_click(['--copyright', test_dir, '--json', result_file], monkeypatch)
     assert result.exit_code == 0
     expected1 = 'Scanned: abcdefghijklmnopqr...234567890123456789.c'
     expected2 = 'Scanned: 0123456789012345678901234567890123456789.c'
@@ -612,7 +612,7 @@ def test_scan_does_scan_php_composer():
     test_file = test_env.get_test_loc('composer/composer.json')
     expected_file = test_env.get_test_loc('composer/composer.expected.json')
     result_file = test_env.get_temp_file('results.json')
-    result = run_scan_click(['--package', test_file, result_file])
+    result = run_scan_click(['--package', test_file, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(expected_file, result_file)
@@ -622,7 +622,7 @@ def test_scan_does_scan_rpm():
     test_file = test_env.get_test_loc('rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm')
     expected_file = test_env.get_test_loc('rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json')
     result_file = test_env.get_temp_file('results.json')
-    result = run_scan_click(['--package', test_file, result_file])
+    result = run_scan_click(['--package', test_file, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(expected_file, result_file, regen=False)
diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
index 73716a824ab..5e570e9252f 100644
--- a/tests/scancode/test_plugin_ignore.py
+++ b/tests/scancode/test_plugin_ignore.py
@@ -68,8 +68,8 @@ def test_is_ignored_glob_file(self):
 
     def test_ProcessIgnore_with_single_file(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(group=None, name='ignore', option='--ignore',
-                               value=('sample.doc',), default=None)
+        option = CommandOption(help_group=None, name='ignore', option='--ignore',
+                               value=('sample.doc',), pretty_value=None)
         test_plugin = ProcessIgnore([option])
         expected = [
             'user',
@@ -87,8 +87,8 @@ def test_ProcessIgnore_with_single_file(self):
 
     def test_ProcessIgnore_with_multiple_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(group=None, name='ignore', option='--ignore',
-                               value=('ignore.doc', 'sample.doc',), default=None)
+        option = CommandOption(help_group=None, name='ignore', option='--ignore',
+                               value=('ignore.doc', 'sample.doc',), pretty_value=None)
         test_plugin = ProcessIgnore([option])
         expected = [
             'user',
@@ -104,8 +104,8 @@ def test_ProcessIgnore_with_multiple_files(self):
 
     def test_ProcessIgnore_with_glob_for_extension(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(group=None, name='ignore', option='--ignore',
-                               value=('*.doc',), default=None)
+        option = CommandOption(help_group=None, name='ignore', option='--ignore',
+                               value=('*.doc',), pretty_value=None)
         test_plugin = ProcessIgnore([option])
 
         expected = [
@@ -122,8 +122,8 @@ def test_ProcessIgnore_with_glob_for_extension(self):
 
     def test_ProcessIgnore_with_glob_for_path(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(group=None, name='ignore', option='--ignore',
-                               value=('*/src/test',), default=None)
+        option = CommandOption(help_group=None, name='ignore', option='--ignore',
+                               value=('*/src/test',), pretty_value=None)
         test_plugin = ProcessIgnore([option])
 
         expected = [
@@ -141,10 +141,10 @@ def test_ProcessIgnore_with_glob_for_path(self):
     def test_ProcessIgnore_with_multiple_plugins(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         test_plugins = [
-            ProcessIgnore([CommandOption(group=None, name='ignore', option='--ignore',
-                               value=('*.doc',), default=None)]),
-            ProcessIgnore([CommandOption(group=None, name='ignore', option='--ignore',
-                               value=('*/src/test/*',), default=None)]),
+            ProcessIgnore([CommandOption(help_group=None, name='ignore', option='--ignore',
+                               value=('*.doc',), pretty_value=None)]),
+            ProcessIgnore([CommandOption(help_group=None, name='ignore', option='--ignore',
+                               value=('*/src/test/*',), pretty_value=None)]),
         ]
 
         expected = [
diff --git a/tests/scancode/test_plugin_only_findings.py b/tests/scancode/test_plugin_only_findings.py
index b269f078e83..f710703bf43 100644
--- a/tests/scancode/test_plugin_only_findings.py
+++ b/tests/scancode/test_plugin_only_findings.py
@@ -61,5 +61,5 @@ def test_scan_only_findings(self):
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_only_findings/expected.json')
 
-        _result = run_scan_click(['--only-findings', test_dir, result_file])
+        _result = run_scan_click(['--only-findings', test_dir, '--json', result_file])
         check_json_scan(expected_file, result_file)
diff --git a/tests/scancode/test_scan_utils.py b/tests/scancode/test_scan_utils.py
index ced5dee1a9a..b13fa8d0a89 100644
--- a/tests/scancode/test_scan_utils.py
+++ b/tests/scancode/test_scan_utils.py
@@ -36,7 +36,7 @@
 from click.testing import CliRunner
 
 from commoncode.testcase import FileDrivenTesting
-from scancode import ScanOption
+from scancode import CommandLineOption
 from scancode.cli import ScanCommand
 from scancode.utils import fixed_width_file_name
 
@@ -136,24 +136,28 @@ def scan(opt):
 
         runner = CliRunner()
         result = runner.invoke(scan, ['--help'])
-        assert 'misc:\n    --opt   Help text for option\n' in result.output
+        from scancode import MISC_GROUP
+        assert MISC_GROUP + ':\n    --opt   Help text for option\n' in result.output
 
     def test_scan_help_with_custom_class(self):
         @click.command(name='scan', cls=ScanCommand)
-        @click.option('--opt', is_flag=True, help='Help text for option', cls=ScanOption)
+        @click.option('--opt', is_flag=True, help='Help text for option', cls=CommandLineOption)
         def scan(opt):
             pass
 
         runner = CliRunner()
         result = runner.invoke(scan, ['--help'])
-        assert 'misc:\n    --opt   Help text for option\n' in result.output
+        from scancode import MISC_GROUP
+        assert MISC_GROUP + ':\n    --opt   Help text for option\n' in result.output
 
     def test_scan_help_with_group(self):
+        from scancode import CORE_GROUP
         @click.command(name='scan', cls=ScanCommand)
-        @click.option('--opt', is_flag=True, help='Help text for option', group='core', cls=ScanOption)
+        @click.option('--opt', is_flag=True, help='Help text for option',
+                      help_group=CORE_GROUP, cls=CommandLineOption)
         def scan(opt):
             pass
 
         runner = CliRunner()
         result = runner.invoke(scan, ['--help'])
-        assert 'core:\n    --opt  Help text for option\n' in result.output
+        assert CORE_GROUP + ':\n    --opt  Help text for option\n' in result.output

From 60dc3fd4b7348a8618b61a15b6f36fe12568f474 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 16 Jan 2018 23:26:53 +0100
Subject: [PATCH 040/122] Update test to use new format options #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/scripts/test_json2csv.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/scripts/test_json2csv.py b/etc/scripts/test_json2csv.py
index 8fcb96f8851..4a25c55d9dc 100644
--- a/etc/scripts/test_json2csv.py
+++ b/etc/scripts/test_json2csv.py
@@ -214,7 +214,8 @@ def test_can_process_scan_from_json_scan(self):
         json_file = self.get_temp_file('json')
         scan_cmd = os.path.join(scancode.root_dir, 'scancode')
         rc, _stdout, _stderr = execute(scan_cmd,
-            ['-clip', '--email', '--url', '--strip-root', '--format', 'json', test_dir, json_file])
+            ['-clip', '--email', '--url', '--strip-root', test_dir, 
+             '--format-json', json_file])
         assert rc == 0
         result_file = self.get_temp_file('.csv')
         with open(result_file, 'wb') as rf:

From 4d0d7e3d2459e94c8a938528269cc5ce241adcf7 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 16 Jan 2018 23:27:43 +0100
Subject: [PATCH 041/122] Update functions doc #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/functional.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/commoncode/functional.py b/src/commoncode/functional.py
index abe0226a80e..281dee5e831 100644
--- a/src/commoncode/functional.py
+++ b/src/commoncode/functional.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -37,6 +37,7 @@ def flatten(seq):
     flat list of elements.
 
     For example::
+
     >>> flatten([7, (6, [5, [4, ['a'], 3]], 3), 2, 1])
     [7, 6, 5, 4, 'a', 3, 3, 2, 1]
     >>> def gen():
@@ -68,6 +69,7 @@ def pair_chunks(iterable):
     must contain an even number of elements or it will truncated.
 
     For example::
+
     >>> list(pair_chunks([1, 2, 3, 4, 5, 6]))
     [(1, 2), (3, 4), (5, 6)]
     >>> list(pair_chunks([1, 2, 3, 4, 5, 6, 7]))
@@ -78,10 +80,11 @@ def pair_chunks(iterable):
 
 def memoize(fun):
     """
-    Decorate fun function and cache return values. Arguments must be
-    hashable. kwargs are not handled. Used to speed up some often executed
-    functions.
-    Usage example::
+    Decorate `fun` function and cache return values. Arguments must be hashable.
+    Only args are supported, kwargs are not handled. Used to speed up some often
+    executed functions.
+
+    For example::
 
     >>> @memoize
     ... def expensive(*args, **kwargs):
@@ -114,7 +117,7 @@ def memoized(*args, **kwargs):
         # calls with kwargs are not handled and not cached
         if kwargs:
             return fun(*args, **kwargs)
-        # convert any list arg to a tuple
+        # convert any list args to a tuple
         args = tuple(tuple(arg) if isinstance(arg, (ListType, tuple, array)) else arg
                      for arg in args)
         try:
@@ -128,10 +131,11 @@ def memoized(*args, **kwargs):
 
 def memoize_to_attribute(attr_name, _test=False):
     """
-    Decorate a method and cache return values in attr_name of the parent object.
+    Decorate a method and cache return values in `attr_name` of the parent object.
     Used to speed up some often called methods that cache their values in
     instance variables.
-    Usage example::
+
+    For example::
 
     >>> class Obj(object):
     ...     def __init__(self):
@@ -169,10 +173,11 @@ def wrapper(self, *args, **kwargs):
 
 def memoize_gen(fun):
     """
-    Decorate fun generator function and cache return values. Arguments must be
+    Decorate `fun` generator function and cache return values. Arguments must be
     hashable. kwargs are not handled. Used to speed up some often executed
     functions.
-    Usage example::
+
+    For example::
 
     >>> @memoize
     ... def expensive(*args, **kwargs):

From 74282991114f6036eb12001e53d3f16acab5a933 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 16 Jan 2018 23:28:22 +0100
Subject: [PATCH 042/122] Add new timed function decorator to time execution
 #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/timeutils.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/commoncode/timeutils.py b/src/commoncode/timeutils.py
index 643d141f8a5..37790f1b05a 100644
--- a/src/commoncode/timeutils.py
+++ b/src/commoncode/timeutils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -24,7 +24,11 @@
 
 from __future__ import absolute_import, print_function
 
-from datetime import datetime, tzinfo
+from datetime import datetime
+from datetime import tzinfo
+from functools import update_wrapper
+from functools import wraps
+from time import time
 
 
 """
@@ -100,3 +104,20 @@ def tstamp2time(stamp):
         if 0 <= microsec <= 999999:
             datim = datim.replace(microsecond=microsec)
     return datim
+
+
+def timed(fun):
+    """
+    Decorate `fun` callable to return a tuple of (timing, result) where timing
+    is a function execution time in seconds as a float and result is the value
+    returned by calling `fun`.
+
+    Note: this decorator will not work as expected for functions that return
+    generators.
+    """
+    @wraps(fun)
+    def _timed(*args, **kwargs):
+        start = time()
+        result = fun(*args, **kwargs)
+        return time() - start, result
+    return update_wrapper(_timed, fun)

From 6f1ddd22db1ba7210d92b89e2f07c2961df1d72a Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 13:33:05 +0100
Subject: [PATCH 043/122] Improve handling of re._MAXCACHE

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/cluecode/copyrights.py |  3 ++-
 src/commoncode/__init__.py | 30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/cluecode/copyrights.py b/src/cluecode/copyrights.py
index 28bc3db1c1c..faeecb4b8a7 100644
--- a/src/cluecode/copyrights.py
+++ b/src/cluecode/copyrights.py
@@ -30,8 +30,9 @@
 import os
 import re
 
-
+# importand: this sets re._MAXCACHE
 import commoncode
+
 from textcode import analysis
 from cluecode import copyrights_hint
 
diff --git a/src/commoncode/__init__.py b/src/commoncode/__init__.py
index 096c946c0db..0eaadbbdb2a 100644
--- a/src/commoncode/__init__.py
+++ b/src/commoncode/__init__.py
@@ -26,19 +26,23 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-# set re and fnmatch _MAXCACHE to 1M to cache regex compiled aggressively
-# their default is 100 and many utilities and libraries use a lot of regex
-import re
 
-remax = getattr(re, '_MAXCACHE', 0)
-if remax < 1000000:
-    setattr(re, '_MAXCACHE', 1000000)
-del remax
+def set_re_max_cache(max_cache=1000000):
+    """
+    Set re and fnmatch _MAXCACHE to 1M to cache regex compiled aggressively
+    their default is 100 and many utilities and libraries use a lot of regex
+    """
+    import re
+    import fnmatch
+    
+    remax = getattr(re, '_MAXCACHE', 0)
+    if remax < max_cache:
+        setattr(re, '_MAXCACHE', max_cache)
 
-import fnmatch
+    
+    fnmatchmax = getattr(fnmatch, '_MAXCACHE', 0)
+    if fnmatchmax < max_cache:
+        setattr(fnmatch, '_MAXCACHE', max_cache)
 
-fnmatchmax = getattr(fnmatch, '_MAXCACHE', 0)
-if fnmatchmax < 1000000:
-    setattr(fnmatch, '_MAXCACHE', 1000000)
-del fnmatchmax
-del re
+
+set_re_max_cache()
\ No newline at end of file

From c6a0317d722c08d656e63bfdb9afe3d19983d8de Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 14:49:04 +0100
Subject: [PATCH 044/122] Restore correct SPDX output tests results #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .../data/spdx/license_known/expected.rdf      |  56 ++++----
 .../spdx/license_known/expected_with_text.rdf |  70 +++++-----
 .../data/spdx/license_ref/expected.rdf        |  56 ++++----
 .../spdx/license_ref/expected_with_text.rdf   |  58 ++++----
 .../data/spdx/or_later/expected.rdf           |  24 ++--
 .../data/spdx/simple/expected.rdf             |  34 ++---
 .../data/spdx/simple/expected.tv              |   2 +-
 .../formattedcode/data/spdx/tree/expected.rdf | 130 +++++++++---------
 .../data/spdx/unicode/expected.rdf            |  74 +++++-----
 9 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/tests/formattedcode/data/spdx/license_known/expected.rdf b/tests/formattedcode/data/spdx/license_known/expected.rdf
index d4e4521afbe..49602d49c82 100644
--- a/tests/formattedcode/data/spdx/license_known/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected.rdf
@@ -3,18 +3,14 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:hasFile": [
             null, 
             null
@@ -22,63 +18,67 @@
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
           "ns1:licenseInfoFromFiles": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }
           ], 
           "ns1:name": "scan"
         }
       }, 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": [
         {
           "ns1:File": {
+            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada"
+                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+            }, 
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
           }
         }, 
         {
           "ns1:File": {
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890"
+                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
           }
         }
       ], 
-      "ns1:specVersion": "SPDX-2.1"
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
index d4e4521afbe..22cdd8c71e5 100644
--- a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
@@ -3,26 +3,13 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:hasFile": [
-            null, 
-            null
-          ], 
-          "ns1:licenseConcluded": {
+          "ns1:name": "scan", 
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseDeclared": {
+          "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoFromFiles": [
@@ -33,52 +20,65 @@
               "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:name": "scan"
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:hasFile": [
+            null, 
+            null
+          ]
         }
       }, 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": [
         {
           "ns1:File": {
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada"
+                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-            }
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:fileName": "./scan/apache-2.0.LICENSE"
           }
         }, 
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890"
+                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+            }, 
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
           }
         }
       ], 
-      "ns1:specVersion": "SPDX-2.1"
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_ref/expected.rdf b/tests/formattedcode/data/spdx/license_ref/expected.rdf
index ff18de2701b..f12c0f93321 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected.rdf
@@ -1,61 +1,59 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
+    "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+          "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+        }
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:hasFile": null, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
-          "ns1:licenseConcluded": {
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseDeclared": {
+          "ns1:name": "scan", 
+          "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
-            {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-            }, 
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
               }
+            }, 
+            {
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:name": "scan"
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
         }
       }, 
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-          "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
-        }
+      "ns1:specVersion": "SPDX-2.1", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:algorithm": "SHA1", 
-              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831"
+              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
+              "ns1:algorithm": "SHA1"
             }
           }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:fileName": "./scan/NOTICE", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
@@ -69,14 +67,16 @@
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
               }
             }
-          ]
+          ], 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:fileName": "./scan/NOTICE"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1"
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
index 757e7ea506f..3745b692426 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
@@ -1,82 +1,82 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
+    "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+          "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+        }
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:hasFile": null, 
-          "ns1:licenseConcluded": {
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseDeclared": {
+          "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoFromFiles": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
               }
             }
           ], 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:name": "scan"
         }
       }, 
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-          "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
-        }
+      "ns1:specVersion": "SPDX-2.1", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
+          "ns1:fileName": "./scan/NOTICE", 
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:algorithm": "SHA1", 
-              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831"
+              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
+              "ns1:algorithm": "SHA1"
             }
           }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:fileName": "./scan/NOTICE", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
           "ns1:licenseInfoInFile": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
               }
             }
           ]
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1"
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/or_later/expected.rdf b/tests/formattedcode/data/spdx/or_later/expected.rdf
index ba15c1fa3f1..9b319226c3a 100644
--- a/tests/formattedcode/data/spdx/or_later/expected.rdf
+++ b/tests/formattedcode/data/spdx/or_later/expected.rdf
@@ -3,48 +3,48 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:name": "or_later", 
           "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
           }, 
-          "ns1:name": "or_later"
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:hasFile": null
         }
       }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": {
         "ns1:File": {
+          "ns1:fileName": "./test.java", 
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:algorithm": "SHA1", 
-              "ns1:checksumValue": "0c5bf934430394112921e7a1a8128176606d32ca"
+              "ns1:checksumValue": "0c5bf934430394112921e7a1a8128176606d32ca", 
+              "ns1:algorithm": "SHA1"
             }
           }, 
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
-          "ns1:fileName": "./test.java", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
           "ns1:licenseInfoInFile": {
             "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
           }
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1"
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/simple/expected.rdf b/tests/formattedcode/data/spdx/simple/expected.rdf
index cd628e1e064..35bf0c8305c 100644
--- a/tests/formattedcode/data/spdx/simple/expected.rdf
+++ b/tests/formattedcode/data/spdx/simple/expected.rdf
@@ -3,52 +3,52 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          "ns1:name": "simple", 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
           "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
-          "ns1:name": "simple"
+          "ns1:hasFile": null
         }
       }, 
+      "ns1:specVersion": "SPDX-2.1", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:referencesFile": {
         "ns1:File": {
+          "ns1:fileName": "./simple/test.txt", 
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:algorithm": "SHA1", 
-              "ns1:checksumValue": "b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8"
+              "ns1:checksumValue": "b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8", 
+              "ns1:algorithm": "SHA1"
             }
           }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:fileName": "./test.txt", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoInFile": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1"
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/simple/expected.tv b/tests/formattedcode/data/spdx/simple/expected.tv
index 7ef5f485fd7..3f5fe575a66 100644
--- a/tests/formattedcode/data/spdx/simple/expected.tv
+++ b/tests/formattedcode/data/spdx/simple/expected.tv
@@ -17,7 +17,7 @@ PackageLicenseConcluded: NOASSERTION
 PackageLicenseInfoFromFiles: NONE
 PackageCopyrightText: NONE
 # File
-FileName: ./test.txt
+FileName: ./simple/test.txt
 FileChecksum: SHA1: b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8
 LicenseConcluded: NOASSERTION
 LicenseInfoInFile: NONE
diff --git a/tests/formattedcode/data/spdx/tree/expected.rdf b/tests/formattedcode/data/spdx/tree/expected.rdf
index de1f5843f6f..65e40a151aa 100644
--- a/tests/formattedcode/data/spdx/tree/expected.rdf
+++ b/tests/formattedcode/data/spdx/tree/expected.rdf
@@ -3,87 +3,59 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
-      "ns1:describesPackage": {
-        "ns1:Package": {
-          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:hasFile": [
-            null, 
-            null, 
-            null, 
-            null, 
-            null, 
-            null, 
-            null
-          ], 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:licenseInfoFromFiles": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:name": "scan"
-        }
-      }, 
       "ns1:referencesFile": [
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f"
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy3.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/copy1.c"
           }
         }, 
         {
           "ns1:File": {
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy1.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/copy2.c"
           }
         }, 
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy2.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:fileName": "./scan/subdir/copy1.c", 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -91,17 +63,17 @@
         }, 
         {
           "ns1:File": {
+            "ns1:fileName": "./scan/copy3.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
+                "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy1.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -111,15 +83,15 @@
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
+                "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy2.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
+            "ns1:fileName": "./scan/subdir/copy4.c", 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -129,40 +101,68 @@
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1"
+                "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy4.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy3.c"
           }
         }, 
         {
           "ns1:File": {
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:algorithm": "SHA1", 
-                "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f"
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
+                "ns1:algorithm": "SHA1"
               }
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy3.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy2.c"
           }
         }
       ], 
-      "ns1:specVersion": "SPDX-2.1"
+      "ns1:specVersion": "SPDX-2.1", 
+      "ns1:describesPackage": {
+        "ns1:Package": {
+          "ns1:hasFile": [
+            null, 
+            null, 
+            null, 
+            null, 
+            null, 
+            null, 
+            null
+          ], 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:name": "scan", 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+          "ns1:licenseInfoFromFiles": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:downloadLocation": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }
+        }
+      }, 
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/unicode/expected.rdf b/tests/formattedcode/data/spdx/unicode/expected.rdf
index 89592719834..6a5babd4fbf 100644
--- a/tests/formattedcode/data/spdx/unicode/expected.rdf
+++ b/tests/formattedcode/data/spdx/unicode/expected.rdf
@@ -1,66 +1,66 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
+    "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
+          "ns1:licenseId": "LicenseRef-agere-bsd"
+        }
+      }, 
+      "ns1:referencesFile": {
+        "ns1:File": {
+          "ns1:licenseInfoInFile": {
+            "ns1:ExtractedLicensingInfo": {
+              "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
+              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
+              "ns1:licenseId": "LicenseRef-agere-bsd"
+            }
+          }, 
+          "ns1:checksum": {
+            "ns1:Checksum": {
+              "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90", 
+              "ns1:algorithm": "SHA1"
+            }
+          }, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
+          "ns1:fileName": "./et131x.h"
+        }
+      }, 
+      "ns1:specVersion": "SPDX-2.1", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
           "ns1:licenseInfoFromFiles": {
             "ns1:ExtractedLicensingInfo": {
               "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-              "ns1:licenseId": "LicenseRef-agere-bsd", 
-              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
+              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
+              "ns1:licenseId": "LicenseRef-agere-bsd"
             }
           }, 
-          "ns1:name": "unicode"
-        }
-      }, 
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-          "ns1:licenseId": "LicenseRef-agere-bsd", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
-        }
-      }, 
-      "ns1:referencesFile": {
-        "ns1:File": {
-          "ns1:checksum": {
-            "ns1:Checksum": {
-              "ns1:algorithm": "SHA1", 
-              "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90"
-            }
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
-          "ns1:fileName": "./et131x.h", 
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseInfoInFile": {
-            "ns1:ExtractedLicensingInfo": {
-              "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-              "ns1:licenseId": "LicenseRef-agere-bsd", 
-              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
-            }
-          }
+          "ns1:name": "unicode"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1"
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
     }
   }
 }
\ No newline at end of file

From f5c7a97d0904258863c2f31b88cef04a65f157b3 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 22:43:07 +0100
Subject: [PATCH 045/122] Add new plugin system for output #787 #789

 * each plugin just process a Codebase (though there is still some code
   left to cleanup)
 * renamed options to --output
 * multiple outputs are now possible for #789

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/scripts/test_json2csv.py                  |   2 +-
 src/formattedcode/format_json.py              |  71 ----
 .../{format_csv.py => output_csv.py}          |  46 ++-
 .../{format_templated.py => output_html.py}   | 377 +++++++++++-------
 src/formattedcode/output_json.py              | 100 +++++
 ...ormat_jsonlines.py => output_jsonlines.py} |  57 +--
 .../{format_spdx.py => output_spdx.py}        | 125 ++++--
 src/plugincode/output.py                      | 229 +++++++++--
 .../data/json/simple-expected.json            |   6 +-
 .../data/json/simple-expected.jsonlines       |   5 +-
 .../data/json/simple-expected.jsonpp          |   7 +-
 .../data/json/tree/expected.json              |   6 +-
 .../data/spdx/license_known/expected.rdf      |  56 +--
 .../spdx/license_known/expected_with_text.rdf |  70 ++--
 .../data/spdx/license_ref/expected.rdf        |  56 +--
 .../spdx/license_ref/expected_with_text.rdf   |  58 +--
 .../data/spdx/or_later/expected.rdf           |  24 +-
 .../data/spdx/simple/expected.rdf             |  34 +-
 .../data/spdx/simple/expected.tv              |   2 +-
 .../formattedcode/data/spdx/tree/expected.rdf | 130 +++---
 .../data/spdx/unicode/expected.rdf            |  74 ++--
 ...{test_format_csv.py => test_output_csv.py} |  15 +-
 ...est_format_json.py => test_output_json.py} |  12 +-
 ..._jsonlines.py => test_output_jsonlines.py} |   4 +-
 ...est_format_spdx.py => test_output_spdx.py} |  56 +--
 ..._templated.py => test_output_templated.py} |  23 +-
 26 files changed, 1013 insertions(+), 632 deletions(-)
 delete mode 100644 src/formattedcode/format_json.py
 rename src/formattedcode/{format_csv.py => output_csv.py} (87%)
 rename src/formattedcode/{format_templated.py => output_html.py} (52%)
 create mode 100644 src/formattedcode/output_json.py
 rename src/formattedcode/{format_jsonlines.py => output_jsonlines.py} (50%)
 rename src/formattedcode/{format_spdx.py => output_spdx.py} (68%)
 rename tests/formattedcode/{test_format_csv.py => test_output_csv.py} (94%)
 rename tests/formattedcode/{test_format_json.py => test_output_json.py} (89%)
 rename tests/formattedcode/{test_format_jsonlines.py => test_output_jsonlines.py} (96%)
 rename tests/formattedcode/{test_format_spdx.py => test_output_spdx.py} (88%)
 rename tests/formattedcode/{test_format_templated.py => test_output_templated.py} (85%)

diff --git a/etc/scripts/test_json2csv.py b/etc/scripts/test_json2csv.py
index 4a25c55d9dc..da708fcc060 100644
--- a/etc/scripts/test_json2csv.py
+++ b/etc/scripts/test_json2csv.py
@@ -215,7 +215,7 @@ def test_can_process_scan_from_json_scan(self):
         scan_cmd = os.path.join(scancode.root_dir, 'scancode')
         rc, _stdout, _stderr = execute(scan_cmd,
             ['-clip', '--email', '--url', '--strip-root', test_dir, 
-             '--format-json', json_file])
+             '--output-json', json_file])
         assert rc == 0
         result_file = self.get_temp_file('.csv')
         with open(result_file, 'wb') as rf:
diff --git a/src/formattedcode/format_json.py b/src/formattedcode/format_json.py
deleted file mode 100644
index 7eb8d272235..00000000000
--- a/src/formattedcode/format_json.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
-# http://nexb.com and https://github.com/nexB/scancode-toolkit/
-# The ScanCode software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode require an acknowledgment.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# When you publish or redistribute any data created with ScanCode or any ScanCode
-# derivative work, you must accompany this data with the following acknowledgment:
-#
-#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-#  ScanCode should be considered or used as legal advice. Consult an Attorney
-#  for any legal advice.
-#  ScanCode is a free software code scanning tool from nexB Inc. and others.
-#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-from collections import OrderedDict
-
-import simplejson
-
-from plugincode.output import scan_output_writer
-
-
-"""
-Output plugins to write scan results as JSON.
-"""
-
-@scan_output_writer
-def write_json_compact(files_count, version, notice, scanned_files, options, output_file, *args, **kwargs):
-    """
-    Write scan output formatted as compact JSON.
-    """
-    _write_json(files_count, version, notice, scanned_files, options, output_file, pretty=False)
-
-
-@scan_output_writer
-def write_json_pretty_printed(files_count, version, notice, scanned_files, options, output_file, *args, **kwargs):
-    """
-    Write scan output formatted as pretty-printed JSON.
-    """
-    _write_json(files_count, version, notice, scanned_files, options, output_file, pretty=True)
-
-
-def _write_json(files_count, version, notice, scanned_files, options, output_file, pretty=False):
-    scan = OrderedDict([
-        ('scancode_notice', notice),
-        ('scancode_version', version),
-        ('scancode_options', options),
-        ('files_count', files_count),
-        ('files', scanned_files),
-    ])
-    kwargs = dict(iterable_as_array=True, encoding='utf-8')
-    if pretty:
-        kwargs['indent'] = 2 * ' '
-    else:
-        kwargs['separators'] = (',', ':',)
-
-    # FIXME: Why do we wrap the output in unicode? Test output when we do not wrap the output in unicode
-    output_file.write(unicode(simplejson.dumps(scan, **kwargs)))
-    output_file.write('\n')
diff --git a/src/formattedcode/format_csv.py b/src/formattedcode/output_csv.py
similarity index 87%
rename from src/formattedcode/format_csv.py
rename to src/formattedcode/output_csv.py
index a5782919a24..49648bc642b 100644
--- a/src/formattedcode/format_csv.py
+++ b/src/formattedcode/output_csv.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -29,22 +29,38 @@
 
 from collections import OrderedDict
 
+import click
 import unicodecsv
 
-from plugincode.output import scan_output_writer
+from plugincode.output import output
+from plugincode.output import OutputPlugin
+from scancode import CommandLineOption
+from scancode import OUTPUT_GROUP
 
 
-"""
-Output plugin to write scan results as CSV.
-"""
+@output
+class CsvOutput(OutputPlugin):
 
+    options = [
+        CommandLineOption(('--output-csv',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output formatted as CSV to FILE.',
+            help_group=OUTPUT_GROUP)
+    ]
 
-@scan_output_writer
-def write_csv(scanned_files, output_file, *args, **kwargs):
-    """
-    Write scan output formatted as CSV.
-    """
-    scan_results = list(scanned_files)
+    def is_enabled(self):
+        return self.is_command_option_enabled('output_csv')
+
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_csv').value
+        self.create_parent_directory(output_file)
+        return write_csv(results, output_file)
+
+
+def write_csv(results, output_file):
+    # FIXMe: this is reading all in memory
+    results = list(results)
 
     headers = OrderedDict([
         ('info', []),
@@ -56,7 +72,7 @@ def write_csv(scanned_files, output_file, *args, **kwargs):
     ])
 
     # note: FIXME: headers are collected as a side effect and this is not great
-    rows = list(flatten_scan(scan_results, headers))
+    rows = list(flatten_scan(results, headers))
 
     ordered_headers = []
     for key_group in headers.values():
@@ -126,11 +142,11 @@ def collect_keys(mapping, key_group):
                     continue
 
                 if k == 'score':
-                    # normalize the string representation of this number
+                    # normalize score with two decimal values
                     val = '{:.2f}'.format(val)
 
-                # lines are present in multiple scans: keep their column name as not scan-specific
-                # Prefix othe columns with license__
+                # lines are present in multiple scans: keep their column name as
+                # not scan-specific. Prefix othe columns with license__
                 if k not in ('start_line', 'end_line',):
                     k = 'license__' + k
                 lic[k] = val
diff --git a/src/formattedcode/format_templated.py b/src/formattedcode/output_html.py
similarity index 52%
rename from src/formattedcode/format_templated.py
rename to src/formattedcode/output_html.py
index 9774dcdacef..fa620a15a45 100644
--- a/src/formattedcode/format_templated.py
+++ b/src/formattedcode/output_html.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -23,19 +23,37 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 from collections import OrderedDict
 import codecs
 from operator import itemgetter
-import os
-
-import simplejson as json
-
-from commoncode import fileutils
-from plugincode.output import scan_output_writer
+from os.path import abspath
+from os.path import basename
+from os.path import dirname
+from os.path import exists
+from os.path import expanduser
+from os.path import isfile
+from os.path import join
+
+import click
+import simplejson
+
+from commoncode.fileutils import PATH_TYPE
+from commoncode.fileutils import as_posixpath
+from commoncode.fileutils import copytree
+from commoncode.fileutils import delete
+from commoncode.fileutils import file_name
+from commoncode.fileutils import file_base_name
+from commoncode.fileutils import fsencode
+from commoncode.fileutils import parent_directory
+from commoncode.system import on_linux
+from plugincode.output import output
+from plugincode.output import OutputPlugin
+from scancode import CommandLineOption
+from scancode import OUTPUT_GROUP
 
 
 """
@@ -46,152 +64,120 @@
 """
 
 
-@scan_output_writer
-def write_html(scanned_files, output_file, _echo, version, *args, **kwargs):
-    """
-    Write scan output formatted as plain HTML page.
-    """
-    _write_templated(scanned_files, output_file, _echo, version, template_or_format='html', raise_ex=False)
+@output
+class HtmlOutput(OutputPlugin):
 
+    options = [
+        CommandLineOption(('--output-html',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output formatted as HTML to FILE.',
+            help_group=OUTPUT_GROUP)
+    ]
 
-def write_custom(scanned_files, output_file, _echo, version, template_path):
-    """
-    Write scan output formatted with a custom template.
-    NOTE: this is NOT a plugin, but a built-in
-    """
-    _write_templated(scanned_files, output_file, _echo, version, template_or_format=template_path, raise_ex=True)
+    def is_enabled(self):
+        return self.is_command_option_enabled('output_html')
+
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_html').value
+        self.create_parent_directory(output_file)
+        write_templated(output_file, results, version, template_or_format='html')
 
 
-def _write_templated(scanned_files, output_file, _echo, version, template_or_format, raise_ex=False):
+# TODO: Implmenet me as a proper callback with partial
+def validate_together(ctx, options):
+    """
+    Validate that a list of `options` names are all provided.
+    Raise a UsageError on errors.
+    """
+    ctx_params = ctx.params
+    requested_options = [ctx_params[eop] for eop in options if ctx_params[eop]]
+    if len(options) != requested_options:
+        msg = ' and '.join('`' + eo.replace('_', '-') + '`' for eo in options)
+        msg += ' options are required to be set together. You must use set all of them.'
+        raise click.UsageError(msg)
+
+
+@output
+class CustomTemplateOutput(OutputPlugin):
+
+    options = [
+        CommandLineOption(('--output-custom',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output to FILE formatted with '
+                 'the custom Jinja template file.',
+            help_group=OUTPUT_GROUP),
+
+        CommandLineOption(('--custom-template',),
+            type=click.Path(
+                exists=True, file_okay=True, dir_okay=False,
+                readable=True, path_type=PATH_TYPE),
+            default=None,
+            metavar='FILE',
+            help='Use this Jinja template FILE as a custom template.',
+            help_group=OUTPUT_GROUP)
+    ]
+
+    def is_enabled(self):
+        return (
+            self.is_command_option_enabled('output_custom')
+            and self.is_command_option_enabled('custom_template')
+        )
+
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_custom').value
+        self.create_parent_directory(output_file)
+        template_path = self.get_command_option('custom_template').value
+        if on_linux:
+            template_path = fsencode(template_path)
+        write_templated(output_file, results, version, template_or_format=template_path)
+
+
+@output
+class HtmlAppOutput(OutputPlugin):
+    """
+    Write scan output formatted as a mini HTML application.
+    """
+    options = [
+        CommandLineOption(('--output-html-app',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output formatted as a mini HTML application FILE.',
+            help_group=OUTPUT_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('output_html_app')
+
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_html_app').value
+        scanned_path = codebase.location
+        self.create_parent_directory(output_file)
+        output_file.write(as_html_app(output_file, scanned_path, version))
+        create_html_app_assets(results, output_file)
+
+
+def write_templated(output_file, results, version, template_or_format):
     """
     Write scan output using a template or a format.
     Optionally raise an exception on errors.
     """
 
-    for template_chunk in as_template(scanned_files, version, template=template_or_format):
+    for template_chunk in as_template(results, version, template_or_format=template_or_format):
         try:
             output_file.write(template_chunk)
         except Exception:
             import traceback
-            extra_context = 'ERROR: Failed to write output for: ' + repr(template_chunk)
-            extra_context += '\n' + traceback.format_exc()
-            _echo(extra_context, fg='red')
-            if raise_ex:
-                # NOTE: this is a tad brutal to raise here, but helps
-                # the template authors
-                raise
-
-
-@scan_output_writer
-def write_html_app(scanned_files, input, output_file, _echo, version, *args, **kwargs):
-    """
-    Write scan output formatted as a mini HTML application.
-    """
-    output_file.write(as_html_app(input, version, output_file))
-    try:
-        create_html_app_assets(scanned_files, output_file)
-    except HtmlAppAssetCopyWarning:
-        _echo('\nHTML app creation skipped when printing to stdout.', fg='yellow')
-    except HtmlAppAssetCopyError:
-        _echo('\nFailed to create HTML app.', fg='red')
-
-
-def create_html_app_assets(results, output_file):
-    """
-    Given an html-app output_file, create the corresponding `_files`
-    directory and copy the assets to this directory. The target
-    directory is deleted if it exists.
-
-    Raise HtmlAppAssetCopyWarning if the output_file is <stdout> or
-    HtmlAppAssetCopyError if the copy was not possible.
-    """
-    try:
-        if is_stdout(output_file):
-            raise HtmlAppAssetCopyWarning()
-        assets_dir = os.path.join(get_template_dir('html-app'), 'assets')
-
-        # delete old assets
-        tgt_dirs = get_html_app_files_dirs(output_file)
-        target_dir = os.path.join(*tgt_dirs)
-        if os.path.exists(target_dir):
-            fileutils.delete(target_dir)
-
-        # copy assets
-        fileutils.copytree(assets_dir, target_dir)
-
-        # write json data
-        root_path, assets_dir = get_html_app_files_dirs(output_file)
-        with codecs.open(os.path.join(root_path, assets_dir, 'data.json'), 'wb', encoding='utf-8') as f:
-            f.write('data=')
-            json.dump(results, f, iterable_as_array=True)
-
-        # create help file
-        with codecs.open(os.path.join(root_path, assets_dir, 'help.html'), 'wb', encoding='utf-8') as f:
-            f.write(get_html_app_help(os.path.basename(output_file.name)))
-    except HtmlAppAssetCopyWarning, w:
-        raise w
-    except Exception, e:
-        raise HtmlAppAssetCopyError(e)
-
-
-def as_html_app(scanned_path, version, output_file):
-    """
-    Return an HTML string built from a list of results and the html-app template.
-    """
-    template = get_template(get_template_dir('html-app'))
-    _, assets_dir = get_html_app_files_dirs(output_file)
-
-    return template.render(assets_dir=assets_dir, scanned_path=scanned_path, version=version)
-
-
-def get_html_app_help(output_filename):
-    """
-    Return an HTML string containing the html-app help page with a
-    reference back to the main app page.
-    """
-    template = get_template(get_template_dir('html-app'),
-                            template_name='help_template.html')
-
-    return template.render(main_app=output_filename)
+            msg = 'ERROR: Failed to write output for: ' + repr(template_chunk)
+            msg += '\n' + traceback.format_exc()
+            raise Exception(msg)
 
 
-class HtmlAppAssetCopyWarning(Exception):
-    pass
-
-
-class HtmlAppAssetCopyError(Exception):
-    pass
-
-
-def is_stdout(output_file):
-    return output_file.name == '<stdout>'
-
-
-def get_html_app_files_dirs(output_file):
-    """
-    Return a tuple of (parent_dir, dir_name) directory named after the
-    `output_file` file object file_base_name (stripped from extension) and a
-    `_files` suffix Return empty strings if output is to stdout.
-    """
-    if is_stdout(output_file):
-        return '', ''
-
-    file_name = output_file.name
-    parent_dir = os.path.dirname(file_name)
-    dir_name = fileutils.file_base_name(file_name) + '_files'
-    return parent_dir, dir_name
-
-
-#
-# Common utilities for templated scans outputs: html, html-app and
-# custom templates.
-#
-
-# FIXME: no HTML default!
 def get_template(templates_dir, template_name='template.html'):
     """
-    Given a template directory, load and return the template file in the template_name
-    file found in that directory.
+    Given a `templates_dir` template directory, load and return the template
+    file for the `template_name` file found in that directory.
     """
     from jinja2 import Environment, FileSystemLoader
     env = Environment(loader=FileSystemLoader(templates_dir))
@@ -199,20 +185,19 @@ def get_template(templates_dir, template_name='template.html'):
     return template
 
 
-def get_template_dir(format):
+def get_template_dir(format_code):
     """
-    Given a format string return the corresponding standard template
-    directory.
+    Return the template directory of a built-in template for a `format_code`
+    string.
     """
-    return os.path.join(os.path.dirname(__file__), 'templates', format)
+    return join(dirname(__file__), 'templates', format_code)
 
 
-# FIXME: no HTML default!
-def as_template(scanned_files, version, template):
+def as_template(results, version, template_or_format):
     """
-    Return an string built from a list of `scanned_files` results and
-    the provided `template` identifier. The template defaults to the standard HTML
-    template format or can point to the path of a custom template file.
+    Return an string built from a list of `results` and the provided `template`
+    identifier. The template_or_format is either a built-in template format code
+    (e.g. "html") or the path of a custom template file.
     """
     # FIXME: This code is highly coupled with actual scans and may not
     # support adding new scans at all
@@ -220,14 +205,14 @@ def as_template(scanned_files, version, template):
     from licensedcode.cache import get_licenses_db
 
     # FIXME: factor out the html vs custom from this function: we should get a template path
-    if template == 'html':
+    if template_or_format == 'html':
         template = get_template(get_template_dir('html'))
     else:
         # load a custom template
-        tpath = fileutils.as_posixpath(os.path.abspath(os.path.expanduser(template)))
-        assert os.path.isfile(tpath)
-        tdir = fileutils.parent_directory(tpath)
-        tfile = fileutils.file_name(tpath)
+        tpath = as_posixpath(abspath(expanduser(template_or_format)))
+        assert isfile(tpath)
+        tdir = parent_directory(tpath)
+        tfile = file_name(tpath)
         template = get_template(tdir, tfile)
 
     converted = OrderedDict()
@@ -242,7 +227,7 @@ def as_template(scanned_files, version, template):
     EMAILS = 'emails'
 
     # Create a flattened data dict keyed by path
-    for scanned_file in scanned_files:
+    for scanned_file in results:
         path = scanned_file['path']
         results = []
         if COPYRIGHTS in scanned_file:
@@ -292,3 +277,91 @@ def as_template(scanned_files, version, template):
     }
 
     return template.generate(files=files, licenses=licenses, version=version)
+
+
+def create_html_app_assets(results, output_file):
+    """
+    Given an html-app output_file, create the corresponding `_files`
+    directory and copy the assets to this directory. The target
+    directory is deleted if it exists.
+
+    Raise HtmlAppAssetCopyWarning if the output_file is <stdout> or
+    HtmlAppAssetCopyError if the copy was not possible.
+    """
+    try:
+        if is_stdout(output_file):
+            raise HtmlAppAssetCopyWarning()
+        assets_dir = join(get_template_dir('html-app'), 'assets')
+
+        # delete old assets
+        tgt_dirs = get_html_app_files_dirs(output_file)
+        target_dir = join(*tgt_dirs)
+        if exists(target_dir):
+            delete(target_dir)
+
+        # copy assets
+        copytree(assets_dir, target_dir)
+
+        # write json data
+        # FIXME: this should a regular JSON scan format
+        root_path, assets_dir = get_html_app_files_dirs(output_file)
+        with codecs.open(join(root_path, assets_dir, 'data.json'), 'wb', encoding='utf-8') as f:
+            f.write('data=')
+            simplejson.dump(results, f, iterable_as_array=True)
+
+        # create help file
+        with codecs.open(join(root_path, assets_dir, 'help.html'), 'wb', encoding='utf-8') as f:
+            f.write(get_html_app_help(basename(output_file.name)))
+    except HtmlAppAssetCopyWarning, w:
+        raise w
+    except Exception, e:
+        raise HtmlAppAssetCopyError(e)
+
+
+def as_html_app(output_file, scanned_path, version,):
+    """
+    Return an HTML string built from a list of results and the html-app template.
+    """
+    template = get_template(get_template_dir('html-app'))
+    _, assets_dir = get_html_app_files_dirs(output_file)
+
+    return template.render(assets_dir=assets_dir, scanned_path=scanned_path, version=version)
+
+
+def get_html_app_help(output_filename):
+    """
+    Return an HTML string containing the html-app help page with a
+    reference back to the main app page.
+    """
+    template = get_template(get_template_dir('html-app'),
+                            template_name='help_template.html')
+
+    return template.render(main_app=output_filename)
+
+
+class HtmlAppAssetCopyWarning(Exception):
+    pass
+
+
+class HtmlAppAssetCopyError(Exception):
+    pass
+
+
+def is_stdout(output_file):
+    return output_file.name == '<stdout>'
+
+
+def get_html_app_files_dirs(output_file):
+    """
+    Return a tuple of (parent_dir, dir_name) directory named after the
+    `output_file` file-like object file_base_name (stripped from extension) and
+    a `_files` suffix Return empty strings if output is to stdout.
+    """
+    if is_stdout(output_file):
+        return '', ''
+
+    # FIXME: what if there is no name attribute??
+    file_name = output_file.name
+    parent_dir = dirname(file_name)
+    dir_name = file_base_name(file_name) + '_files'
+    return parent_dir, dir_name
diff --git a/src/formattedcode/output_json.py b/src/formattedcode/output_json.py
new file mode 100644
index 00000000000..84c1d6e0c4a
--- /dev/null
+++ b/src/formattedcode/output_json.py
@@ -0,0 +1,100 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from collections import OrderedDict
+
+import click
+import simplejson
+
+from plugincode.output import output
+from plugincode.output import OutputPlugin
+from scancode import CommandLineOption
+from scancode import OUTPUT_GROUP
+
+"""
+Output plugins to write scan results as JSON.
+"""
+
+
+@output
+class JsonCompactOutput(OutputPlugin):
+
+    options = [
+        CommandLineOption(('--json', '--output-json',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output formatted as compact JSON to FILE.',
+            help_group=OUTPUT_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('output_json')
+
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_json').value
+        self.create_parent_directory(output_file)
+        write_json(results, output_file, files_count, version, notice, options, pretty=False)
+
+
+@output
+class JsonPrettyOutput(OutputPlugin):
+
+    options = [
+        CommandLineOption(('--json-pp', '--output-json-pp',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output formatted as pretty-printed JSON to FILE.',
+            help_group=OUTPUT_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('output_json_pp')
+
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_json_pp').value
+        self.create_parent_directory(output_file)
+        write_json(results, output_file, files_count, version, notice, options, pretty=True)
+
+
+def write_json(results, output_file, files_count, version, notice, options, pretty=False):
+    scan = OrderedDict([
+        ('scancode_notice', notice),
+        ('scancode_version', version),
+        ('scancode_options', options),
+        ('files_count', files_count),
+        ('files', results),
+    ])
+
+    kwargs = dict(iterable_as_array=True, encoding='utf-8')
+    if pretty:
+        kwargs['indent'] = 2 * b' '
+    else:
+        kwargs['separators'] = (b',', b':',)
+
+    # FIXME: Why do we wrap the output in unicode? Test output when we do not wrap the output in unicode
+    output_file.write(simplejson.dumps(scan, **kwargs))
+    output_file.write(b'\n')
diff --git a/src/formattedcode/format_jsonlines.py b/src/formattedcode/output_jsonlines.py
similarity index 50%
rename from src/formattedcode/format_jsonlines.py
rename to src/formattedcode/output_jsonlines.py
index e79b572acdc..d7f6cbb507d 100644
--- a/src/formattedcode/format_jsonlines.py
+++ b/src/formattedcode/output_jsonlines.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -27,34 +27,45 @@
 
 from collections import OrderedDict
 
+import click
 import simplejson
 
-from plugincode.output import scan_output_writer
+from plugincode.output import output
+from plugincode.output import OutputPlugin
+from scancode import CommandLineOption
+from scancode import OUTPUT_GROUP
 
 
-"""
-Output plugins to write scan results as JSON Lines.
-"""
+@output
+class JsonLinesOutput(OutputPlugin):
 
+    options = [
+        CommandLineOption(('--output-json-lines',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output formatted as JSON Lines to FILE.',
+            help_group=OUTPUT_GROUP)
+    ]
 
-@scan_output_writer
-def write_jsonlines(files_count, version, notice, scanned_files, options, output_file, *args, **kwargs):
-    """
-    Write scan output formatted as JSON Lines.
-    """
-    header = dict(header=OrderedDict([
-        ('scancode_notice', notice),
-        ('scancode_version', version),
-        ('scancode_options', options),
-        ('files_count', files_count)
-    ]))
+    def is_enabled(self):
+        return self.is_command_option_enabled('output_json_lines')
 
-    kwargs = dict(iterable_as_array=True, encoding='utf-8', separators=(',', ':',))
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_json_lines').value
+        self.create_parent_directory(output_file)
+        header = dict(header=OrderedDict([
+            ('scancode_notice', notice),
+            ('scancode_version', version),
+            ('scancode_options', options),
+            ('files_count', files_count)
+        ]))
 
-    output_file.write(simplejson.dumps(header, **kwargs))
-    output_file.write('\n')
-
-    for scanned_file in scanned_files:
-        scanned_file_line = {'files': [scanned_file]}
-        output_file.write(simplejson.dumps(scanned_file_line, **kwargs))
+        kwargs = dict(
+            iterable_as_array=True, encoding='utf-8', separators=(',', ':',))
+        output_file.write(simplejson.dumps(header, **kwargs))
         output_file.write('\n')
+
+        for scanned_file in results:
+            scanned_file_line = {'files': [scanned_file]}
+            output_file.write(simplejson.dumps(scanned_file_line, **kwargs))
+            output_file.write('\n')
diff --git a/src/formattedcode/format_spdx.py b/src/formattedcode/output_spdx.py
similarity index 68%
rename from src/formattedcode/format_spdx.py
rename to src/formattedcode/output_spdx.py
index 622a051f2f9..5372f0291aa 100644
--- a/src/formattedcode/format_spdx.py
+++ b/src/formattedcode/output_spdx.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -27,9 +27,15 @@
 from __future__ import division
 from __future__ import unicode_literals
 
-import os
 from os.path import abspath
-
+from os.path import basename
+from os.path import dirname
+from os.path import isdir
+from os.path import isfile
+from os.path import join
+import sys
+
+import click
 from spdx.checksum import Algorithm
 from spdx.creationinfo import Tool
 from spdx.document import Document
@@ -41,39 +47,102 @@
 from spdx.utils import SPDXNone
 from spdx.version import Version
 
-from plugincode.output import scan_output_writer
+from plugincode.output import output
+from plugincode.output import OutputPlugin
+from scancode import CommandLineOption
+from scancode import OUTPUT_GROUP
+
+# Python 2 and 3 support
+try:
+    # Python 2
+    unicode
+    str_orig = str
+    bytes = str  # @ReservedAssignment
+    str = unicode  # @ReservedAssignment
+except NameError:
+    # Python 3
+    unicode = str  # @ReservedAssignment
+
+
+# Tracing flags
+TRACE = False
+TRACE_DEEP = False
+
+def logger_debug(*args):
+    pass
+
+if TRACE or TRACE_DEEP:
+    import logging
+
+    logger = logging.getLogger(__name__)
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
+
+    def logger_debug(*args):
+        return logger.debug(' '.join(isinstance(a, unicode)
+                                     and a or repr(a) for a in args))
 
 
 """
 Output plugins to write scan results in SPDX format.
 """
 
-@scan_output_writer
-def write_spdx_tag_value(files_count, version, notice, scanned_files, input, output_file, *args, **kwargs):
-    """
-    Write scan output formatted as SPDX Tag/Value.
-    """
-    write_spdx(version, notice, scanned_files, input, output_file, as_tagvalue=True)
+@output
+class SpdxTvOutput(OutputPlugin):
 
+    needs_info = True
 
-@scan_output_writer
-def write_spdx_rdf(files_count, version, notice, scanned_files, input, output_file, *args, **kwargs):
-    """
-    Write scan output formatted as SPDX RDF.
-    """
-    write_spdx(version, notice, scanned_files, input, output_file, as_tagvalue=False)
+    options = [
+        CommandLineOption(('--output-spdx-tv',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output formatted as SPDX Tag/Value to FILE. '
+                 'Implies running the --info scan.',
+            help_group=OUTPUT_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('output_spdx_tv')
+
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_spdx_tv').value
+        self.create_parent_directory(output_file)
+        input_file = codebase.location
+        write_spdx(output_file, results, version, notice, input_file, as_tagvalue=True)
+
+
+@output
+class SpdxRdfOutput(OutputPlugin):
+
+    options = [
+        CommandLineOption(('--output-spdx-rdf',),
+            type=click.File(mode='wb', lazy=False),
+            metavar='FILE',
+            help='Write scan output formatted as SPDX RDF to FILE. '
+                 'Implies running the --info scan.',
+            help_group=OUTPUT_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('output_spdx_rdf')
+
+    def save_results(self, codebase, results, files_count, version, notice, options):
+        output_file = self.get_command_option('output_spdx_rdf').value
+        self.create_parent_directory(output_file)
+        input_file = codebase.location
+        write_spdx(output_file, results, version, notice, input_file, as_tagvalue=False)
 
 
-def write_spdx(version, notice, scanned_files, input, output_file, as_tagvalue=True):
+def write_spdx(output_file, results, version, notice, input_file, as_tagvalue=True):
     """
     Write scan output formatted as SPDX Tag/value or RDF.
     """
-    absinput = abspath(input)
+    absinput = abspath(input_file)
 
-    if os.path.isdir(absinput):
+    if isdir(absinput):
         input_path = absinput
     else:
-        input_path = os.path.dirname(absinput)
+        input_path = dirname(absinput)
 
     doc = Document(Version(2, 1), License.from_identifier('CC0-1.0'))
     doc.comment = notice
@@ -82,7 +151,7 @@ def write_spdx(version, notice, scanned_files, input, output_file, as_tagvalue=T
     doc.creation_info.set_created_now()
 
     package = doc.package = Package(
-        name=os.path.basename(input_path),
+        name=basename(input_path),
         download_location=NoAssert()
     )
 
@@ -92,14 +161,15 @@ def write_spdx(version, notice, scanned_files, input, output_file, as_tagvalue=T
     all_files_have_no_license = True
     all_files_have_no_copyright = True
 
-    for file_data in scanned_files:
+    # FIXME: this should walk the codebase instead!!!
+    for file_data in results:
         # Construct the absolute path in case we need to access the file
         # to calculate its SHA1.
-        file_entry = File(os.path.join(input_path, file_data.get('path')))
+        file_entry = File(join(input_path, file_data.get('path')))
 
         file_sha1 = file_data.get('sha1')
         if not file_sha1:
-            if os.path.isfile(file_entry.name):
+            if isfile(file_entry.name):
                 # Calculate the SHA1 in case it is missing, e.g. for empty files.
                 file_sha1 = file_entry.calc_chksum()
             else:
@@ -125,7 +195,8 @@ def write_spdx(version, notice, scanned_files, input, output_file, as_tagvalue=T
                     licenseref_id = 'LicenseRef-' + license_key
                     spdx_license = ExtractedLicense(licenseref_id)
                     spdx_license.name = file_license.get('short_name')
-                    comment = 'See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/%s.yml\n' % license_key
+                    comment = ('See details at https://github.com/nexB/scancode-toolkit'
+                               '/blob/develop/src/licensedcode/data/licenses/%s.yml\n' % license_key)
                     spdx_license.comment = comment
                     text = file_license.get('matched_text')
                     # always set some text, even if we did not extract the matched text
@@ -203,9 +274,9 @@ def write_spdx(version, notice, scanned_files, input, output_file, as_tagvalue=T
     package.conc_lics = NoAssert()
 
     if as_tagvalue:
-        from spdx.writers.tagvalue import write_document
+        from spdx.writers.tagvalue import write_document  # @UnusedImport
     else:
-        from spdx.writers.rdf import write_document
+        from spdx.writers.rdf import write_document  # @Reimport
 
     # The spdx-tools write_document returns either:
     # - unicode for tag values
diff --git a/src/plugincode/output.py b/src/plugincode/output.py
index 59afd10090e..aa6f8b48148 100644
--- a/src/plugincode/output.py
+++ b/src/plugincode/output.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -23,56 +23,217 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 
 from collections import OrderedDict
-import sys
+from functools import partial
+from os.path import abspath
+from os.path import dirname
+from os.path import expanduser
+from sys import stderr
+from sys import stdout
 
-from pluggy import HookimplMarker
-from pluggy import HookspecMarker
-from pluggy import PluginManager
+from commoncode.fileutils import create_dir
+from commoncode.fileutils import fsdecode
+from commoncode.system import on_linux
+from plugincode import CodebasePlugin
+from plugincode import PluginManager
+from plugincode import HookimplMarker
+from plugincode import HookspecMarker
+from scancode.resource import Resource
 
 
-scan_output_spec = HookspecMarker('scan_output_writer')
-scan_output_writer = HookimplMarker('scan_output_writer')
+# Python 2 and 3 support
+try:
+    # Python 2
+    unicode
+    str_orig = str
+    bytes = str  # @ReservedAssignment
+    str = unicode  # @ReservedAssignment
+except NameError:
+    # Python 3
+    unicode = str  # @ReservedAssignment
 
 
-# FIXME: simplify the hooskpec
-@scan_output_spec
-def write_output(files_count, version, notice, scanned_files, options, input, output_file, _echo):
-    """
-    Write the `scanned_files` scan results in the format supplied by
-    the --format command line option.
-    Parameters:
-     - `file_count`: the number of files and directories scanned.
-     - `version`: ScanCode version
-     - `notice`: ScanCode notice
-     - `scanned_files`: an iterable of scan results for each file
-     - `options`: a mapping of key by command line option to a flag True
-        if this option was enabled.
-     - `input`: the original input path scanned.
-     - `output_file`: an opened, file-like object to write the output to.
-     - `_echo`: a funtion to echo strings to stderr. This will be removedd in the future.
-    """
+# Tracing flags
+TRACE = False
+TRACE_DEEP = False
+
+def logger_debug(*args):
     pass
 
+if TRACE or TRACE_DEEP:
+    import logging
+
+    logger = logging.getLogger(__name__)
+    logging.basicConfig(stream=stdout)
+    logger.setLevel(logging.DEBUG)
 
-output_plugins = PluginManager('scan_output_writer')
-output_plugins.add_hookspecs(sys.modules[__name__])
+    def logger_debug(*args):
+        return logger.debug(' '.join(isinstance(a, unicode)
+                                     and a or repr(a) for a in args))
 
 
-def initialize():
+stage = 'output'
+entrypoint = 'scancode_output'
+
+output_spec = HookspecMarker(project_name=stage)
+output = HookimplMarker(project_name=stage)
+
+
+@output_spec
+class OutputPlugin(CodebasePlugin):
     """
-    NOTE: this defines the entry points for use in setup.py
+    Base plugin class for scan output formatters all output plugins must extend.
     """
-    output_plugins.load_setuptools_entrypoints('scancode_output_writers')
+
+    # TODO: pass own command options name/values as concrete kwargs
+    def process_codebase(self, codebase, **kwargs):
+        """
+        FIXME: this is a stopgap, intermediate implementation
+        Write scan output for the `codebase`.
+        """
+        serializer = partial(Resource.to_dict,
+            full_root=codebase.full_root,
+            strip_root=codebase.strip_root,
+            with_info=codebase.with_info)
+
+        filtered_rids = codebase.filtered_rids
+        if TRACE_DEEP:
+            logger_debug('OutputPlugin.process_codebase: filtered_rids:', filtered_rids)
+        resources = [res for res in codebase.walk(
+            topdown=True, sort=True, skip_root=codebase.strip_root)
+            # we apply any filter plugins here
+            if res.rid not in filtered_rids
+        ]
+        # TODO: add dirs to results
+        files_count, _dirs_count = codebase.resource_counts(resources)
+        
+        results = [serializer(res)
+            for res in codebase.walk(topdown=True, sort=True, skip_root=codebase.strip_root)
+            # we apply any filter plugins here
+            if res.rid not in filtered_rids
+        ]
+
+        version = codebase.summary['scancode_version']
+        notice = codebase.summary['scancode_notice']
+
+        # TODO: consider getting this from the codebase?
+        options = get_pretty_options(self.command_options, self._test_mode)
+
+        return self.save_results(codebase, results, files_count, version, notice, options)
+
+    def save_results(self, codebase, results, files_count, version, notice, options, *args, **kwargs):
+        """
+        FIXME: this is a stopgap, intermediate implementation
+        Write scan `results` to `output_file`
+        """
+        raise NotImplementedError
+
+    def create_parent_directory(self, output_file):
+        """
+        Create parent directory for the `output_file` file-like object if needed.
+        """
+        # FIXME: this IS NOT RIGHT!!!
+
+        # We use this to check if this is a real filesystem file or not.
+        # note: sys.stdout.name == '<stdout>' so it has a name.
+        has_name = hasattr(output, 'name')
+        output_is_real_file = output not in (stdout, stderr) and has_name
+        if output_is_real_file:
+            # we are writing to a real filesystem file: create directories!
+            parent_dir = dirname(output_file.name)
+            if parent_dir:
+                create_dir(abspath(expanduser(parent_dir)))
+
+    def setup_output_file(self, output_file):
+        """
+        Return `output_file` fully resolved and in the proper OS encoding.
+        Create intermediate directoties if needed.
+        """
+        if on_linux:
+            output_file = fsdecode(output_file)
+        output_file = abspath(expanduser(output_file))
+        self.create_parent_directory(output_file)
+        return output_file
 
 
-def get_plugins():
+def get_pretty_options(command_options, generic_paths=False):
     """
-    Return an ordered mapping of format name --> plugin callable for all
-    the output plugins. The mapping is ordered by sorted key.
-    This is the main API for other code to access format plugins.
+    Return a sorted mapping of {CLI option: pretty value string} for the
+    `command_options` list of CommandOption as in:
+        {"--license": True, "input": ~some/path}
+
+    Skip options with with None or empty seq values or a value set to its
+    default. Skip eager and hidden options.
+
+    If `generic_paths` is True, click.File and click.Path parameters are made
+    "generic" replacing their value with a placeholder. This is used mostly for
+    testing.
     """
-    return OrderedDict(sorted(output_plugins.list_name_plugin()))
+    import click
+
+    if TRACE:
+        logger_debug('get_pretty_options: generic_paths', generic_paths)
+    args = []
+    options = []
+    for option in command_options:
+        value = option.value
+        param = option.param
+        if value == param.default:
+            continue
+
+        if param.is_eager:  
+            continue
+
+        if value is None:
+            continue
+
+        # not yet in Click 6.7 or param.hidden:
+        if option.name == 'test_mode':
+            continue
+
+        if value in (tuple(), [],):
+            # option with multiple values, the value is a tuple
+            continue
+
+        if isinstance(param.type, click.Path) and generic_paths:
+            value = '<path>'
+
+        if isinstance(param.type, click.File):
+            if generic_paths:
+                value = '<file>'
+            else:
+                # the value cannot be displayed as-is as this may be an opened file-
+                # like object
+                vname = getattr(value, 'name', None)
+                if vname:
+                    value = vname
+                else:
+                    value = '<file>'
+
+        # coerce to string for non-basic supported types
+        if not (value in (True, False, None)
+            or isinstance(value, (str, unicode, bytes, tuple, list, dict, OrderedDict))):
+            value = repr(value)
+
+        # opts is a list of CLI options as in "--strip-root": the last opt is
+        # the CLI option long form by convention
+        cli_opt = param.opts[-1]
+
+        if isinstance(param, click.Argument):
+            args.append((cli_opt, value))
+        else:
+            options.append((cli_opt, value))
+
+    return OrderedDict(sorted(args) + sorted(options))
+
+
+output_plugins = PluginManager(
+    stage=stage,
+    module_qname=__name__,
+    entrypoint=entrypoint,
+    plugin_base_class=OutputPlugin
+)
diff --git a/tests/formattedcode/data/json/simple-expected.json b/tests/formattedcode/data/json/simple-expected.json
index 0b41e30114c..be20daa4941 100644
--- a/tests/formattedcode/data/json/simple-expected.json
+++ b/tests/formattedcode/data/json/simple-expected.json
@@ -1,10 +1,12 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
+    "--info": true,
     "--license": true,
-    "--package": true,
-    "--info": true
+    "--output-json": "<file>",
+    "--package": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index 1e3a926d925..0d35388d521 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -3,8 +3,9 @@
     "header": {
       "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
       "scancode_options": {
+        "input": "<path>",
         "--info": true,
-        "--format": "jsonlines"
+        "--output-json-lines": "<file>"
       },
       "files_count": 1
     }
@@ -61,4 +62,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/tests/formattedcode/data/json/simple-expected.jsonpp b/tests/formattedcode/data/json/simple-expected.jsonpp
index 201735e574d..c52b0f17f2d 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonpp
+++ b/tests/formattedcode/data/json/simple-expected.jsonpp
@@ -1,11 +1,12 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
-    "--license": true,
-    "--package": true,
     "--info": true,
-    "--format": "json-pp"
+    "--license": true,
+    "--output-json-pp": "<file>",
+    "--package": true
   },
   "files_count": 1,
   "files": [
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
index 06031593176..4693bb787c1 100644
--- a/tests/formattedcode/data/json/tree/expected.json
+++ b/tests/formattedcode/data/json/tree/expected.json
@@ -1,13 +1,15 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
+    "--info": true,
     "--license": true,
     "--package": true,
-    "--info": true,
+    "--output-json-pp": "<file>",
     "--strip-root": true
   },
-  "files_count": 4,
+  "files_count": 7,
   "files": [
     {
       "path": "copy1.c",
diff --git a/tests/formattedcode/data/spdx/license_known/expected.rdf b/tests/formattedcode/data/spdx/license_known/expected.rdf
index 49602d49c82..d4e4521afbe 100644
--- a/tests/formattedcode/data/spdx/license_known/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected.rdf
@@ -3,12 +3,16 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
-          "ns1:licenseDeclared": {
+          "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:hasFile": [
@@ -18,67 +22,63 @@
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoFromFiles": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
           "ns1:name": "scan"
         }
       }, 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": [
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada"
               }
             }, 
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }, 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           }
         }, 
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890"
               }
             }, 
-            "ns1:licenseConcluded": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-            }, 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
+            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
+            "ns1:licenseConcluded": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+            }, 
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+            }
           }
         }
       ], 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
index 22cdd8c71e5..d4e4521afbe 100644
--- a/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_known/expected_with_text.rdf
@@ -3,15 +3,28 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:name": "scan", 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": [
+            null, 
+            null
+          ], 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
@@ -20,65 +33,52 @@
               "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:hasFile": [
-            null, 
-            null
-          ]
+          "ns1:name": "scan"
         }
       }, 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": [
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada"
               }
             }, 
-            "ns1:licenseConcluded": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-            }, 
             "ns1:copyrightText": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }, 
-            "ns1:fileName": "./scan/apache-2.0.LICENSE"
+            "ns1:fileName": "./scan/cc0-1.0.LICENSE", 
+            "ns1:licenseConcluded": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+            }, 
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+            }
           }
         }, 
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "172444e7c137eb5cd3cae530aca0879c90f7fada", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "2b8b815229aa8a61e483fb4ba0588b8b6c491890"
               }
             }, 
+            "ns1:copyrightText": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }, 
+            "ns1:fileName": "./scan/apache-2.0.LICENSE", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-            }, 
-            "ns1:copyrightText": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:fileName": "./scan/cc0-1.0.LICENSE"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+            }
           }
         }
       ], 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_ref/expected.rdf b/tests/formattedcode/data/spdx/license_ref/expected.rdf
index f12c0f93321..ff18de2701b 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected.rdf
@@ -1,59 +1,61 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
+    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "ns1:SpdxDocument": {
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-          "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
-        }
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:hasFile": null, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:licenseDeclared": {
+          "ns1:hasFile": null, 
+          "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "scan", 
-          "ns1:licenseConcluded": {
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoFromFiles": [
             {
               "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
+            {
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+            }, 
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
               }
-            }, 
-            {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }
           ], 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others."
+          "ns1:name": "scan"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
+          "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
+        }
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
-              "ns1:algorithm": "SHA1"
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831"
             }
           }, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:fileName": "./scan/NOTICE", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
@@ -67,16 +69,14 @@
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
               }
             }
-          ], 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:fileName": "./scan/NOTICE"
+          ]
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
index 3745b692426..757e7ea506f 100644
--- a/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
+++ b/tests/formattedcode/data/spdx/license_ref/expected_with_text.rdf
@@ -1,82 +1,82 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
+    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "ns1:SpdxDocument": {
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-          "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
-        }
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:downloadLocation": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:hasFile": null, 
-          "ns1:licenseDeclared": {
+          "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:downloadLocation": {
+          "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoFromFiles": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }, 
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
               }
             }
           ], 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
           "ns1:name": "scan"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
+          "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
+        }
       }, 
       "ns1:referencesFile": {
         "ns1:File": {
-          "ns1:fileName": "./scan/NOTICE", 
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831", 
-              "ns1:algorithm": "SHA1"
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "f9c28fa2714ad0c2e36d3e5561afb0031fa76831"
             }
           }, 
+          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
+          "ns1:fileName": "./scan/NOTICE", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": "Copyright (c) 2017 nexB Inc. and others.", 
           "ns1:licenseInfoInFile": [
             {
-              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
             }, 
             {
-              "@rdf:resource": "http://spdx.org/licenses/Apache-2.0"
+              "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
             }, 
             {
               "ns1:ExtractedLicensingInfo": {
                 "ns1:extractedText": "The ScanCode software is licensed under the Apache License version 2.0.\nData generated with ScanCode require an acknowledgment.\nScanCode is a trademark of nexB Inc.\n\nYou may not use this software except in compliance with the License.\nYou may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License.\n\nWhen you publish or redistribute any data created with ScanCode or any ScanCode\nderivative work, you must accompany this data with the following acknowledgment:\n\n  Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\n  OR CONDITIONS OF ANY KIND, either express or implied. No content created from\n  ScanCode should be considered or used as legal advice. Consult an Attorney\n  for any legal advice.\n  ScanCode is a free software code scanning tool from nexB Inc. and others.\n  Visit https://github.com/nexB/scancode-toolkit/ for support and download", 
-                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml", 
-                "ns1:licenseId": "LicenseRef-scancode-acknowledgment"
+                "ns1:licenseId": "LicenseRef-scancode-acknowledgment", 
+                "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
               }
             }
           ]
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/or_later/expected.rdf b/tests/formattedcode/data/spdx/or_later/expected.rdf
index 9b319226c3a..ba15c1fa3f1 100644
--- a/tests/formattedcode/data/spdx/or_later/expected.rdf
+++ b/tests/formattedcode/data/spdx/or_later/expected.rdf
@@ -3,48 +3,48 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "or_later", 
           "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
           }, 
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:hasFile": null
+          "ns1:name": "or_later"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
       "ns1:referencesFile": {
         "ns1:File": {
-          "ns1:fileName": "./test.java", 
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:checksumValue": "0c5bf934430394112921e7a1a8128176606d32ca", 
-              "ns1:algorithm": "SHA1"
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "0c5bf934430394112921e7a1a8128176606d32ca"
             }
           }, 
+          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
+          "ns1:fileName": "./test.java", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": "Copyright 2010, Red Hat, Inc.", 
           "ns1:licenseInfoInFile": {
             "@rdf:resource": "http://spdx.org/licenses/LGPL-2.1+"
           }
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/simple/expected.rdf b/tests/formattedcode/data/spdx/simple/expected.rdf
index 35bf0c8305c..cd628e1e064 100644
--- a/tests/formattedcode/data/spdx/simple/expected.rdf
+++ b/tests/formattedcode/data/spdx/simple/expected.rdf
@@ -3,52 +3,52 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
+      "ns1:dataLicense": {
+        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
+      }, 
       "ns1:describesPackage": {
         "ns1:Package": {
-          "ns1:name": "simple", 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoFromFiles": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }, 
-          "ns1:hasFile": null
+          "ns1:name": "simple"
         }
       }, 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:dataLicense": {
-        "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
-      }, 
       "ns1:referencesFile": {
         "ns1:File": {
-          "ns1:fileName": "./simple/test.txt", 
           "ns1:checksum": {
             "ns1:Checksum": {
-              "ns1:checksumValue": "b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8", 
-              "ns1:algorithm": "SHA1"
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8"
             }
           }, 
+          "ns1:copyrightText": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:fileName": "./test.txt", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
           "ns1:licenseInfoInFile": {
             "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:copyrightText": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
           }
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/simple/expected.tv b/tests/formattedcode/data/spdx/simple/expected.tv
index 3f5fe575a66..7ef5f485fd7 100644
--- a/tests/formattedcode/data/spdx/simple/expected.tv
+++ b/tests/formattedcode/data/spdx/simple/expected.tv
@@ -17,7 +17,7 @@ PackageLicenseConcluded: NOASSERTION
 PackageLicenseInfoFromFiles: NONE
 PackageCopyrightText: NONE
 # File
-FileName: ./simple/test.txt
+FileName: ./test.txt
 FileChecksum: SHA1: b8a793cce3c3a4cd3a4646ddbe86edd542ed0cd8
 LicenseConcluded: NOASSERTION
 LicenseInfoInFile: NONE
diff --git a/tests/formattedcode/data/spdx/tree/expected.rdf b/tests/formattedcode/data/spdx/tree/expected.rdf
index 65e40a151aa..de1f5843f6f 100644
--- a/tests/formattedcode/data/spdx/tree/expected.rdf
+++ b/tests/formattedcode/data/spdx/tree/expected.rdf
@@ -3,59 +3,87 @@
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
     "ns1:SpdxDocument": {
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
+      "ns1:describesPackage": {
+        "ns1:Package": {
+          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+          "ns1:downloadLocation": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:hasFile": [
+            null, 
+            null, 
+            null, 
+            null, 
+            null, 
+            null, 
+            null
+          ], 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseDeclared": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
+          "ns1:licenseInfoFromFiles": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#none"
+          }, 
+          "ns1:name": "scan"
+        }
+      }, 
       "ns1:referencesFile": [
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy3.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy1.c"
+            }
           }
         }, 
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/copy1.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/copy2.c"
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }
           }
         }, 
         {
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/copy2.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/subdir/copy1.c", 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -63,17 +91,17 @@
         }, 
         {
           "ns1:File": {
-            "ns1:fileName": "./scan/copy3.c", 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy1.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -83,15 +111,15 @@
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy2.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:fileName": "./scan/subdir/copy4.c", 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
             }
@@ -101,68 +129,40 @@
           "ns1:File": {
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "389af7e629a9853056e42b262d5e30bf4579a74f", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "58748872d25374160692f1ed7075d0fe80a544b1"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/subdir/copy4.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
             "ns1:licenseInfoInFile": {
               "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy3.c"
+            }
           }
         }, 
         {
           "ns1:File": {
-            "ns1:licenseInfoInFile": {
-              "@rdf:resource": "http://spdx.org/rdf/terms#none"
-            }, 
             "ns1:checksum": {
               "ns1:Checksum": {
-                "ns1:checksumValue": "3922760d8492eb8f853c10a627f5a73f9eaec6ff", 
-                "ns1:algorithm": "SHA1"
+                "ns1:algorithm": "SHA1", 
+                "ns1:checksumValue": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f"
               }
             }, 
+            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
+            "ns1:fileName": "./scan/copy3.c", 
             "ns1:licenseConcluded": {
               "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
             }, 
-            "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-            "ns1:fileName": "./scan/subdir/copy2.c"
+            "ns1:licenseInfoInFile": {
+              "@rdf:resource": "http://spdx.org/rdf/terms#none"
+            }
           }
         }
       ], 
-      "ns1:specVersion": "SPDX-2.1", 
-      "ns1:describesPackage": {
-        "ns1:Package": {
-          "ns1:hasFile": [
-            null, 
-            null, 
-            null, 
-            null, 
-            null, 
-            null, 
-            null
-          ], 
-          "ns1:licenseDeclared": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:name": "scan", 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2000 ACME, Inc.", 
-          "ns1:licenseInfoFromFiles": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#none"
-          }, 
-          "ns1:downloadLocation": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }
-        }
-      }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/spdx/unicode/expected.rdf b/tests/formattedcode/data/spdx/unicode/expected.rdf
index 6a5babd4fbf..89592719834 100644
--- a/tests/formattedcode/data/spdx/unicode/expected.rdf
+++ b/tests/formattedcode/data/spdx/unicode/expected.rdf
@@ -1,66 +1,66 @@
 {
   "rdf:RDF": {
     "@xmlns:ns1": "http://spdx.org/rdf/terms#", 
-    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "@xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", 
+    "@xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#", 
     "ns1:SpdxDocument": {
-      "ns1:hasExtractedLicensingInfo": {
-        "ns1:ExtractedLicensingInfo": {
-          "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
-          "ns1:licenseId": "LicenseRef-agere-bsd"
-        }
-      }, 
-      "ns1:referencesFile": {
-        "ns1:File": {
-          "ns1:licenseInfoInFile": {
-            "ns1:ExtractedLicensingInfo": {
-              "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
-              "ns1:licenseId": "LicenseRef-agere-bsd"
-            }
-          }, 
-          "ns1:checksum": {
-            "ns1:Checksum": {
-              "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90", 
-              "ns1:algorithm": "SHA1"
-            }
-          }, 
-          "ns1:licenseConcluded": {
-            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
-          }, 
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
-          "ns1:fileName": "./et131x.h"
-        }
-      }, 
-      "ns1:specVersion": "SPDX-2.1", 
+      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS", 
       "ns1:dataLicense": {
         "@rdf:resource": "http://spdx.org/licenses/CC0-1.0"
       }, 
       "ns1:describesPackage": {
         "ns1:Package": {
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.", 
           "ns1:downloadLocation": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
+          "ns1:hasFile": null, 
+          "ns1:licenseConcluded": {
+            "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
+          }, 
           "ns1:licenseDeclared": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:hasFile": null, 
           "ns1:licenseInfoFromFiles": {
             "ns1:ExtractedLicensingInfo": {
               "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
-              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml", 
-              "ns1:licenseId": "LicenseRef-agere-bsd"
+              "ns1:licenseId": "LicenseRef-agere-bsd", 
+              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
             }
           }, 
-          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.", 
+          "ns1:name": "unicode"
+        }
+      }, 
+      "ns1:hasExtractedLicensingInfo": {
+        "ns1:ExtractedLicensingInfo": {
+          "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
+          "ns1:licenseId": "LicenseRef-agere-bsd", 
+          "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
+        }
+      }, 
+      "ns1:referencesFile": {
+        "ns1:File": {
+          "ns1:checksum": {
+            "ns1:Checksum": {
+              "ns1:algorithm": "SHA1", 
+              "ns1:checksumValue": "3903b654c47ea95203567230d72093ad1c5c4b90"
+            }
+          }, 
+          "ns1:copyrightText": "Copyright (c) 2005 Agere Systems Inc.\nCopyright (c) 2005 Agere Systems Inc.", 
+          "ns1:fileName": "./et131x.h", 
           "ns1:licenseConcluded": {
             "@rdf:resource": "http://spdx.org/rdf/terms#noassertion"
           }, 
-          "ns1:name": "unicode"
+          "ns1:licenseInfoInFile": {
+            "ns1:ExtractedLicensingInfo": {
+              "ns1:extractedText": "SOFTWARE LICENSE\n *\n * This software is provided subject to the following terms and conditions,\n * which you should read carefully before using the software.  Using this\n * software indicates your acceptance of these terms and conditions.  If you do\n * not agree with these terms and conditions, do not use the software.\n *\n * [Copyright] \u00a9 [2005] [Agere] [Systems] [Inc].\n * [All] [rights] [reserved].\n *\n * Redistribution and use in source or binary forms, with or without\n * modifications, are permitted provided that the following conditions are met:\n *\n * . Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following Disclaimer as comments in the code as\n *    well as in the documentation and/or other materials provided with the\n *    distribution.\n *\n * . Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following Disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * . Neither the name of Agere Systems Inc. nor the names of the contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * Disclaimer\n *\n * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF\n * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY\n * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN\n * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY\n * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\n * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n * DAMAGE", 
+              "ns1:licenseId": "LicenseRef-agere-bsd", 
+              "rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/agere-bsd.yml"
+            }
+          }
         }
       }, 
-      "@rdf:about": "http://www.spdx.org/tools#SPDXANALYSIS"
+      "ns1:specVersion": "SPDX-2.1"
     }
   }
 }
\ No newline at end of file
diff --git a/tests/formattedcode/test_format_csv.py b/tests/formattedcode/test_output_csv.py
similarity index 94%
rename from tests/formattedcode/test_format_csv.py
rename to tests/formattedcode/test_output_csv.py
index d2f0e7195be..68a12da100c 100644
--- a/tests/formattedcode/test_format_csv.py
+++ b/tests/formattedcode/test_output_csv.py
@@ -38,7 +38,10 @@
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import run_scan_plain
 
-from formattedcode.format_csv import flatten_scan
+from formattedcode.output_csv import flatten_scan
+
+from plugincode import output
+output._TEST_MODE = True
 
 
 test_env = FileDrivenTesting()
@@ -193,7 +196,7 @@ def test_csv_minimal():
     test_dir = test_env.get_test_loc('csv/srp')
     result_file = test_env.get_temp_file('csv')
     expected_file = test_env.get_test_loc('csv/srp.csv')
-    result = run_scan_click(['--copyright', '--format', 'csv', test_dir, result_file])
+    result = run_scan_click(['--copyright', test_dir, '--output-csv', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_csvs(result_file, expected_file)
@@ -203,7 +206,8 @@ def test_csv_tree():
     test_dir = test_env.get_test_loc('csv/tree/scan')
     result_file = test_env.get_temp_file('csv')
     expected_file = test_env.get_test_loc('csv/tree/expected.csv')
-    result = run_scan_click(['--copyright', '--format', 'csv', test_dir, result_file])
+    result = run_scan_click(['--copyright', test_dir, 
+                             '--output-csv', result_file])
     assert result.exit_code == 0
     check_csvs(result_file, expected_file)
 
@@ -211,9 +215,8 @@ def test_csv_tree():
 def test_can_process_live_scan_with_all_options():
     test_dir = test_env.get_test_loc('csv/livescan/scan')
     result_file = test_env.get_temp_file('csv')
-    rc, stdout, stderr = run_scan_plain(
-        ['-clip', '--email', '--url', '--strip-root', '--format', 'csv',
-         test_dir, result_file])
+    rc, stdout, stderr = run_scan_plain(['-clip', '--email', '--url', 
+        '--strip-root', test_dir, '--output-csv', result_file])
     try:
         assert rc == 0
     except:
diff --git a/tests/formattedcode/test_format_json.py b/tests/formattedcode/test_output_json.py
similarity index 89%
rename from tests/formattedcode/test_format_json.py
rename to tests/formattedcode/test_output_json.py
index 62629d71f85..d3050b73049 100644
--- a/tests/formattedcode/test_format_json.py
+++ b/tests/formattedcode/test_output_json.py
@@ -33,6 +33,8 @@
 from scancode.cli_test_utils import check_json_scan
 from scancode.cli_test_utils import run_scan_click
 
+from plugincode import output
+output._TEST_MODE = True
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -42,7 +44,7 @@ def test_json_pretty_print():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['-clip', '--format', 'json-pp', test_dir, result_file])
+    result = run_scan_click(['-clip', test_dir, '--output-json-pp', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -54,12 +56,12 @@ def test_json_compact():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['-clip', '--format', 'json', test_dir, result_file])
+    result = run_scan_click(['-clip', test_dir, '--output-json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
     with open(result_file, 'rb') as res:
-        assert len(res.read().splitlines())==1
+        assert len(res.read().splitlines()) == 1
 
     expected = test_env.get_test_loc('json/simple-expected.json')
     check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True, regen=False)
@@ -70,7 +72,7 @@ def test_scan_output_does_not_truncate_copyright_json():
     result_file = test_env.get_temp_file('test.json')
 
     result = run_scan_click(
-        ['-clip', '--strip-root', '--format', 'json', test_dir, result_file])
+        ['-clip', '--strip-root', test_dir, '--output-json-pp', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -83,7 +85,7 @@ def test_scan_output_does_not_truncate_copyright_with_json_to_stdout():
     result_file = test_env.get_temp_file('test.json')
 
     result = run_scan_click(
-        ['-clip', '--strip-root', '--format', 'json', test_dir, result_file])
+        ['-clip', '--strip-root', test_dir, '--output-json-pp', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
diff --git a/tests/formattedcode/test_format_jsonlines.py b/tests/formattedcode/test_output_jsonlines.py
similarity index 96%
rename from tests/formattedcode/test_format_jsonlines.py
rename to tests/formattedcode/test_output_jsonlines.py
index abb191634b9..98dad78b626 100644
--- a/tests/formattedcode/test_format_jsonlines.py
+++ b/tests/formattedcode/test_output_jsonlines.py
@@ -35,6 +35,8 @@
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
 
+from plugincode import output
+output._TEST_MODE = True
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -92,7 +94,7 @@ def test_jsonlines():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('jsonline')
 
-    result = run_scan_click(['-i', '--format', 'jsonlines', test_dir, result_file])
+    result = run_scan_click(['-i', test_dir, '--output-json-lines', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
diff --git a/tests/formattedcode/test_format_spdx.py b/tests/formattedcode/test_output_spdx.py
similarity index 88%
rename from tests/formattedcode/test_format_spdx.py
rename to tests/formattedcode/test_output_spdx.py
index 7f1383d41dd..be5f41d1417 100644
--- a/tests/formattedcode/test_format_spdx.py
+++ b/tests/formattedcode/test_output_spdx.py
@@ -150,70 +150,70 @@ def test_spdx_rdf_basic():
     test_file = test_env.get_test_loc('spdx/simple/test.txt')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/simple/expected.rdf')
-    result = run_scan_click(['--format', 'spdx-rdf', test_file, result_file])
-    assert result.exit_code == 0
+    result = run_scan_click([test_file, '-clip', '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
+    assert result.exit_code == 0
 
 
 def test_spdx_tv_basic():
     test_dir = test_env.get_test_loc('spdx/simple/test.txt')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/simple/expected.tv')
-    result = run_scan_click(['--format', 'spdx-tv', test_dir, result_file])
-    assert result.exit_code == 0
+    result = run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
+    assert result.exit_code == 0
 
 
 def test_spdx_rdf_with_known_licenses():
     test_dir = test_env.get_test_loc('spdx/license_known/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/license_known/expected.rdf')
-    result = run_scan_click(['--format', 'spdx-rdf', test_dir, result_file])
-    assert result.exit_code == 0
+    result = run_scan_click([test_dir, '-clip', '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
+    assert result.exit_code == 0
 
 
 def test_spdx_rdf_with_license_ref():
     test_dir = test_env.get_test_loc('spdx/license_ref/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/license_ref/expected.rdf')
-    result = run_scan_click(['--format', 'spdx-rdf', test_dir, result_file])
-    assert result.exit_code == 0
+    result = run_scan_click([test_dir, '-clip', '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
+    assert result.exit_code == 0
 
 
 def test_spdx_tv_with_known_licenses():
     test_dir = test_env.get_test_loc('spdx/license_known/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/license_known/expected.tv')
-    result = run_scan_click(['--format', 'spdx-tv', test_dir, result_file])
-    assert result.exit_code == 0
+    result = run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
+    assert result.exit_code == 0
 
 
 def test_spdx_tv_with_license_ref():
     test_dir = test_env.get_test_loc('spdx/license_ref/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/license_ref/expected.tv')
-    result = run_scan_click(['--format', 'spdx-tv', test_dir, result_file])
-    assert result.exit_code == 0
+    result = run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
+    assert result.exit_code == 0
 
 
 def test_spdx_rdf_with_known_licenses_with_text():
     test_dir = test_env.get_test_loc('spdx/license_known/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/license_known/expected_with_text.rdf')
-    result = run_scan_click(['--format', 'spdx-rdf', '--license-text', test_dir, result_file])
-    assert result.exit_code == 0
+    result = run_scan_click([ '-clip', '--license-text', test_dir, '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
+    assert result.exit_code == 0
 
 
 def test_spdx_rdf_with_license_ref_with_text():
     test_dir = test_env.get_test_loc('spdx/license_ref/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/license_ref/expected_with_text.rdf')
-    result = run_scan_click(['--format', 'spdx-rdf', '--license-text', test_dir, result_file])
+    result = run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-rdf', result_file])
     assert result.exit_code == 0
     check_rdf_scan(expected_file, result_file)
 
@@ -222,7 +222,7 @@ def test_spdx_tv_with_known_licenses_with_text():
     test_dir = test_env.get_test_loc('spdx/license_known/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/license_known/expected_with_text.tv')
-    result = run_scan_click(['--format', 'spdx-tv', '--license-text', test_dir, result_file])
+    result = run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-tv', result_file])
     assert result.exit_code == 0
     check_tv_scan(expected_file, result_file)
 
@@ -231,7 +231,7 @@ def test_spdx_tv_with_license_ref_with_text():
     test_dir = test_env.get_test_loc('spdx/license_ref/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/license_ref/expected_with_text.tv')
-    result = run_scan_click(['--format', 'spdx-tv', '--license-text', test_dir, result_file])
+    result = run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-tv', result_file])
     assert result.exit_code == 0
     check_tv_scan(expected_file, result_file)
 
@@ -240,7 +240,7 @@ def test_spdx_tv_tree():
     test_dir = test_env.get_test_loc('spdx/tree/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/tree/expected.tv')
-    result = run_scan_click(['--format', 'spdx-tv', test_dir, result_file])
+    result = run_scan_click(['-clip', test_dir, '--output-spdx-tv', result_file])
     assert result.exit_code == 0
     check_tv_scan(expected_file, result_file)
 
@@ -249,7 +249,7 @@ def test_spdx_rdf_tree():
     test_dir = test_env.get_test_loc('spdx/tree/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/tree/expected.rdf')
-    result = run_scan_click(['--format', 'spdx-rdf', test_dir, result_file])
+    result = run_scan_click(['-clip', test_dir, '--output-spdx-rdf', result_file])
     assert result.exit_code == 0
     check_rdf_scan(expected_file, result_file)
 
@@ -260,9 +260,9 @@ def test_spdx_tv_with_unicode_license_text_does_not_fail():
     expected_file = test_env.get_test_loc('spdx/unicode/expected.tv')
     rc, stdout, stderr = run_scan_plain([
         '--license', '--copyright', '--info',
-        '--format', 'spdx-tv', '--strip-root', '--license-text',
-        '--diag',
-         test_file, result_file
+        '--strip-root', '--license-text',
+        '--license-diag',
+         test_file, '--output-spdx-tv', result_file
     ])
     if rc != 0:
         print('stdout', stdout)
@@ -277,9 +277,9 @@ def test_spdx_rdf_with_unicode_license_text_does_not_fail():
     expected_file = test_env.get_test_loc('spdx/unicode/expected.rdf')
     rc, stdout, stderr = run_scan_plain([
         '--license', '--copyright', '--info',
-        '--format', 'spdx-rdf', '--strip-root', '--license-text',
-        '--diag',
-         test_file, result_file
+        '--strip-root', '--license-text',
+        '--license-diag',
+         test_file, '--output-spdx-rdf', result_file
     ])
     if rc != 0:
         print('stdout', stdout)
@@ -294,9 +294,9 @@ def test_spdx_rdf_with_or_later_license_does_not_fail():
     expected_file = test_env.get_test_loc('spdx/or_later/expected.rdf')
     rc, stdout, stderr = run_scan_plain([
         '--license', '--copyright', '--info',
-        '--format', 'spdx-rdf', '--strip-root', '--license-text',
-        '--diag',
-         test_file, result_file
+        '--strip-root', '--license-text',
+        '--license-diag',
+         test_file, '--output-spdx-rdf', result_file
     ])
     if rc != 0:
         print('stdout', stdout)
diff --git a/tests/formattedcode/test_format_templated.py b/tests/formattedcode/test_output_templated.py
similarity index 85%
rename from tests/formattedcode/test_format_templated.py
rename to tests/formattedcode/test_output_templated.py
index edf1181e177..b044ceef1f7 100644
--- a/tests/formattedcode/test_format_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -35,6 +35,8 @@
 from scancode import __version__
 from scancode.cli_test_utils import run_scan_click
 
+from plugincode import output
+output._TEST_MODE = True
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -44,7 +46,7 @@ def test_paths_are_posix_paths_in_html_app_format_output():
     test_dir = test_env.get_test_loc('templated/simple')
     result_file = test_env.get_temp_file(extension='html', file_name='test_html')
 
-    result = run_scan_click(['--copyright', '--format', 'html-app', test_dir, result_file])
+    result = run_scan_click(['--copyright', test_dir, '--output-html-app', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -59,7 +61,7 @@ def test_paths_are_posix_in_html_format_output():
     test_dir = test_env.get_test_loc('templated/simple')
     result_file = test_env.get_temp_file('html')
 
-    result = run_scan_click(['--copyright', '--format', 'html', test_dir, result_file])
+    result = run_scan_click(['--copyright', test_dir, '--output-html', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     results = open(result_file).read()
@@ -71,11 +73,12 @@ def test_scanned_path_is_present_in_html_app_output():
     test_dir = test_env.get_test_loc('templated/html_app')
     result_file = test_env.get_temp_file('test.html')
 
-    result = run_scan_click(['--copyright', '--format', 'html-app', test_dir, result_file])
+    result = run_scan_click(['--copyright', '--output-html-app', result_file, test_dir])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
     results = open(result_file).read()
+    
     assert '<title>ScanCode scan results for: %(test_dir)s</title>' % locals() in results
     assert '<div class="row" id = "scan-result-header">' % locals() in results
     assert '<strong>scan results for:</strong>' % locals() in results
@@ -88,8 +91,8 @@ def test_scan_html_output_does_not_truncate_copyright_html():
     result_file = test_env.get_temp_file('test.html')
 
     result = run_scan_click(
-        ['-clip', '--strip-root', '--format', 'html', '-n', '3',
-         test_dir, result_file])
+        ['-clip', '--strip-root', '-n', '3', test_dir,
+         '--output-html', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -129,9 +132,11 @@ def test_custom_format_with_custom_filename_fails_for_directory():
     test_dir = test_env.get_temp_dir('html')
     result_file = test_env.get_temp_file('html')
 
-    result = run_scan_click(['--format', test_dir, test_dir, result_file])
+    result = run_scan_click(['--custom-template', test_dir,
+                             '--output-custom', result_file,
+                             test_dir])
     assert result.exit_code != 0
-    assert 'Unknwow <format> or invalid template file path' in result.output
+    assert 'Invalid value for "--custom-template": Path' in result.output
 
 
 def test_custom_format_with_custom_filename():
@@ -139,7 +144,9 @@ def test_custom_format_with_custom_filename():
     custom_template = test_env.get_test_loc('templated/sample-template.html')
     result_file = test_env.get_temp_file('html')
 
-    result = run_scan_click(['--format', custom_template, test_dir, result_file])
+    result = run_scan_click(['--custom-template', custom_template,
+                             '--output-custom', result_file,
+                             test_dir])
     assert result.exit_code == 0
     results = open(result_file).read()
     assert 'Custom Template' in results

From b160cd7e56d530201fc6e607654960ddb10d6071 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 22:45:39 +0100
Subject: [PATCH 046/122] Add new output_filter stage and plugins #787

 * an output filter can filter the codebase resource tree (including
   breaking its tree shape) and is processed just before output
 * the only_findings plugins has been recated as a filter

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/output_filter.py               |  65 ++++++++++++
 .../data/plugin_only_findings/expected.json   | 100 +++++++++++-------
 tests/scancode/test_plugin_only_findings.py   |   9 +-
 3 files changed, 135 insertions(+), 39 deletions(-)
 create mode 100644 src/plugincode/output_filter.py

diff --git a/src/plugincode/output_filter.py b/src/plugincode/output_filter.py
new file mode 100644
index 00000000000..1e0e0981dd8
--- /dev/null
+++ b/src/plugincode/output_filter.py
@@ -0,0 +1,65 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from plugincode import BasePlugin
+from plugincode import PluginManager
+from plugincode import HookimplMarker
+from plugincode import HookspecMarker
+
+
+stage = 'output_filter'
+entrypoint = 'scancode_output_filter'
+
+output_filter_spec = HookspecMarker(project_name=stage)
+output_filter_impl = HookimplMarker(project_name=stage)
+
+
+@output_filter_spec
+class OutputFilterPlugin(BasePlugin):
+    """
+    Base plugin class for Resource output filter plugins that all output filter
+    plugins must extend.
+    """
+
+    # TODO: pass own command options name/values as concrete kwargs
+    def process_resource(self, resource, **kwargs):
+        """
+        Return True is the `resource` should be kept, False if it should omitted
+        aka. filtered out of the Resource stream.
+        Subclasses must override.
+        """
+        raise NotImplementedError
+
+
+output_filter_plugins = PluginManager(
+    stage=stage,
+    module_qname=__name__,
+    entrypoint=entrypoint,
+    plugin_base_class=OutputFilterPlugin
+)
diff --git a/tests/scancode/data/plugin_only_findings/expected.json b/tests/scancode/data/plugin_only_findings/expected.json
index f6d45ca951a..db1bbb4bbe0 100644
--- a/tests/scancode/data/plugin_only_findings/expected.json
+++ b/tests/scancode/data/plugin_only_findings/expected.json
@@ -1,33 +1,37 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--only-findings": true
+    "input": "<path>",
+    "--copyright": true,
+    "--info": true,
+    "--license": true,
+    "--only-findings": true,
+    "--output-json": "<file>",
+    "--package": true
   },
   "files_count": 3,
   "files": [
-    {
-      "path": "basic.tgz",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
-    },
-    {
-      "path": "basic.tgz/basic",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
-    },
-    {
-      "path": "basic.tgz/basic/dir",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
-    },
     {
       "path": "basic.tgz/basic/dir/e.tar",
+      "type": "file",
+      "name": "e.tar",
+      "base_name": "e",
+      "extension": ".tar",
+      "date": "2015-06-19",
+      "size": 10240,
+      "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
+      "md5": "393e789f4e4b2be93a46d0619380b445",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "application/x-tar",
+      "file_type": "POSIX tar archive (GNU)",
+      "programming_language": null,
+      "is_binary": true,
+      "is_text": false,
+      "is_archive": true,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
       "scan_errors": [],
       "licenses": [],
       "copyrights": [],
@@ -78,22 +82,27 @@
         }
       ]
     },
-    {
-      "path": "basic.tgz/basic/dir2",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
-    },
-    {
-      "path": "basic.tgz/basic/dir2/subdir",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
-    },
     {
       "path": "basic.tgz/basic/dir2/subdir/bcopy.s",
+      "type": "file",
+      "name": "bcopy.s",
+      "base_name": "bcopy",
+      "extension": ".s",
+      "date": "2015-06-19",
+      "size": 32452,
+      "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
+      "md5": "e1c66adaf6b8aa90e348668ac4869a61",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/x-c",
+      "file_type": "C source, ASCII text, with CRLF line terminators",
+      "programming_language": "GAS",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
       "scan_errors": [],
       "licenses": [
         {
@@ -144,6 +153,25 @@
     },
     {
       "path": "basic.tgz/basic/main.c",
+      "type": "file",
+      "name": "main.c",
+      "base_name": "main",
+      "extension": ".c",
+      "date": "2015-06-19",
+      "size": 1940,
+      "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
+      "md5": "8d0a3b3fe1c96a49af2a66040193291b",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/x-c",
+      "file_type": "C source, ASCII text",
+      "programming_language": "C",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
       "scan_errors": [],
       "licenses": [
         {
diff --git a/tests/scancode/test_plugin_only_findings.py b/tests/scancode/test_plugin_only_findings.py
index f710703bf43..0d18991d617 100644
--- a/tests/scancode/test_plugin_only_findings.py
+++ b/tests/scancode/test_plugin_only_findings.py
@@ -34,6 +34,9 @@
 from scancode.plugin_only_findings import has_findings
 from scancode.resource import Resource
 
+from plugincode import output
+output._TEST_MODE = True
+
 
 class TestHasFindings(FileDrivenTesting):
 
@@ -47,7 +50,7 @@ def test_has_findings(self):
     def test_has_findings_with_children(self):
         resource = Resource('name', 1, 2, 3, use_cache=False)
         resource.children_rids.append(1)
-        assert has_findings(resource)
+        assert not has_findings(resource)
 
     def test_has_findings_includes_errors(self):
         resource = Resource('name', 1, 2, 3, use_cache=False)
@@ -61,5 +64,5 @@ def test_scan_only_findings(self):
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_only_findings/expected.json')
 
-        _result = run_scan_click(['--only-findings', test_dir, '--json', result_file])
-        check_json_scan(expected_file, result_file)
+        _result = run_scan_click(['-clip','--only-findings', test_dir, '--json', result_file])
+        check_json_scan(expected_file, result_file, regen=False)

From a19d6258cd92831d16351fbb86ca31dad6cf825c Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 22:46:29 +0100
Subject: [PATCH 047/122] Add new housekeeping stage and plugins #787

 * housekeeping plugins only expose eager options and do not run any
   scan

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/housekeeping.py | 64 ++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 src/plugincode/housekeeping.py

diff --git a/src/plugincode/housekeeping.py b/src/plugincode/housekeeping.py
new file mode 100644
index 00000000000..f9a475c6223
--- /dev/null
+++ b/src/plugincode/housekeeping.py
@@ -0,0 +1,64 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from plugincode import BasePlugin
+from plugincode import PluginManager
+from plugincode import HookimplMarker
+from plugincode import HookspecMarker
+
+
+stage = 'housekeeping'
+entrypoint = 'scancode_housekeeping'
+
+housekeeping_spec = HookspecMarker(project_name=stage)
+housekeeping_impl = HookimplMarker(project_name=stage)
+
+
+@housekeeping_spec
+class HousekeepingPlugin(BasePlugin):
+    """
+    Base plugin class for miscellaneous housekeeping plugins that are executed
+    eagerly and exclusively of all other options.
+    They must define only eager option flags that run with a Click callback
+    options. They scan nothing.
+    """
+    pass
+
+    def is_enabled(self):
+        """
+        By design and because they are executed eagerly through a callback, an
+        HousekeepingPlugin is never "enabled" during scan processing.
+        """
+        return False
+
+
+housekeeping_plugins = PluginManager(
+    stage=stage,
+    module_qname=__name__,
+    entrypoint=entrypoint,
+    plugin_base_class=HousekeepingPlugin
+)

From 861e9a1a08744f8b6e20b59faeebf53643ee01bb Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 22:50:50 +0100
Subject: [PATCH 048/122] Add new scan stage and plugins #787 #552 #698

 * A scan plugin handles the scan of one resource at a time
 * Existing scans have been reworked as plugins

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/scan.py           |  72 +++++++++++++++++++
 src/scancode/plugin_copyright.py |  55 +++++++++++++++
 src/scancode/plugin_email.py     |  55 +++++++++++++++
 src/scancode/plugin_license.py   | 114 +++++++++++++++++++++++++++++++
 src/scancode/plugin_package.py   |  55 +++++++++++++++
 src/scancode/plugin_url.py       |  55 +++++++++++++++
 6 files changed, 406 insertions(+)
 create mode 100644 src/plugincode/scan.py
 create mode 100644 src/scancode/plugin_copyright.py
 create mode 100644 src/scancode/plugin_email.py
 create mode 100644 src/scancode/plugin_license.py
 create mode 100644 src/scancode/plugin_package.py
 create mode 100644 src/scancode/plugin_url.py

diff --git a/src/plugincode/scan.py b/src/plugincode/scan.py
new file mode 100644
index 00000000000..1584628efd7
--- /dev/null
+++ b/src/plugincode/scan.py
@@ -0,0 +1,72 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+from plugincode import BasePlugin
+from plugincode import PluginManager
+from plugincode import HookimplMarker
+from plugincode import HookspecMarker
+
+
+stage = 'scan'
+entrypoint = 'scancode_scan'
+
+scan_spec = HookspecMarker(stage)
+scan_impl = HookimplMarker(stage)
+
+
+@scan_spec
+class ScanPlugin(BasePlugin):
+    """
+    A scan plugin base class that all scan plugins must extend. A scan plugin
+    provides a single `get_scanner()` method that returns a scanner function.
+    The key under which scan results are retruned for a scanner is the plugin
+    "name" attribute. This attribute is set automatically as the "entrypoint"
+    name used for this plugin.
+    """
+    
+    # a relative sort order number (integer or float). In scan results, results
+    # from scanners are sorted by this sorted_order then by "key" which is the
+    # scanner plugin name
+    sort_order = 100
+
+    # TODO: pass own command options name/values as concrete kwargs
+    def get_scanner(self, **kwargs):
+        """
+        Return a scanner callable that takes a single `location` argument.
+        This callable (typically a bare function) should carry as little state
+        as possible as it may be executed through multiprocessing.
+        Subclasses must override.
+        """
+        raise NotImplementedError
+
+
+scan_plugins = PluginManager(
+    stage=stage,
+    module_qname=__name__,
+    entrypoint=entrypoint,
+    plugin_base_class=ScanPlugin
+)
diff --git a/src/scancode/plugin_copyright.py b/src/scancode/plugin_copyright.py
new file mode 100644
index 00000000000..6922ebb6f44
--- /dev/null
+++ b/src/scancode/plugin_copyright.py
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
+from scancode import CommandLineOption
+from scancode import SCAN_GROUP
+
+
+@scan_impl
+class CopyrightScanner(ScanPlugin):
+    """
+    Scan a Resource for copyrights.
+    """
+    sort_order = 4
+
+    options = [
+        CommandLineOption(('-c', '--copyright',),
+            is_flag=True, default=False,
+            help='Scan <input> for copyrights.',
+            help_group=SCAN_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('copyright')
+
+    def get_scanner(self, **kwargs):
+        from scancode.api import get_copyrights
+        return get_copyrights
diff --git a/src/scancode/plugin_email.py b/src/scancode/plugin_email.py
new file mode 100644
index 00000000000..fc3e95a3ff4
--- /dev/null
+++ b/src/scancode/plugin_email.py
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
+from scancode import CommandLineOption
+from scancode import OTHER_SCAN_GROUP
+
+
+@scan_impl
+class EmailScanner(ScanPlugin):
+    """
+    Scan a Resource for emails.
+    """
+    sort_order = 8
+
+    options = [
+        CommandLineOption(('-e', '--email',),
+            is_flag=True, default=False,
+            help='Scan <input> for emails.',
+            help_group=OTHER_SCAN_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('email')
+
+    def get_scanner(self, **kwargs):
+        from scancode.api import get_emails
+        return get_emails
diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
new file mode 100644
index 00000000000..b8616865cdd
--- /dev/null
+++ b/src/scancode/plugin_license.py
@@ -0,0 +1,114 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from functools import partial
+
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
+from plugincode.housekeeping import HousekeepingPlugin
+from plugincode.housekeeping import housekeeping_impl
+from scancode import CommandLineOption
+from scancode import MISC_GROUP
+from scancode import SCAN_OPTIONS_GROUP
+from scancode import SCAN_GROUP
+from scancode.api import DEJACODE_LICENSE_URL
+
+
+@scan_impl
+class LicenseScanner(ScanPlugin):
+    """
+    Scan a Resource for licenses.
+    """
+    sort_order = 2
+
+    options = [
+        CommandLineOption(('-l', '--license'),
+            is_flag=True, default=False,
+            help='Scan <input> for licenses.',
+            help_group=SCAN_GROUP),
+
+        CommandLineOption(('--license-score',),
+            type=int, default=0, show_default=True,
+            help='Do not return license matches with a score lower than this score. '
+                 'A number between 0 and 100.',
+            help_group=SCAN_OPTIONS_GROUP),
+
+        CommandLineOption(('--license-text',),
+            is_flag=True, default=False,
+            help='Include the detected licenses matched text.',
+            help_group=SCAN_OPTIONS_GROUP),
+
+        CommandLineOption(('--license-url-template',),
+            default=DEJACODE_LICENSE_URL, show_default=True,
+            help='Set the template URL used for the license reference URLs. '
+                 'Curly braces ({}) are replaced by the license key.',
+            help_group=SCAN_OPTIONS_GROUP),
+
+        CommandLineOption(('--license-diag',),
+            is_flag=True, default=False,
+            help='Include diagnostic information in license scan results.',
+            help_group=SCAN_OPTIONS_GROUP),
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('license')
+
+    def get_scanner(self, license_score=0, license_text=False,
+                    license_url_template=DEJACODE_LICENSE_URL, license_diag=False, **kwargs):
+        from scancode.api import get_licenses
+        return partial(get_licenses, min_score=license_score,
+                       include_text=license_text, diag=license_diag,
+                       license_url_template=license_url_template)
+
+
+
+def reindex_licenses(ctx, param, value):
+    if not value or ctx.resilient_parsing:
+        return
+
+    # TODO: check for temp file configuration and use that for the cache!!!
+    from licensedcode.cache import reindex
+    import click
+    click.echo('Checking and rebuilding the license index...')
+    reindex()
+    click.echo('Done.')
+    ctx.exit()
+
+
+@housekeeping_impl
+class LicenseIndexer(HousekeepingPlugin):
+
+    options = [
+        CommandLineOption(
+            ('--reindex-licenses',),
+            is_eager=True, is_flag=True, default=False,
+            callback=reindex_licenses,
+            help='Check the license index cache and reindex if needed.',
+            help_group=MISC_GROUP)
+    ]
diff --git a/src/scancode/plugin_package.py b/src/scancode/plugin_package.py
new file mode 100644
index 00000000000..bf009963150
--- /dev/null
+++ b/src/scancode/plugin_package.py
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
+from scancode import CommandLineOption
+from scancode import SCAN_GROUP
+
+
+@scan_impl
+class PackageScanner(ScanPlugin):
+    """
+    Scan a Resource for Package manifests.
+    """
+    sort_order = 6
+
+    options = [
+        CommandLineOption(('-p', '--package',),
+            is_flag=True, default=False,
+            help='Scan <input> for packages.',
+            help_group=SCAN_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('package')
+
+    def get_scanner(self, **kwargs):
+        from scancode.api import get_package_info
+        return get_package_info
diff --git a/src/scancode/plugin_url.py b/src/scancode/plugin_url.py
new file mode 100644
index 00000000000..7dad1b20456
--- /dev/null
+++ b/src/scancode/plugin_url.py
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
+from scancode import CommandLineOption
+from scancode import OTHER_SCAN_GROUP
+
+
+@scan_impl
+class UrlScanner(ScanPlugin):
+    """
+    Scan a Resource for URLs.
+    """
+    sort_order = 10
+
+    options = [
+        CommandLineOption(('-u', '--url',),
+            is_flag=True, default=False,
+            help='Scan <input> for urls.',
+            help_group=OTHER_SCAN_GROUP)
+    ]
+
+    def is_enabled(self):
+        return self.is_command_option_enabled('url')
+
+    def get_scanner(self, **kwargs):
+        from scancode.api import get_urls
+        return get_urls

From 5b5c85cae56fb891d64ca0519624d9752b9d2c06 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 22:51:22 +0100
Subject: [PATCH 049/122] Add new output_filter stage and plugins #787

 * an output filter can filter the codebase resource tree (including
   breaking its tree shape) and is processed just before output
 * the only_findings plugins has been recated as a filter

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/plugin_only_findings.py | 51 +++++++++++-----------------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index c5a4b391624..f40238448f6 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -25,50 +25,39 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from plugincode.post_scan import PostScanPlugin
-from plugincode.post_scan import post_scan_impl
+from plugincode.output_filter import OutputFilterPlugin
+from plugincode.output_filter import output_filter_impl
+from scancode import CommandLineOption
+from scancode import OUTPUT_FILTER_GROUP
 
 
-@post_scan_impl
-class OnlyFindings(PostScanPlugin):
+@output_filter_impl
+class OnlyFindings(OutputFilterPlugin):
     """
-    Prune files or directories without scan findings for the requested scans.
+    Filter files or directories without scan findings for the requested scans.
     """
 
-    name = 'only-findings'
-
-    @classmethod
-    def get_plugin_options(cls):
-        from scancode.cli import ScanOption
-        return [
-            ScanOption(('--only-findings',), is_flag=True,
-                help='''
-                Only return files or directories with findings for the requested
-                scans. Files and directories without findings are omitted (not
-                considering basic file information as findings).''')
-        ]
+    options = [
+        CommandLineOption(('--only-findings',), is_flag=True,
+            help='Only return files or directories with findings for the '
+                 'requested scans. Files and directories without findings are '
+                 'omitted (file information is not treated as findings).',
+            help_group=OUTPUT_FILTER_GROUP)
+    ]
 
     def is_enabled(self):
-        return any(se.value == True for se in self.command_options
-                      if se.name == 'only_findings')
+        return self.is_command_option_enabled('only_findings')
 
-    def process_codebase(self, codebase):
+    def process_resource(self, resource):
         """
-        Remove Resources from codebase bottom-up if they have no scan data, no
-        errors and no children.
+        Return True if `resource` has finding e.g. if they have no scan data, no
+        errors.
         """
-        for resource in codebase.walk(topdown=False):
-            if not has_findings(resource):
-                # TODO: test me, this is likely a source of bugs???
-                codebase.remove_resource(resource)
+        return has_findings(resource)
 
 
 def has_findings(resource):
     """
     Return True if this resource has findings.
     """
-    return (resource.errors
-            or resource.children_rids
-            or any(resource.get_scans().values())
-            # NEVER remove the root resource
-            or resource.is_root())
+    return any(resource.get_scans().values() + resource.errors)

From c7ec2977a5537619ed8b8ce299b0a8b37713f387 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 22:52:05 +0100
Subject: [PATCH 050/122] Update pre and post-scan plugins to new architecture

 * and refactor existing plugins to this approach

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/post_scan.py        | 53 +++++++-------------
 src/plugincode/pre_scan.py         | 54 +++++++-------------
 src/scancode/plugin_ignore.py      | 79 +++++++++++++++++-------------
 src/scancode/plugin_mark_source.py | 32 +++++-------
 4 files changed, 93 insertions(+), 125 deletions(-)

diff --git a/src/plugincode/post_scan.py b/src/plugincode/post_scan.py
index ed155f6a198..f165598d8f9 100644
--- a/src/plugincode/post_scan.py
+++ b/src/plugincode/post_scan.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -25,47 +25,30 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from collections import OrderedDict
-import sys
+from plugincode import CodebasePlugin
+from plugincode import PluginManager
+from plugincode import HookimplMarker
+from plugincode import HookspecMarker
 
-from pluggy import HookimplMarker
-from pluggy import HookspecMarker
-from pluggy import PluginManager
 
-from plugincode import BasePlugin
+stage = 'post_scan'
+entrypoint = 'scancode_post_scan'
 
-
-post_scan_spec = HookspecMarker('post_scan')
-post_scan_impl = HookimplMarker('post_scan')
+post_scan_spec = HookspecMarker(project_name=stage)
+post_scan_impl = HookimplMarker(project_name=stage)
 
 
 @post_scan_spec
-class PostScanPlugin(BasePlugin):
+class PostScanPlugin(CodebasePlugin):
     """
-    A post-scan plugin base class.
+    A post-scan plugin base class that all post-scan plugins must extend.
     """
+    pass
 
 
-post_scan_plugins = PluginManager('post_scan')
-post_scan_plugins.add_hookspecs(sys.modules[__name__])
-
-
-def initialize():
-    """
-    Load and validates plugins.
-    NOTE: this defines the entry points for use in setup.py
-    """
-    post_scan_plugins.load_setuptools_entrypoints('scancode_post_scan')
-    for name, plugin in get_plugins().items():
-        if not issubclass(plugin, PostScanPlugin):
-            raise Exception('Invalid post-scan plugin "%(name)s": does not extend "plugincode.post_scan.PostScanPlugin".' % locals())
-
-
-def get_plugins():
-    """
-    Return an ordered mapping of
-        "command line option name" --> "plugin callable"
-    for all the post_scan plugins. The mapping is sorted by option name.
-    This is the main API for other code to access post_scan plugins.
-    """
-    return OrderedDict(sorted(post_scan_plugins.list_name_plugin()))
+post_scan_plugins = PluginManager(
+    stage=stage,
+    module_qname=__name__,
+    entrypoint=entrypoint,
+    plugin_base_class=PostScanPlugin
+)
diff --git a/src/plugincode/pre_scan.py b/src/plugincode/pre_scan.py
index c720fe53d5a..913fe57f0fc 100644
--- a/src/plugincode/pre_scan.py
+++ b/src/plugincode/pre_scan.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -25,48 +25,30 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from collections import OrderedDict
-import sys
+from plugincode import CodebasePlugin
+from plugincode import PluginManager
+from plugincode import HookimplMarker
+from plugincode import HookspecMarker
 
-from pluggy import HookimplMarker
-from pluggy import HookspecMarker
-from pluggy import PluginManager
 
-from plugincode import BasePlugin
+stage = 'pre_scan'
+entrypoint = 'scancode_pre_scan'
 
-
-pre_scan_spec = HookspecMarker('pre_scan')
-pre_scan_impl = HookimplMarker('pre_scan')
+pre_scan_spec = HookspecMarker(stage)
+pre_scan_impl = HookimplMarker(stage)
 
 
 @pre_scan_spec
-class PreScanPlugin(BasePlugin):
+class PreScanPlugin(CodebasePlugin):
     """
-    A pre-scan plugin base class.
+    A pre-scan plugin base class that all pre-scan plugins must extend.
     """
+    pass
 
 
-pre_scan_plugins = PluginManager('pre_scan')
-pre_scan_plugins.add_hookspecs(sys.modules[__name__])
-
-
-def initialize():
-    """
-    NOTE: this defines the entry points for use in setup.py
-    Load and validates plugins.
-    """
-    pre_scan_plugins.load_setuptools_entrypoints('scancode_pre_scan')
-    for name, plugin in get_plugins().items():
-        if not issubclass(plugin, PreScanPlugin):
-            raise Exception(
-                'Invalid pre-scan plugin "%(name)s": '
-                'does not extend "plugincode.pre_scan.PreScanPlugin".' % locals())
-
-
-def get_plugins():
-    """
-    Return an ordered mapping of plugin "name" --> plugin object
-    for all the pre-scan plugins. The mapping is sorted by name.
-    This is the main API for other code to access pre-scan plugins.
-    """
-    return OrderedDict(sorted(pre_scan_plugins.list_name_plugin()))
+pre_scan_plugins = PluginManager(
+    stage=stage,
+    module_qname=__name__,
+    entrypoint=entrypoint,
+    plugin_base_class=PreScanPlugin
+)
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 285ac8ecc84..1e2f78db10f 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -25,17 +25,13 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+from functools import partial
+
 from commoncode.fileset import match
 from plugincode.pre_scan import PreScanPlugin
 from plugincode.pre_scan import pre_scan_impl
-
-
-def is_ignored(location, ignores):
-    """
-    Return a tuple of (pattern , message) if a file at location is ignored or
-    False otherwise. `ignores` is a mappings of patterns to a reason.
-    """
-    return match(location, includes=ignores, excludes={})
+from scancode import CommandLineOption
+from scancode import PRE_SCAN_GROUP
 
 
 @pre_scan_impl
@@ -43,44 +39,57 @@ class ProcessIgnore(PreScanPlugin):
     """
     Ignore files matching the supplied pattern.
     """
-    name = 'ignore'
-    def __init__(self, command_options):
-        super(ProcessIgnore, self).__init__(command_options)
 
-        ignores = []
-        for se in command_options:
-            if se.name == 'ignore':
-                ignores = se.value or []
+    options = [
+        CommandLineOption(('--ignore',),
+           multiple=True,
+           metavar='<pattern>',
+           help='Ignore files matching <pattern>.',
+           help_group=PRE_SCAN_GROUP)
+    ]
 
-        self.ignores = {
-            pattern: 'User ignore: Supplied by --ignore' for pattern in ignores
-        }
-
-    @classmethod
-    def get_plugin_options(cls):
-        from scancode.cli import ScanOption
-        return [
-            ScanOption(('--ignore',),
-                   multiple=True,
-                   metavar='<pattern>',
-                   help='Ignore files matching <pattern>.')
-        ]
+    def is_enabled(self):
+        return self.is_command_option_enabled('ignore')
 
     def process_codebase(self, codebase):
         """
         Remove ignored Resources from the resource tree.
         """
+        ignore_opt = self.get_command_option('ignore')
+        ignores = ignore_opt and ignore_opt.value or  []
+        if not ignores:
+            return
+
+        ignores = {
+            pattern: 'User ignore: Supplied by --ignore' for pattern in ignores
+        }
+
+        ignorable = partial(is_ignored, ignores=ignores)
         resources_to_remove = []
+        resources_to_remove_append = resources_to_remove.append
+
+        # first walk top down the codebase and collect ignored resource ids
         for resource in codebase.walk(topdown=True):
-            abs_path = resource.get_path(absolute=True)
-            if is_ignored(abs_path, ignores=self.ignores):
-                resources_to_remove.append(resource)
+            # FIXME: this should absolute==False!!
+            if ignorable(resource.get_path(absolute=True)):
+                resources_to_remove_append(resource)
+
+        # then remove the collected ignored resource ids (that may remove whole
+        # trees at once) in a second step
         removed_rids = set()
+        removed_rids_update = removed_rids.update
+        remove_resource = codebase.remove_resource
+
         for resource in resources_to_remove:
             if resource.rid in removed_rids:
                 continue
-            pruned_rids = codebase.remove_resource(resource)
-            removed_rids.update(pruned_rids)
+            pruned_rids = remove_resource(resource)
+            removed_rids_update(pruned_rids)
 
-    def is_enabled(self):
-        return any(se.value for se in self.command_options if se.name == 'ignore')
+
+def is_ignored(location, ignores):
+    """
+    Return a tuple of (pattern , message) if a file at location is ignored or
+    False otherwise. `ignores` is a mappings of patterns to a reason.
+    """
+    return match(location, includes=ignores, excludes={})
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 289bf06cf67..8db50a17dd0 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -29,6 +29,8 @@
 
 from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
+from scancode import CommandLineOption
+from scancode import POST_SCAN_GROUP
 
 
 @post_scan_impl
@@ -39,39 +41,31 @@ class MarkSource(PostScanPlugin):
     Has no effect unless the --info scan is requested.
     """
 
-    name = 'mark-source'
+    needs_info = True
 
-    @classmethod
-    def get_plugin_options(cls):
-        from scancode.cli import ScanOption
-        return [
-            ScanOption(('--mark-source',), is_flag=True,
-                help='''
-                Set the "is_source" flag to true for directories that contain
-                over 90% of source files as direct children.
-                Has no effect unless the --info scan is requested.
-                ''')
-        ]
+    options = [
+        CommandLineOption(('--mark-source',),
+            is_flag=True,default=False,
+            help='Set the "is_source" to true for directories that contain '
+                 'over 90% of source files as children and descendants. '
+                 'Implies running the --info scan.',
+            help_group=POST_SCAN_GROUP)
+    ]
 
     def is_enabled(self):
-        # FIXME: we need infos for this to work, we should use a better way to
-        # express dependencies on one or more scan
-        return all(se.value for se in self.command_options
-                      if se.name in ('mark_source', 'infos'))
+        return self.is_command_option_enabled('mark_source')
 
     def process_codebase(self, codebase):
         """
         Set the `is_source` to True in directories if they contain over 90% of
         source code files at full depth.
         """
-        codebase.update_counts()
         # TODO: these two nested walk() calls are not super efficient
         for resource in codebase.walk(topdown=False):
             if resource.is_file:
                 continue
             src_count = sum(1 for c in resource.walk(topdown=True) if c.is_file and c.is_source)
-            files_count = resource.files_count
-            resource.is_source = is_source_directory(src_count, files_count)
+            resource.is_source = is_source_directory(src_count, resource.files_count)
 
 
 def is_source_directory(src_count, files_count):

From 60bdb243bbb3fbd714c8330c107a2bc092f8415e Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 17 Jan 2018 22:57:55 +0100
Subject: [PATCH 051/122] New plugin and CLi architecture #787 #552

This is a major update of the code scancode processing.
The scancode CLI has been reworked such that:

   * each plugin can have as many options as needed
   * plugins are organizaed by stages. New stages have been added
     for output_filter, scan and housekeeping
   * plugins work on a Codebase or a Resource which is an in-memory
     representation of a scanned filesystem

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 setup.py                                      |  110 +-
 src/plugincode/__init__.py                    |  293 +++-
 src/scancode/__init__.py                      |   38 +-
 src/scancode/api.py                           |   50 +-
 src/scancode/cli.py                           | 1265 ++++++++++-------
 src/scancode/cli_test_utils.py                |   16 +-
 src/scancode/resource.py                      |   82 +-
 src/scancode/utils.py                         |    7 +-
 .../data/altpath/copyright.expected.json      |    2 +
 .../data/composer/composer.expected.json      |    2 +
 .../data/failing/patchelf.expected.json       |    4 +-
 tests/scancode/data/help/help.txt             |  145 +-
 tests/scancode/data/info/all.expected.json    |    4 +-
 .../data/info/all.rooted.expected.json        |    4 +-
 tests/scancode/data/info/basic.expected.json  |    2 +
 .../data/info/basic.rooted.expected.json      |    4 +-
 .../data/info/email_url_info.expected.json    |    6 +-
 .../scancode/data/license_text/test.expected  |    2 +
 .../data/non_utf8/expected-linux.json         |    2 +
 .../scancode/data/non_utf8/expected-mac.json  |   61 +-
 .../scancode/data/non_utf8/expected-win.json  |    4 +-
 .../with_info.expected.json                   |    4 +-
 .../without_info.expected.json                |  809 +++++------
 ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json |    2 +
 .../data/single/iproute.expected.json         |    2 +
 .../unicodepath.expected-linux.json           |   10 +-
 .../unicodepath/unicodepath.expected-mac.json |   22 +-
 .../unicodepath/unicodepath.expected-win.json |   22 +-
 .../data/weird_file_name/expected-linux.json  |    4 +-
 .../data/weird_file_name/expected-mac.json    |   21 +-
 .../data/weird_file_name/expected-win.json    |   21 +-
 tests/scancode/test_cli.py                    |   77 +-
 tests/scancode/test_extract_cli.py            |    4 +-
 tests/scancode/test_plugin_ignore.py          |   36 +-
 tests/scancode/test_plugin_mark_source.py     |    7 +-
 35 files changed, 1851 insertions(+), 1293 deletions(-)

diff --git a/setup.py b/setup.py
index cfb4b883a09..04d9d16bec0 100644
--- a/setup.py
+++ b/setup.py
@@ -200,39 +200,93 @@ def read(*names, **kwargs):
             'extractcode = scancode.extract_cli:extractcode',
         ],
 
-        # scancode_output_writers is an entry point to define plugins
-        # that write a scan output in a given format.
-        # See the plugincode.output module for details and doc.
-        # note: the "name" of the entrypoint (e.g "html") becomes the
-        # ScanCode command line  --format option used to enable a given
-        # format plugin
-        'scancode_output_writers': [
-            'html = formattedcode.format_templated:write_html',
-            'html-app = formattedcode.format_templated:write_html_app',
-            'json = formattedcode.format_json:write_json_compact',
-            'json-pp = formattedcode.format_json:write_json_pretty_printed',
-            'spdx-tv = formattedcode.format_spdx:write_spdx_tag_value',
-            'spdx-rdf = formattedcode.format_spdx:write_spdx_rdf',
-            'csv = formattedcode.format_csv:write_csv',
-            'jsonlines = formattedcode.format_jsonlines:write_jsonlines',
+        # scancode_pre_scan is the entry point for pre_scan plugins executed
+        # before the scans.
+        #
+        # Each entry hast this form:
+        #   plugin-name = fully.qualified.module:PluginClass
+        # where plugin-name must be a unique name for this entrypoint.
+        #
+        # See also plugincode.pre_scan module for details and doc.
+        'scancode_pre_scan': [
+            'ignore = scancode.plugin_ignore:ProcessIgnore',
+        ],
+
+        # scancode_scan is the entry point for scan plugins that run a scan
+        # after the pre_scan plugins and before the post_scan plugins.
+        #
+        # Each entry hast this form:
+        #   plugin-name = fully.qualified.module:PluginClass
+        # where plugin-name must be a unique name for this entrypoint.
+        #
+        # IMPORTANT: The plugin-name is also the "scan key" used in scan results
+        # for this scanner.
+        #
+        # See also plugincode.scan module for details and doc.
+        'scancode_scan': [
+            'licenses = scancode.plugin_license:LicenseScanner',
+            'copyrights = scancode.plugin_copyright:CopyrightScanner',
+            'packages = scancode.plugin_package:PackageScanner',
+            'emails = scancode.plugin_email:EmailScanner',
+            'urls = scancode.plugin_url:UrlScanner',
         ],
 
-        # scancode_post_scan is an entry point for post_scan_plugins.
-        # See plugincode.post_scan module for details and doc.
-        # note: for simple plugins, the "name" of the entrypoint
-        # (e.g only-findings) becomes the ScanCode CLI boolean flag
-        # used to enable the plugin
+        # scancode_post_scan is the entry point for post_scan plugins executed
+        # after the scan plugins and before the output plugins.
+        #
+        # Each entry hast this form:
+        #   plugin-name = fully.qualified.module:PluginClass
+        # where plugin-name must be a unique name for this entrypoint.
+        #
+        # See also plugincode.post_scan module for details and doc.
         'scancode_post_scan': [
-            'only-findings = scancode.plugin_only_findings:OnlyFindings',
             'mark-source = scancode.plugin_mark_source:MarkSource',
         ],
 
-        # scancode_pre_scan is an entry point to define pre_scan plugins.
-        # See plugincode.pre_scan module for details and doc.
-        # note: the "name" of the entrypoint (e.g ignore) will be used for
-        # the option name which passes the input to the given pre_scan plugin
-        'scancode_pre_scan': [
-            'ignore = scancode.plugin_ignore:ProcessIgnore',
-        ]
+        # scancode_output_filter is the entry point for filter plugins executed
+        # after the post-scan plugins and used by the output plugins to
+        # exclude/filter certain files or directories from the codebase.
+        #
+        # Each entry hast this form:
+        #   plugin-name = fully.qualified.module:PluginClass
+        # where plugin-name must be a unique name for this entrypoint.
+        #
+        # See also plugincode.post_scan module for details and doc.
+        'scancode_output_filter': [
+            'only-findings2 = scancode.plugin_only_findings:OnlyFindings',
+        ],
+
+        # scancode_output is the entry point for ouput plugins that write a scan
+        # output in a given format at the end of a scan.
+        #
+        # Each entry hast this form:
+        #   plugin-name = fully.qualified.module:PluginClass
+        # where plugin-name must be a unique name for this entrypoint.
+        #
+        # See also plugincode._output module for details and doc.
+        'scancode_output': [
+            'html = formattedcode.output_html:HtmlOutput',
+            'html-app = formattedcode.output_html:HtmlAppOutput',
+            'json = formattedcode.output_json:JsonCompactOutput',
+            'json-pp = formattedcode.output_json:JsonPrettyOutput',
+            'spdx-tv = formattedcode.output_spdx:SpdxTvOutput',
+            'spdx-rdf = formattedcode.output_spdx:SpdxRdfOutput',
+            'csv = formattedcode.output_csv:CsvOutput',
+            'jsonlines = formattedcode.output_jsonlines:JsonLinesOutput',
+            'template = formattedcode.output_html:CustomTemplateOutput',
+        ],
+
+        # scancode_housekeeping is the entry point for miscellaneous eager
+        # housekeeping plugins that only run their own Click callback instead of
+        # running the scans.
+        #
+        # Each entry hast this form:
+        #   plugin-name = fully.qualified.module:PluginClass
+        # where plugin-name must be a unique name for this entrypoint.
+        #
+        # See also plugincode.housekeeping module for details and doc.
+        'scancode_housekeeping': [
+            'ignore = scancode.plugin_license:LicenseIndexer',
+        ],
     },
 )
diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 9323c7eb47b..af2f38b34f3 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -27,67 +27,298 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+from collections import OrderedDict
+import sys
+
+from pluggy import HookimplMarker
+from pluggy import HookspecMarker
+from pluggy import PluginManager as PluggyPluginManager
+from scancode import CommandLineOption
+
 
 class BasePlugin(object):
     """
     A base class for all ScanCode plugins.
     """
-    # A short string describing this plugin, used for GUI display. The class
-    # name is used if not provided. Subclass should override
+    # List of stage:name strings that this plugin requires to run before it
+    # runs.
+    # Subclasses should set this as needed
+    requires = []
+
+    # List of CommandLineOption CLI options for this plugin.
+    # Subclasses should set this as needed
+    options = []
+
+    # flag set to True once this plugin class has been initialized by calling it
+    # setup() class method.
+    # This is set automatically when a plugin class is loaded in its manager.
+    # Subclasses must not set this.
+    initialized = False
+
+    # stage string for this plugin.
+    # This is set automatically when a plugin class is loaded in its manager.
+    # Subclasses must not set this.
+    stage = None
+
+    # name string under which this plugin is registered.
+    # This is set automatically when a plugin class is loaded in its manager.
+    # Subclasses must not set this.
     name = None
+    
+    # set to True for testing
+    _test_mode = False
 
-    # Tuple of scanner names that this plugin requires to run its own run
-    requires = tuple()
 
-    def __init__(self, command_options):
+    def __init__(self, command_options, *args, **kwargs):
         """
         Initialize a new plugin with a list of user `command_options` (e.g.
         CommandOption tuples based on CLI keyword arguments).
+        Plugins can override as needed (still calling super).
         """
+        self.options_by_name = {o.name: o for o in self.options}
+
         self.command_options = command_options or []
- 
-    @classmethod
-    def get_plugin_options(cls):
-        """
-        Return a list of `ScanOption` objects for this plugin.
-        Subclasses must override and implement.
-        """
-        raise NotImplementedError
+        self.command_options_by_name = {co.name: co for co in command_options}
 
-    def is_enabled(self):
+        # mapping of scan summary data and statistics.
+        # This is populated automatically on the plugin instance.
+        # Subclasses must not set this.
+        self.summary = OrderedDict()
+
+    # TODO: pass own command options name/values as concrete kwargs
+    def is_enabled(self, **kwargs):
         """
         Return True is this plugin is enabled by user-selected options.
         Subclasses must override.
         """
         raise NotImplementedError
 
-    def setup(self):
+    # TODO: pass own command options name/values as concrete kwargs
+    def setup(self, **kwargs):
         """
         Execute some setup for this plugin. This is guaranteed to be called
-        exactly one time after initialization. Must return True on sucess or
-        False otherwise. Subclasses can override as needed.
+        exactly one time at initialization if this plugin is enabled.
+        Must raise an Exception on failure.
+        Subclasses can override as needed.
         """
-        return True
+        pass
 
-    def teardown(self):
+    # NOTE: Other methods below should NOT be overriden.
+    
+    @property
+    def qname(self):
         """
-        Execute some teardown for this plugin. This is guaranteed to be called
-        exactly one time when ScanCode exists. Must return True on sucess or
-        False otherwise. Subclasses can override as needed.
+        Return the qualified name of this plugin.
         """
-        return True
+        return '{self.stage}:{self.name}'.format(self=self)
 
-    def process_resource(self, resource):
+    def get_option(self, name):
         """
-        Process a single `resource` Resource object.
-        Subclasses should override.
+        Return the CommandLineOption of this plugin with `name` or None.
         """
-        pass
+        return self.options_by_name.get(name)
 
-    def process_codebase(self, codebase):
+    def get_command_option(self, name):
+        """
+        Return a global CommandOption with `name` or None.
+        """
+        return self.command_options_by_name.get(name)
+
+    def is_command_option_enabled(self, name):
+        """
+        Return True if the CommandOption with `name` is enabled.
+        """
+        opt = self.get_command_option(name)
+        if opt:
+            return opt.value
+
+    def get_own_command_options(self):
+        """
+        Return a mapping of {name: CommandOption} that belong to this plugin.
+        """
+        return {nco: co for nco, co in self.command_options_by_name.items()
+                if nco in self.options_by_name}
+
+    def get_own_command_options_kwargs(self):
+        """
+        Return a mapping of {name: value} for CommandOption objects that belong
+        to this plugin and suitable to use as kwargs for a function or method
+        call.
+        """
+        return {nco: co.value for nco, co in  self.get_own_command_options().items()}
+
+    def is_active(self, plugins, *args, **kwargs):
+        """
+        Return True is this plugin is enabled meaning it is enabled and all its
+        required plugins are enabled.
+        """
+        return (self.is_enabled()
+                and all(p.is_enabled() for p in self.requirements(plugins)))
+
+    def requirements(self, plugins, resolved=None):
+        """
+        Return a tuple of (original list of `plugins` arg, as-is, list of unique
+        required plugins by this plugin recursively) given a `plugins` list of all
+        plugins and an optional list of already `resolved` plugins.
+
+        Raise an Exception if there are inconsistencies in the plugins graph,
+        such as self-referencing plugins, missing plugins or requirements
+        cycles.
+        """
+        if  resolved is None:
+            resolved = []
+
+        qname = self.qname
+        required_qnames = unique(qn for qn in self.requires if qn != qname)
+        plugins_by_qname = {p.qname: p for p in plugins}
+        resolved_by_qname = {p.qname: p for p in resolved}
+
+        direct_requirements = []
+        for required_qname in self.requires:
+
+            if required_qname == self.name:
+                raise Exception(
+                    'Plugin %(qname)r cannot require itself.' % locals())
+
+            if required_qname not in plugins_by_qname:
+                raise Exception(
+                    'Missing required plugin %(required_qname)r '
+                    'for plugin %(qname)r.' % locals())
+
+            if required_qname in resolved_by_qname:
+                # already satisfied
+                continue
+
+            required = plugins_by_qname[required_qname]
+            direct_requirements.append(required)
+            resolved.append(required)
+
+        for required in direct_requirements:
+            plugins, resolved = required.walk_requirements(plugins, resolved)
+
+            if self in resolved:
+                req_chain = ' -> '.join(p.qname for p in resolved)
+                raise Exception(
+                    'Requirements for plugin %(qname)r are circular: '
+                    '%(req_chain)s.' % locals())
+
+        return plugins, resolved
+
+
+class CodebasePlugin(BasePlugin):
+    """
+    Base class for plugins that process a whole codebase at once.
+    """
+    # flag set to True if this plugin needs file information available to run.
+    # Subclasses should set this as needed.
+    needs_info = False
+
+    def process_codebase(self, codebase, *args, **kwargs):
         """
         Process a `codebase` Codebase object updating its Reousrce as needed.
         Subclasses should override.
         """
-        for resource in codebase.walk():
-            self.process_resource(resource)
+        raise NotImplementedError
+
+
+def unique(iterable):
+    """
+    Return a sequence of unique items in `iterable` keeping their original order.
+    """
+    seen = set()
+    uni = []
+    for item in iterable:
+        if item in seen:
+            continue
+        uni.append(item)
+        seen.add(item)
+    return uni
+
+
+class PluginManager(object):
+    """
+    A PluginManager class for plugins.
+    """
+
+    # a global managers cache as a mapping of {stage: manager instance}
+    managers = {}
+
+    def __init__(self, stage, module_qname, entrypoint, plugin_base_class):
+        """
+        Initialize this manager for the `stage` string in
+        module `module_qname` with plugins loaded from the setuptools
+        `entrypoint` that must subclass `plugin_base_class`.
+        """
+        self.manager = PluggyPluginManager(project_name=stage)
+        self.managers[stage] = self
+
+        self.stage = stage
+        self.entrypoint = entrypoint
+        self.plugin_base_class = plugin_base_class
+        self.manager.add_hookspecs(sys.modules[module_qname])
+
+        # set to True once this manager is initialized by running its setup()
+        self.initialized = False
+
+        # mapping of {plugin.name: plugin_class} for all the plugins of this
+        # manager
+        self.plugin_classes = OrderedDict()
+
+    @classmethod
+    def setup_all(cls):
+        """
+        Setup the plugins enviroment.
+        Must be called once to initialize all the plugins of all managers.
+        """
+        plugin_classes = []
+        plugin_options = []
+        for _stage, manager in cls.managers.items():
+            mplugin_classes, mplugin_options = manager.setup()
+            plugin_classes.extend(mplugin_classes)
+            plugin_options.extend(mplugin_options)
+        return plugin_classes, plugin_options
+
+    def setup(self):
+        """
+        Return a tuple of (list of all plugin classes, list of all options of
+        all plugin classes).
+
+        Load and validate available plugins for this PluginManager from its
+        assigned `entrypoint`. Raise an Exception if a plugin is not valid such
+        that when it does not subcclass the manager `plugin_base_class`.
+        Must be called once to setup the plugins if this manager.
+        """
+        if self.initialized:
+            return
+
+        entrypoint = self.entrypoint
+        self.manager.load_setuptools_entrypoints(entrypoint)
+        stage = self.stage
+
+        plugin_options = []
+        for name, plugin_class in self.manager.list_name_plugin():
+
+            if not issubclass(plugin_class, self.plugin_base_class):
+                qname = '%(entrypoint)s:%(name)s' % locals()
+                raise Exception(
+                    'Invalid plugin: %(qname)r: %(plugin_class)r '
+                    'must extend %(plugin_base_class)r.' % locals())
+
+
+            for option in plugin_class.options:
+                if not isinstance(option, CommandLineOption):
+                    qname = '%(entrypoint)s:%(name)s' % locals()
+                    oname = option.name
+                    clin = CommandLineOption
+                    raise Exception(
+                        'Invalid plugin: %(qname)r: option %(oname)r '
+                        'must extend %(clin)r.' % locals())
+                plugin_options.append(option)
+
+            plugin_class.stage = stage
+            plugin_class.name = name
+
+            self.plugin_classes[name] = plugin_class
+
+        self.initialized = True
+        return self.plugin_classes.values(), plugin_options
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index c75ca34b5d1..b1cc5c71fb9 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -25,6 +25,7 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
+from collections import namedtuple
 from os.path import dirname
 from os.path import abspath
 from os.path import getsize
@@ -55,21 +56,44 @@
     __version__ = '2.2.1'
 
 
-class ScanOption(click.Option):
+# CLI help groups
+SCAN_GROUP = 'primary scans'
+SCAN_OPTIONS_GROUP = 'scan options'
+OTHER_SCAN_GROUP = 'other scans'
+OUTPUT_GROUP = 'output formats'
+OUTPUT_FILTER_GROUP = 'output filters'
+OUTPUT_CONTROL_GROUP = 'output control'
+PRE_SCAN_GROUP = 'pre-scan'
+POST_SCAN_GROUP = 'post-scan'
+MISC_GROUP = 'miscellaneous'
+CORE_GROUP = 'core'
+
+
+# Holds a CLI option actual name/value and its corresponding
+# click.Parameter instance
+CommandOption = namedtuple('CommandOption', 'help_group name value param')
+
+# Holds a scan plugin result "key and the corresponding function.
+# click.Parameter instance
+Scanner = namedtuple('Scanner', 'key function')
+
+
+class CommandLineOption(click.Option):
     """
-    Allow an extra param `group` to be set which can be used
-    to determine to which group the option belongs.
+    An option with an extra `help_group` attribute that tells which CLI help group
+    the option belongs.
     """
 
     def __init__(self, param_decls=None, show_default=False,
                  prompt=False, confirmation_prompt=False,
                  hide_input=False, is_flag=None, flag_value=None,
                  multiple=False, count=False, allow_from_autoenv=True,
-                 type=None, help=None, group=None, expose_value=True, **attrs):
+                 type=None, help=None, expose_value=True,
+                 help_group=MISC_GROUP,
+                 **attrs):
 
-        super(ScanOption, self).__init__(param_decls, show_default,
+        super(CommandLineOption, self).__init__(param_decls, show_default,
                      prompt, confirmation_prompt,
                      hide_input, is_flag, flag_value,
                      multiple, count, allow_from_autoenv, type, help, **attrs)
-
-        self.group = group
+        self.help_group = help_group
diff --git a/src/scancode/api.py b/src/scancode/api.py
index 75c02efb29e..c8488aafdf8 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -22,19 +22,20 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 from __future__ import unicode_literals
 
 from collections import OrderedDict
 from os.path import getsize
 
-from commoncode.hash import multi_checksums
 from commoncode.filetype import get_last_modified_date
 from commoncode.filetype import get_type as get_simple_type
 from commoncode.filetype import is_file as filetype_is_file
 from commoncode.fileutils import file_name
 from commoncode.fileutils import splitext
+from commoncode.hash import multi_checksums
 from commoncode.system import on_linux
 from typecode.contenttype import get_type
 
@@ -42,26 +43,14 @@
 """
 Main scanning functions.
 
-Each scanner is a function that accepts a location and returns an iterable of
-results.
+Each scanner is a function that accepts a location and returns a sequence of
+mappings as results.
 
 Note: this API is unstable and still evolving.
 """
 
 
-def extract_archives(location, recurse=True):
-    """
-    Extract any archives found at `location` and yield ExtractEvents. If
-    `recurse` is True, extracts nested archives-in- archives
-    recursively.
-    """
-    from extractcode.extract import extract
-    from extractcode import default_kinds
-    for xevent in extract(location, kinds=default_kinds, recurse=recurse):
-        yield xevent
-
-
-def get_copyrights(location):
+def get_copyrights(location, **kwargs):
     """
     Return a list of mappings for copyright detected in the file at `location`.
     """
@@ -79,7 +68,7 @@ def get_copyrights(location):
     return results
 
 
-def get_emails(location):
+def get_emails(location, **kwargs):
     """
     Return a list of mappings for emails detected in the file at `location`.
     """
@@ -96,7 +85,7 @@ def get_emails(location):
     return results
 
 
-def get_urls(location):
+def get_urls(location, **kwargs):
     """
     Return a list of mappings for urls detected in the file at `location`.
     """
@@ -118,7 +107,7 @@ def get_urls(location):
 
 
 def get_licenses(location, min_score=0, include_text=False, diag=False,
-                 license_url_template=DEJACODE_LICENSE_URL):
+                 license_url_template=DEJACODE_LICENSE_URL, **kwargs):
     """
     Return a list of mappings for licenses detected in the file at `location`.
 
@@ -182,7 +171,7 @@ def get_licenses(location, min_score=0, include_text=False, diag=False,
     return results
 
 
-def get_package_infos(location):
+def get_package_info(location, **kwargs):
     """
     Return a list of mappings for package information detected in the file at
     `location`.
@@ -195,7 +184,7 @@ def get_package_infos(location):
     return results
 
 
-def get_file_info(location):
+def get_file_info(location, **kwargs):
     """
     Return a list of mappings for file information collected for the file or
     directory at `location`.
@@ -231,3 +220,18 @@ def get_file_info(location):
         result['is_script'] = bool(collector.is_script)
 
     return results
+
+
+def extract_archives(location, recurse=True):
+    """
+    Yield ExtractEvent while extracting archive(s) and compressed files at
+    `location`. If `recurse` is True, extract nested archives-in-archives
+    recursively.
+    Archives and compressed files are extracted in a directory named
+    "<file_name>-extract" created in the same directory as the archive.
+    Note: this API is returning an iterable and NOT a sequence.
+    """
+    from extractcode.extract import extract
+    from extractcode import default_kinds
+    for xevent in extract(location, kinds=default_kinds, recurse=recurse):
+        yield xevent
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index da9de92d2cc..a760922c3ad 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -30,13 +30,12 @@
 # Import early because this import has monkey-patching side effects
 from scancode.pool import get_pool
 
-from collections import namedtuple
 from collections import OrderedDict
 from functools import partial
 from itertools import imap
-import os
-from os.path import expanduser
 from os.path import abspath
+from os.path import dirname
+from os.path import join
 import sys
 from time import time
 import traceback
@@ -44,29 +43,40 @@
 import click
 click.disable_unicode_literals_warning = True
 
-from commoncode.fileutils import create_dir
 from commoncode.fileutils import PATH_TYPE
+from commoncode.timeutils import time2tstamp
 
-import plugincode.output
-import plugincode.post_scan
-import plugincode.pre_scan
+from plugincode import CommandLineOption
+from plugincode import PluginManager
+
+# these are important to register plugin managers
+from plugincode import housekeeping
+from plugincode import pre_scan
+from plugincode import scan
+from plugincode import post_scan
+from plugincode import output_filter
+from plugincode import output
 
 from scancode import __version__ as version
-from scancode import ScanOption
-from scancode.api import DEJACODE_LICENSE_URL
-from scancode.api import get_copyrights
-from scancode.api import get_emails
+from scancode import CORE_GROUP
+from scancode import MISC_GROUP
+from scancode import OTHER_SCAN_GROUP
+from scancode import OUTPUT_GROUP
+from scancode import OUTPUT_FILTER_GROUP
+from scancode import OUTPUT_CONTROL_GROUP
+from scancode import POST_SCAN_GROUP
+from scancode import PRE_SCAN_GROUP
+from scancode import SCAN_GROUP
+from scancode import SCAN_OPTIONS_GROUP
+from scancode import CommandOption
+from scancode import Scanner
 from scancode.api import get_file_info
-from scancode.api import get_licenses
-from scancode.api import get_package_infos
-from scancode.api import get_urls
 from scancode.interrupt import DEFAULT_TIMEOUT
 from scancode.interrupt import interruptible
 from scancode.resource import Codebase
-from scancode.resource import Resource
 from scancode.utils import BaseCommand
-from scancode.utils import progressmanager
 from scancode.utils import path_progress_message
+from scancode.utils import progressmanager
 
 # Python 2 and 3 support
 try:
@@ -80,16 +90,26 @@
     unicode = str  # @ReservedAssignment
 
 
-echo_stderr = partial(click.secho, err=True)
+# Tracing flags
+TRACE = False
+TRACE_DEEP = False
 
-# this discovers and validates avialable plugins
-plugincode.pre_scan.initialize()
-plugincode.output.initialize()
-plugincode.post_scan.initialize()
+def logger_debug(*args):
+    pass
 
+if TRACE or TRACE_DEEP:
+    import logging
 
-CommandOption = namedtuple('CommandOption', 'group, name, option, value, default')
-Scanner = namedtuple('Scanner', 'name function is_enabled')
+    logger = logging.getLogger(__name__)
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
+
+    def logger_debug(*args):
+        return logger.debug(' '.join(isinstance(a, unicode)
+                                     and a or repr(a) for a in args))
+
+
+echo_stderr = partial(click.secho, err=True)
 
 
 info_text = '''
@@ -98,7 +118,7 @@
 
 '''
 
-notice_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'NOTICE')
+notice_path = join(abspath(dirname(__file__)), 'NOTICE')
 notice_text = open(notice_path).read()
 
 delimiter = '\n\n\n'
@@ -111,14 +131,6 @@
 
 notice = acknowledgment_text.strip().replace('  ', '')
 
-# CLI help groups
-SCANS = 'scans'
-OUTPUT = 'output'
-PRE_SCAN = 'pre-scan'
-POST_SCAN = 'post-scan'
-MISC = 'misc'
-CORE = 'core'
-
 
 def print_about(ctx, param, value):
     if not value or ctx.resilient_parsing:
@@ -127,64 +139,71 @@ def print_about(ctx, param, value):
     ctx.exit()
 
 
+# FIXME: this should be pushed out in some external help or pushed down in plugins.
+# FIXME: the glob story is very weird!!!
 examples_text = '''
 Scancode command lines examples:
 
 (Note for Windows: use '\\' back slash instead of '/' forward slash for paths.)
 
-Scan the 'samples' directory for licenses and copyrights. Save scan results to
-an HTML app file for interactive scan results navigation. When the scan is done,
-open 'scancode_result.html' in your web browser. Note that additional app files
-are saved in a directory named 'scancode_result_files':
-
-    scancode --format html-app samples/ scancode_result.html
-
-Scan a directory for licenses and copyrights. Save scan results to an
-HTML file:
-
-    scancode --format html samples/zlib scancode_result.html
-
 Scan a single file for copyrights. Print scan results to stdout as JSON:
 
-    scancode --copyright samples/zlib/zlib.h
+    scancode --copyright samples/zlib/zlib.h --json
 
 Scan a single file for licenses, print verbose progress to stderr as each
 file is scanned. Save scan to a JSON file:
 
-    scancode --license --verbose samples/zlib/zlib.h licenses.json
+    scancode --license --verbose samples/zlib/zlib.h --json licenses.json
 
 Scan a directory explicitly for licenses and copyrights. Redirect JSON scan
 results to a file:
 
-    scancode -f json -l -c samples/zlib/ > scan.json
+    scancode --json -l -c samples/zlib/ > scan.json
 
-Scan a directory while ignoring a single file. Print scan results to stdout as JSON:
+Scan a directory while ignoring a single file.
+Print scan results to stdout as JSON:
 
-    scancode --ignore README samples/
+    scancode --json  --ignore README samples/
 
-Scan a directory while ignoring all files with txt extension. Print scan results to
-stdout as JSON (It is recommended to use quoted glob patterns to prevent pattern
-expansion by the shell):
+Scan a directory while ignoring all files with .txt extension.
+Print scan results to stdout as JSON.
+It is recommended to use quotes around glob patterns to prevent pattern
+expansion by the shell:
 
-    scancode --ignore "*.txt" samples/
+    scancode --json --ignore "*.txt" samples/
 
 Special characters supported in GLOB pattern:
-*       matches everything
-?       matches any single character
-[seq]   matches any character in seq
-[!seq]  matches any character not in seq
+- *       matches everything
+- ?       matches any single character
+- [seq]   matches any character in seq
+- [!seq]  matches any character not in seq
+
+For a literal match, wrap the meta-characters in brackets.
+For example, '[?]' matches the character '?'.
+For details on GLOB patterns see https://en.wikipedia.org/wiki/Glob_(programming).
 
-For a literal match, wrap the meta-characters in brackets. For example, '[?]' matches the character '?'.
-For glob see https://en.wikipedia.org/wiki/Glob_(programming).
+Note: Glob patterns cannot be applied to path as strings.
+For example, this will not ignore "samples/JGroups/licenses".
 
-Note: Glob patterns cannot be applied to path as strings, for e.g.
-    scancode --ignore "samples*licenses" samples/
-will not ignore "samples/JGroups/licenses".
+    scancode --json --ignore "samples*licenses" samples/
 
-Scan a directory while ignoring multiple files (or glob patterns). Print the scan
-results to stdout as JSON:
 
-    scancode --ignore README --ignore "*.txt" samples/
+Scan a directory while ignoring multiple files (or glob patterns).
+Print the scan results to stdout as JSON:
+
+    scancode --json --ignore README --ignore "*.txt" samples/
+
+Scan the 'samples' directory for licenses and copyrights. Save scan results to
+an HTML app file for interactive scan results navigation. When the scan is done,
+open 'scancode_result.html' in your web browser. Note that additional app files
+are saved in a directory named 'scancode_result_files':
+
+    scancode --output-html-app scancode_result.html samples/
+
+Scan a directory for licenses and copyrights. Save scan results to an
+HTML file:
+
+    scancode --output-html scancode_result.html samples/zlib
 
 To extract archives, see the 'extractcode' command instead.
 '''
@@ -204,30 +223,20 @@ def print_version(ctx, param, value):
     ctx.exit()
 
 
-def reindex_licenses(ctx, param, value):
-    if not value or ctx.resilient_parsing:
-        return
-    from licensedcode import cache
-    click.echo('Checking and rebuilding the license index...')
-    cache.reindex()
-    click.echo('Done.')
-    ctx.exit()
-
-
+# FIXME: this should be pushed out in some external help or pushed down in plugins.
 epilog_text = '''Examples (use --examples for more):
 
 \b
 Scan the 'samples' directory for licenses and copyrights.
 Save scan results to a JSON file:
 
-    scancode --format json samples scancode_result.json
+    scancode --license --copyright --output-json=scancode_result.json samples
 
 \b
-Scan the 'samples' directory for licenses and copyrights. Save scan results to
-an HTML app file for interactive web browser results navigation. Additional app
-files are saved to the 'myscan_files' directory:
+Scan the 'samples' directory for licenses and package manifests. Print scan
+results on screen as pretty-formatted JSON:
 
-    scancode --format html-app samples myscan.html
+    scancode --json-pp --license --package  samples
 
 Note: when you run scancode, a progress bar is displayed with a counter of the
 number of files processed. Use --verbose to display file-by-file progress.
@@ -236,9 +245,10 @@ def reindex_licenses(ctx, param, value):
 
 class ScanCommand(BaseCommand):
     """
-    A command class that is aware of ScanCode plugins and provides help where
-    each option is grouped by group.
+    A command class that is aware of ScanCode options that provides enhanced
+    help where each option is grouped by group.
     """
+
     short_usage_help = '''
 Try 'scancode --help' for help on options and arguments.'''
 
@@ -246,434 +256,605 @@ def __init__(self, name, context_settings=None, callback=None, params=None,
                  help=None,  # @ReservedAssignment
                  epilog=None, short_help=None,
                  options_metavar='[OPTIONS]', add_help_option=True,
-                 plugins_by_group=()):
+                 plugin_options=()):
+        """
+        Create a new ScanCommand using the `plugin_options` list of
+        CommandLineOption instances.
+        """
 
         super(ScanCommand, self).__init__(name, context_settings, callback,
-                 params, help, epilog, short_help, options_metavar, add_help_option)
-
-        for group, plugins in plugins_by_group:
-            for pname, plugin in sorted(plugins.items()):
-                for option in plugin.get_plugin_options():
-                    if not isinstance(option, ScanOption):
-                        raise Exception(
-                            'Invalid plugin option "%(pname)s": option is not '
-                            'an instance of "ScanOption".' % locals())
-
-                    # normalize the help text, which may otherwise be messy
-                    option.help = option.help and ' '.join(option.help.split())
-                    option.group = group
-                    # this makes the plugin options "known" from the command
-                    self.params.append(option)
+             params, help, epilog, short_help, options_metavar, add_help_option)
+
+        # this makes the options "known" to the command
+        self.params.extend(plugin_options)
 
     def format_options(self, ctx, formatter):
         """
         Overridden from click.Command to write all options into the formatter in
-        groups they belong to. If a group is not specified, add the option to
-        MISC group.
+        help_groups they belong to. If a group is not specified, add the option
+        to MISC_GROUP group.
         """
         # this mapping defines the CLI help presentation order
-        groups = OrderedDict([
-            (SCANS, []),
-            (OUTPUT, []),
-            (PRE_SCAN, []),
-            (POST_SCAN, []),
-            (MISC, []),
-            (CORE, []),
+        help_groups = OrderedDict([
+            (SCAN_GROUP, []),
+            (OTHER_SCAN_GROUP, []),
+            (SCAN_OPTIONS_GROUP, []),
+            (OUTPUT_GROUP, []),
+            (OUTPUT_FILTER_GROUP, []),
+            (OUTPUT_CONTROL_GROUP, []),
+            (PRE_SCAN_GROUP, []),
+            (POST_SCAN_GROUP, []),
+            (CORE_GROUP, []),
+            (MISC_GROUP, []),
         ])
 
         for param in self.get_params(ctx):
             # Get the list of option's name and help text
             help_record = param.get_help_record(ctx)
             if help_record:
-                if getattr(param, 'group', None):
-                    groups[param.group].append(help_record)
+                if getattr(param, 'help_group', None):
+                    # if we have a group, organize options by group
+                    help_groups[param.help_group].append(help_record)
                 else:
                     # use the misc group if no group is defined
-                    groups['misc'].append(help_record)
+                    help_groups[MISC_GROUP].append(help_record)
 
         with formatter.section('Options'):
-            for group, option in groups.items():
-                if option:
-                    with formatter.section(group):
-                        formatter.write_dl(option)
-
-
-def validate_formats(ctx, param, value):
-    """
-    Validate formats and template files. Raise a BadParameter on errors.
-    """
-    value_lower = value.lower()
-    if value_lower in plugincode.output.get_plugins():
-        return value_lower
-    # render using a user-provided custom format template
-    if not os.path.isfile(value):
-        raise click.BadParameter(
-            'Unknwow <format> or invalid template file path: "%(value)s" '
-            'does not exist or is not readable.' % locals())
-    return value
+            for group, option in help_groups.items():
+                if not option:
+                    continue
+                with formatter.section(group):
+                    formatter.write_dl(option)
 
 
+# TODO: Implmenet me as a proper callback with partial
 def validate_exclusive(ctx, exclusive_options):
     """
-    Validate mutually exclusive options.
-    Raise a UsageError with on errors.
+    Validate a list of mutually `exclusive_options` names.
+    Raise a UsageError on errors.
     """
     ctx_params = ctx.params
-    selected_options = [ctx_params[eop] for eop in exclusive_options if ctx_params[eop]]
-    if len(selected_options) > 1:
+    options = [ctx_params[eop] for eop in exclusive_options if ctx_params[eop]]
+    if len(options) > 1:
         msg = ' and '.join('`' + eo.replace('_', '-') + '`' for eo in exclusive_options)
         msg += ' are mutually exclusion options. You can use only one of them.'
         raise click.UsageError(msg)
 
 
-# collect plugins for each group and add plugins options to the command
-# params
-_plugins_by_group = [
-    (PRE_SCAN, plugincode.pre_scan.get_plugins()),
-    (POST_SCAN, plugincode.post_scan.get_plugins()),
-]
+# IMPORTANT: this discovers, loads and validates all available plugins
+plugin_classes, plugin_options = PluginManager.setup_all()
+
+
+def print_plugins(ctx, param, value):
+    if not value or ctx.resilient_parsing:
+        return
+    for plugin_cls in sorted(plugin_classes, key=lambda pc: (pc.stage, pc.name)):
+        click.echo('Plugin: scancode_{self.stage}:{self.name}'.format(self=plugin_cls), nl=False)
+        click.echo('  class: {self.__module__}:{self.__name__}'.format(self=plugin_cls))
+        requires = ', '.join(plugin_cls.requires)
+        click.echo('  requires: {}'.format(requires), nl=False)
+        needs_info = getattr(plugin_cls, 'needs_info', False)
+        if needs_info:
+            click.echo(' needs_info: yes')
+        else:
+            click.echo('')
+        click.echo('  doc: {self.__doc__}'.format(self=plugin_cls))
+        click.echo('  options:'.format(self=plugin_cls))
+        for option in plugin_cls.options:
+            name = option.name
+            opts = ', '.join(option.opts)
+            help_group = option.help_group
+            click.echo('    {help_group!s}, {name!s}: {opts}'.format(**locals()))
+        click.echo('')
+    ctx.exit()
+
+
+@click.command(name='scancode',
+    epilog=epilog_text,
+    cls=ScanCommand,
+    plugin_options=plugin_options)
 
-@click.command(name='scancode', epilog=epilog_text, cls=ScanCommand, plugins_by_group=_plugins_by_group)
 @click.pass_context
 
 # ensure that the input path is bytes on Linux, unicode elsewhere
-@click.argument('input', metavar='<input>', type=click.Path(exists=True, readable=True, path_type=PATH_TYPE))
-@click.argument('output_file', default='-', metavar='<output_file>', type=click.File(mode='wb', lazy=False))
-
-# Note that click's 'default' option is set to 'false' here despite these being documented to be enabled by default in
-# order to more elegantly enable all of these (see code below) if *none* of the command line options are specified.
-@click.option('-c', '--copyright', '--copyrights', is_flag=True, default=False, help='Scan <input> for copyrights. [default]', group=SCANS, cls=ScanOption)
-@click.option('-l', '--license', '--licenses', is_flag=True, default=False, help='Scan <input> for licenses. [default]', group=SCANS, cls=ScanOption)
-@click.option('-p', '--package', '--packages', is_flag=True, default=False, help='Scan <input> for packages. [default]', group=SCANS, cls=ScanOption)
-
-@click.option('-e', '--email', '--emails', is_flag=True, default=False, help='Scan <input> for emails.', group=SCANS, cls=ScanOption)
-@click.option('-u', '--url', '--urls', is_flag=True, default=False, help='Scan <input> for urls.', group=SCANS, cls=ScanOption)
-@click.option('-i', '--info', '--infos', is_flag=True, default=False, help='Include information such as size, type, etc.', group=SCANS, cls=ScanOption)
-
-@click.option('--license-score', is_flag=False, default=0, type=int, show_default=True,
-              help='Do not return license matches with scores lower than this score. A number between 0 and 100.', group=SCANS, cls=ScanOption)
-@click.option('--license-text', is_flag=True, default=False,
-              help='Include the detected licenses matched text. Has no effect unless --license is requested.', group=SCANS, cls=ScanOption)
-@click.option('--license-url-template', is_flag=False, default=DEJACODE_LICENSE_URL, show_default=True,
-              help='Set the template URL used for the license reference URLs. In a template URL, curly braces ({}) are replaced by the license key.', group=SCANS, cls=ScanOption)
-@click.option('--strip-root', is_flag=True, default=False,
-              help='Strip the root directory segment of all paths. The default is to always '
-                   'include the last directory segment of the scanned path such that all paths have a common root directory. '
-                   'This cannot be combined with `--full-root` option.', group=OUTPUT, cls=ScanOption)
-@click.option('--full-root', is_flag=True, default=False,
-              help='Report full, absolute paths. The default is to always '
-                   'include the last directory segment of the scanned path such that all paths have a common root directory. '
-                   'This cannot be combined with the `--strip-root` option.', group=OUTPUT, cls=ScanOption)
-
-@click.option('-f', '--format', is_flag=False, default='json', show_default=True, metavar='<format>',
-              help=('Set <output_file> format to one of: %s or use <format> '
-                    'as the path to a custom template file' % ', '.join(plugincode.output.get_plugins())),
-                     callback=validate_formats, group=OUTPUT, cls=ScanOption)
-
-@click.option('--verbose', is_flag=True, default=False, help='Print verbose file-by-file progress messages.', group=OUTPUT, cls=ScanOption)
-@click.option('--quiet', is_flag=True, default=False, help='Do not print summary or progress messages.', group=OUTPUT, cls=ScanOption)
-
-@click.help_option('-h', '--help', group=CORE, cls=ScanOption)
-@click.option('-n', '--processes', is_flag=False, default=1, type=int, show_default=True, help='Scan <input> using n parallel processes.', group=CORE, cls=ScanOption)
-@click.option('--examples', is_flag=True, is_eager=True, callback=print_examples, help=('Show command examples and exit.'), group=CORE, cls=ScanOption)
-@click.option('--about', is_flag=True, is_eager=True, callback=print_about, help='Show information about ScanCode and licensing and exit.', group=CORE, cls=ScanOption)
-@click.option('--version', is_flag=True, is_eager=True, callback=print_version, help='Show the version and exit.', group=CORE, cls=ScanOption)
-
-@click.option('--diag', is_flag=True, default=False, help='Include additional diagnostic information such as error messages or result details.', group=CORE, cls=ScanOption)
-@click.option('--timeout', is_flag=False, default=DEFAULT_TIMEOUT, type=float, show_default=True, help='Stop scanning a file if scanning takes longer than a timeout in seconds.', group=CORE, cls=ScanOption)
-@click.option('--no-cache', is_flag=True, default=False, is_eager=False, help='Do not use on-disk cache for scan results. Faster but uses more memory.', group=CORE, cls=ScanOption)
-@click.option('--reindex-licenses', is_flag=True, default=False, is_eager=True, callback=reindex_licenses, help='Force a check and possible reindexing of the cached license index.', group=MISC, cls=ScanOption)
-
-def scancode(ctx,
-             input,  # @ReservedAssignment
-             output_file, infos,
-             verbose, quiet, processes, diag, timeout, no_cache,
+@click.argument('input', metavar='<input> <OUTPUT FORMAT OPTION(s)>',
+    type=click.Path(exists=True, readable=True, path_type=PATH_TYPE))
+
+@click.option('-i', '--info',
+    is_flag=True, default=False,
+    help='Scan <input> for file information (size, type, checksums, etc).',
+    help_group=OTHER_SCAN_GROUP, cls=CommandLineOption)
+
+@click.option('--strip-root',
+    is_flag=True, default=False,
+    help='Strip the root directory segment of all paths. The default is to '
+         'always include the last directory segment of the scanned path such '
+         'that all paths have a common root directory.',
+    help_group=OUTPUT_CONTROL_GROUP, cls=CommandLineOption)
+
+@click.option('--full-root',
+    is_flag=True, default=False,
+    help='Report full, absolute paths. The default is to always '
+         'include the last directory segment of the scanned path such that all '
+         'paths have a common root directory.',
+    help_group=OUTPUT_CONTROL_GROUP, cls=CommandLineOption)
+
+@click.option('--verbose',
+    is_flag=True, default=False,
+    help='Print progress  as file-by-file path instead of a progress bar. '
+         'Print a verbose scan summary.',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--quiet',
+    is_flag=True, default=False,
+    help='Do not print summary or progress.',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.help_option('-h', '--help',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('-n', '--processes',
+    type=int, default=1,
+    metavar='INT',
+    help='Set the number of parallel processes to use. '
+         'Disable parallel processing if 0.  [default: 1]',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--examples',
+    is_flag=True, is_eager=True,
+    callback=print_examples,
+    help=('Show command examples and exit.'),
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--about',
+    is_flag=True, is_eager=True,
+    callback=print_about,
+    help='Show information about ScanCode and licensing and exit.',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--version',
+    is_flag=True, is_eager=True,
+    callback=print_version,
+    help='Show the version and exit.',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--timeout',
+    type=float, default=DEFAULT_TIMEOUT,
+    metavar='<seconds>',
+    help='Stop an unfinished file scan after a timeout in seconds.  '
+         '[default: %d]' % DEFAULT_TIMEOUT,
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--plugins',
+    is_flag=True, is_eager=True,
+    callback=print_plugins,
+    help='Print the list of available ScanCode plugins.',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--no-cache',
+    is_flag=True, default=False,
+    help='Do not use on-disk cache for intermediate results. Uses more memory.',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--timing',
+    is_flag=True, default=False,
+    help='Collect execution timing for each scan and scanned file.',
+    help_group=CORE_GROUP, cls=CommandLineOption)
+
+@click.option('--temp-dir',
+    type=click.Path(
+        exists=True, file_okay=False, dir_okay=True,
+        readable=True, path_type=PATH_TYPE),
+    default=None,
+    metavar='DIR',
+    help='Set the path to the temporary directory to use for ScanCode '
+         'cache and temporary files.',
+    help_group=CORE_GROUP,
+    cls=CommandLineOption)
+
+@click.option('--test-mode',
+    is_flag=True, default=False,
+    # not yet supported in Click 6.7
+    # hidden = True,
+    help='Run ScanCode in a special "test mode". Only for testing.',
+    help_group=MISC_GROUP, cls=CommandLineOption)
+
+
+def scancode(ctx, input, info,  # @ReservedAssignment
+             strip_root, full_root,
+             verbose, quiet,
+             processes, timeout,
+             no_cache,
+             timing,
+             temp_dir,
+             test_mode,
              *args, **kwargs):
-    """scan the <input> file or directory for license, origin and packages and save results to <output_file(s)>.
+    """scan the <input> file or directory for license, origin and packages and save results to FILE(s) using one or more ouput format option.
 
-    The scan results are printed to stdout if <output_file> is not provided.
     Error and progress is printed to stderr.
     """
-    validate_exclusive(ctx, ['strip_root', 'full_root'])
-
-    # ## TODO: FIX when plugins are used everywhere
-    copyrights = kwargs.get('copyrights')
-    licenses = kwargs.get('licenses')
-    packages = kwargs.get('packages')
-    emails = kwargs.get('emails')
-    urls = kwargs.get('urls')
-
-    strip_root = kwargs.get('strip_root')
-    full_root = kwargs.get('full_root')
-    format = kwargs.get('format')  # @ReservedAssignment
-    # ## TODO: END FIX when plugins are used everywhere
-
-    get_licenses_with_score = partial(get_licenses,
-        diag=diag,
-        min_score=kwargs.get('license_score'),
-        include_text=kwargs.get('license_text'),
-        license_url_template=kwargs.get('license_url_template'))
-
-    # Use default scan options when no scan option is provided
-    # FIXME: this should be removed?
-    use_default_scans = not any([infos, licenses, copyrights, packages, emails, urls])
-
-    # FIXME: A hack to force info being exposed for SPDX output in order to
-    # reuse calculated file SHA1s.
-    is_spdx = format in ('spdx-tv', 'spdx-rdf')
-
-
-    scanners = [scan for scan in [
-            # FIXME: we enable infos at all times!!!
-            Scanner('infos', get_file_info, True),
-            Scanner('licenses', get_licenses_with_score, licenses or use_default_scans),
-            Scanner('copyrights', get_copyrights, copyrights or use_default_scans),
-            Scanner('packages', get_package_infos, packages or use_default_scans),
-            Scanner('emails', get_emails, emails),
-            Scanner('urls', get_urls, urls)]
-        if scan.is_enabled
-    ]
-
-    ignored_options = 'verbose', 'quiet', 'processes', 'timeout'
-    all_options = list(get_command_options(ctx, ignores=ignored_options, skip_no_group=True))
-
-    scanner_names = [scan.name for scan in scanners if scan.is_enabled]
-    scan_names = ', '.join(scanner_names)
-    if not quiet:
-        echo_stderr('Scanning files for: %(scan_names)s with %(processes)d process(es)...' % locals())
-
-    if not quiet and not processes:
-        echo_stderr('Disabling multi-processing and multi-threading...', fg='yellow')
-
-    # FIXME: this is terribly hackish :|
-    # FIXUP OPTIONS FOR DEFAULT SCANS
-    options = []
-    for opt in all_options:
-        if opt.name in scanner_names:
-            options.append(opt._replace(value=True))
-            continue
 
-        # do not report option set to defaults or with an empty list value
-        if isinstance(opt.value, (list, tuple)):
-            if opt.value:
-                options.append(opt)
-            continue
-        if opt.value != opt.default:
-            options.append(opt)
+    # notes: the above docstring of this function is used in the CLI help Here is
+    # it's actual docstring:
+    """
+    Return a return code of 0 on success or 1 on error from running all the
+    scanning "stages" in the `input` file and saving results inthe `format` format
+    to `output_file`.
+    The scanning stages are:
+
+    - `inventory`: collect the codebase inventory resources tree for the `input`.
+      This is a built-in stage that does not accept plugins.
+
+    - `setup`: as part of the plugins system, each plugin is loaded and
+      its `setup` class method is called if it is enabled.
+
+    - `pre-scan`: each enabled pre-scan plugin `process_codebase(codebase)`
+       method is called to update/transforme the whole codebase
+
+    - `scan`: the codebase is walked and each enabled scan plugin
+      `process_resource(resource.location)` method is called for each codebase
+      resource.
+
+    - `post-scan`: each enabled post-scan plugin `process_codebase(codebase)`
+       method is called to update/transforme the whole codebase
+
+    # !!!!!TODO: this is not yet true!!!!
+    - `output`: each enabled output plugin `process_codebase(codebase)`
+       method is called to create an output for the codebase
+
+    This function is the main CLI entry point.
 
+    The other arguments are:
+
+    - `quiet` and `verbose`: boolean flags: Do not display any message if
+      `quiet` is True. Otherwise, display extra verbose messages if `quiet` is
+      False and `verbose` is True. These two options are mutually exclusive.
+
+    - `strip_root` and `full_root`: boolean flags: In the outputs, strip the
+      first path segment of a file if `strip_root` is True unless the `input` is
+      a single file. If `full_root` is True report the path as an absolute path.
+      These coptions are mutually exclusive.
+
+    - `processes`: int: run the scan using up to this number of processes in
+      parallel. If 0, disable the multiprocessing machinery.
+
+    - `timeout`: float: intterup the scan of a file if it does not finish within
+      `timeout` seconds. This applied to each file and scan individually (e.g.
+      if the license scan is interrupted they other scans may complete, each
+      withing the timeout)
+
+    - `no_cache`: boolean flag: disable on-disk caching of intermediate scan
+      results and store these in memory instead if True
+
+    - `timing`: boolean flag: collect per-scan and per-file scan timings if
+      True.
+
+    - `temp_dir`: path to a non-default temporary directory fo caching and other
+      temporary files. If not provided, the default is used.
+
+    Other **kwargs are passed down to plugins as CommandOption indirectly
+    through Click context machinery.
+    """
+
+    success = True
+    codebase = None
     processing_start = time()
-    if not quiet:
-        echo_stderr('Collecting file inventory...' % locals(), fg='green')
-    # TODO: add progress indicator
-    codebase = Codebase(location=input, use_cache=not no_cache)
-    collect_time = time() - processing_start
 
-    license_indexing_start = time()
+    # UTC start timestamp
+    scan_start = time2tstamp()
+
     try:
-        ###############################################################
-        # SCANNERS SETUP
-        ###############################################################
-        license_indexing_time = 0
-        # FIXME: this should be moved as the setup() for a license plugin
-        with_licenses = any(sc for sc in scanners if sc.name == 'licenses' and sc.is_enabled)
-        if with_licenses:
-            # build index outside of the main loop for speed
-            # FIXME: REALLY????? this also ensures that forked processes will get the index on POSIX naturally
-            if not quiet:
-                echo_stderr('Building/Loading license detection index...', fg='green', nl=False)
-            # TODO: add progress indicator
-            from licensedcode.cache import get_index
-            get_index(False)
-            license_indexing_time = time() - license_indexing_start
+        validate_exclusive(ctx, ['strip_root', 'full_root'])
+        validate_exclusive(ctx, ['quiet', 'verbose'])
+
+        if not processes and not quiet:
+            echo_stderr('Disabling multi-processing.', fg='yellow')
+
+        ############################################################################
+        # 1. get command options and create all plugin instances
+        ############################################################################
+        command_options = sorted(get_command_options(ctx))
+        if TRACE_DEEP:
+            logger_debug('scancode: command_options:')
+            for co in command_options:
+                logger_debug('  scancode: command_option:', co)
+
+        enabled_plugins = OrderedDict()
+
+        for stage, manager in PluginManager.managers.items():
+            if stage == housekeeping.stage:
+                continue
+
+            enabled_plugins[stage] = stage_plugins = OrderedDict()
+            for name, plugin_cls in manager.plugin_classes.items():
+                # TODO: manage errors: this will error out loudly if there are errors
+                plugin = plugin_cls(command_options)
+                if plugin.is_enabled():
+                    # Set special test mode flag that plugins can leverage
+                    plugin._test_mode = test_mode
+                    stage_plugins[name] = plugin
+
+        # these are plugin instances, not classes
+        pre_scan_plugins = enabled_plugins[pre_scan.stage]
+        scanner_plugins = enabled_plugins[scan.stage]
+        post_scan_plugins = enabled_plugins[post_scan.stage]
+        output_filter_plugins = enabled_plugins[output_filter.stage]
+        output_plugins = enabled_plugins[output.stage]
+
+        if not output_plugins:
+            msg = ('Missing output option(s): at least one output '
+                   'option is needed to save scan results.')
+            raise click.UsageError(msg)
+            ctx.exit(1)
+
+        if not scanner_plugins and not info:
+            # Use default info scan when no scan option is requested
+            info = True
+            for co in command_options:
+                if co.name == 'info':
+                    co._replace(value=True)
+
+        # TODO: check for plugin dependencies and if a plugin is ACTIVE!!!
+
+        ############################################################################
+        # 2. setup enabled plugins
+        ############################################################################
+
+        setup_timings = OrderedDict()
+        plugins_setup_start = time()
+        # TODO: add progress indicator
+        if not quiet and not verbose:
+            echo_stderr('Setup plugins...', fg='green')
+        for stage, stage_plugins in enabled_plugins.items():
+            for name, plugin in stage_plugins.items():
+                plugin_setup_start = time()
+                if not quiet and verbose:
+                    echo_stderr('Setup plugin: %(stage)s:%(name)s...' % locals(),
+                                fg='green')
+                plugin.setup()
+
+                timing_key = 'setup_%(stage)s_%(name)s' % locals()
+                setup_timings[timing_key] = time() - plugin_setup_start
+
+        setup_timings['setup'] = time() - plugins_setup_start
+
+        ############################################################################
+        # 3. collect codebase inventory
+        ############################################################################
+
+        if not quiet:
+            echo_stderr('Collect file inventory...', fg='green')
+
+        # TODO: add progress indicator
+        # note: inventory timing collection is built in Codebase initialization
+        codebase = Codebase(location=input, use_cache=not no_cache)
+        if TRACE: logger_debug('scancode: codebase.use_cache:', codebase.use_cache)
+
+        codebase.strip_root = strip_root
+        codebase.full_root = full_root
+
+        codebase.timings.update(setup_timings)
+
+        # TODO: thse are noy YET used in outputs!!
+        codebase.summary['scancode_notice'] = notice
+        codebase.summary['scancode_version'] = version
+        # TODO: this is NOT the pretty options
+        codebase.summary['scancode_options'] = command_options
+
+        ############################################################################
+        # 4. if any prescan plugins needs_info run an info scan first
+        ############################################################################
+
+        # do we need to collect info before prescan?
+        pre_scan_needs_info = any(p.needs_info for p in pre_scan_plugins.values())
+
+        info_is_collected = False
+
+        if pre_scan_needs_info:
+            info_start = time()
+
+            progress_manager = None
             if not quiet:
-                echo_stderr('Done.', fg='green')
+                echo_stderr('Collect file information for pre-scans '
+                            'with %(processes)d process(es)...' % locals())
+                item_show_func = partial(path_progress_message, verbose=verbose)
+                progress_manager = partial(progressmanager,
+                    item_show_func=item_show_func, verbose=verbose, file=sys.stderr)
+
+            scanners = [Scanner(key='infos', function=get_file_info)]
+            # TODO: add CLI option to bypass cache entirely
+            info_success = scan_codebase(codebase, scanners, processes, timeout,
+                with_timing=timing, with_info=True, progress_manager=progress_manager)
+
+            codebase.timings['collect-info'] = time() - info_start
+            info_is_collected = True
+
+            success = success and info_success
+
+        ############################################################################
+        # 5. run prescans
+        ############################################################################
 
-        ###############################################################
-        # PRE-SCAN
-        ###############################################################
         pre_scan_start = time()
+        if not quiet and not verbose and pre_scan_plugins:
+            echo_stderr('Run pre-scan plugins...', fg='green')
+
         # TODO: add progress indicator
-        for name, plugin in plugincode.pre_scan.get_plugins().items():
-            plugin = plugin(all_options, scanner_names)
-            if plugin.is_enabled():
-                if not quiet:
-                    name = name or plugin.__class__.__name__
-                    echo_stderr('Running pre-scan plugin: %(name)s...' % locals(), fg='green')
-                # FIXME: we should always catch errors from plugins properly
-                plugin.process_codebase(codebase)
-                codebase.update_counts()
-
-        pre_scan_time = time() - pre_scan_start
-
-        ###############################################################
-        # SCANS RUN
-        ###############################################################
+        # FIXME: we should always catch errors from plugins properly
+        for name, plugin in pre_scan_plugins.items():
+            plugin_prescan_start = time()
+            if verbose:
+                echo_stderr('Run pre-scan plugin: %(name)s...' % locals(),
+                            fg='green')
+
+            plugin.process_codebase(codebase)
+            codebase.update_counts()
+            timing_key = 'prescan_%(name)s' % locals()
+            setup_timings[timing_key] = time() - plugin_prescan_start
+
+        codebase.timings['pre-scan'] = time() - pre_scan_start
+
+        ############################################################################
+        # 6. run scans.
+        ############################################################################
+
         scan_start = time()
-        if not quiet:
-            echo_stderr('Scanning files...', fg='green')
+        scanners = []
+        # add info is requested or needed but not yet collected
+        stages_needs_info = any(p.needs_info for p in
+            (post_scan_plugins.values() + output_plugins.values()))
 
-        progress_manager = None
-        if not quiet:
-            item_show_func = partial(path_progress_message, verbose=verbose)
-            progress_manager = partial(progressmanager,
-                item_show_func=item_show_func, verbose=verbose, file=sys.stderr)
+        with_info = info or stages_needs_info
+        codebase.with_info = with_info
+        if not info_is_collected and with_info:
+            scanners = [Scanner(key='infos', function=get_file_info)]
 
-        # TODO: add CLI option to bypass cache entirely
-        success = scan_codebase(codebase, scanners, processes, timeout,
-                                progress_manager=progress_manager)
+        scan_sorter = lambda s: (s.sort_order, s.name)
+        for scanner in sorted(scanner_plugins.values(), key=scan_sorter):
+            scanner_kwargs = scanner.get_own_command_options_kwargs()
+            func = scanner.get_scanner(**scanner_kwargs)
+            scanners.append(Scanner(key=scanner.name, function=func))
 
-        scan_time = time() - scan_start
+        if TRACE_DEEP: logger_debug('scancode: scanners:', scanners)
 
-        scanned_count, _, scanned_size = codebase.counts(update=True, skip_root=False)
+        if scanners:
+            scan_names = ', '.join(s.key for s in scanners)
+
+            if not quiet:
+                echo_stderr('Scan files for: %(scan_names)s '
+                            'with %(processes)d process(es)...' % locals())
+
+            progress_manager = None
+            if not quiet:
+                item_show_func = partial(path_progress_message, verbose=verbose)
+                progress_manager = partial(progressmanager,
+                    item_show_func=item_show_func, verbose=verbose, file=sys.stderr)
+
+            # TODO: add CLI option to bypass cache entirely
+            scan_success = scan_codebase(codebase, scanners, processes, timeout,
+                with_timing=timing, with_info=with_info, progress_manager=progress_manager)
+
+            scanned_count, _, scanned_size = codebase.counts(
+                update=True, skip_root=False)
+
+            codebase.summary['scan_names'] = scan_names
+            codebase.summary['scanned_count'] = scanned_count
+            codebase.summary['scanned_size'] = scanned_size
+            codebase.timings['scan'] = time() - scan_start
+
+            success = success and scan_success
+
+        ############################################################################
+        # 7. run postscans
+        ############################################################################
 
-        ###############################################################
-        # POST-SCAN
-        ###############################################################
-        # TODO: add progress indicator
         post_scan_start = time()
+        # TODO: add progress indicator
+        # FIXME: we should always catch errors from plugins properly
+        if not quiet and not verbose and post_scan_plugins:
+            echo_stderr('Run post-scan plugins...', fg='green')
+        for name, plugin in post_scan_plugins.items():
+            if not quiet and verbose:
+                echo_stderr('Run post-scan plugin: %(name)s...' % locals(), fg='green')
+
+            plugin.process_codebase(codebase)
+            codebase.update_counts()
+
+        codebase.timings['post-scan'] = time() - post_scan_start
+
+        ############################################################################
+        # 8. apply output filters
+        ############################################################################
+        output_filter_start = time()
+        # TODO: add progress indicator
+        # FIXME: we should always catch errors from plugins properly
+        if not quiet and not verbose and output_filter_plugins:
+            echo_stderr('Run output filter plugins...', fg='green')
+
+        filters = tuple(plugin.process_resource for plugin in output_filter_plugins.values())
+        if filters:
+            # This is a set of resource ids to filter out from the final outputs
+            filtered_rids_add = codebase.filtered_rids.add
+            for rid, resource in codebase.get_resources_with_rid():
+                if all(to_keep(resource) for to_keep in filters):
+                    continue
+                filtered_rids_add(rid)
+
+        codebase.timings['output-filter'] = time() - post_scan_start
 
-        for name, plugin in plugincode.post_scan.get_plugins().items():
-            plugin = plugin(all_options, scanner_names)
-            if plugin.is_enabled():
-                if not quiet:
-                    name = name or plugin.__class__.__name__
-                    echo_stderr('Running post-scan plugin: %(name)s...' % locals(), fg='green')
-                # FIXME: we should always catch errors from plugins properly
-                plugin.process_codebase(codebase)
-                codebase.update_counts()
+        ############################################################################
+        # 9. run outputs
+        ############################################################################
+        output_start = time()
+        # TODO: add progress indicator
+        # FIXME: we should always catch errors from plugins properly
+
+        if not quiet and not verbose:
+            echo_stderr('Save results...' , fg='green')
 
-        post_scan_time = time() - post_scan_start
+        for name, plugin in output_plugins.items():
+            if not quiet and verbose:
+                echo_stderr('Save results as: %(name)s...' % locals(), fg='green')
 
+            plugin.process_codebase(codebase)
+            codebase.update_counts()
 
-        ###############################################################
-        # SUMMARY
-        ###############################################################
-        total_time = time() - processing_start
+        codebase.timings['output'] = time() - output_start
 
-        files_count, dirs_count, size = codebase.counts(
-            update=True, skip_root=strip_root)
+        ############################################################################
+        # 9. display summary
+        ############################################################################
+        codebase.timings['total'] = time() - processing_start
 
+        # TODO: compute summary for output plugins too??
         if not quiet:
+            echo_stderr('Scanning done.', fg='green' if success else 'red')
             display_summary(codebase, scan_names, processes,
-                            total_time, license_indexing_time,
-                            pre_scan_time,
-                            scanned_count, scanned_size, scan_time,
-                            post_scan_time,
-                            files_count, dirs_count, size,
-                            verbose)
-
-        ###############################################################
-        # FORMATTED REPORTS OUTPUT
-        ###############################################################
-        if not quiet:
-            echo_stderr('Saving results...', fg='green')
-
-        # FIXME: we should have simpler args: a scan "header" and scan results
-        # FIXME: we should use Codebase.resources instead of results
-        with_info = infos or is_spdx
-        serializer = partial(Resource.to_dict, full_root=full_root, strip_root=strip_root, with_info=with_info)
-        results = [serializer(res) for res in codebase.walk(topdown=True, sort=True, skip_root=strip_root)]
-        save_results(results, files_count, format, options, input, output_file)
+                skip_root=strip_root, verbose=verbose)
 
     finally:
-        # cleanup
-        codebase.clear()
+        # cleanup including cache cleanup
+        if codebase:
+            codebase.clear()
 
     rc = 0 if success else 1
     ctx.exit(rc)
 
 
-def display_summary(codebase, scan_names, processes,
-                    total_time,
-                    license_indexing_time,
-                    pre_scan_time,
-                    scanned_count, scanned_size, scan_time,
-                    post_scan_time,
-                    files_count, dirs_count, size,
-                    verbose):
-    """
-    Display a scan summary.
+def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
+                  with_timing=False, with_info=False, progress_manager=None):
     """
-    top_errors = codebase.errors
-    path_errors = [(r.get_path(decode=True, posix=True), r.errors) for r in codebase.walk() if r.errors]
+    Run the `scanners` Scanner object on the `codebase` Codebase. Return True on
+    success or False otherwise.
 
-    has_errors = top_errors or path_errors
-    echo_stderr('Scanning done.', fg=has_errors and 'red' or 'green')
+    Run the `scanners` ing multiprocessing with `processes` number of
+    processes allocating one process per scanned `codebase` Resource.
 
-    errors_count = 0
-    if has_errors:
-        echo_stderr('Some files failed to scan properly:', fg='red')
-        for error in top_errors:
-            echo_stderr(error)
-            errors_count += 1
-        for errored_path, errors in path_errors:
-            echo_stderr('Path: ' + errored_path, fg='red')
-            if not verbose:
-                continue
-            for error in errors:
-                for emsg in error.splitlines(False):
-                    echo_stderr('  ' + emsg, fg='red')
-                errors_count += 1
-
-    sym = 'Bytes'
-    if size >= 1024 * 1024 * 1024:
-        sym = 'GB'
-        size = size / (1024 * 1024 * 1024)
-    elif size >= 1024 * 1024:
-        sym = 'MB'
-        size = size / (1024 * 1024)
-    elif size >= 1024:
-        sym = 'KB'
-        size = size / 1024
-    size = round(size, 2)
-
-    scan_sym = 'Bytes'
-    if scanned_size >= 1024 * 1024 * 1024:
-        scan_sym = 'GB'
-        scanned_size = scanned_size / (1024 * 1024 * 1024)
-    elif scanned_size >= 1024 * 1024:
-        scan_sym = 'MB'
-        scanned_size = scanned_size / (1024 * 1024)
-    elif scanned_size >= 1024:
-        scan_sym = 'KB'
-        scanned_size = scanned_size / 1024
-    size_speed = round(scanned_size / scan_time, 2)
-    scanned_size = round(scanned_size, 2)
-
-    file_speed = round(float(scanned_count) / scan_time , 2)
-
-    res_count = files_count + dirs_count
-    echo_stderr('Summary:        %(scan_names)s with %(processes)d process(es)' % locals())
-    echo_stderr('Total time:     %(scanned_count)d files, %(scanned_size).2f %(scan_sym)s '
-                                 'scanned in %(total_time)d total (excluding format)' % locals())
-    echo_stderr('Scan Speed:     %(file_speed).2f files/s, %(size_speed).2f %(scan_sym)s/s' % locals())
-    echo_stderr('Results:        %(res_count)d resources: %(files_count)d files, %(dirs_count)d directories for %(size).2f %(sym)s' % locals())
-    echo_stderr('Timings:        Indexing: %(license_indexing_time).2fs, '
-                                'Pre-scan: %(pre_scan_time).2fs, '
-                                'Scan: %(scan_time).2fs, '
-                                'Post-scan: %(post_scan_time).2fs' % locals())
-    echo_stderr('Errors count:   %(errors_count)d' % locals())
+    Run each scanner function for up to `timeout` seconds and fail it otherwise.
 
+    If `with_timing` is True, per-scanner execution time (as a float in seconds)
+    is added to the `scan_timings` mapping of each Resource as {scanner.key:
+    execution time}.
 
-def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
-                  progress_manager=None):
-    """
-    Run the `scanners` on the `codebase`. Return True on success or False
-    otherwise. Provides optional progress feedback in the UI using the
-    `progress_manager` callable that accepts an iterable of tuple of (location,
-    rid, scan_errors, scan_result ) as argument.
+    Provide optional progress feedback in the UI using the `progress_manager`
+    callable that accepts an iterable of tuple of (location, rid, scan_errors,
+    scan_result ) as argument.
     """
 
     # FIXME: this path computation is super inefficient
     # tuples of  (absolute location, resource id)
     # TODO: should we alk topdown or not???
+
     resources = ((r.get_path(absolute=True), r.rid) for r in codebase.walk())
 
     runner = partial(scan_resource, scanners=scanners, timeout=timeout)
 
-    has_info_scanner = any(sc.name == 'infos' for sc in scanners)
+    has_info_scanner = with_info
     lscan = len(scanners)
     has_other_scanners = lscan > 1 if has_info_scanner else lscan
+    if TRACE:
+        logger_debug('scan_codebase: scanners:', '\n'.join(repr(s) for s in scanners))
+        logger_debug('scan_codebase: has_other_scanners:', bool(has_other_scanners))
 
     get_resource = codebase.get_resource
 
@@ -701,8 +882,11 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
 
         while True:
             try:
-                location, rid, scan_errors, scan_result = scans.next()
-
+                if with_timing:
+                    location, rid, scan_errors, scan_result, scan_time, scan_result, scan_timings = scans.next()
+                else:
+                    location, rid, scan_errors, scan_time, scan_result = scans.next()
+                    if TRACE_DEEP: logger_debug('scan_codebase: results:', scan_result)
                 resource = get_resource(rid)
                 if not resource:
                     # this should never happen
@@ -721,8 +905,11 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
                     # always set info directly on resources
                     info = scan_result.pop('infos', [])
                     resource.set_info(info)
-                if has_info_scanner and scan_result:
+                    if TRACE: logger_debug('scan_codebase: set_info:', info)
+
+                if has_other_scanners and scan_result:
                     resource.put_scans(scan_result, update=True)
+                    if TRACE: logger_debug('scan_codebase: pu_scans:', scan_result)
 
             except StopIteration:
                 break
@@ -745,118 +932,174 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
     return success
 
 
-def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT):
+def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT, with_timing=False):
     """
-    Return a tuple of (location, rid, list or errors, mapping of scan results) by running
-    the `scanners` Scanner objects for the file or directory resource with id
-    `rid` at `location` provided as a `location_rid` tuple (location, rid).
+    Return a tuple of (location, rid, errors, scan_time, scan_results)
+    by running the `scanners` Scanner objects for the file or directory resource
+    with id `rid` at `location` provided as a `location_rid` tuple of (location,
+    rid) for up to `timeout` seconds.
+    In the returned tuple:
+    - `errors` is a list of error strings
+    - `scan_time` is the duration in seconds as float to run all scans for this resource
+    - `scan_results` is a mapping of scan results keyed by scanner name.
+
+    If `with_timing` is True, the execution time of each scanner is also
+    collected as a float in seconds and the returned tuple contains an extra
+    trailing item as a mapping of {scanner.key: execution time}.
     """
+    scan_time = time()
+
+    if with_timing:
+        timings = OrderedDict((scanner.key, 0) for scanner in scanners)
+
     location, rid = location_rid
     errors = []
-    results = OrderedDict((scanner.name, []) for scanner in scanners)
+    results = OrderedDict((scanner.key, []) for scanner in scanners)
 
     # run each scanner in sequence in its own interruptible
     for scanner, scanner_result in zip(scanners, results.values()):
+        if with_timing:
+            start = time()
         try:
-            runner = partial(scanner.function, location)
-            error, value = interruptible(runner, timeout=timeout)
+            error, value = interruptible(
+                partial(scanner.function, location), timeout=timeout)
             if error:
-                msg = 'ERROR: for scanner: ' + scanner.name + ':\n' + error
+                msg = 'ERROR: for scanner: ' + scanner.key + ':\n' + error
                 errors.append(msg)
             if value:
                 # a scanner function MUST return a sequence
                 scanner_result.extend(value)
         except Exception:
-            msg = 'ERROR: for scanner: ' + scanner.name + ':\n' + traceback.format_exc()
+            msg = 'ERROR: for scanner: ' + scanner.key + ':\n' + traceback.format_exc()
             errors.append(msg)
-    return location, rid, errors, results
+        finally:
+            scan_time = time() - scan_time
+            if with_timing:
+                timings[scanner.key] = time() - start
+
+    if with_timing:
+        return location, rid, errors, scan_time, results, timings
+    else:
+        return location, rid, errors, scan_time, results
 
 
-def save_results(results, files_count,
-                 format,  # @ReservedAssignment
-                 options,
-                 input,  # @ReservedAssignment
-                 output_file):
+def display_summary(codebase, scan_names, processes, skip_root, verbose):
     """
-    Save scan results to file or screen.
+    Display a scan summary.
     """
+    counts = codebase.counts(update=False, skip_root=skip_root)
 
-    # note: in tests, sys.stdout is not used, but is instead some io
-    # wrapper with no name attributes. We use this to check if this is a
-    # real filesystem file or not.
-    # note: sys.stdout.name == '<stdout>' so it has a name.
-    is_real_file = hasattr(output_file, 'name')
-
-    if output_file != sys.stdout and is_real_file:
-        # we are writing to a real filesystem file: create directories!
-        parent_dir = os.path.dirname(output_file.name)
-        if parent_dir:
-            create_dir(abspath(expanduser(parent_dir)))
-
-    # Write scan results to file or screen as a formatted output ...
-    # ... using a user-provided custom format template
-    format_plugins = plugincode.output.get_plugins()
-
-    if format in format_plugins:
-    # use the selected format plugin
-        writer = format_plugins[format]
-        # FIXME: carrying an echo function does not make sense
-        # FIXME: do not use input as a variable name
-        # FIXME: do NOT pass options around, but a header instead
-        opts = OrderedDict([(o.option, o.value) for o in options])
-        writer(files_count=files_count, version=version, notice=notice,
-               scanned_files=results,
-               options=opts,
-               input=input, output_file=output_file, _echo=echo_stderr)
-        return
+    initial_files_count = codebase.summary.get('initial_files_count', 0)
+    initial_dirs_count = codebase.summary.get('initial_dirs_count', 0)
+    initial_res_count = initial_files_count + initial_dirs_count
 
-    # format may be a custom template file path
-    if not os.path.isfile(format):
-        # this check was done before in the CLI validation, but this
-        # is done again if the function is used directly
-        echo_stderr('\nInvalid template: must be a file.', fg='red')
-    else:
-        from formattedcode import format_templated
-        # FIXME: carrying an echo function does not make sense
-        format_templated.write_custom(
-            results, output_file,
-            _echo=echo_stderr, version=version, template_path=format)
+    final_files_count, final_dirs_count, final_size = counts
+    final_res_count = final_files_count + final_dirs_count
+
+    top_errors = codebase.errors
+    path_errors = [(r.get_path(decode=True, posix=True), r.errors) for r in codebase.walk() if r.errors]
+
+    has_errors = top_errors or path_errors
+
+    errors_count = 0
+    if has_errors:
+        echo_stderr('Some files failed to scan properly:', fg='red')
+        for error in top_errors:
+            echo_stderr(error)
+            errors_count += 1
+        for errored_path, errors in path_errors:
+            echo_stderr('Path: ' + errored_path, fg='red')
+            if not verbose:
+                continue
+            for error in errors:
+                for emsg in error.splitlines(False):
+                    echo_stderr('  ' + emsg, fg='red')
+                errors_count += 1
+
+    scanned_size = codebase.summary.get('scanned_size', 0)
+    scan_time = codebase.timings.get('scan', 0.)
+    scan_size_speed = format_size(scanned_size / scan_time)
+    scanned_count = codebase.summary.get('scanned_count', 0)
+    scan_file_speed = round(float(scanned_count) / scan_time , 2)
+    final_size = format_size(final_size)
+
+    echo_stderr('Summary:        %(scan_names)s with %(processes)d process(es)' % locals())
+    echo_stderr('Errors count:   %(errors_count)d' % locals())
+    echo_stderr('Scan Speed:     %(scan_file_speed).2f files/sec. %(scan_size_speed)s/sec.' % locals())
+
+    echo_stderr('Initial counts: %(initial_res_count)d resource(s): '
+                                '%(initial_files_count)d file(s) '
+                                'and %(initial_dirs_count)d directorie(s)' % locals())
+
+    echo_stderr('Final counts:   %(final_res_count)d resource(s): '
+                                '%(final_files_count)d file(s) '
+                                'and %(final_dirs_count)d directorie(s) '
+                                'for %(final_size)s' % locals())
 
+    echo_stderr('Timings:')
+    for key, value, in codebase.timings.items():
+        if value > 0.1:
+            echo_stderr('  %(key)s: %(value).2fs' % locals())
+    # TODO: if timing was requested display per-scan/per-file stats
 
-def get_command_options(ctx, ignores=(), skip_default=False, skip_no_group=False):
+
+def format_size(size):
+    """
+    Return a human-readable value for the `size` int or float.
+
+    For example:
+    >>> format_size(0)
+    u'0 Byte'
+    >>> format_size(1)
+    u'1 Byte'
+    >>> format_size(0.123)
+    u'0.1 Byte'
+    >>> format_size(123)
+    u'123 Bytes'
+    >>> format_size(1023)
+    u'1023 Bytes'
+    >>> format_size(1024)
+    u'1 KB'
+    >>> format_size(2567)
+    u'2.51 KB'
+    >>> format_size(2567000)
+    u'2.45 MB'
+    >>> format_size(1024*1024)
+    u'1 MB'
+    >>> format_size(1024*1024*1024)
+    u'1 GB'
+    >>> format_size(1024*1024*1024*12.3)
+    u'12.30 GB'
+    """
+    if not size:
+        return '0 Byte'
+    if size < 1:
+        return '%(size).1f Byte' % locals()
+    if size == 1:
+        return '%(size)d Byte' % locals()
+    size = float(size)
+    for symbol in ('Bytes', 'KB', 'MB', 'GB', 'TB'):
+        if size < 1024:
+            if int(size) == float(size):
+                return '%(size)d %(symbol)s' % locals()
+            return '%(size).2f %(symbol)s' % locals()
+        size = size / 1024.
+    return '%(size).2f %(symbol)s' % locals()
+
+
+def get_command_options(ctx):
     """
-    Yield CommandOption tuples for each Click option in the `ctx` Click context.
-    Ignore:
-    - eager flags,
-    - Parameter with a "name" listed in the `ignores` sequence
-    - Parameters whose value is the default if `skip_default` is True
-    - Parameters without a group if `skip_no_group` is True
+    Yield CommandOption tuples for each click.Option option in the `ctx` Click
+    context. Ignore eager flags.
     """
     param_values = ctx.params
     for param in ctx.command.params:
-
         if param.is_eager:
             continue
-
-        group = getattr(param, 'group', None)
-        if skip_no_group and not group:
+        if param.name == 'test_mode':
             continue
 
+        help_group = getattr(param, 'help_group', None)
         name = param.name
-        if ignores and name in ignores:
-            continue
-
-        # opts is a list, the last one is the long form by convention
-        option = param.opts[-1]
-
         value = param_values.get(name)
-        # for opened file args that may have a name
-        if value and hasattr(value, 'name'):
-            value = getattr(value, 'name', None)
-
-        default = param.default
-
-        if skip_default and value == default:
-            continue
-
-        yield CommandOption(group, name, option, value, default)
+        yield CommandOption(help_group, name, value, param)
diff --git a/src/scancode/cli_test_utils.py b/src/scancode/cli_test_utils.py
index ddac798bf6d..6f323734408 100644
--- a/src/scancode/cli_test_utils.py
+++ b/src/scancode/cli_test_utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -86,14 +86,18 @@ def run_scan_plain(options, cwd=None):
     """
     Run a scan as a plain subprocess. Return rc, stdout, stderr.
     """
+    from commoncode.command import execute
     import scancode
+
+    if '--test-mode' not in options:
+        options.append('--test-mode')
+
     scmd = b'scancode' if on_linux else 'scancode'
-    from commoncode.command import execute
     scan_cmd = os.path.join(scancode.root_dir, scmd)
     return execute(scan_cmd, options, cwd=cwd)
 
 
-def run_scan_click(options, monkeypatch=None, catch_exceptions=False):
+def run_scan_click(options, monkeypatch=None):
     """
     Run a scan as a Click-controlled subprocess
     If monkeypatch is provided, a tty with a size (80, 43) is mocked.
@@ -103,8 +107,12 @@ def run_scan_click(options, monkeypatch=None, catch_exceptions=False):
     from click.testing import CliRunner
     from scancode import cli
 
+    if '--test-mode' not in options:
+        options.append('--test-mode')
+
     if monkeypatch:
         monkeypatch.setattr(click._termui_impl, 'isatty', lambda _: True)
         monkeypatch.setattr(click , 'get_terminal_size', lambda : (80, 43,))
     runner = CliRunner()
-    return runner.invoke(cli.scancode, options, catch_exceptions=catch_exceptions)
+
+    return runner.invoke(cli.scancode, options, catch_exceptions=False)
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index a6fb06a4be6..72fe7182a53 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -38,6 +38,7 @@
 from os.path import expanduser
 from os.path import join
 from os.path import normpath
+from time import time
 import traceback
 import sys
 
@@ -171,6 +172,8 @@ class Codebase(object):
     Represent a codebase being scanned. A Codebase is a tree of Resources.
     """
 
+    # TODO: add populate progress manager!!!
+
     def __init__(self, location, use_cache=True, cache_base_dir=scans_cache_dir):
         """
         Initialize a new codebase rooted at the `location` existing file or
@@ -180,6 +183,7 @@ def __init__(self, location, use_cache=True, cache_base_dir=scans_cache_dir):
         Resource in a new unique directory under `cache_base_dir`. Otherwise,
         scans are kept as Resource attributes.
         """
+        start = time()
         self.original_location = location
 
         if on_linux:
@@ -207,6 +211,19 @@ def __init__(self, location, use_cache=True, cache_base_dir=scans_cache_dir):
         # unreadable file, etc)
         self.errors = []
 
+        # mapping of scan summary data and statistics at the codebase level such
+        # as ScanCode version, notice, command options, etc.
+        # This is populated automatically as the scan progresses.
+        self.summary = OrderedDict()
+
+        # total processing time from start to finish, across all stages.
+        # This is populated automatically.
+        self.total_time = 0
+
+        # mapping of timings for scan stage as {stage: time in seconds as float}
+        # This is populated automatically.
+        self.timings = OrderedDict()
+
         # setup cache
         self.use_cache = use_cache
         self.cache_base_dir = self.cache_dir = None
@@ -221,10 +238,29 @@ def __init__(self, location, use_cache=True, cache_base_dir=scans_cache_dir):
 
         self.populate()
 
+        self.timings['inventory'] = time() - start
+        files_count, dirs_count = self.resource_counts()
+        self.summary['initial_files_count'] = files_count
+        self.summary['initial_dirs_count'] = dirs_count
+
+        # Flag set to True if file information was requested for results output
+        self.with_info = False
+
+        # Flag set to True is strip root was requested for results output
+        self.strip_root = False
+        # Flag set to True is full root was requested for results output
+        self.full_root = False
+
+        # set of resource rid to exclude from outputs
+        # This is populated automatically.
+        self.filtered_rids = set()
+
+
     def populate(self):
         """
         Populate this codebase with Resource objects for this codebase by
-        walking its `self.location` in topdown order.
+        walking its `location` topdown, returning directories then files, each
+        in sorted order.
         """
         # clear things
         self.resources = []
@@ -270,7 +306,7 @@ def err(error):
 
             if TRACE: logger_debug('Codebase.collect: parent:', parent)
 
-            for name in dirs:
+            for name in sorted(dirs):
                 loc = join(top, name)
 
                 if is_special(loc) or ignored(loc):
@@ -285,7 +321,7 @@ def err(error):
                 resources_append(res)
                 if TRACE: logger_debug('Codebase.collect: dir:', res)
 
-            for name in files:
+            for name in sorted(files):
                 loc = join(top, name)
 
                 if is_special(loc) or ignored(loc):
@@ -395,6 +431,34 @@ def update_counts(self):
         for resource in self.walk(topdown=False):
             resource._update_children_counts()
 
+    def resource_counts(self, resources=None):
+        """
+        Return a tuple of quick counters (files_count, dirs_count) for this
+        codebase or an optional list of resources.
+        """
+        resources = resources or self.resources
+        
+        files_count = 0
+        dirs_count = 0
+        for res in resources:
+            if res is None:
+                continue
+            if res.is_file:
+                files_count += 1
+            else:
+                dirs_count += 1
+        return files_count, dirs_count
+
+    def get_resources_with_rid(self):
+        """
+        Return an iterable of (rid, resource) for all the resources.
+        The order is topdown.
+        """
+        for rid, res in enumerate(self.resources):
+            if res is None:
+                continue
+            yield rid, res
+
     def clear(self):
         """
         Purge the codebase cache(s) by deleting the corresponding cached data
@@ -470,11 +534,16 @@ class Resource(object):
     files_count = attr.ib(default=0, type=int, repr=False)
     dirs_count = attr.ib(default=0, type=int, repr=False)
 
+    # Duration in seconds as float to run all scans for this resource
+    scan_time = attr.ib(default=0, repr=False)
+    # mapping of timings for each scan as {scan_key: duration in seconds as a float}
+    scan_timings = attr.ib(default=None, repr=False)
+
     def __attrs_post_init__(self):
         # build simple cache keys for this resource based on the hex
         # representation of the resource id: they are guaranteed to be unique
         # within a codebase.
-        if self.use_cache is None:
+        if self.use_cache is None and hasattr(self.codebase, 'use_cache'):
             self.use_cache = self.codebase.use_cache
         hx = '%08x' % self.rid
         if on_linux:
@@ -521,7 +590,7 @@ def _children_counts(self):
     @property
     def codebase(self):
         """
-        Return the codebase that contains this Resource.
+        Return this Resource codebase from the global cache.
         """
         return get_codebase(self.cid)
 
@@ -583,6 +652,7 @@ def put_scans(self, scans, update=True):
             if TRACE: logger_debug('put_scans: merged:', self._scans)
             return self._scans
 
+        # from here on we use_cache!
         self._scans.clear()
         cached_path = self._get_cached_path(create=True)
         if update:
@@ -635,7 +705,7 @@ def _walk(self, topdown=True, sort=False):
             children.sort(key=sorter)
 
         for child in children:
-            for subchild in child.walk(topdown, sort):
+            for subchild in child._walk(topdown, sort):
                 yield subchild
 
         if not topdown:
diff --git a/src/scancode/utils.py b/src/scancode/utils.py
index ee2f35c3a8a..b84857353c5 100644
--- a/src/scancode/utils.py
+++ b/src/scancode/utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -225,11 +225,12 @@ def file_name_max_len(used_width=BAR_WIDTH + BAR_SEP_LEN + 7 + BAR_SEP_LEN + 8 +
 def path_progress_message(item, verbose=False, prefix='Scanned: '):
     """
     Return a styled message suitable for progress display when processing a path
-    for an `item` tuple of (location, rid, scan_errors, scan_results)
+    for an `item` tuple of (location, rid, scan_errors, *other items)
     """
     if not item:
         return ''
-    location, _rid, errors, _results = item
+    location = item[0]
+    errors = item[2]
     location = fsdecode(location)
     progress_line = location
     if not verbose:
diff --git a/tests/scancode/data/altpath/copyright.expected.json b/tests/scancode/data/altpath/copyright.expected.json
index f4f9f7c2670..fa922c94bd4 100644
--- a/tests/scancode/data/altpath/copyright.expected.json
+++ b/tests/scancode/data/altpath/copyright.expected.json
@@ -1,8 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
     "--info": true,
+    "--output-json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index f2fc3a014af..2921734880b 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -1,6 +1,8 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
+    "--output-json": "<file>",
     "--package": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/failing/patchelf.expected.json b/tests/scancode/data/failing/patchelf.expected.json
index 55cd16d503d..a106bf717e1 100644
--- a/tests/scancode/data/failing/patchelf.expected.json
+++ b/tests/scancode/data/failing/patchelf.expected.json
@@ -1,7 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
+    "--output-json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
@@ -9,7 +11,7 @@
     {
       "path": "patchelf.pdf",
       "scan_errors": [
-        "ERROR: for scanner: copyrights:\nERROR: Unknown error:\nTraceback (most recent call last):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/scancode/interrupt.py\", line 88, in interruptible\n    return NO_ERROR, func(*(args or ()), **(kwargs or {}))\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/scancode/api.py\", line 70, in get_copyrights\n    for copyrights, authors, _years, holders, start_line, end_line in detect_copyrights(location):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/cluecode/copyrights.py\", line 70, in detect_copyrights\n    for numbered_lines in candidate_lines(analysis.text_lines(location)):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/cluecode/copyrights.py\", line 1269, in candidate_lines\n    for line_number, line in enumerate(lines):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/textcode/analysis.py\", line 125, in unicode_text_lines_from_pdf\n    for line in pdf.get_text_lines(location):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/textcode/pdf.py\", line 57, in get_text_lines\n    interpreter.process_page(page)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 852, in process_page\n    self.render_contents(page.resources, page.contents, ctm=ctm)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 862, in render_contents\n    self.init_resources(resources)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 362, in init_resources\n    self.fontmap[fontid] = self.rsrcmgr.get_font(objid, spec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 212, in get_font\n    font = self.get_font(None, subspec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 203, in get_font\n    font = PDFCIDFont(self, spec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdffont.py\", line 667, in __init__\n    BytesIO(self.fontfile.get_data()))\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdffont.py\", line 386, in __init__\n    (ntables, _1, _2, _3) = struct.unpack('>HHHH', fp.read(8))\nerror: unpack requires a string argument of length 8\n"
+        "ERROR: for scanner: copyrights:\nERROR: Unknown error:\nTraceback (most recent call last):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/scancode/interrupt.py\", line 88, in interruptible\n    return NO_ERROR, func(*(args or ()), **(kwargs or {}))\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/scancode/api.py\", line 59, in get_copyrights\n    for copyrights, authors, _years, holders, start_line, end_line in detect_copyrights(location):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/cluecode/copyrights.py\", line 71, in detect_copyrights\n    for numbered_lines in candidate_lines(analysis.text_lines(location)):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/cluecode/copyrights.py\", line 1270, in candidate_lines\n    for line_number, line in enumerate(lines):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/textcode/analysis.py\", line 125, in unicode_text_lines_from_pdf\n    for line in pdf.get_text_lines(location):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/textcode/pdf.py\", line 57, in get_text_lines\n    interpreter.process_page(page)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 852, in process_page\n    self.render_contents(page.resources, page.contents, ctm=ctm)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 862, in render_contents\n    self.init_resources(resources)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 362, in init_resources\n    self.fontmap[fontid] = self.rsrcmgr.get_font(objid, spec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 212, in get_font\n    font = self.get_font(None, subspec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 203, in get_font\n    font = PDFCIDFont(self, spec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdffont.py\", line 667, in __init__\n    BytesIO(self.fontfile.get_data()))\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdffont.py\", line 386, in __init__\n    (ntables, _1, _2, _3) = struct.unpack('>HHHH', fp.read(8))\nerror: unpack requires a string argument of length 8\n"
       ],
       "copyrights": []
     }
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index ae6f296754d..c8b8f1427c3 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -1,90 +1,111 @@
-Usage: scancode [OPTIONS] <input> <output_file>
+Usage: scancode [OPTIONS] <input> <OUTPUT FORMAT OPTION(s)>
 
   scan the <input> file or directory for license, origin and packages and save
-  results to <output_file(s)>.
+  results to FILE(s) using one or more ouput format option.
 
-  The scan results are printed to stdout if <output_file> is not provided.
   Error and progress is printed to stderr.
 
 Options:
 
-  scans:
-    -c, --copyright              Scan <input> for copyrights. [default]
-    -l, --license                Scan <input> for licenses. [default]
-    -p, --package                Scan <input> for packages. [default]
-    -e, --email                  Scan <input> for emails.
-    -u, --url                    Scan <input> for urls.
-    -i, --info                   Include information such as size, type, etc.
-    --license-score INTEGER      Do not return license matches with scores lower
+  primary scans:
+    -l, --license    Scan <input> for licenses.
+    -p, --package    Scan <input> for packages.
+    -c, --copyright  Scan <input> for copyrights.
+
+  other scans:
+    -i, --info   Scan <input> for file information (size, type, checksums, etc).
+    -e, --email  Scan <input> for emails.
+    -u, --url    Scan <input> for urls.
+
+  scan options:
+    --license-score INTEGER      Do not return license matches with a score lower
                                  than this score. A number between 0 and 100.
                                  [default: 0]
-    --license-text               Include the detected licenses matched text. Has
-                                 no effect unless --license is requested.
+    --license-text               Include the detected licenses matched text.
     --license-url-template TEXT  Set the template URL used for the license
-                                 reference URLs. In a template URL, curly braces
-                                 ({}) are replaced by the license key.  [default: h
-                                 ttps://enterprise.dejacode.com/urn/urn:dje:licens
-                                 e:{}]
-
-  output:
-    --strip-root           Strip the root directory segment of all paths. The
-                           default is to always include the last directory segment
-                           of the scanned path such that all paths have a common
-                           root directory. This cannot be combined with `--full-
-                           root` option.
-    --full-root            Report full, absolute paths. The default is to always
-                           include the last directory segment of the scanned path
-                           such that all paths have a common root directory. This
-                           cannot be combined with the `--strip-root` option.
-    -f, --format <format>  Set <output_file> format to one of: csv, html, html-
-                           app, json, json-pp, jsonlines, spdx-rdf, spdx-tv or use
-                           <format> as the path to a custom template file
-                           [default: json]
-    --verbose              Print verbose file-by-file progress messages.
-    --quiet                Do not print summary or progress messages.
+                                 reference URLs. Curly braces ({}) are replaced by
+                                 the license key.  [default: https://enterprise.de
+                                 jacode.com/urn/urn:dje:license:{}]
+    --license-diag               Include diagnostic information in license scan
+                                 results.
 
-  pre-scan:
-    --ignore <pattern>  Ignore files matching <pattern>.
+  output formats:
+    --json-pp, --output-json-pp FILE
+                                    Write scan output formatted as pretty-printed
+                                    JSON to FILE.
+    --output-spdx-rdf FILE          Write scan output formatted as SPDX RDF to
+                                    FILE. Implies running the --info scan.
+    --output-spdx-tv FILE           Write scan output formatted as SPDX Tag/Value
+                                    to FILE. Implies running the --info scan.
+    --output-html-app FILE          Write scan output formatted as a mini HTML
+                                    application FILE.
+    --output-json-lines FILE        Write scan output formatted as JSON Lines to
+                                    FILE.
+    --json, --output-json FILE      Write scan output formatted as compact JSON to
+                                    FILE.
+    --output-html FILE              Write scan output formatted as HTML to FILE.
+    --output-custom FILE            Write scan output to FILE formatted with the
+                                    custom Jinja template file.
+    --custom-template FILE          Use this Jinja template FILE as a custom
+                                    template.
+    --output-csv FILE               Write scan output formatted as CSV to FILE.
 
-  post-scan:
-    --mark-source    Set the "is_source" flag to true for directories that contain
-                     over 90% of source files as direct children. Has no effect
-                     unless the --info scan is requested.
+  output filters:
     --only-findings  Only return files or directories with findings for the
                      requested scans. Files and directories without findings are
-                     omitted (not considering basic file information as findings).
+                     omitted (file information is not treated as findings).
 
-  misc:
-    --reindex-licenses  Force a check and possible reindexing of the cached
-                        license index.
+  output control:
+    --strip-root  Strip the root directory segment of all paths. The default is to
+                  always include the last directory segment of the scanned path
+                  such that all paths have a common root directory.
+    --full-root   Report full, absolute paths. The default is to always include
+                  the last directory segment of the scanned path such that all
+                  paths have a common root directory.
+
+  pre-scan:
+    --ignore <pattern>  Ignore files matching <pattern>.
+
+  post-scan:
+    --mark-source  Set the "is_source" to true for directories that contain over
+                   90% of source files as children and descendants. Implies
+                   running the --info scan.
 
   core:
-    -h, --help               Show this message and exit.
-    -n, --processes INTEGER  Scan <input> using n parallel processes.  [default:
-                             1]
-    --examples               Show command examples and exit.
-    --about                  Show information about ScanCode and licensing and
-                             exit.
-    --version                Show the version and exit.
-    --diag                   Include additional diagnostic information such as
-                             error messages or result details.
-    --timeout FLOAT          Stop scanning a file if scanning takes longer than a
-                             timeout in seconds.  [default: 120]
-    --no-cache               Do not use on-disk cache for scan results. Faster but
-                             uses more memory.
+    --verbose            Print progress  as file-by-file path instead of a
+                         progress bar. Print a verbose scan summary.
+    --quiet              Do not print summary or progress.
+    -h, --help           Show this message and exit.
+    -n, --processes INT  Set the number of parallel processes to use. Disable
+                         parallel processing if 0.  [default: 1]
+    --examples           Show command examples and exit.
+    --about              Show information about ScanCode and licensing and exit.
+    --version            Show the version and exit.
+    --timeout <seconds>  Stop an unfinished file scan after a timeout in seconds.
+                         [default: 120]
+    --plugins            Print the list of available ScanCode plugins.
+    --no-cache           Do not use on-disk cache for intermediate results. Uses
+                         more memory.
+    --timing             Collect execution timing for each scan and scanned file.
+    --temp-dir DIR       Set the path to the temporary directory to use for
+                         ScanCode cache and temporary files.
+
+  miscellaneous:
+    --test-mode         Run ScanCode in a special "test mode". Only for testing.
+    --reindex-licenses  Check the license index cache and reindex if needed.
 
   Examples (use --examples for more):
 
   Scan the 'samples' directory for licenses and copyrights.
   Save scan results to a JSON file:
 
-      scancode --format json samples scancode_result.json
+      scancode --license --copyright --output-json=scancode_result.json
+      samples
 
-  Scan the 'samples' directory for licenses and copyrights. Save scan results to
-  an HTML app file for interactive web browser results navigation. Additional app
-  files are saved to the 'myscan_files' directory:
+  Scan the 'samples' directory for licenses and package manifests. Print scan
+  results on screen as pretty-formatted JSON:
 
-      scancode --format html-app samples myscan.html
+      scancode --json-pp --license --package  samples
 
   Note: when you run scancode, a progress bar is displayed with a counter of
   the number of files processed. Use --verbose to display file-by-file
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 0be1afecc5c..17db28a3504 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -1,9 +1,11 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
-    "--license": true,
     "--info": true,
+    "--license": true,
+    "--output-json": "<file>",
     "--strip-root": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index 8b99b4b29c3..ada751d2ed2 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -1,9 +1,11 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
-    "--license": true,
     "--email": true,
+    "--license": true,
+    "--output-json": "<file>",
     "--url": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/basic.expected.json b/tests/scancode/data/info/basic.expected.json
index 57135d53fb4..e06865981dd 100644
--- a/tests/scancode/data/info/basic.expected.json
+++ b/tests/scancode/data/info/basic.expected.json
@@ -1,7 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--info": true,
+    "--output-json": "<file>",
     "--strip-root": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/basic.rooted.expected.json b/tests/scancode/data/info/basic.rooted.expected.json
index 819be57697b..d97c0690e64 100644
--- a/tests/scancode/data/info/basic.rooted.expected.json
+++ b/tests/scancode/data/info/basic.rooted.expected.json
@@ -1,7 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--info": true
+    "input": "<path>",
+    "--info": true,
+    "--output-json": "<file>"
   },
   "files_count": 6,
   "files": [
diff --git a/tests/scancode/data/info/email_url_info.expected.json b/tests/scancode/data/info/email_url_info.expected.json
index 62fa81e9689..92dce82e917 100644
--- a/tests/scancode/data/info/email_url_info.expected.json
+++ b/tests/scancode/data/info/email_url_info.expected.json
@@ -1,10 +1,12 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--email": true,
-    "--url": true,
     "--info": true,
-    "--strip-root": true
+    "--strip-root": true,
+    "--output-json": "<file>",
+    "--url": true
   },
   "files_count": 6,
   "files": [
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index 7b7550a664a..f7e2d7b72aa 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -1,8 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--license": true,
     "--license-text": true,
+    "--output-json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/non_utf8/expected-linux.json b/tests/scancode/data/non_utf8/expected-linux.json
index 6e5d76f6f82..adc181a8a18 100644
--- a/tests/scancode/data/non_utf8/expected-linux.json
+++ b/tests/scancode/data/non_utf8/expected-linux.json
@@ -1,7 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--info": true,
+    "--output-json": "<file>",
     "--strip-root": true
   },
   "files_count": 18,
diff --git a/tests/scancode/data/non_utf8/expected-mac.json b/tests/scancode/data/non_utf8/expected-mac.json
index 9ea7d26c4ef..2ab56cfa3cb 100644
--- a/tests/scancode/data/non_utf8/expected-mac.json
+++ b/tests/scancode/data/non_utf8/expected-mac.json
@@ -1,12 +1,12 @@
 {
       "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--info": true,
-    "--format": "json",
-    "--license-score": 0,
+    "--output-json": "<file>",
     "--strip-root": true
   },
-  "files_count": 19,
+  "files_count": 18,
   "files": [
     {
       "path": "non_unicode",
@@ -15,6 +15,7 @@
       "extension": "",
       "file_type": null,
       "files_count": 18,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -36,7 +37,8 @@
       "date": "2017-07-14",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -57,7 +59,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -79,7 +82,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -101,7 +105,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -123,7 +128,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -145,7 +151,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -167,7 +174,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -189,7 +197,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -211,7 +220,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -233,7 +243,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -255,7 +266,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -277,7 +289,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -299,7 +312,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -321,7 +335,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -343,7 +358,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -365,7 +381,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -387,7 +404,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -409,7 +427,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
diff --git a/tests/scancode/data/non_utf8/expected-win.json b/tests/scancode/data/non_utf8/expected-win.json
index b5e12bcd430..295971d6268 100644
--- a/tests/scancode/data/non_utf8/expected-win.json
+++ b/tests/scancode/data/non_utf8/expected-win.json
@@ -1,9 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--format": "json",
+    "input": "<path>",
     "--info": true,
-    "--license-score": 0,
+    "--output-json": "<file>",
     "--strip-root": true
   },
   "files_count": 19,
diff --git a/tests/scancode/data/plugin_mark_source/with_info.expected.json b/tests/scancode/data/plugin_mark_source/with_info.expected.json
index 0ff0e0a09a8..cfe9c6e9fa2 100644
--- a/tests/scancode/data/plugin_mark_source/with_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/with_info.expected.json
@@ -1,8 +1,10 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--info": true,
-    "--mark-source": true
+    "--mark-source": true,
+    "--output-json": "<file>"
   },
   "files_count": 12,
   "files": [
diff --git a/tests/scancode/data/plugin_mark_source/without_info.expected.json b/tests/scancode/data/plugin_mark_source/without_info.expected.json
index e27830c78cc..6c2099eb886 100644
--- a/tests/scancode/data/plugin_mark_source/without_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/without_info.expected.json
@@ -1,542 +1,379 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
-    "--mark-source": true
+    "input": "<path>",
+    "--mark-source": true,
+    "--output-json": "<file>"
   },
   "files_count": 12,
   "files": [
     {
       "path": "JGroups.tgz",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
+      "type": "directory",
+      "name": "JGroups.tgz",
+      "base_name": "JGroups.tgz",
+      "extension": "",
+      "date": null,
+      "size": 206642,
+      "sha1": null,
+      "md5": null,
+      "files_count": 12,
+      "dirs_count": 3,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
+      "type": "directory",
+      "name": "JGroups",
+      "base_name": "JGroups",
+      "extension": "",
+      "date": null,
+      "size": 206642,
+      "sha1": null,
+      "md5": null,
+      "files_count": 12,
+      "dirs_count": 2,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/licenses",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
+      "type": "directory",
+      "name": "licenses",
+      "base_name": "licenses",
+      "extension": "",
+      "date": null,
+      "size": 54552,
+      "sha1": null,
+      "md5": null,
+      "files_count": 5,
+      "dirs_count": 0,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/licenses/apache-1.1.txt",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "apache-1.1",
-          "score": 100.0,
-          "short_name": "Apache 1.1",
-          "category": "Permissive",
-          "owner": "Apache Software Foundation",
-          "homepage_url": "http://www.apache.org/licenses/",
-          "text_url": "http://apache.org/licenses/LICENSE-1.1",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-1.1",
-          "spdx_license_key": "Apache-1.1",
-          "spdx_url": "https://spdx.org/licenses/Apache-1.1",
-          "start_line": 2,
-          "end_line": 56,
-          "matched_rule": {
-            "identifier": "apache-1.1.SPDX.RULE",
-            "license_choice": false,
-            "licenses": [
-              "apache-1.1"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [
-            "Copyright (c) 2000 The Apache Software Foundation."
-          ],
-          "holders": [
-            "The Apache Software Foundation."
-          ],
-          "authors": [],
-          "start_line": 4,
-          "end_line": 5
-        },
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "the Apache Software Foundation"
-          ],
-          "start_line": 20,
-          "end_line": 23
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "apache-1.1.txt",
+      "base_name": "apache-1.1",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 2885,
+      "sha1": "6b5608d35c3e304532af43db8bbfc5947bef46a6",
+      "md5": "276982197c941f4cbf3d218546e17ae2",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with CRLF line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/licenses/apache-2.0.txt",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "apache-2.0",
-          "score": 100.0,
-          "short_name": "Apache 2.0",
-          "category": "Permissive",
-          "owner": "Apache Software Foundation",
-          "homepage_url": "http://www.apache.org/licenses/",
-          "text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
-          "spdx_license_key": "Apache-2.0",
-          "spdx_url": "https://spdx.org/licenses/Apache-2.0",
-          "start_line": 2,
-          "end_line": 202,
-          "matched_rule": {
-            "identifier": "apache-2.0_easyeclipse.RULE",
-            "license_choice": false,
-            "licenses": [
-              "apache-2.0"
-            ]
-          }
-        }
-      ],
-      "copyrights": [],
-      "packages": []
+      "type": "file",
+      "name": "apache-2.0.txt",
+      "base_name": "apache-2.0",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 11560,
+      "sha1": "47b573e3824cd5e02a1a3ae99e2735b49e0256e4",
+      "md5": "d273d63619c9aeaf15cdaf76422c4f87",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with CRLF line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/licenses/bouncycastle.txt",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "mit",
-          "score": 100.0,
-          "short_name": "MIT License",
-          "category": "Permissive",
-          "owner": "MIT",
-          "homepage_url": "http://opensource.org/licenses/mit-license.php",
-          "text_url": "http://opensource.org/licenses/mit-license.php",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:mit",
-          "spdx_license_key": "MIT",
-          "spdx_url": "https://spdx.org/licenses/MIT",
-          "start_line": 7,
-          "end_line": 18,
-          "matched_rule": {
-            "identifier": "mit.LICENSE",
-            "license_choice": false,
-            "licenses": [
-              "mit"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [
-            "Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)"
-          ],
-          "holders": [
-            "Legion Of The Bouncy Castle (http://www.bouncycastle.org)"
-          ],
-          "authors": [],
-          "start_line": 5,
-          "end_line": 5
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "bouncycastle.txt",
+      "base_name": "bouncycastle",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 1186,
+      "sha1": "74facb0e9a734479f9cd893b5be3fe1bf651b760",
+      "md5": "9fffd8de865a5705969f62b128381f85",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/licenses/cpl-1.0.txt",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "cpl-1.0",
-          "score": 99.94,
-          "short_name": "CPL 1.0",
-          "category": "Copyleft Limited",
-          "owner": "IBM",
-          "homepage_url": "http://www.eclipse.org/legal/cpl-v10.html",
-          "text_url": "http://www.eclipse.org/legal/cpl-v10.html",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:cpl-1.0",
-          "spdx_license_key": "CPL-1.0",
-          "spdx_url": "https://spdx.org/licenses/CPL-1.0",
-          "start_line": 1,
-          "end_line": 212,
-          "matched_rule": {
-            "identifier": "cpl-1.0.SPDX.RULE",
-            "license_choice": false,
-            "licenses": [
-              "cpl-1.0"
-            ]
-          }
-        }
-      ],
-      "copyrights": [],
-      "packages": []
+      "type": "file",
+      "name": "cpl-1.0.txt",
+      "base_name": "cpl-1.0",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 11987,
+      "sha1": "681cf776bcd79752543d42490ec7ed22a29fd888",
+      "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with CRLF line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/licenses/lgpl.txt",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "lgpl-2.1-plus",
-          "score": 100.0,
-          "short_name": "LGPL 2.1 or later",
-          "category": "Copyleft Limited",
-          "owner": "Free Software Foundation (FSF)",
-          "homepage_url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
-          "text_url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:lgpl-2.1-plus",
-          "spdx_license_key": "LGPL-2.1+",
-          "spdx_url": "https://spdx.org/licenses/LGPL-2.1",
-          "start_line": 1,
-          "end_line": 502,
-          "matched_rule": {
-            "identifier": "lgpl-2.1-plus_2.RULE",
-            "license_choice": false,
-            "licenses": [
-              "lgpl-2.1-plus"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [
-            "Copyright (c) 1991, 1999 Free Software Foundation, Inc."
-          ],
-          "holders": [
-            "Free Software Foundation, Inc."
-          ],
-          "authors": [],
-          "start_line": 4,
-          "end_line": 7
-        },
-        {
-          "statements": [
-            "copyrighted by the Free Software Foundation"
-          ],
-          "holders": [
-            "the Free Software Foundation"
-          ],
-          "authors": [],
-          "start_line": 427,
-          "end_line": 433
-        },
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "James Random Hacker."
-          ],
-          "start_line": 496,
-          "end_line": 497
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "lgpl.txt",
+      "base_name": "lgpl",
+      "extension": ".txt",
+      "date": "2017-08-05",
+      "size": 26934,
+      "sha1": "8f1a637d2e2ed1bdb9eb01a7dccb5c12cc0557e1",
+      "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with CRLF line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/src",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [],
-      "packages": []
+      "type": "directory",
+      "name": "src",
+      "base_name": "src",
+      "extension": "",
+      "date": null,
+      "size": 152090,
+      "sha1": null,
+      "md5": null,
+      "files_count": 7,
+      "dirs_count": 0,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/src/FixedMembershipToken.java",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "lgpl-2.1-plus",
-          "score": 100.0,
-          "short_name": "LGPL 2.1 or later",
-          "category": "Copyleft Limited",
-          "owner": "Free Software Foundation (FSF)",
-          "homepage_url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
-          "text_url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:lgpl-2.1-plus",
-          "spdx_license_key": "LGPL-2.1+",
-          "spdx_url": "https://spdx.org/licenses/LGPL-2.1",
-          "start_line": 7,
-          "end_line": 20,
-          "matched_rule": {
-            "identifier": "lgpl-2.1-plus_59.RULE",
-            "license_choice": false,
-            "licenses": [
-              "lgpl-2.1-plus"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [
-            "Copyright 2005, JBoss Inc."
-          ],
-          "holders": [
-            "JBoss Inc."
-          ],
-          "authors": [],
-          "start_line": 2,
-          "end_line": 5
-        },
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "Chris Mills (millsy@jboss.com)"
-          ],
-          "start_line": 51,
-          "end_line": 51
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "FixedMembershipToken.java",
+      "base_name": "FixedMembershipToken",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 5144,
+      "sha1": "5901f73dcc78155a1a2c7b5663a3a11fba400b19",
+      "md5": "aca9640ec8beee21b098bcf8ecc91442",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/src/GuardedBy.java",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "cc-by-2.5",
-          "score": 70.0,
-          "short_name": "CC-BY-2.5",
-          "category": "Permissive",
-          "owner": "Creative Commons",
-          "homepage_url": "http://creativecommons.org/licenses/by/2.5/",
-          "text_url": "http://creativecommons.org/licenses/by/2.5/legalcode",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:cc-by-2.5",
-          "spdx_license_key": "CC-BY-2.5",
-          "spdx_url": "https://spdx.org/licenses/CC-BY-2.5",
-          "start_line": 10,
-          "end_line": 11,
-          "matched_rule": {
-            "identifier": "cc-by-2.5_4.RULE",
-            "license_choice": false,
-            "licenses": [
-              "cc-by-2.5"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [
-            "Copyright (c) 2005 Brian Goetz and Tim Peierls"
-          ],
-          "holders": [
-            "Brian Goetz and Tim Peierls"
-          ],
-          "authors": [],
-          "start_line": 9,
-          "end_line": 12
-        },
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "Bela Ban"
-          ],
-          "start_line": 14,
-          "end_line": 17
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "GuardedBy.java",
+      "base_name": "GuardedBy",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 813,
+      "sha1": "981d67087e65e9a44957c026d4b10817cf77d966",
+      "md5": "c5064400f759d3e81771005051d17dc1",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/src/ImmutableReference.java",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "lgpl-2.1-plus",
-          "score": 100.0,
-          "short_name": "LGPL 2.1 or later",
-          "category": "Copyleft Limited",
-          "owner": "Free Software Foundation (FSF)",
-          "homepage_url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
-          "text_url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:lgpl-2.1-plus",
-          "spdx_license_key": "LGPL-2.1+",
-          "spdx_url": "https://spdx.org/licenses/LGPL-2.1",
-          "start_line": 7,
-          "end_line": 20,
-          "matched_rule": {
-            "identifier": "lgpl-2.1-plus_59.RULE",
-            "license_choice": false,
-            "licenses": [
-              "lgpl-2.1-plus"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [
-            "Copyright 2010, Red Hat, Inc."
-          ],
-          "holders": [
-            "Red Hat, Inc."
-          ],
-          "authors": [],
-          "start_line": 2,
-          "end_line": 5
-        },
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "Brian Stansberry"
-          ],
-          "start_line": 29,
-          "end_line": 29
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "ImmutableReference.java",
+      "base_name": "ImmutableReference",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 1838,
+      "sha1": "30f56b876d5576d9869e2c5c509b08db57110592",
+      "md5": "48ca3c72fb9a65c771a321222f118b88",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/src/RATE_LIMITER.java",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "Bela Ban"
-          ],
-          "start_line": 14,
-          "end_line": 17
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "RATE_LIMITER.java",
+      "base_name": "RATE_LIMITER",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 3692,
+      "sha1": "a8087e5d50da3273536ebda9b87b77aa4ff55deb",
+      "md5": "4626bdbc48871b55513e1a12991c61a8",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/src/RouterStub.java",
-      "scan_errors": [],
-      "licenses": [],
-      "copyrights": [
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "Bela Ban"
-          ],
-          "start_line": 22,
-          "end_line": 24
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "RouterStub.java",
+      "base_name": "RouterStub",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 9913,
+      "sha1": "c1f6818f8ee7bddcc9f444bc94c099729d716d52",
+      "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/src/RouterStubManager.java",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "lgpl-2.1-plus",
-          "score": 100.0,
-          "short_name": "LGPL 2.1 or later",
-          "category": "Copyleft Limited",
-          "owner": "Free Software Foundation (FSF)",
-          "homepage_url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
-          "text_url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:lgpl-2.1-plus",
-          "spdx_license_key": "LGPL-2.1+",
-          "spdx_url": "https://spdx.org/licenses/LGPL-2.1",
-          "start_line": 7,
-          "end_line": 20,
-          "matched_rule": {
-            "identifier": "lgpl-2.1-plus_59.RULE",
-            "license_choice": false,
-            "licenses": [
-              "lgpl-2.1-plus"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [
-            "Copyright 2009, Red Hat Middleware LLC"
-          ],
-          "holders": [
-            "Red Hat Middleware LLC"
-          ],
-          "authors": [],
-          "start_line": 2,
-          "end_line": 5
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "RouterStubManager.java",
+      "base_name": "RouterStubManager",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 8162,
+      "sha1": "eb419dc94cfe11ca318a3e743a7f9f080e70c751",
+      "md5": "20bee9631b7c82a45c250e095352aec7",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "JGroups.tgz/JGroups/src/S3_PING.java",
-      "scan_errors": [],
-      "licenses": [
-        {
-          "key": "public-domain",
-          "score": 10.0,
-          "short_name": "Public Domain",
-          "category": "Public Domain",
-          "owner": "Unspecified",
-          "homepage_url": "http://www.linfo.org/publicdomain.html",
-          "text_url": "",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:public-domain",
-          "spdx_license_key": "",
-          "spdx_url": "",
-          "start_line": 1649,
-          "end_line": 1649,
-          "matched_rule": {
-            "identifier": "public-domain.LICENSE",
-            "license_choice": false,
-            "licenses": [
-              "public-domain"
-            ]
-          }
-        },
-        {
-          "key": "public-domain",
-          "score": 10.0,
-          "short_name": "Public Domain",
-          "category": "Public Domain",
-          "owner": "Unspecified",
-          "homepage_url": "http://www.linfo.org/publicdomain.html",
-          "text_url": "",
-          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:public-domain",
-          "spdx_license_key": "",
-          "spdx_url": "",
-          "start_line": 1692,
-          "end_line": 1692,
-          "matched_rule": {
-            "identifier": "public-domain.LICENSE",
-            "license_choice": false,
-            "licenses": [
-              "public-domain"
-            ]
-          }
-        }
-      ],
-      "copyrights": [
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "Bela Ban"
-          ],
-          "start_line": 35,
-          "end_line": 38
-        },
-        {
-          "statements": [],
-          "holders": [],
-          "authors": [
-            "Robert Harder",
-            "rob@iharder.net"
-          ],
-          "start_line": 1697,
-          "end_line": 1700
-        }
-      ],
-      "packages": []
+      "type": "file",
+      "name": "S3_PING.java",
+      "base_name": "S3_PING",
+      "extension": ".java",
+      "date": "2017-08-05",
+      "size": 122528,
+      "sha1": "08dba9986f69719970ead3592dc565465164df0d",
+      "md5": "83d8324f37d0e3f120bc89865cf0bd39",
+      "files_count": 0,
+      "dirs_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "Java",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
index f6d11cd19f2..0f3412c0a0f 100644
--- a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
+++ b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
@@ -1,6 +1,8 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
+    "--output-json": "<file>",
     "--package": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/single/iproute.expected.json b/tests/scancode/data/single/iproute.expected.json
index abc79d7e830..1a6b66f37dd 100644
--- a/tests/scancode/data/single/iproute.expected.json
+++ b/tests/scancode/data/single/iproute.expected.json
@@ -1,7 +1,9 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--info": true,
+    "--output-json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
index e2e088ffed8..daf9814ef0b 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
@@ -1,13 +1,15 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
-    "--license": true,
-    "--package": true,
     "--email": true,
-    "--url": true,
     "--info": true,
-    "--strip-root": true
+    "--license": true,
+    "--output-json": "<file>",
+    "--package": true,
+    "--strip-root": true,
+    "--url": true
   },
   "files_count": 3,
   "files": [
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
index 2148ad88e03..b1d52686b84 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
@@ -1,17 +1,17 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
-    "--license": true,
-    "--package": true,
     "--email": true,
-    "--url": true,
     "--info": true,
-    "--license-score": 0,
+    "--license": true,
+    "--output-json": "<file>",
+    "--package": true,
     "--strip-root": true,
-    "--format": "json"
+    "--url": true
   },
-  "files_count": 4,
+  "files_count": 3,
   "files": [
     {
       "path": "unicodepath",
@@ -24,6 +24,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 3,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -50,7 +51,8 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -77,7 +79,8 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -104,7 +107,8 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
index 82ba666dcbb..4000f1303ab 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-win.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
@@ -1,17 +1,17 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
-    "--license": true,
-    "--package": true,
     "--email": true,
-    "--url": true,
     "--info": true,
-    "--license-score": 0,
+    "--license": true,
+    "--output-json": "<file>",
+    "--package": true,
     "--strip-root": true,
-    "--format": "json"
+    "--url": true
   },
-  "files_count": 4,
+  "files_count": 3,
   "files": [
     {
       "path": "unicodepath",
@@ -23,6 +23,7 @@
       "sha1": null,
       "md5": null,
       "files_count": 3,
+      "dirs_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -48,7 +49,8 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -74,7 +76,8 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -100,7 +103,8 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
diff --git a/tests/scancode/data/weird_file_name/expected-linux.json b/tests/scancode/data/weird_file_name/expected-linux.json
index 938fff328ec..e315afbb629 100644
--- a/tests/scancode/data/weird_file_name/expected-linux.json
+++ b/tests/scancode/data/weird_file_name/expected-linux.json
@@ -1,11 +1,13 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
     "--info": true,
+    "--output-json": "<file>",
     "--strip-root": true
   },
-  "files_count": 0,
+  "files_count": 5,
   "files": [
     {
       "path": "some 'file",
diff --git a/tests/scancode/data/weird_file_name/expected-mac.json b/tests/scancode/data/weird_file_name/expected-mac.json
index ee28dbb6552..5603b9a0dce 100644
--- a/tests/scancode/data/weird_file_name/expected-mac.json
+++ b/tests/scancode/data/weird_file_name/expected-mac.json
@@ -1,11 +1,11 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--output-json": "<file>",
+    "--strip-root": true
   },
   "files_count": 5,
   "files": [
@@ -19,7 +19,8 @@
       "size": 20,
       "sha1": "715037088f2582f3fbb7e9492f819987f713a332",
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -42,7 +43,8 @@
       "size": 21,
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -65,7 +67,8 @@
       "size": 38,
       "sha1": "5fbba80b758b93a311369979d8a68f22c4817d37",
       "md5": "41ac81497162f2ff48a0442847238ad7",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "a /usr/bin/env node script, ASCII text executable",
       "programming_language": null,
@@ -88,7 +91,8 @@
       "size": 39,
       "sha1": "b2016984d073f405f9788fbf6ae270b452ab73b0",
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/plain",
       "file_type": "a /usr/bin/env node script, ASCII text executable",
       "programming_language": null,
@@ -111,7 +115,8 @@
       "size": 21,
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
diff --git a/tests/scancode/data/weird_file_name/expected-win.json b/tests/scancode/data/weird_file_name/expected-win.json
index 4c28553bf3d..9e973dea37b 100644
--- a/tests/scancode/data/weird_file_name/expected-win.json
+++ b/tests/scancode/data/weird_file_name/expected-win.json
@@ -1,11 +1,11 @@
 {
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
+    "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--license-score": 0,
-    "--strip-root": true,
-    "--format": "json"
+    "--output-json": "<file>",
+    "--strip-root": true
   },
   "files_count": 5,
   "files": [
@@ -18,7 +18,8 @@
       "size": 39,
       "sha1": "b2016984d073f405f9788fbf6ae270b452ab73b0",
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -40,7 +41,8 @@
       "size": 20,
       "sha1": "715037088f2582f3fbb7e9492f819987f713a332",
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -62,7 +64,8 @@
       "size": 21,
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -84,7 +87,8 @@
       "size": 38,
       "sha1": "5fbba80b758b93a311369979d8a68f22c4817d37",
       "md5": "41ac81497162f2ff48a0442847238ad7",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -106,7 +110,8 @@
       "size": 21,
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index af9b207ca8d..55b38b19211 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -47,6 +47,9 @@
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import run_scan_plain
 
+from plugincode import output
+output._TEST_MODE = True
+
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -205,7 +208,7 @@ def test_scan_info_license_copyrights():
 def test_scan_license_with_url_template():
     test_dir = test_env.get_test_loc('license_url', copy=True)
 
-    result = run_scan_click(['--license', '--license-url-template', 'https://example.com/urn:{}', test_dir])
+    result = run_scan_click(['--license', '--license-url-template', 'https://example.com/urn:{}', test_dir, '--json', '-'])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     assert 'https://example.com/urn:apache-1.0' in result.output
@@ -272,16 +275,17 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.html')
 
-    result = run_scan_click([ '--copyright', test_file , '--format-html', result_file])
-    assert result.exit_code == 1
+    result = run_scan_click([ '--copyright', test_file , '--output-html', result_file])
+    print(result.output)
     assert 'Scanning done' in result.output
+    assert result.exit_code == 1
 
 
 def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_errors_and_keep_trucking_with_html_app():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.app.html')
 
-    result = run_scan_click([ '--copyright',  test_file, '--format-html-app',result_file])
+    result = run_scan_click([ '--copyright', test_file, '--output-html-app', result_file])
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
 
@@ -291,11 +295,11 @@ def test_scan_works_with_multiple_processes():
 
     # run the same scan with one or three processes
     result_file_1 = test_env.get_temp_file('json')
-    result1 = run_scan_click([ '--copyright', '--processes', '1', '--format', 'json', test_dir, result_file_1])
+    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--output-json', result_file_1])
     assert result1.exit_code == 0
 
     result_file_3 = test_env.get_temp_file('json')
-    result3 = run_scan_click([ '--copyright', '--processes', '3', '--format', 'json', test_dir, result_file_3])
+    result3 = run_scan_click([ '--copyright', '--processes', '3', test_dir, '--output-json', result_file_3])
     assert result3.exit_code == 0
     res1 = json.loads(open(result_file_1).read())
     res3 = json.loads(open(result_file_3).read())
@@ -307,12 +311,12 @@ def test_scan_works_with_no_processes_in_single_threaded_mode():
 
     # run the same scan with zero or one process
     result_file_0 = test_env.get_temp_file('json')
-    result0 = run_scan_click([ '--copyright', '--processes', '0', '--format', 'json', test_dir, result_file_0])
+    result0 = run_scan_click([ '--copyright', '--processes', '0', test_dir, '--output-json', result_file_0])
     assert result0.exit_code == 0
-    assert 'Disabling multi-processing and multi-threading...' in result0.output
+    assert 'Disabling multi-processing.' in result0.output
 
     result_file_1 = test_env.get_temp_file('json')
-    result1 = run_scan_click([ '--copyright', '--processes', '1', '--format', 'json', test_dir, result_file_1])
+    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--output-json', result_file_1])
     assert result1.exit_code == 0
     res0 = json.loads(open(result_file_0).read())
     res1 = json.loads(open(result_file_1).read())
@@ -335,7 +339,7 @@ def test_scan_works_with_multiple_processes_and_timeouts():
     result = run_scan_click(
         [ '--copyright', '--processes', '2',
          '--timeout', '0.000001',
-         '--strip-root', '--format', 'json', test_dir, '--json', result_file],
+         '--strip-root', test_dir, '--json', result_file],
     )
 
     assert result.exit_code == 1
@@ -343,24 +347,19 @@ def test_scan_works_with_multiple_processes_and_timeouts():
     expected = [
         [(u'path', u'test1.txt'),
          (u'scan_errors',
-            [u'ERROR: for scanner: infos:\nERROR: Processing interrupted: timeout after 0 seconds.',
-             u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
+          [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
          (u'copyrights', [])
         ],
-
         [(u'path', u'test2.txt'),
          (u'scan_errors',
-            [u'ERROR: for scanner: infos:\nERROR: Processing interrupted: timeout after 0 seconds.',
-             u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
+          [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
          (u'copyrights', [])
         ],
-
         [(u'path', u'test3.txt'),
          (u'scan_errors',
-            [u'ERROR: for scanner: infos:\nERROR: Processing interrupted: timeout after 0 seconds.',
-             u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
+          [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
          (u'copyrights', [])
-        ]
+        ],
     ]
 
     result_json = json.loads(open(result_file).read(), object_pairs_hook=OrderedDict)
@@ -412,9 +411,9 @@ def test_scan_does_not_fail_when_scanning_unicode_test_files_from_express():
     test_dir = fsencode(test_dir)
 
     args = ['-n0', '--info', '--license', '--copyright',
-            '--package', '--email', '--url', '--strip-root',
+            '--package', '--email', '--url', '--strip-root', '--json', '-',
             test_dir]
-    result = run_scan_click(args, catch_exceptions=False)
+    result = run_scan_click(args)
     if result.exit_code != 0:
         raise Exception(result.output, args)
     assert 'Scanning done' in result.output
@@ -431,34 +430,34 @@ def test_scan_can_handle_licenses_with_unicode_metadata():
 
 def test_scan_quiet_to_file_does_not_echo_anything():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
-    result1_file = test_env.get_temp_file('json')
+    result_file = test_env.get_temp_file('json')
 
-    result1 = run_scan_click(['--quiet', '--info', test_dir, result1_file])
-    assert result1.exit_code == 0
-    assert not result1.output
+    result = run_scan_click(['--quiet', '--info', test_dir, '--json', result_file])
+    assert not result.output
+    assert result.exit_code == 0
 
 
 def test_scan_quiet_to_stdout_only_echoes_json_results():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
-    result1_file = test_env.get_temp_file('json')
+    result_file = test_env.get_temp_file('json')
 
-    result1 = run_scan_click(['--quiet', '--info', test_dir, result1_file])
-    assert result1.exit_code == 0
-    assert not result1.output
+    result_to_file = run_scan_click(['--quiet', '--info', test_dir, '--json-pp', result_file])
+    assert result_to_file.exit_code == 0
+    assert not result_to_file.output
 
     # also test with an output of JSON to stdout
-    result2 = run_scan_click(['--quiet', '--info', test_dir])
-    assert result2.exit_code == 0
+    result_to_stdout = run_scan_click(['--quiet', '--info', test_dir, '--json-pp', '-'])
+    assert result_to_stdout.exit_code == 0
 
     # outputs to file or stdout should be identical
-    result1_output = open(result1_file).read()
-    assert result1_output == result2.output
+    result1_output = open(result_file).read()
+    assert result1_output == result_to_stdout.output
 
 
-def test_scan_verbose_does_not_echo_ansi_escapes():
+def test_scan_verbose_to_stdout_does_not_echo_ansi_escapes():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
 
-    result = run_scan_click(['--verbose', '--info', test_dir])
+    result = run_scan_click(['--verbose', '--info', test_dir, '--json', '-'])
     assert result.exit_code == 0
     assert '[?' not in result.output
 
@@ -543,7 +542,7 @@ def test_scan_can_run_from_other_directory():
 
 def test_scan_logs_errors_messages_not_verbosely_on_stderr():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', '-n', '0', test_file])
+    rc, stdout, stderr = run_scan_plain(['-pi', '-n', '0', test_file, '--json', '-'])
     assert rc == 1
     assert 'Path: errors/package.json' in stderr
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
@@ -552,7 +551,7 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr():
 
 def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', '-n', '2', test_file])
+    rc, stdout, stderr = run_scan_plain(['-pi', '-n', '2', test_file, '--json', '-'])
     assert rc == 1
     assert 'Path: errors/package.json' in stderr
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
@@ -561,7 +560,7 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing(
 
 def test_scan_logs_errors_messages_verbosely_with_verbose():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', '--verbose', '-n', '0', test_file, ])
+    rc, stdout, stderr = run_scan_plain(['-pi', '--verbose', '-n', '0', test_file, '--json', '-'])
     assert rc == 1
     assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout
@@ -571,7 +570,7 @@ def test_scan_logs_errors_messages_verbosely_with_verbose():
 
 def test_scan_logs_errors_messages_verbosely_with_verbose_and_multiprocessing():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', '--verbose', '-n', '2', test_file, ])
+    rc, stdout, stderr = run_scan_plain(['-pi', '--verbose', '-n', '2', test_file, '--json', '-'])
     assert rc == 1
     assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout
diff --git a/tests/scancode/test_extract_cli.py b/tests/scancode/test_extract_cli.py
index faf5f886e40..5b0ffca8154 100644
--- a/tests/scancode/test_extract_cli.py
+++ b/tests/scancode/test_extract_cli.py
@@ -191,7 +191,7 @@ def test_extractcode_command_can_extract_archive_with_unicode_names_verbose(monk
     if on_linux:
         test_dir = fsencode(test_dir)
     runner = CliRunner()
-    result = runner.invoke(extract_cli.extractcode, ['--verbose', test_dir], catch_exceptions=False)
+    result = runner.invoke(extract_cli.extractcode, ['--verbose', test_dir])
     assert result.exit_code == 0
 
     assert 'Sanders' in result.output
@@ -216,7 +216,7 @@ def test_extractcode_command_can_extract_archive_with_unicode_names(monkeypatch)
     if on_linux:
         test_dir = fsencode(test_dir)
     runner = CliRunner()
-    result = runner.invoke(extract_cli.extractcode, [test_dir], catch_exceptions=False)
+    result = runner.invoke(extract_cli.extractcode, [test_dir])
     assert result.exit_code == 0
 
     uni_arch = b'unicodepath.tgz' if on_linux else 'unicodepath.tgz'
diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
index 5e570e9252f..624572ecd3b 100644
--- a/tests/scancode/test_plugin_ignore.py
+++ b/tests/scancode/test_plugin_ignore.py
@@ -36,6 +36,9 @@
 from scancode.cli_test_utils import _load_json_result
 from scancode.resource import Codebase
 
+from plugincode import output
+output._TEST_MODE = True
+
 
 class TestPluginIgnoreFiles(FileDrivenTesting):
 
@@ -68,8 +71,7 @@ def test_is_ignored_glob_file(self):
 
     def test_ProcessIgnore_with_single_file(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(help_group=None, name='ignore', option='--ignore',
-                               value=('sample.doc',), pretty_value=None)
+        option = CommandOption(help_group=None, name='ignore', value=('sample.doc',), param=None)
         test_plugin = ProcessIgnore([option])
         expected = [
             'user',
@@ -87,8 +89,7 @@ def test_ProcessIgnore_with_single_file(self):
 
     def test_ProcessIgnore_with_multiple_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(help_group=None, name='ignore', option='--ignore',
-                               value=('ignore.doc', 'sample.doc',), pretty_value=None)
+        option = CommandOption(help_group=None, name='ignore', value=('ignore.doc', 'sample.doc',), param=None)
         test_plugin = ProcessIgnore([option])
         expected = [
             'user',
@@ -104,8 +105,7 @@ def test_ProcessIgnore_with_multiple_files(self):
 
     def test_ProcessIgnore_with_glob_for_extension(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(help_group=None, name='ignore', option='--ignore',
-                               value=('*.doc',), pretty_value=None)
+        option = CommandOption(help_group=None, name='ignore', value=('*.doc',), param=None)
         test_plugin = ProcessIgnore([option])
 
         expected = [
@@ -122,8 +122,7 @@ def test_ProcessIgnore_with_glob_for_extension(self):
 
     def test_ProcessIgnore_with_glob_for_path(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(help_group=None, name='ignore', option='--ignore',
-                               value=('*/src/test',), pretty_value=None)
+        option = CommandOption(help_group=None, name='ignore', value=('*/src/test',), param=None)
         test_plugin = ProcessIgnore([option])
 
         expected = [
@@ -141,10 +140,8 @@ def test_ProcessIgnore_with_glob_for_path(self):
     def test_ProcessIgnore_with_multiple_plugins(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         test_plugins = [
-            ProcessIgnore([CommandOption(help_group=None, name='ignore', option='--ignore',
-                               value=('*.doc',), pretty_value=None)]),
-            ProcessIgnore([CommandOption(help_group=None, name='ignore', option='--ignore',
-                               value=('*/src/test/*',), pretty_value=None)]),
+            ProcessIgnore([CommandOption(help_group=None, name='ignore', value=('*.doc',), param=None)]),
+            ProcessIgnore([CommandOption(help_group=None, name='ignore', value=('*/src/test/*',), param=None)]),
         ]
 
         expected = [
@@ -169,7 +166,7 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
         test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', test_dir, result_file])
+        result = run_scan_click(['--copyright', '--strip-root', test_dir, '--output-json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         # a single test.tst file and its directory that is not a VCS file should be listed
@@ -179,8 +176,7 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
     def test_scancode_ignore_vcs_files_and_dirs_by_default_no_multiprocess(self):
         test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
         result_file = self.get_temp_file('json')
-        result = run_scan_click(['--copyright', '--strip-root', '--processes', '0', test_dir, result_file],
-            catch_exceptions=False)
+        result = run_scan_click(['--copyright', '--strip-root', '--processes', '0', test_dir, '--output-json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         # a single test.tst file and its directory that is not a VCS file should be listed
@@ -193,7 +189,7 @@ def test_scancode_ignore_single_file(self):
         result_file = self.get_temp_file('json')
 
         result = run_scan_click(
-            ['--copyright', '--strip-root', '--ignore', 'sample.doc', test_dir, result_file])
+            ['--copyright', '--strip-root', '--ignore', 'sample.doc', test_dir, '--output-json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 3 == scan_result['files_count']
@@ -213,7 +209,7 @@ def test_scancode_ignore_multiple_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', 'ignore.doc', test_dir, result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', 'ignore.doc', test_dir, '--output-json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 2 == scan_result['files_count']
@@ -224,7 +220,7 @@ def test_scancode_ignore_glob_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*.doc', test_dir, result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*.doc', test_dir, '--output-json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 1 == scan_result['files_count']
@@ -235,7 +231,7 @@ def test_scancode_ignore_glob_path(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test/*', test_dir, result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test/*', test_dir, '--output-json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 2 == scan_result['files_count']
@@ -246,7 +242,7 @@ def test_scancode_multiple_ignores(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test', '--ignore', '*.doc', test_dir, result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test', '--ignore', '*.doc', test_dir, '--output-json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 0 == scan_result['files_count']
diff --git a/tests/scancode/test_plugin_mark_source.py b/tests/scancode/test_plugin_mark_source.py
index 86a4c442ca6..2fbd64f172c 100644
--- a/tests/scancode/test_plugin_mark_source.py
+++ b/tests/scancode/test_plugin_mark_source.py
@@ -33,6 +33,9 @@
 from scancode.cli_test_utils import run_scan_click
 from scancode.plugin_mark_source import is_source_directory
 
+from plugincode import output
+output._TEST_MODE = True
+
 
 class TestMarkSource(FileDrivenTesting):
 
@@ -53,7 +56,7 @@ def test_scan_mark_source_without_info(self):
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_mark_source/without_info.expected.json')
 
-        _result = run_scan_click(['--mark-source', test_dir, result_file])
+        _result = run_scan_click(['--mark-source', test_dir, '--output-json', result_file])
         check_json_scan(expected_file, result_file, regen=False)
 
     def test_scan_mark_source_with_info(self):
@@ -61,5 +64,5 @@ def test_scan_mark_source_with_info(self):
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_mark_source/with_info.expected.json')
 
-        _result = run_scan_click(['--info', '--mark-source', test_dir, result_file])
+        _result = run_scan_click(['--info', '--mark-source', test_dir, '--output-json', result_file])
         check_json_scan(expected_file, result_file)

From 72bfdbd5f5604dd71f13d04174da31dbb1ec7d1e Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 18 Jan 2018 16:51:13 +0100
Subject: [PATCH 052/122] Fix typo in configure message

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/configure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/configure.py b/etc/configure.py
index 44cada3448a..7d5bb6448f0 100644
--- a/etc/configure.py
+++ b/etc/configure.py
@@ -213,7 +213,7 @@ def create_virtualenv(std_python, root_dir, tpp_dirs, quiet=False):
 
 def activate(root_dir):
     """ Activate a virtualenv in the current process."""
-    print("* Activating ...")
+    #print("* Activating...")
     bin_dir = os.path.join(root_dir, 'bin')
     activate_this = os.path.join(bin_dir, 'activate_this.py')
     with open(activate_this) as f:

From f66f13d27b904a6a5633cc9f4db9b70317fb00d8 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 18 Jan 2018 16:51:59 +0100
Subject: [PATCH 053/122] Update release script output options #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/release/release.sh | 43 ++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/etc/release/release.sh b/etc/release/release.sh
index 2e8684d6fe7..a4f03caf795 100755
--- a/etc/release/release.sh
+++ b/etc/release/release.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2017 nexB Inc. http://www.nexb.com/ - All rights reserved.
+# Copyright (c) 2018 nexB Inc. http://www.nexb.com/ - All rights reserved.
 #
 
 # ScanCode release script
@@ -52,17 +52,36 @@ function test_scan {
             # this is needed for the zip
             chmod o+x scancode extractcode
 
-            # minimal test: update when new scans are available
-            ./scancode --quiet -lcip apache-2.0.LICENSE test_scan.json
-            echo "TEST JSON passed: ./scancode --quiet -lcip apache-2.0.LICENSE test_scan.json"
-            ./scancode --quiet -lcip --format json-pp apache-2.0.LICENSE test_scan.json
-            echo "TEST JSON-PP passed: ./scancode --quiet -lcip --format json-pp apache-2.0.LICENSE test_scan.json"
-            ./scancode --quiet -lcip --format html apache-2.0.LICENSE test_scan.html
-            echo "TEST HTML passed: ./scancode --quiet -lcip --format html apache-2.0.LICENSE test_scan.html"
-            ./scancode --quiet -lcip --format html-app apache-2.0.LICENSE test_scan_app.html
-            echo "TEST HTML-APP passed: ./scancode --quiet -lcip --format html-app apache-2.0.LICENSE test_scan_app.html"
-            ./extractcode --quiet samples/arch
-            echo "TEST EXTRACTCODE passed: ./extractcode --quiet samples/arch"
+            # minimal tests: update when new scans are available
+            cmd="./scancode --quiet -lcip apache-2.0.LICENSE --json test_scan.json"
+            echo "RUNNING TEST: $cmd"
+            $cmd
+            echo "TEST PASSED"
+
+            cmd="./scancode --quiet -lcip  apache-2.0.LICENSE --json-pp test_scan.json"
+            echo "RUNNING TEST: $cmd"
+            $cmd
+            echo "TEST PASSED"
+
+            cmd="./scancode --quiet -lcip apache-2.0.LICENSE --output-html test_scan.html"
+            echo "RUNNING TEST: $cmd"
+            $cmd
+            echo "TEST PASSED"
+
+            cmd="./scancode --quiet -lcip  apache-2.0.LICENSE --output-html-app test_scan_app.html"
+            echo "RUNNING TEST: $cmd"
+            $cmd
+            echo "TEST PASSED"
+
+            cmd="./scancode --quiet -lcip apache-2.0.LICENSE --output-spdx-tv test_scan.spdx"
+            echo "RUNNING TEST: $cmd"
+            $cmd
+            echo "TEST PASSED"
+
+            cmd="./extractcode --quiet samples/arch"
+            echo "RUNNING TEST: $cmd"
+            $cmd
+            echo "TEST PASSED"
 
             # cleanup
             cd ..

From d69e9592eb4ecf1952cf3b374c7f84bafec6978c Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 18 Jan 2018 20:09:56 +0100
Subject: [PATCH 054/122] Improve CLI options handling #787

 * ensure that a File option used in output cannot bet set to the value
   of a command line option. This is done with FileOptionType, a
   click.File subclass that verifies that a file name is not one of the
   avaialble options and fails if this is the case.
   Reported by @JonoYang
 * move CommandLineOption to scancode.__init__.py
 * add new args to CommandLineOption: requires and conflicts. Each are
   a sequence of other option names that either conflict with this
   option or are require to be set with this option. --strip-root,
   --full-root, --verbose, --quiet and plugin options with option
   dependencies are now using this feature. The CLI fails early
   if requirements are not met or conflicts exist. Added a few simple
   tests for this.
 * add new sort_order arg to CommandLineOption and used it to
   set a relative sort order for options helps in a help group
 * add new documentation CLI help_group for help and other related
   options. Reorganized CLI help
 * renamed json-realted output CLI options to plain json-*

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/scripts/test_json2csv.py                  |   2 +-
 src/formattedcode/output_csv.py               |  10 +-
 src/formattedcode/output_html.py              |  43 ++--
 src/formattedcode/output_json.py              |  20 +-
 src/formattedcode/output_jsonlines.py         |  11 +-
 src/formattedcode/output_spdx.py              |  12 +-
 src/plugincode/__init__.py                    |   4 +-
 src/plugincode/scan.py                        |   4 +-
 src/scancode/__init__.py                      | 231 +++++++++++++++++-
 src/scancode/cli.py                           | 176 ++++++-------
 src/scancode/plugin_copyright.py              |   3 +-
 src/scancode/plugin_ignore.py                 |   3 +-
 src/scancode/plugin_license.py                |  15 +-
 src/scancode/plugin_mark_source.py            |   2 +-
 src/scancode/plugin_package.py                |   3 +-
 .../data/json/simple-expected.json            |   2 +-
 .../data/json/simple-expected.jsonlines       |   2 +-
 .../data/json/simple-expected.jsonpp          |   2 +-
 .../data/json/tree/expected.json              |   2 +-
 tests/formattedcode/test_output_json.py       |   8 +-
 tests/formattedcode/test_output_jsonlines.py  |   2 +-
 .../data/altpath/copyright.expected.json      |   2 +-
 .../data/composer/composer.expected.json      |   2 +-
 .../data/failing/patchelf.expected.json       |   2 +-
 tests/scancode/data/help/help.txt             |  79 +++---
 tests/scancode/data/info/all.expected.json    |   2 +-
 .../data/info/all.rooted.expected.json        |   2 +-
 tests/scancode/data/info/basic.expected.json  |   2 +-
 .../data/info/basic.rooted.expected.json      |   2 +-
 .../data/info/email_url_info.expected.json    |   2 +-
 .../scancode/data/license_text/test.expected  |   2 +-
 .../data/non_utf8/expected-linux.json         |   2 +-
 .../scancode/data/non_utf8/expected-mac.json  |   2 +-
 .../scancode/data/non_utf8/expected-win.json  |  58 +++--
 .../with_info.expected.json                   |   2 +-
 .../without_info.expected.json                |   2 +-
 .../data/plugin_only_findings/expected.json   |   2 +-
 ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json |   2 +-
 .../data/single/iproute.expected.json         |   2 +-
 .../unicodepath.expected-linux.json           |   2 +-
 .../unicodepath/unicodepath.expected-mac.json |   2 +-
 .../unicodepath/unicodepath.expected-win.json |   2 +-
 .../data/weird_file_name/expected-linux.json  |   2 +-
 .../data/weird_file_name/expected-mac.json    |   2 +-
 .../data/weird_file_name/expected-win.json    |   2 +-
 tests/scancode/test_cli.py                    |  47 +++-
 tests/scancode/test_plugin_ignore.py          |  16 +-
 tests/scancode/test_plugin_mark_source.py     |   4 +-
 tests/scancode/test_scan_utils.py             |  11 +-
 49 files changed, 532 insertions(+), 284 deletions(-)

diff --git a/etc/scripts/test_json2csv.py b/etc/scripts/test_json2csv.py
index da708fcc060..d083b76aac8 100644
--- a/etc/scripts/test_json2csv.py
+++ b/etc/scripts/test_json2csv.py
@@ -215,7 +215,7 @@ def test_can_process_scan_from_json_scan(self):
         scan_cmd = os.path.join(scancode.root_dir, 'scancode')
         rc, _stdout, _stderr = execute(scan_cmd,
             ['-clip', '--email', '--url', '--strip-root', test_dir, 
-             '--output-json', json_file])
+             '--json', json_file])
         assert rc == 0
         result_file = self.get_temp_file('.csv')
         with open(result_file, 'wb') as rf:
diff --git a/src/formattedcode/output_csv.py b/src/formattedcode/output_csv.py
index 49648bc642b..5188cc2a8f1 100644
--- a/src/formattedcode/output_csv.py
+++ b/src/formattedcode/output_csv.py
@@ -29,24 +29,26 @@
 
 from collections import OrderedDict
 
-import click
 import unicodecsv
 
 from plugincode.output import output
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
+from scancode import FileOptionType
 from scancode import OUTPUT_GROUP
 
 
+
 @output
 class CsvOutput(OutputPlugin):
 
     options = [
         CommandLineOption(('--output-csv',),
-            type=click.File(mode='wb', lazy=False),
+            type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output formatted as CSV to FILE.',
-            help_group=OUTPUT_GROUP)
+            help='Write scan output as CSV to FILE.',
+            help_group=OUTPUT_GROUP,
+            sort_order= 30),
     ]
 
     def is_enabled(self):
diff --git a/src/formattedcode/output_html.py b/src/formattedcode/output_html.py
index fa620a15a45..c37275c7bfb 100644
--- a/src/formattedcode/output_html.py
+++ b/src/formattedcode/output_html.py
@@ -53,9 +53,9 @@
 from plugincode.output import output
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
+from scancode import FileOptionType
 from scancode import OUTPUT_GROUP
 
-
 """
 Output plugins to write scan results using templates such as HTML.
 
@@ -69,10 +69,11 @@ class HtmlOutput(OutputPlugin):
 
     options = [
         CommandLineOption(('--output-html',),
-            type=click.File(mode='wb', lazy=False),
+            type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output formatted as HTML to FILE.',
-            help_group=OUTPUT_GROUP)
+            help='Write scan output as HTML to FILE.',
+            help_group=OUTPUT_GROUP,
+            sort_order=50),
     ]
 
     def is_enabled(self):
@@ -84,39 +85,28 @@ def save_results(self, codebase, results, files_count, version, notice, options)
         write_templated(output_file, results, version, template_or_format='html')
 
 
-# TODO: Implmenet me as a proper callback with partial
-def validate_together(ctx, options):
-    """
-    Validate that a list of `options` names are all provided.
-    Raise a UsageError on errors.
-    """
-    ctx_params = ctx.params
-    requested_options = [ctx_params[eop] for eop in options if ctx_params[eop]]
-    if len(options) != requested_options:
-        msg = ' and '.join('`' + eo.replace('_', '-') + '`' for eo in options)
-        msg += ' options are required to be set together. You must use set all of them.'
-        raise click.UsageError(msg)
-
-
 @output
 class CustomTemplateOutput(OutputPlugin):
 
     options = [
         CommandLineOption(('--output-custom',),
-            type=click.File(mode='wb', lazy=False),
+            type=FileOptionType(mode='wb', lazy=False),
+            requires=['custom_template'],
             metavar='FILE',
             help='Write scan output to FILE formatted with '
                  'the custom Jinja template file.',
-            help_group=OUTPUT_GROUP),
+            help_group=OUTPUT_GROUP,
+            sort_order=60),
 
         CommandLineOption(('--custom-template',),
             type=click.Path(
                 exists=True, file_okay=True, dir_okay=False,
                 readable=True, path_type=PATH_TYPE),
-            default=None,
+            requires=['output_custom'],
             metavar='FILE',
             help='Use this Jinja template FILE as a custom template.',
-            help_group=OUTPUT_GROUP)
+            help_group=OUTPUT_GROUP,
+            sort_order=65),
     ]
 
     def is_enabled(self):
@@ -137,14 +127,15 @@ def save_results(self, codebase, results, files_count, version, notice, options)
 @output
 class HtmlAppOutput(OutputPlugin):
     """
-    Write scan output formatted as a mini HTML application.
+    Write scan output as a mini HTML application.
     """
     options = [
         CommandLineOption(('--output-html-app',),
-            type=click.File(mode='wb', lazy=False),
+            type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output formatted as a mini HTML application FILE.',
-            help_group=OUTPUT_GROUP)
+            help='Write scan output as a mini HTML application to FILE.',
+            help_group=OUTPUT_GROUP,
+            sort_order=70),
     ]
 
     def is_enabled(self):
diff --git a/src/formattedcode/output_json.py b/src/formattedcode/output_json.py
index 84c1d6e0c4a..f11e9eb861e 100644
--- a/src/formattedcode/output_json.py
+++ b/src/formattedcode/output_json.py
@@ -27,12 +27,12 @@
 
 from collections import OrderedDict
 
-import click
 import simplejson
 
 from plugincode.output import output
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
+from scancode import FileOptionType
 from scancode import OUTPUT_GROUP
 
 """
@@ -44,11 +44,12 @@
 class JsonCompactOutput(OutputPlugin):
 
     options = [
-        CommandLineOption(('--json', '--output-json',),
-            type=click.File(mode='wb', lazy=False),
+        CommandLineOption(('--json', 'output_json',),
+            type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output formatted as compact JSON to FILE.',
-            help_group=OUTPUT_GROUP)
+            help='Write scan output as compact JSON to FILE.',
+            help_group=OUTPUT_GROUP,
+            sort_order= 10),
     ]
 
     def is_enabled(self):
@@ -64,11 +65,12 @@ def save_results(self, codebase, results, files_count, version, notice, options)
 class JsonPrettyOutput(OutputPlugin):
 
     options = [
-        CommandLineOption(('--json-pp', '--output-json-pp',),
-            type=click.File(mode='wb', lazy=False),
+        CommandLineOption(('--json-pp', 'output_json_pp',),
+            type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output formatted as pretty-printed JSON to FILE.',
-            help_group=OUTPUT_GROUP)
+            help='Write scan output as pretty-printed JSON to FILE.',
+            help_group=OUTPUT_GROUP,
+            sort_order= 10),
     ]
 
     def is_enabled(self):
diff --git a/src/formattedcode/output_jsonlines.py b/src/formattedcode/output_jsonlines.py
index d7f6cbb507d..32e36c47038 100644
--- a/src/formattedcode/output_jsonlines.py
+++ b/src/formattedcode/output_jsonlines.py
@@ -27,12 +27,12 @@
 
 from collections import OrderedDict
 
-import click
 import simplejson
 
 from plugincode.output import output
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
+from scancode import FileOptionType
 from scancode import OUTPUT_GROUP
 
 
@@ -40,11 +40,12 @@
 class JsonLinesOutput(OutputPlugin):
 
     options = [
-        CommandLineOption(('--output-json-lines',),
-            type=click.File(mode='wb', lazy=False),
+        CommandLineOption(('--json-lines','output_json_lines',),
+            type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output formatted as JSON Lines to FILE.',
-            help_group=OUTPUT_GROUP)
+            help='Write scan output as JSON Lines to FILE.',
+            help_group=OUTPUT_GROUP,
+            sort_order= 15),
     ]
 
     def is_enabled(self):
diff --git a/src/formattedcode/output_spdx.py b/src/formattedcode/output_spdx.py
index 5372f0291aa..835bdd96297 100644
--- a/src/formattedcode/output_spdx.py
+++ b/src/formattedcode/output_spdx.py
@@ -35,7 +35,6 @@
 from os.path import join
 import sys
 
-import click
 from spdx.checksum import Algorithm
 from spdx.creationinfo import Tool
 from spdx.document import Document
@@ -50,6 +49,7 @@
 from plugincode.output import output
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
+from scancode import FileOptionType
 from scancode import OUTPUT_GROUP
 
 # Python 2 and 3 support
@@ -94,9 +94,9 @@ class SpdxTvOutput(OutputPlugin):
 
     options = [
         CommandLineOption(('--output-spdx-tv',),
-            type=click.File(mode='wb', lazy=False),
+            type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output formatted as SPDX Tag/Value to FILE. '
+            help='Write scan output as SPDX Tag/Value to FILE. '
                  'Implies running the --info scan.',
             help_group=OUTPUT_GROUP)
     ]
@@ -116,9 +116,9 @@ class SpdxRdfOutput(OutputPlugin):
 
     options = [
         CommandLineOption(('--output-spdx-rdf',),
-            type=click.File(mode='wb', lazy=False),
+            type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output formatted as SPDX RDF to FILE. '
+            help='Write scan output as SPDX RDF to FILE. '
                  'Implies running the --info scan.',
             help_group=OUTPUT_GROUP)
     ]
@@ -135,7 +135,7 @@ def save_results(self, codebase, results, files_count, version, notice, options)
 
 def write_spdx(output_file, results, version, notice, input_file, as_tagvalue=True):
     """
-    Write scan output formatted as SPDX Tag/value or RDF.
+    Write scan output as SPDX Tag/value or RDF.
     """
     absinput = abspath(input_file)
 
diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index af2f38b34f3..7fffe18068d 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -64,7 +64,7 @@ class BasePlugin(object):
     # This is set automatically when a plugin class is loaded in its manager.
     # Subclasses must not set this.
     name = None
-    
+
     # set to True for testing
     _test_mode = False
 
@@ -104,7 +104,7 @@ def setup(self, **kwargs):
         pass
 
     # NOTE: Other methods below should NOT be overriden.
-    
+
     @property
     def qname(self):
         """
diff --git a/src/plugincode/scan.py b/src/plugincode/scan.py
index 1584628efd7..5ea12edd915 100644
--- a/src/plugincode/scan.py
+++ b/src/plugincode/scan.py
@@ -47,10 +47,10 @@ class ScanPlugin(BasePlugin):
     "name" attribute. This attribute is set automatically as the "entrypoint"
     name used for this plugin.
     """
-    
+
     # a relative sort order number (integer or float). In scan results, results
     # from scanners are sorted by this sorted_order then by "key" which is the
-    # scanner plugin name
+    # scanner plugin name. This is also used in the CLI UI
     sort_order = 100
 
     # TODO: pass own command options name/values as concrete kwargs
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index b1cc5c71fb9..cba072672ca 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -22,21 +22,37 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 from collections import namedtuple
+from itertools import chain
 from os.path import dirname
 from os.path import abspath
 from os.path import getsize
 from os.path import getmtime
 from os.path import join
 from os.path import exists
+from types import BooleanType
 
 import click
+from click.types import BoolParamType
 
 from commoncode import fileutils
 
+# Python 2 and 3 support
+try:
+    # Python 2
+    unicode
+    str_orig = str
+    bytes = str  # @ReservedAssignment
+    str = unicode  # @ReservedAssignment
+except NameError:
+    # Python 3
+    unicode = str  # @ReservedAssignment
+
 
 scan_src_dir = abspath(dirname(__file__))
 src_dir = dirname(scan_src_dir)
@@ -56,6 +72,24 @@
     __version__ = '2.2.1'
 
 
+# Tracing flags
+TRACE = False
+
+def logger_debug(*args):
+    pass
+
+if TRACE:
+    import logging
+    import sys
+    logger = logging.getLogger(__name__)
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
+
+    def logger_debug(*args):
+        return logger.debug(' '.join(isinstance(a, (unicode, str))
+                                     and a or repr(a) for a in args))
+
+
 # CLI help groups
 SCAN_GROUP = 'primary scans'
 SCAN_OPTIONS_GROUP = 'scan options'
@@ -66,6 +100,7 @@
 PRE_SCAN_GROUP = 'pre-scan'
 POST_SCAN_GROUP = 'post-scan'
 MISC_GROUP = 'miscellaneous'
+DOC_GROUP = 'documentation'
 CORE_GROUP = 'core'
 
 
@@ -80,20 +115,204 @@
 
 class CommandLineOption(click.Option):
     """
-    An option with an extra `help_group` attribute that tells which CLI help group
-    the option belongs.
+    An option with extra args and attributes to control CLI help options
+    grouping, co-required and conflicting options (e.g. mutually exclusive).
     """
 
+    # args are from Click 6.7
     def __init__(self, param_decls=None, show_default=False,
                  prompt=False, confirmation_prompt=False,
                  hide_input=False, is_flag=None, flag_value=None,
                  multiple=False, count=False, allow_from_autoenv=True,
-                 type=None, help=None, expose_value=True,
+                 type=None, help=None,
+                 # custom additions #
+                 # a string that set the CLI help group for this option
                  help_group=MISC_GROUP,
+                 # a relative sort order number (integer or float) for this
+                 # option within a help group: the sort is by increasing
+                 # sort_order then by option declaration.
+                 sort_order = 100,
+                 # a sequence of other option name strings that this option
+                 # requires to be set
+                 requires=(),
+                 # a sequence of other option name strings that this option
+                 # conflicts with if they are set
+                 conflicts=(),
                  **attrs):
 
         super(CommandLineOption, self).__init__(param_decls, show_default,
                      prompt, confirmation_prompt,
                      hide_input, is_flag, flag_value,
-                     multiple, count, allow_from_autoenv, type, help, **attrs)
+                     multiple, count, allow_from_autoenv,
+                     type, help, **attrs)
+
         self.help_group = help_group
+        self.sort_order = sort_order
+        self.requires = requires
+        self.conflicts = conflicts
+
+    def __repr__(self, *args, **kwargs):
+        name = self.name
+        opt = self.opts[-1]
+        help_group = self.help_group
+        requires = self.requires
+        conflicts = self.conflicts
+
+        return ('CommandLineOption<name=%(name)r, '
+                'requires=%(requires)r, conflicts=%(conflicts)r>' % locals())
+
+    def validate_dependencies(self, ctx, value):
+        """
+        Validate `value` against declared `requires` or `conflicts` dependencies.
+        """
+        _validate_option_dependencies(ctx, self, value, self.requires, required=True)
+        _validate_option_dependencies(ctx, self, value, self.conflicts, required=False)
+
+
+def validate_option_dependencies(ctx):
+    """
+    Validate all CommandLineOption dependencies in the `ctx` Click context.
+    Ignore eager flags.
+    """
+    values = ctx.params
+    if TRACE:
+        logger_debug('validate_option_dependencies: values:')
+        for va in sorted(values.items()):
+            logger_debug('  ', va)
+
+    for param in ctx.command.params:
+        if param.is_eager:
+            continue
+        if not isinstance(param, CommandLineOption):
+            if TRACE:
+                logger_debug('  validate_option_dependencies: skip param:', param)
+            continue
+        value = values.get(param.name)
+        if TRACE:
+            logger_debug('  validate_option_dependencies: param:', param, 'value:', value)
+        param.validate_dependencies(ctx, value)
+
+
+def _validate_option_dependencies(ctx, param, value,
+                                  other_option_names, required=False):
+    """
+    Validate the `other_option_names` option dependencies and return a
+    UsageError if the `param` `value` is set to a not-None non-default value and
+    if:
+    - `required` is True and the `other_option_names` options are not set with a
+       not-None value in the `ctx` context.
+    - `required` is False and any of the `other_option_names` options are set
+       with a not-None, non-default value in the `ctx` context.
+    """
+    if not other_option_names:
+        return
+
+    def _is_set(_value, _default, typ):
+        if type in (BooleanType, BoolParamType):
+            return _value
+        return bool(_value is not None and _value != _default)
+
+    is_set = _is_set(value, param.default, param.type)
+
+    if TRACE:
+        logger_debug()
+        logger_debug('Checking param:', param)
+        logger_debug('  value:', value, 'is_set:' , is_set)
+
+    if not is_set:
+        return
+
+    oparams_by_name = {oparam.name: oparam for oparam in ctx.command.params}
+    oparams = []
+    missing_onames = []
+
+    for oname in other_option_names:
+        oparam = oparams_by_name.get(oname)
+        if not oparam:
+            missing_onames.append(oparam)
+        else:
+            oparams.append(oparam)
+
+    if TRACE:
+        logger_debug()
+        logger_debug('  Available other params:')
+        for oparam in oparams:
+            logger_debug('    other param:', oparam)
+            logger_debug('      value:', ctx.params.get(oparam.name))
+        if required:
+            logger_debug('    missing names:', missing_onames)
+
+    if required and missing_onames:
+        opt = param.opts[-1]
+        oopts = [oparam.opts[-1] for oparam in oparams]
+        omopts = ['--' + oname.replace('_', '-') for oname in missing_onames]
+        oopts.extend(omopts)
+        oopts = ', '.join(oopts)
+        msg = ('The option %(opt)s requires the option(s) %(all_opts)s.'
+               'and is missing %(omopts)s. '
+               'You must set all of these options if you use this option.' % locals())
+        raise click.UsageError(msg)
+
+    if TRACE:
+        logger_debug()
+        logger_debug('  Checking other params:')
+
+    opt = param.opts[-1]
+
+    for oparam in oparams:
+        ovalue = ctx.params.get(oparam.name)
+        ois_set = _is_set(ovalue, oparam.default, oparam.type)
+
+        if TRACE:
+            logger_debug('    Checking oparam:', oparam)
+            logger_debug('      value:', ovalue, 'ois_set:' , ois_set)
+
+        # by convention the last opt is the long form
+        oopt = oparam.opts[-1]
+        oopts = ', '.join(oparam.opts[-1] for oparam in oparams)
+        all_opts = '%(opt)s and %(oopts)s' % locals()
+        if required and not ois_set:
+            msg = ('The option %(opt)s requires the option(s) %(oopts)s '
+                   'and is missing %(oopt)s. '
+                   'You must set all of these options if you use this option.' % locals())
+            raise click.UsageError(msg)
+
+        if not required  and ois_set:
+            msg = ('The option %(opt)s cannot be used together with the %(oopts)s option(s) '
+                   'and %(oopt)s is used. '
+                   'You can set only one of these options at a time.' % locals())
+            raise click.UsageError(msg)
+
+
+def get_command_options(ctx):
+    """
+    Yield CommandOption tuples for each click.Option option in the `ctx` Click
+    context. Ignore eager flags.
+    """
+    param_values = ctx.params
+    for param in ctx.command.params:
+        if param.is_eager:
+            continue
+        if param.name == 'test_mode':
+            continue
+
+        help_group = getattr(param, 'help_group', None)
+        name = param.name
+        value = param_values.get(name)
+        yield CommandOption(help_group, name, value, param)
+
+
+class FileOptionType(click.File):
+    """
+    A click.File subclass that ensures that a file name is not set to an
+    existing option parameter to avoid mistakes.
+    """
+    def convert(self, value, param, ctx):
+        known_opts = set(chain.from_iterable(p.opts for p in ctx.command.params 
+                                             if isinstance(p, click.Option)))
+        if value in known_opts:
+            self.fail('Illegal file name conflicting with an option name: %s. ' 
+                      'Use the special "-" file name to print results on screen/stdout.'
+                % (click.types.filename_to_ui(value),
+            ), param, ctx)
+        return click.File.convert(self, value, param, ctx)
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index a760922c3ad..c2ca5d5f8d8 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -59,6 +59,7 @@
 
 from scancode import __version__ as version
 from scancode import CORE_GROUP
+from scancode import DOC_GROUP
 from scancode import MISC_GROUP
 from scancode import OTHER_SCAN_GROUP
 from scancode import OUTPUT_GROUP
@@ -68,8 +69,9 @@
 from scancode import PRE_SCAN_GROUP
 from scancode import SCAN_GROUP
 from scancode import SCAN_OPTIONS_GROUP
-from scancode import CommandOption
+from scancode import get_command_options
 from scancode import Scanner
+from scancode import validate_option_dependencies
 from scancode.api import get_file_info
 from scancode.interrupt import DEFAULT_TIMEOUT
 from scancode.interrupt import interruptible
@@ -228,15 +230,16 @@ def print_version(ctx, param, value):
 
 \b
 Scan the 'samples' directory for licenses and copyrights.
-Save scan results to a JSON file:
+Save scan results to the 'scancode_result.json' JSON file:
 
-    scancode --license --copyright --output-json=scancode_result.json samples
+    scancode --license --copyright --json=scancode_result.json samples
 
 \b
 Scan the 'samples' directory for licenses and package manifests. Print scan
-results on screen as pretty-formatted JSON:
+results on screen as pretty-formatted JSON (using the special '-' FILE to print
+to on screen/to stdout):
 
-    scancode --json-pp --license --package  samples
+    scancode --json-pp - --license --package  samples
 
 Note: when you run scancode, a progress bar is displayed with a counter of the
 number of files processed. Use --verbose to display file-by-file progress.
@@ -286,39 +289,26 @@ def format_options(self, ctx, formatter):
             (POST_SCAN_GROUP, []),
             (CORE_GROUP, []),
             (MISC_GROUP, []),
+            (DOC_GROUP, []),
         ])
 
         for param in self.get_params(ctx):
             # Get the list of option's name and help text
             help_record = param.get_help_record(ctx)
-            if help_record:
-                if getattr(param, 'help_group', None):
-                    # if we have a group, organize options by group
-                    help_groups[param.help_group].append(help_record)
-                else:
-                    # use the misc group if no group is defined
-                    help_groups[MISC_GROUP].append(help_record)
+            if not help_record:
+                continue
+            # organize options by group
+            help_group = getattr(param, 'help_group', MISC_GROUP)
+            sort_order = getattr(param, 'sort_order', 100)
+            help_groups[help_group].append((sort_order, help_record))
 
         with formatter.section('Options'):
-            for group, option in help_groups.items():
-                if not option:
+            for group, help_records in help_groups.items():
+                if not help_records:
                     continue
                 with formatter.section(group):
-                    formatter.write_dl(option)
-
-
-# TODO: Implmenet me as a proper callback with partial
-def validate_exclusive(ctx, exclusive_options):
-    """
-    Validate a list of mutually `exclusive_options` names.
-    Raise a UsageError on errors.
-    """
-    ctx_params = ctx.params
-    options = [ctx_params[eop] for eop in exclusive_options if ctx_params[eop]]
-    if len(options) > 1:
-        msg = ' and '.join('`' + eo.replace('_', '-') + '`' for eo in exclusive_options)
-        msg += ' are mutually exclusion options. You can use only one of them.'
-        raise click.UsageError(msg)
+                    sorted_records = [help_record for _, help_record in sorted(help_records)]
+                    formatter.write_dl(sorted_records)
 
 
 # IMPORTANT: this discovers, loads and validates all available plugins
@@ -361,83 +351,60 @@ def print_plugins(ctx, param, value):
     type=click.Path(exists=True, readable=True, path_type=PATH_TYPE))
 
 @click.option('-i', '--info',
-    is_flag=True, default=False,
+    is_flag=True,
     help='Scan <input> for file information (size, type, checksums, etc).',
-    help_group=OTHER_SCAN_GROUP, cls=CommandLineOption)
+    help_group=OTHER_SCAN_GROUP, sort_order=10, cls=CommandLineOption)
 
 @click.option('--strip-root',
-    is_flag=True, default=False,
+    is_flag=True,
+    conflicts=['full_root'],
     help='Strip the root directory segment of all paths. The default is to '
          'always include the last directory segment of the scanned path such '
          'that all paths have a common root directory.',
     help_group=OUTPUT_CONTROL_GROUP, cls=CommandLineOption)
 
 @click.option('--full-root',
-    is_flag=True, default=False,
+    is_flag=True,
+    conflicts=['strip_root'],
     help='Report full, absolute paths. The default is to always '
          'include the last directory segment of the scanned path such that all '
          'paths have a common root directory.',
     help_group=OUTPUT_CONTROL_GROUP, cls=CommandLineOption)
 
-@click.option('--verbose',
-    is_flag=True, default=False,
-    help='Print progress  as file-by-file path instead of a progress bar. '
-         'Print a verbose scan summary.',
-    help_group=CORE_GROUP, cls=CommandLineOption)
-
-@click.option('--quiet',
-    is_flag=True, default=False,
-    help='Do not print summary or progress.',
-    help_group=CORE_GROUP, cls=CommandLineOption)
-
-@click.help_option('-h', '--help',
-    help_group=CORE_GROUP, cls=CommandLineOption)
-
 @click.option('-n', '--processes',
     type=int, default=1,
     metavar='INT',
     help='Set the number of parallel processes to use. '
          'Disable parallel processing if 0.  [default: 1]',
-    help_group=CORE_GROUP, cls=CommandLineOption)
-
-@click.option('--examples',
-    is_flag=True, is_eager=True,
-    callback=print_examples,
-    help=('Show command examples and exit.'),
-    help_group=CORE_GROUP, cls=CommandLineOption)
-
-@click.option('--about',
-    is_flag=True, is_eager=True,
-    callback=print_about,
-    help='Show information about ScanCode and licensing and exit.',
-    help_group=CORE_GROUP, cls=CommandLineOption)
-
-@click.option('--version',
-    is_flag=True, is_eager=True,
-    callback=print_version,
-    help='Show the version and exit.',
-    help_group=CORE_GROUP, cls=CommandLineOption)
+    help_group=CORE_GROUP, sort_order=10, cls=CommandLineOption)
 
 @click.option('--timeout',
     type=float, default=DEFAULT_TIMEOUT,
     metavar='<seconds>',
     help='Stop an unfinished file scan after a timeout in seconds.  '
-         '[default: %d]' % DEFAULT_TIMEOUT,
-    help_group=CORE_GROUP, cls=CommandLineOption)
+         '[default: %d seconds]' % DEFAULT_TIMEOUT,
+    help_group=CORE_GROUP, sort_order=10, cls=CommandLineOption)
 
-@click.option('--plugins',
-    is_flag=True, is_eager=True,
-    callback=print_plugins,
-    help='Print the list of available ScanCode plugins.',
-    help_group=CORE_GROUP, cls=CommandLineOption)
+@click.option('--quiet',
+    is_flag=True,
+    conflicts=['verbose'],
+    help='Do not print summary or progress.',
+    help_group=CORE_GROUP, sort_order=20, cls=CommandLineOption)
+
+@click.option('--verbose',
+    is_flag=True,
+    conflicts=['quiet'],
+    help='Print progress  as file-by-file path instead of a progress bar. '
+         'Print a verbose scan summary.',
+    help_group=CORE_GROUP, sort_order=20, cls=CommandLineOption)
 
 @click.option('--no-cache',
-    is_flag=True, default=False,
+    is_flag=True,
     help='Do not use on-disk cache for intermediate results. Uses more memory.',
-    help_group=CORE_GROUP, cls=CommandLineOption)
+    help_group=CORE_GROUP, sort_order=200, cls=CommandLineOption)
 
 @click.option('--timing',
-    is_flag=True, default=False,
+    is_flag=True,
     help='Collect execution timing for each scan and scanned file.',
     help_group=CORE_GROUP, cls=CommandLineOption)
 
@@ -445,20 +412,46 @@ def print_plugins(ctx, param, value):
     type=click.Path(
         exists=True, file_okay=False, dir_okay=True,
         readable=True, path_type=PATH_TYPE),
-    default=None,
+    default=None, sort_order=200,
     metavar='DIR',
     help='Set the path to the temporary directory to use for ScanCode '
          'cache and temporary files.',
     help_group=CORE_GROUP,
     cls=CommandLineOption)
 
+@click.help_option('-h', '--help',
+    help_group=DOC_GROUP, sort_order= 10,cls=CommandLineOption)
+
+@click.option('--examples',
+    is_flag=True, is_eager=True,
+    callback=print_examples,
+    help=('Show command examples and exit.'),
+    help_group=DOC_GROUP, sort_order= 50,cls=CommandLineOption)
+
+@click.option('--about',
+    is_flag=True, is_eager=True,
+    callback=print_about,
+    help='Show information about ScanCode and licensing and exit.',
+    help_group=DOC_GROUP, sort_order= 20,cls=CommandLineOption)
+
+@click.option('--version',
+    is_flag=True, is_eager=True,
+    callback=print_version,
+    help='Show the version and exit.',
+    help_group=DOC_GROUP, sort_order= 20,cls=CommandLineOption)
+
+@click.option('--plugins',
+    is_flag=True, is_eager=True,
+    callback=print_plugins,
+    help='Show the list of available ScanCode plugins and exit.',
+    help_group=DOC_GROUP, cls=CommandLineOption)
+
 @click.option('--test-mode',
     is_flag=True, default=False,
     # not yet supported in Click 6.7
     # hidden = True,
     help='Run ScanCode in a special "test mode". Only for testing.',
-    help_group=MISC_GROUP, cls=CommandLineOption)
-
+    help_group=MISC_GROUP, sort_order= 1000,cls=CommandLineOption)
 
 def scancode(ctx, input, info,  # @ReservedAssignment
              strip_root, full_root,
@@ -513,7 +506,7 @@ def scancode(ctx, input, info,  # @ReservedAssignment
     - `strip_root` and `full_root`: boolean flags: In the outputs, strip the
       first path segment of a file if `strip_root` is True unless the `input` is
       a single file. If `full_root` is True report the path as an absolute path.
-      These coptions are mutually exclusive.
+      These options are mutually exclusive.
 
     - `processes`: int: run the scan using up to this number of processes in
       parallel. If 0, disable the multiprocessing machinery.
@@ -544,8 +537,7 @@ def scancode(ctx, input, info,  # @ReservedAssignment
     scan_start = time2tstamp()
 
     try:
-        validate_exclusive(ctx, ['strip_root', 'full_root'])
-        validate_exclusive(ctx, ['quiet', 'verbose'])
+        # validate_exclusive(ctx, ['strip_root', 'full_root'])
 
         if not processes and not quiet:
             echo_stderr('Disabling multi-processing.', fg='yellow')
@@ -553,6 +545,7 @@ def scancode(ctx, input, info,  # @ReservedAssignment
         ############################################################################
         # 1. get command options and create all plugin instances
         ############################################################################
+        validate_option_dependencies(ctx)
         command_options = sorted(get_command_options(ctx))
         if TRACE_DEEP:
             logger_debug('scancode: command_options:')
@@ -585,7 +578,6 @@ def scancode(ctx, input, info,  # @ReservedAssignment
             msg = ('Missing output option(s): at least one output '
                    'option is needed to save scan results.')
             raise click.UsageError(msg)
-            ctx.exit(1)
 
         if not scanner_plugins and not info:
             # Use default info scan when no scan option is requested
@@ -1085,21 +1077,3 @@ def format_size(size):
             return '%(size).2f %(symbol)s' % locals()
         size = size / 1024.
     return '%(size).2f %(symbol)s' % locals()
-
-
-def get_command_options(ctx):
-    """
-    Yield CommandOption tuples for each click.Option option in the `ctx` Click
-    context. Ignore eager flags.
-    """
-    param_values = ctx.params
-    for param in ctx.command.params:
-        if param.is_eager:
-            continue
-        if param.name == 'test_mode':
-            continue
-
-        help_group = getattr(param, 'help_group', None)
-        name = param.name
-        value = param_values.get(name)
-        yield CommandOption(help_group, name, value, param)
diff --git a/src/scancode/plugin_copyright.py b/src/scancode/plugin_copyright.py
index 6922ebb6f44..e8c07dfca34 100644
--- a/src/scancode/plugin_copyright.py
+++ b/src/scancode/plugin_copyright.py
@@ -44,7 +44,8 @@ class CopyrightScanner(ScanPlugin):
         CommandLineOption(('-c', '--copyright',),
             is_flag=True, default=False,
             help='Scan <input> for copyrights.',
-            help_group=SCAN_GROUP)
+            help_group=SCAN_GROUP,
+            sort_order= 50),
     ]
 
     def is_enabled(self):
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 1e2f78db10f..93a509b6dec 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -70,8 +70,7 @@ def process_codebase(self, codebase):
 
         # first walk top down the codebase and collect ignored resource ids
         for resource in codebase.walk(topdown=True):
-            # FIXME: this should absolute==False!!
-            if ignorable(resource.get_path(absolute=True)):
+            if ignorable(resource.get_path(absolute=False, posix=True)):
                 resources_to_remove_append(resource)
 
         # then remove the collected ignored resource ids (that may remove whole
diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index b8616865cdd..7493dd3fb4c 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -49,29 +49,34 @@ class LicenseScanner(ScanPlugin):
 
     options = [
         CommandLineOption(('-l', '--license'),
-            is_flag=True, default=False,
+            is_flag=True, 
             help='Scan <input> for licenses.',
-            help_group=SCAN_GROUP),
+            help_group=SCAN_GROUP,
+            sort_order= 10),
 
         CommandLineOption(('--license-score',),
             type=int, default=0, show_default=True,
+            requires=['license'],
             help='Do not return license matches with a score lower than this score. '
                  'A number between 0 and 100.',
             help_group=SCAN_OPTIONS_GROUP),
 
         CommandLineOption(('--license-text',),
-            is_flag=True, default=False,
+            is_flag=True, 
+            requires=['license'],
             help='Include the detected licenses matched text.',
             help_group=SCAN_OPTIONS_GROUP),
 
         CommandLineOption(('--license-url-template',),
             default=DEJACODE_LICENSE_URL, show_default=True,
+            requires=['license'],
             help='Set the template URL used for the license reference URLs. '
                  'Curly braces ({}) are replaced by the license key.',
             help_group=SCAN_OPTIONS_GROUP),
 
         CommandLineOption(('--license-diag',),
-            is_flag=True, default=False,
+            is_flag=True, 
+            requires=['license'],
             help='Include diagnostic information in license scan results.',
             help_group=SCAN_OPTIONS_GROUP),
     ]
@@ -109,6 +114,6 @@ class LicenseIndexer(HousekeepingPlugin):
             ('--reindex-licenses',),
             is_eager=True, is_flag=True, default=False,
             callback=reindex_licenses,
-            help='Check the license index cache and reindex if needed.',
+            help='Check the license index cache and reindex if needed and exit',
             help_group=MISC_GROUP)
     ]
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 8db50a17dd0..8585840c773 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -45,7 +45,7 @@ class MarkSource(PostScanPlugin):
 
     options = [
         CommandLineOption(('--mark-source',),
-            is_flag=True,default=False,
+            is_flag=True, default=False,
             help='Set the "is_source" to true for directories that contain '
                  'over 90% of source files as children and descendants. '
                  'Implies running the --info scan.',
diff --git a/src/scancode/plugin_package.py b/src/scancode/plugin_package.py
index bf009963150..d48a8c6de6e 100644
--- a/src/scancode/plugin_package.py
+++ b/src/scancode/plugin_package.py
@@ -44,7 +44,8 @@ class PackageScanner(ScanPlugin):
         CommandLineOption(('-p', '--package',),
             is_flag=True, default=False,
             help='Scan <input> for packages.',
-            help_group=SCAN_GROUP)
+            help_group=SCAN_GROUP,
+            sort_order= 20),
     ]
 
     def is_enabled(self):
diff --git a/tests/formattedcode/data/json/simple-expected.json b/tests/formattedcode/data/json/simple-expected.json
index be20daa4941..e486fceb276 100644
--- a/tests/formattedcode/data/json/simple-expected.json
+++ b/tests/formattedcode/data/json/simple-expected.json
@@ -5,7 +5,7 @@
     "--copyright": true,
     "--info": true,
     "--license": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--package": true
   },
   "files_count": 1,
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index 0d35388d521..9f8b7f25e2c 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -5,7 +5,7 @@
       "scancode_options": {
         "input": "<path>",
         "--info": true,
-        "--output-json-lines": "<file>"
+        "--json-lines": "<file>"
       },
       "files_count": 1
     }
diff --git a/tests/formattedcode/data/json/simple-expected.jsonpp b/tests/formattedcode/data/json/simple-expected.jsonpp
index c52b0f17f2d..f95c296408d 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonpp
+++ b/tests/formattedcode/data/json/simple-expected.jsonpp
@@ -5,7 +5,7 @@
     "--copyright": true,
     "--info": true,
     "--license": true,
-    "--output-json-pp": "<file>",
+    "--json-pp": "<file>",
     "--package": true
   },
   "files_count": 1,
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
index 4693bb787c1..5df9c60529a 100644
--- a/tests/formattedcode/data/json/tree/expected.json
+++ b/tests/formattedcode/data/json/tree/expected.json
@@ -6,7 +6,7 @@
     "--info": true,
     "--license": true,
     "--package": true,
-    "--output-json-pp": "<file>",
+    "--json-pp": "<file>",
     "--strip-root": true
   },
   "files_count": 7,
diff --git a/tests/formattedcode/test_output_json.py b/tests/formattedcode/test_output_json.py
index d3050b73049..f18177c35d1 100644
--- a/tests/formattedcode/test_output_json.py
+++ b/tests/formattedcode/test_output_json.py
@@ -44,7 +44,7 @@ def test_json_pretty_print():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['-clip', test_dir, '--output-json-pp', result_file])
+    result = run_scan_click(['-clip', test_dir, '--json-pp', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -56,7 +56,7 @@ def test_json_compact():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['-clip', test_dir, '--output-json', result_file])
+    result = run_scan_click(['-clip', test_dir, '--json', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -72,7 +72,7 @@ def test_scan_output_does_not_truncate_copyright_json():
     result_file = test_env.get_temp_file('test.json')
 
     result = run_scan_click(
-        ['-clip', '--strip-root', test_dir, '--output-json-pp', result_file])
+        ['-clip', '--strip-root', test_dir, '--json-pp', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
@@ -85,7 +85,7 @@ def test_scan_output_does_not_truncate_copyright_with_json_to_stdout():
     result_file = test_env.get_temp_file('test.json')
 
     result = run_scan_click(
-        ['-clip', '--strip-root', test_dir, '--output-json-pp', result_file])
+        ['-clip', '--strip-root', test_dir, '--json-pp', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
diff --git a/tests/formattedcode/test_output_jsonlines.py b/tests/formattedcode/test_output_jsonlines.py
index 98dad78b626..a01bb8071b1 100644
--- a/tests/formattedcode/test_output_jsonlines.py
+++ b/tests/formattedcode/test_output_jsonlines.py
@@ -94,7 +94,7 @@ def test_jsonlines():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('jsonline')
 
-    result = run_scan_click(['-i', test_dir, '--output-json-lines', result_file])
+    result = run_scan_click(['-i', test_dir, '--json-lines', result_file])
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 
diff --git a/tests/scancode/data/altpath/copyright.expected.json b/tests/scancode/data/altpath/copyright.expected.json
index fa922c94bd4..36501a48536 100644
--- a/tests/scancode/data/altpath/copyright.expected.json
+++ b/tests/scancode/data/altpath/copyright.expected.json
@@ -4,7 +4,7 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index 2921734880b..cf4d348dfe6 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -2,7 +2,7 @@
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
     "input": "<path>",
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--package": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/failing/patchelf.expected.json b/tests/scancode/data/failing/patchelf.expected.json
index a106bf717e1..f21c12de299 100644
--- a/tests/scancode/data/failing/patchelf.expected.json
+++ b/tests/scancode/data/failing/patchelf.expected.json
@@ -3,7 +3,7 @@
   "scancode_options": {
     "input": "<path>",
     "--copyright": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index c8b8f1427c3..f5717f4fbd3 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -18,6 +18,8 @@ Options:
     -u, --url    Scan <input> for urls.
 
   scan options:
+    --license-diag               Include diagnostic information in license scan
+                                 results.
     --license-score INTEGER      Do not return license matches with a score lower
                                  than this score. A number between 0 and 100.
                                  [default: 0]
@@ -26,29 +28,21 @@ Options:
                                  reference URLs. Curly braces ({}) are replaced by
                                  the license key.  [default: https://enterprise.de
                                  jacode.com/urn/urn:dje:license:{}]
-    --license-diag               Include diagnostic information in license scan
-                                 results.
 
   output formats:
-    --json-pp, --output-json-pp FILE
-                                    Write scan output formatted as pretty-printed
-                                    JSON to FILE.
-    --output-spdx-rdf FILE          Write scan output formatted as SPDX RDF to
-                                    FILE. Implies running the --info scan.
-    --output-spdx-tv FILE           Write scan output formatted as SPDX Tag/Value
-                                    to FILE. Implies running the --info scan.
-    --output-html-app FILE          Write scan output formatted as a mini HTML
-                                    application FILE.
-    --output-json-lines FILE        Write scan output formatted as JSON Lines to
-                                    FILE.
-    --json, --output-json FILE      Write scan output formatted as compact JSON to
-                                    FILE.
-    --output-html FILE              Write scan output formatted as HTML to FILE.
-    --output-custom FILE            Write scan output to FILE formatted with the
-                                    custom Jinja template file.
-    --custom-template FILE          Use this Jinja template FILE as a custom
-                                    template.
-    --output-csv FILE               Write scan output formatted as CSV to FILE.
+    --json FILE             Write scan output as compact JSON to FILE.
+    --json-pp FILE          Write scan output as pretty-printed JSON to FILE.
+    --json-lines FILE       Write scan output as JSON Lines to FILE.
+    --output-csv FILE       Write scan output as CSV to FILE.
+    --output-html FILE      Write scan output as HTML to FILE.
+    --output-custom FILE    Write scan output to FILE formatted with the custom
+                            Jinja template file.
+    --custom-template FILE  Use this Jinja template FILE as a custom template.
+    --output-html-app FILE  Write scan output as a mini HTML application to FILE.
+    --output-spdx-rdf FILE  Write scan output as SPDX RDF to FILE. Implies running
+                            the --info scan.
+    --output-spdx-tv FILE   Write scan output as SPDX Tag/Value to FILE. Implies
+                            running the --info scan.
 
   output filters:
     --only-findings  Only return files or directories with findings for the
@@ -56,12 +50,12 @@ Options:
                      omitted (file information is not treated as findings).
 
   output control:
-    --strip-root  Strip the root directory segment of all paths. The default is to
-                  always include the last directory segment of the scanned path
-                  such that all paths have a common root directory.
     --full-root   Report full, absolute paths. The default is to always include
                   the last directory segment of the scanned path such that all
                   paths have a common root directory.
+    --strip-root  Strip the root directory segment of all paths. The default is to
+                  always include the last directory segment of the scanned path
+                  such that all paths have a common root directory.
 
   pre-scan:
     --ignore <pattern>  Ignore files matching <pattern>.
@@ -72,40 +66,43 @@ Options:
                    running the --info scan.
 
   core:
-    --verbose            Print progress  as file-by-file path instead of a
-                         progress bar. Print a verbose scan summary.
-    --quiet              Do not print summary or progress.
-    -h, --help           Show this message and exit.
+    --timeout <seconds>  Stop an unfinished file scan after a timeout in seconds.
+                         [default: 120 seconds]
     -n, --processes INT  Set the number of parallel processes to use. Disable
                          parallel processing if 0.  [default: 1]
-    --examples           Show command examples and exit.
-    --about              Show information about ScanCode and licensing and exit.
-    --version            Show the version and exit.
-    --timeout <seconds>  Stop an unfinished file scan after a timeout in seconds.
-                         [default: 120]
-    --plugins            Print the list of available ScanCode plugins.
+    --quiet              Do not print summary or progress.
+    --verbose            Print progress  as file-by-file path instead of a
+                         progress bar. Print a verbose scan summary.
+    --timing             Collect execution timing for each scan and scanned file.
     --no-cache           Do not use on-disk cache for intermediate results. Uses
                          more memory.
-    --timing             Collect execution timing for each scan and scanned file.
     --temp-dir DIR       Set the path to the temporary directory to use for
                          ScanCode cache and temporary files.
 
   miscellaneous:
+    --reindex-licenses  Check the license index cache and reindex if needed and
+                        exit
     --test-mode         Run ScanCode in a special "test mode". Only for testing.
-    --reindex-licenses  Check the license index cache and reindex if needed.
+
+  documentation:
+    -h, --help  Show this message and exit.
+    --about     Show information about ScanCode and licensing and exit.
+    --version   Show the version and exit.
+    --examples  Show command examples and exit.
+    --plugins   Show the list of available ScanCode plugins and exit.
 
   Examples (use --examples for more):
 
   Scan the 'samples' directory for licenses and copyrights.
-  Save scan results to a JSON file:
+  Save scan results to the 'scancode_result.json' JSON file:
 
-      scancode --license --copyright --output-json=scancode_result.json
-      samples
+      scancode --license --copyright --json=scancode_result.json samples
 
   Scan the 'samples' directory for licenses and package manifests. Print scan
-  results on screen as pretty-formatted JSON:
+  results on screen as pretty-formatted JSON (using the special '-' FILE to print
+  to on screen/to stdout):
 
-      scancode --json-pp --license --package  samples
+      scancode --json-pp - --license --package  samples
 
   Note: when you run scancode, a progress bar is displayed with a counter of
   the number of files processed. Use --verbose to display file-by-file
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 17db28a3504..720f0f5a1cc 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -5,7 +5,7 @@
     "--copyright": true,
     "--info": true,
     "--license": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index ada751d2ed2..cee14d0b0c6 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -5,7 +5,7 @@
     "--copyright": true,
     "--email": true,
     "--license": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--url": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/basic.expected.json b/tests/scancode/data/info/basic.expected.json
index e06865981dd..d88eda56291 100644
--- a/tests/scancode/data/info/basic.expected.json
+++ b/tests/scancode/data/info/basic.expected.json
@@ -3,7 +3,7 @@
   "scancode_options": {
     "input": "<path>",
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/basic.rooted.expected.json b/tests/scancode/data/info/basic.rooted.expected.json
index d97c0690e64..825ae5dd263 100644
--- a/tests/scancode/data/info/basic.rooted.expected.json
+++ b/tests/scancode/data/info/basic.rooted.expected.json
@@ -3,7 +3,7 @@
   "scancode_options": {
     "input": "<path>",
     "--info": true,
-    "--output-json": "<file>"
+    "--json": "<file>"
   },
   "files_count": 6,
   "files": [
diff --git a/tests/scancode/data/info/email_url_info.expected.json b/tests/scancode/data/info/email_url_info.expected.json
index 92dce82e917..604f5d0610e 100644
--- a/tests/scancode/data/info/email_url_info.expected.json
+++ b/tests/scancode/data/info/email_url_info.expected.json
@@ -5,7 +5,7 @@
     "--email": true,
     "--info": true,
     "--strip-root": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--url": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index f7e2d7b72aa..8d3d9669255 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -4,7 +4,7 @@
     "input": "<path>",
     "--license": true,
     "--license-text": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/non_utf8/expected-linux.json b/tests/scancode/data/non_utf8/expected-linux.json
index adc181a8a18..02edc3a9c67 100644
--- a/tests/scancode/data/non_utf8/expected-linux.json
+++ b/tests/scancode/data/non_utf8/expected-linux.json
@@ -3,7 +3,7 @@
   "scancode_options": {
     "input": "<path>",
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 18,
diff --git a/tests/scancode/data/non_utf8/expected-mac.json b/tests/scancode/data/non_utf8/expected-mac.json
index 2ab56cfa3cb..554d938f04f 100644
--- a/tests/scancode/data/non_utf8/expected-mac.json
+++ b/tests/scancode/data/non_utf8/expected-mac.json
@@ -3,7 +3,7 @@
   "scancode_options": {
     "input": "<path>",
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 18,
diff --git a/tests/scancode/data/non_utf8/expected-win.json b/tests/scancode/data/non_utf8/expected-win.json
index 295971d6268..1924b62eab8 100644
--- a/tests/scancode/data/non_utf8/expected-win.json
+++ b/tests/scancode/data/non_utf8/expected-win.json
@@ -3,10 +3,10 @@
   "scancode_options": {
     "input": "<path>",
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
-  "files_count": 19,
+  "files_count": 18,
   "files": [
     {
       "path": "non_unicode",
@@ -36,7 +36,8 @@
       "date": "2017-07-14",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -57,7 +58,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -79,7 +81,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -101,7 +104,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -123,7 +127,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -145,7 +150,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -167,7 +173,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -189,7 +196,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -211,7 +219,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -233,7 +242,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -255,7 +265,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -277,7 +288,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -299,7 +311,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -321,7 +334,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -343,7 +357,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -365,7 +380,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -387,7 +403,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -409,7 +426,8 @@
       "date": "2017-08-27",
       "extension": "",
       "file_type": "empty",
-      "files_count": null,
+      "files_count": 0,
+      "dirs_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
diff --git a/tests/scancode/data/plugin_mark_source/with_info.expected.json b/tests/scancode/data/plugin_mark_source/with_info.expected.json
index cfe9c6e9fa2..5a47eb70388 100644
--- a/tests/scancode/data/plugin_mark_source/with_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/with_info.expected.json
@@ -4,7 +4,7 @@
     "input": "<path>",
     "--info": true,
     "--mark-source": true,
-    "--output-json": "<file>"
+    "--json": "<file>"
   },
   "files_count": 12,
   "files": [
diff --git a/tests/scancode/data/plugin_mark_source/without_info.expected.json b/tests/scancode/data/plugin_mark_source/without_info.expected.json
index 6c2099eb886..ecce7fc5482 100644
--- a/tests/scancode/data/plugin_mark_source/without_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/without_info.expected.json
@@ -3,7 +3,7 @@
   "scancode_options": {
     "input": "<path>",
     "--mark-source": true,
-    "--output-json": "<file>"
+    "--json": "<file>"
   },
   "files_count": 12,
   "files": [
diff --git a/tests/scancode/data/plugin_only_findings/expected.json b/tests/scancode/data/plugin_only_findings/expected.json
index db1bbb4bbe0..93ddcfe9f57 100644
--- a/tests/scancode/data/plugin_only_findings/expected.json
+++ b/tests/scancode/data/plugin_only_findings/expected.json
@@ -6,7 +6,7 @@
     "--info": true,
     "--license": true,
     "--only-findings": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--package": true
   },
   "files_count": 3,
diff --git a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
index 0f3412c0a0f..99048ea6301 100644
--- a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
+++ b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
@@ -2,7 +2,7 @@
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
     "input": "<path>",
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--package": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/single/iproute.expected.json b/tests/scancode/data/single/iproute.expected.json
index 1a6b66f37dd..4209a272004 100644
--- a/tests/scancode/data/single/iproute.expected.json
+++ b/tests/scancode/data/single/iproute.expected.json
@@ -3,7 +3,7 @@
   "scancode_options": {
     "input": "<path>",
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
index daf9814ef0b..0ef2a32d400 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
@@ -6,7 +6,7 @@
     "--email": true,
     "--info": true,
     "--license": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--package": true,
     "--strip-root": true,
     "--url": true
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
index b1d52686b84..ab613f6f0da 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
@@ -6,7 +6,7 @@
     "--email": true,
     "--info": true,
     "--license": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--package": true,
     "--strip-root": true,
     "--url": true
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
index 4000f1303ab..df29dc49ab7 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-win.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
@@ -6,7 +6,7 @@
     "--email": true,
     "--info": true,
     "--license": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--package": true,
     "--strip-root": true,
     "--url": true
diff --git a/tests/scancode/data/weird_file_name/expected-linux.json b/tests/scancode/data/weird_file_name/expected-linux.json
index e315afbb629..7dc15860da0 100644
--- a/tests/scancode/data/weird_file_name/expected-linux.json
+++ b/tests/scancode/data/weird_file_name/expected-linux.json
@@ -4,7 +4,7 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 5,
diff --git a/tests/scancode/data/weird_file_name/expected-mac.json b/tests/scancode/data/weird_file_name/expected-mac.json
index 5603b9a0dce..25559d68408 100644
--- a/tests/scancode/data/weird_file_name/expected-mac.json
+++ b/tests/scancode/data/weird_file_name/expected-mac.json
@@ -4,7 +4,7 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 5,
diff --git a/tests/scancode/data/weird_file_name/expected-win.json b/tests/scancode/data/weird_file_name/expected-win.json
index 9e973dea37b..2ba5a36d7d7 100644
--- a/tests/scancode/data/weird_file_name/expected-win.json
+++ b/tests/scancode/data/weird_file_name/expected-win.json
@@ -4,7 +4,7 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--output-json": "<file>",
+    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 5,
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index 55b38b19211..ffd5d7f74a0 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -192,7 +192,7 @@ def test_scan_info_returns_does_not_strip_root_with_single_file():
     result_file = test_env.get_temp_file('json')
     result = run_scan_click(['--info', '--strip-root', test_file, '--json', result_file])
     assert result.exit_code == 0
-    check_json_scan(test_env.get_test_loc('single/iproute.expected.json'), result_file, regen=False)
+    check_json_scan(test_env.get_test_loc('single/iproute.expected.json'), result_file, strip_dates=True)
 
 
 def test_scan_info_license_copyrights():
@@ -295,11 +295,11 @@ def test_scan_works_with_multiple_processes():
 
     # run the same scan with one or three processes
     result_file_1 = test_env.get_temp_file('json')
-    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--output-json', result_file_1])
+    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--json', result_file_1])
     assert result1.exit_code == 0
 
     result_file_3 = test_env.get_temp_file('json')
-    result3 = run_scan_click([ '--copyright', '--processes', '3', test_dir, '--output-json', result_file_3])
+    result3 = run_scan_click([ '--copyright', '--processes', '3', test_dir, '--json', result_file_3])
     assert result3.exit_code == 0
     res1 = json.loads(open(result_file_1).read())
     res3 = json.loads(open(result_file_3).read())
@@ -311,12 +311,12 @@ def test_scan_works_with_no_processes_in_single_threaded_mode():
 
     # run the same scan with zero or one process
     result_file_0 = test_env.get_temp_file('json')
-    result0 = run_scan_click([ '--copyright', '--processes', '0', test_dir, '--output-json', result_file_0])
+    result0 = run_scan_click([ '--copyright', '--processes', '0', test_dir, '--json', result_file_0])
     assert result0.exit_code == 0
     assert 'Disabling multi-processing.' in result0.output
 
     result_file_1 = test_env.get_temp_file('json')
-    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--output-json', result_file_1])
+    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--json', result_file_1])
     assert result1.exit_code == 0
     res0 = json.loads(open(result_file_0).read())
     res1 = json.loads(open(result_file_1).read())
@@ -395,7 +395,7 @@ def test_scan_does_not_fail_when_scanning_unicode_files_and_paths():
     elif on_windows:
         expected = 'unicodepath/unicodepath.expected-win.json'
 
-    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True, regen=False)
+    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True)
 
 
 @skipIf(on_windows, 'Python tar cannot extract these files on Windows')
@@ -634,3 +634,38 @@ def test_scan_cli_help(regen=False):
         with open(expected_file, 'wb') as ef:
             ef.write(result.output)
     assert open(expected_file).read() == result.output
+
+
+def test_scan_errors_out_with_unknown_option():
+    test_file = test_env.get_test_loc('license_text/test.txt')
+    result = run_scan_click([ '--json--info', test_file])
+    assert result.exit_code == 2
+    assert 'Error: no such option: --json--info' in result.output
+
+
+def test_scan_to_json_without_FILE_does_not_write_to_next_option():
+    test_file = test_env.get_test_loc('license_text/test.txt')
+    result = run_scan_click([ '--json', '--info', test_file])
+    assert result.exit_code == 2
+    assert ('Error: Invalid value for "--json": Illegal file name '
+            'conflicting with an option name: --info.') in result.output
+
+
+def test_scan_errors_out_with_conflicting_root_options():
+    test_file = test_env.get_test_loc('license_text/test.txt')
+    result_file = test_env.get_temp_file('results.json')
+    result = run_scan_click(['--strip-root', '--full-root','--json', result_file, '--info', test_file])
+    assert result.exit_code == 2
+    assert ('Error: The option --strip-root cannot be used together with the '
+            '--full-root option(s) and --full-root is used.') in result.output
+
+
+def test_scan_errors_out_with_conflicting_verbosity_options():
+    test_file = test_env.get_test_loc('license_text/test.txt')
+    result_file = test_env.get_temp_file('results.json')
+    result = run_scan_click(['--quiet', '--verbose','--json', result_file, '--info', test_file])
+    assert result.exit_code == 2
+    print(result.output)
+    assert ('Error: The option --quiet cannot be used together with the '
+            '--verbose option(s) and --verbose is used. You can set only one of '
+            'these options at a time.') in result.output
diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
index 624572ecd3b..ab5f183688b 100644
--- a/tests/scancode/test_plugin_ignore.py
+++ b/tests/scancode/test_plugin_ignore.py
@@ -29,7 +29,7 @@
 from os.path import join
 
 from commoncode.testcase import FileDrivenTesting
-from scancode.cli import CommandOption
+from scancode import CommandOption
 from scancode.plugin_ignore import is_ignored
 from scancode.plugin_ignore import ProcessIgnore
 from scancode.cli_test_utils import run_scan_click
@@ -166,7 +166,7 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
         test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', test_dir, '--output-json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root', test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         # a single test.tst file and its directory that is not a VCS file should be listed
@@ -176,7 +176,7 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
     def test_scancode_ignore_vcs_files_and_dirs_by_default_no_multiprocess(self):
         test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
         result_file = self.get_temp_file('json')
-        result = run_scan_click(['--copyright', '--strip-root', '--processes', '0', test_dir, '--output-json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--processes', '0', test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         # a single test.tst file and its directory that is not a VCS file should be listed
@@ -189,7 +189,7 @@ def test_scancode_ignore_single_file(self):
         result_file = self.get_temp_file('json')
 
         result = run_scan_click(
-            ['--copyright', '--strip-root', '--ignore', 'sample.doc', test_dir, '--output-json', result_file])
+            ['--copyright', '--strip-root', '--ignore', 'sample.doc', test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 3 == scan_result['files_count']
@@ -209,7 +209,7 @@ def test_scancode_ignore_multiple_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', 'ignore.doc', test_dir, '--output-json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', 'ignore.doc', test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 2 == scan_result['files_count']
@@ -220,7 +220,7 @@ def test_scancode_ignore_glob_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*.doc', test_dir, '--output-json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*.doc', test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 1 == scan_result['files_count']
@@ -231,7 +231,7 @@ def test_scancode_ignore_glob_path(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test/*', test_dir, '--output-json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test/*', test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 2 == scan_result['files_count']
@@ -242,7 +242,7 @@ def test_scancode_multiple_ignores(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test', '--ignore', '*.doc', test_dir, '--output-json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test', '--ignore', '*.doc', test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 0 == scan_result['files_count']
diff --git a/tests/scancode/test_plugin_mark_source.py b/tests/scancode/test_plugin_mark_source.py
index 2fbd64f172c..80ddf16b0bd 100644
--- a/tests/scancode/test_plugin_mark_source.py
+++ b/tests/scancode/test_plugin_mark_source.py
@@ -56,7 +56,7 @@ def test_scan_mark_source_without_info(self):
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_mark_source/without_info.expected.json')
 
-        _result = run_scan_click(['--mark-source', test_dir, '--output-json', result_file])
+        _result = run_scan_click(['--mark-source', test_dir, '--json', result_file])
         check_json_scan(expected_file, result_file, regen=False)
 
     def test_scan_mark_source_with_info(self):
@@ -64,5 +64,5 @@ def test_scan_mark_source_with_info(self):
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_mark_source/with_info.expected.json')
 
-        _result = run_scan_click(['--info', '--mark-source', test_dir, '--output-json', result_file])
+        _result = run_scan_click(['--info', '--mark-source', test_dir, '--json', result_file])
         check_json_scan(expected_file, result_file)
diff --git a/tests/scancode/test_scan_utils.py b/tests/scancode/test_scan_utils.py
index b13fa8d0a89..6d9171df852 100644
--- a/tests/scancode/test_scan_utils.py
+++ b/tests/scancode/test_scan_utils.py
@@ -128,7 +128,7 @@ class TestHelpGroups(FileDrivenTesting):
 
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
-    def test_scan_help_without_custom_class(self):
+    def test_scan_help_group_and_sort_order_without_custom_class(self):
         @click.command(name='scan', cls=ScanCommand)
         @click.option('--opt', is_flag=True, help='Help text for option')
         def scan(opt):
@@ -137,11 +137,14 @@ def scan(opt):
         runner = CliRunner()
         result = runner.invoke(scan, ['--help'])
         from scancode import MISC_GROUP
-        assert MISC_GROUP + ':\n    --opt   Help text for option\n' in result.output
+        assert MISC_GROUP in result.output
+        assert  '--opt   Help text for option' in result.output
+
 
-    def test_scan_help_with_custom_class(self):
+    def test_scan_help_group_and_sort_order_with_custom_class(self):
         @click.command(name='scan', cls=ScanCommand)
-        @click.option('--opt', is_flag=True, help='Help text for option', cls=CommandLineOption)
+        @click.option('--opt', is_flag=True, sort_order=10,
+                      help='Help text for option', cls=CommandLineOption)
         def scan(opt):
             pass
 

From 43cd8cbfe84fc0e331b637c483e7a58bda48de78 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 19 Jan 2018 09:47:42 +0100
Subject: [PATCH 055/122] Rename Pluggy impl spec from output to output_impl
 #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/formattedcode/output_csv.py       | 5 ++---
 src/formattedcode/output_html.py      | 8 ++++----
 src/formattedcode/output_json.py      | 6 +++---
 src/formattedcode/output_jsonlines.py | 4 ++--
 src/formattedcode/output_spdx.py      | 6 +++---
 src/plugincode/output.py              | 2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/formattedcode/output_csv.py b/src/formattedcode/output_csv.py
index 5188cc2a8f1..dd977b8299b 100644
--- a/src/formattedcode/output_csv.py
+++ b/src/formattedcode/output_csv.py
@@ -31,15 +31,14 @@
 
 import unicodecsv
 
-from plugincode.output import output
+from plugincode.output import output_impl
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
 from scancode import FileOptionType
 from scancode import OUTPUT_GROUP
 
 
-
-@output
+@output_impl
 class CsvOutput(OutputPlugin):
 
     options = [
diff --git a/src/formattedcode/output_html.py b/src/formattedcode/output_html.py
index c37275c7bfb..5b492047976 100644
--- a/src/formattedcode/output_html.py
+++ b/src/formattedcode/output_html.py
@@ -50,7 +50,7 @@
 from commoncode.fileutils import fsencode
 from commoncode.fileutils import parent_directory
 from commoncode.system import on_linux
-from plugincode.output import output
+from plugincode.output import output_impl
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
 from scancode import FileOptionType
@@ -64,7 +64,7 @@
 """
 
 
-@output
+@output_impl
 class HtmlOutput(OutputPlugin):
 
     options = [
@@ -85,7 +85,7 @@ def save_results(self, codebase, results, files_count, version, notice, options)
         write_templated(output_file, results, version, template_or_format='html')
 
 
-@output
+@output_impl
 class CustomTemplateOutput(OutputPlugin):
 
     options = [
@@ -124,7 +124,7 @@ def save_results(self, codebase, results, files_count, version, notice, options)
         write_templated(output_file, results, version, template_or_format=template_path)
 
 
-@output
+@output_impl
 class HtmlAppOutput(OutputPlugin):
     """
     Write scan output as a mini HTML application.
diff --git a/src/formattedcode/output_json.py b/src/formattedcode/output_json.py
index f11e9eb861e..ca95353ccab 100644
--- a/src/formattedcode/output_json.py
+++ b/src/formattedcode/output_json.py
@@ -29,7 +29,7 @@
 
 import simplejson
 
-from plugincode.output import output
+from plugincode.output import output_impl
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
 from scancode import FileOptionType
@@ -40,7 +40,7 @@
 """
 
 
-@output
+@output_impl
 class JsonCompactOutput(OutputPlugin):
 
     options = [
@@ -61,7 +61,7 @@ def save_results(self, codebase, results, files_count, version, notice, options)
         write_json(results, output_file, files_count, version, notice, options, pretty=False)
 
 
-@output
+@output_impl
 class JsonPrettyOutput(OutputPlugin):
 
     options = [
diff --git a/src/formattedcode/output_jsonlines.py b/src/formattedcode/output_jsonlines.py
index 32e36c47038..ea3cedee245 100644
--- a/src/formattedcode/output_jsonlines.py
+++ b/src/formattedcode/output_jsonlines.py
@@ -29,14 +29,14 @@
 
 import simplejson
 
-from plugincode.output import output
+from plugincode.output import output_impl
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
 from scancode import FileOptionType
 from scancode import OUTPUT_GROUP
 
 
-@output
+@output_impl
 class JsonLinesOutput(OutputPlugin):
 
     options = [
diff --git a/src/formattedcode/output_spdx.py b/src/formattedcode/output_spdx.py
index 835bdd96297..25e3e21315d 100644
--- a/src/formattedcode/output_spdx.py
+++ b/src/formattedcode/output_spdx.py
@@ -46,7 +46,7 @@
 from spdx.utils import SPDXNone
 from spdx.version import Version
 
-from plugincode.output import output
+from plugincode.output import output_impl
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption
 from scancode import FileOptionType
@@ -87,7 +87,7 @@ def logger_debug(*args):
 Output plugins to write scan results in SPDX format.
 """
 
-@output
+@output_impl
 class SpdxTvOutput(OutputPlugin):
 
     needs_info = True
@@ -111,7 +111,7 @@ def save_results(self, codebase, results, files_count, version, notice, options)
         write_spdx(output_file, results, version, notice, input_file, as_tagvalue=True)
 
 
-@output
+@output_impl
 class SpdxRdfOutput(OutputPlugin):
 
     options = [
diff --git a/src/plugincode/output.py b/src/plugincode/output.py
index aa6f8b48148..c3cd0630b54 100644
--- a/src/plugincode/output.py
+++ b/src/plugincode/output.py
@@ -80,7 +80,7 @@ def logger_debug(*args):
 entrypoint = 'scancode_output'
 
 output_spec = HookspecMarker(project_name=stage)
-output = HookimplMarker(project_name=stage)
+output_impl = HookimplMarker(project_name=stage)
 
 
 @output_spec

From d7fb3ed47e788f0d5c33b71f22deff5e642d648c Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 19 Jan 2018 09:48:16 +0100
Subject: [PATCH 056/122] Fix spacing #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/plugin_license.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index 7493dd3fb4c..ee4f8bd1d45 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -49,10 +49,10 @@ class LicenseScanner(ScanPlugin):
 
     options = [
         CommandLineOption(('-l', '--license'),
-            is_flag=True, 
+            is_flag=True,
             help='Scan <input> for licenses.',
             help_group=SCAN_GROUP,
-            sort_order= 10),
+            sort_order=10),
 
         CommandLineOption(('--license-score',),
             type=int, default=0, show_default=True,
@@ -62,7 +62,7 @@ class LicenseScanner(ScanPlugin):
             help_group=SCAN_OPTIONS_GROUP),
 
         CommandLineOption(('--license-text',),
-            is_flag=True, 
+            is_flag=True,
             requires=['license'],
             help='Include the detected licenses matched text.',
             help_group=SCAN_OPTIONS_GROUP),
@@ -75,7 +75,7 @@ class LicenseScanner(ScanPlugin):
             help_group=SCAN_OPTIONS_GROUP),
 
         CommandLineOption(('--license-diag',),
-            is_flag=True, 
+            is_flag=True,
             requires=['license'],
             help='Include diagnostic information in license scan results.',
             help_group=SCAN_OPTIONS_GROUP),
@@ -92,7 +92,6 @@ def get_scanner(self, license_score=0, license_text=False,
                        license_url_template=license_url_template)
 
 
-
 def reindex_licenses(ctx, param, value):
     if not value or ctx.resilient_parsing:
         return

From 04159b90c385b138bd7bf3ec7977836632ac0603 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 19 Jan 2018 09:50:34 +0100
Subject: [PATCH 057/122] Catch errors in the execution of scan stages #787

 * for now all stages are catching exceptions and rethrowing them with
   an error message(except for scan stages that already catch
   exceptions). This stops the executaion. A better way would be to
   continue trucking and disable the faulty plugins

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py | 66 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index c2ca5d5f8d8..4e678cc6b0c 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -594,16 +594,24 @@ def scancode(ctx, input, info,  # @ReservedAssignment
 
         setup_timings = OrderedDict()
         plugins_setup_start = time()
-        # TODO: add progress indicator
+
         if not quiet and not verbose:
             echo_stderr('Setup plugins...', fg='green')
+
+        # TODO: add progress indicator
         for stage, stage_plugins in enabled_plugins.items():
             for name, plugin in stage_plugins.items():
                 plugin_setup_start = time()
                 if not quiet and verbose:
                     echo_stderr('Setup plugin: %(stage)s:%(name)s...' % locals(),
                                 fg='green')
-                plugin.setup()
+                try:
+                    plugin.setup()
+                except:
+                    msg = 'ERROR: failed to setup plugin: %(stage)s:%(name)s:' % locals()
+                    echo_stderr(msg, fg='red')
+                    echo_stderr(traceback.format_exc())
+                    ctx.exit(2)
 
                 timing_key = 'setup_%(stage)s_%(name)s' % locals()
                 setup_timings[timing_key] = time() - plugin_setup_start
@@ -619,7 +627,14 @@ def scancode(ctx, input, info,  # @ReservedAssignment
 
         # TODO: add progress indicator
         # note: inventory timing collection is built in Codebase initialization
-        codebase = Codebase(location=input, use_cache=not no_cache)
+        try:
+            codebase = Codebase(location=input, use_cache=not no_cache)
+        except:
+            msg = 'ERROR: failed to collect codebase at: %(input)r' % locals()
+            echo_stderr(msg, fg='red')
+            echo_stderr(traceback.format_exc())
+            ctx.exit(2)
+
         if TRACE: logger_debug('scancode: codebase.use_cache:', codebase.use_cache)
 
         codebase.strip_root = strip_root
@@ -672,14 +687,20 @@ def scancode(ctx, input, info,  # @ReservedAssignment
             echo_stderr('Run pre-scan plugins...', fg='green')
 
         # TODO: add progress indicator
-        # FIXME: we should always catch errors from plugins properly
         for name, plugin in pre_scan_plugins.items():
             plugin_prescan_start = time()
             if verbose:
                 echo_stderr('Run pre-scan plugin: %(name)s...' % locals(),
                             fg='green')
 
-            plugin.process_codebase(codebase)
+            try:
+                plugin.process_codebase(codebase)
+            except:
+                msg = 'ERROR: failed to run pre-scan plugin: %(name)s:' % locals()
+                echo_stderr(msg, fg='red')
+                echo_stderr(traceback.format_exc())
+                ctx.exit(2)
+
             codebase.update_counts()
             timing_key = 'prescan_%(name)s' % locals()
             setup_timings[timing_key] = time() - plugin_prescan_start
@@ -742,14 +763,19 @@ def scancode(ctx, input, info,  # @ReservedAssignment
 
         post_scan_start = time()
         # TODO: add progress indicator
-        # FIXME: we should always catch errors from plugins properly
         if not quiet and not verbose and post_scan_plugins:
             echo_stderr('Run post-scan plugins...', fg='green')
         for name, plugin in post_scan_plugins.items():
             if not quiet and verbose:
                 echo_stderr('Run post-scan plugin: %(name)s...' % locals(), fg='green')
 
-            plugin.process_codebase(codebase)
+            try:
+                plugin.process_codebase(codebase)
+            except:
+                msg = 'ERROR: failed to run post-scan plugin: %(name)s:' % locals()
+                echo_stderr(msg, fg='red')
+                echo_stderr(traceback.format_exc())
+                ctx.exit(2)
             codebase.update_counts()
 
         codebase.timings['post-scan'] = time() - post_scan_start
@@ -759,7 +785,6 @@ def scancode(ctx, input, info,  # @ReservedAssignment
         ############################################################################
         output_filter_start = time()
         # TODO: add progress indicator
-        # FIXME: we should always catch errors from plugins properly
         if not quiet and not verbose and output_filter_plugins:
             echo_stderr('Run output filter plugins...', fg='green')
 
@@ -767,10 +792,16 @@ def scancode(ctx, input, info,  # @ReservedAssignment
         if filters:
             # This is a set of resource ids to filter out from the final outputs
             filtered_rids_add = codebase.filtered_rids.add
-            for rid, resource in codebase.get_resources_with_rid():
-                if all(to_keep(resource) for to_keep in filters):
-                    continue
-                filtered_rids_add(rid)
+            try:
+                for rid, resource in codebase.get_resources_with_rid():
+                    if all(to_keep(resource) for to_keep in filters):
+                        continue
+                    filtered_rids_add(rid)
+            finally:
+                msg = 'ERROR: failed to run output filter plugins'
+                echo_stderr(msg, fg='red')
+                echo_stderr(traceback.format_exc())
+                ctx.exit(2)
 
         codebase.timings['output-filter'] = time() - post_scan_start
 
@@ -779,8 +810,6 @@ def scancode(ctx, input, info,  # @ReservedAssignment
         ############################################################################
         output_start = time()
         # TODO: add progress indicator
-        # FIXME: we should always catch errors from plugins properly
-
         if not quiet and not verbose:
             echo_stderr('Save results...' , fg='green')
 
@@ -788,7 +817,14 @@ def scancode(ctx, input, info,  # @ReservedAssignment
             if not quiet and verbose:
                 echo_stderr('Save results as: %(name)s...' % locals(), fg='green')
 
-            plugin.process_codebase(codebase)
+            try:
+                plugin.process_codebase(codebase)
+            except:
+                msg = 'ERROR: failed to save output with plugin: %(name)s:' % locals()
+                echo_stderr(msg, fg='red')
+                echo_stderr(traceback.format_exc())
+                ctx.exit(2)
+
             codebase.update_counts()
 
         codebase.timings['output'] = time() - output_start

From a1c7053871d4de986baba6d2c34b24016d2fcb66 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 19 Jan 2018 11:45:19 +0100
Subject: [PATCH 058/122] Refine comment on temp file usage

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/extractcode/test_archive.py | 6 +++---
 tests/extractcode/test_extract.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index 0736463c05f..4e33e176724 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -184,7 +184,7 @@ def test_no_handler_is_selected_for_a_non_archive3(self):
     def test_7zip_extract_can_extract_to_relative_paths(self):
         # The setup is a tad complex because we want to have a relative dir
         # to the base dir where we run tests from, ie the scancode-toolkit/ dir
-        # To use relative paths, we use our tmp dir at the root of the code
+        # To use relative paths, we use our tmp dir at the root of the code tree
         from os.path import dirname, join, abspath
         import tempfile
         import shutil
@@ -207,7 +207,7 @@ def test_7zip_extract_can_extract_to_relative_paths(self):
     def test_libarchive_extract_can_extract_to_relative_paths(self):
         # The setup is a tad complex because we want to have a relative dir
         # to the base dir where we run tests from, ie the scancode-toolkit/ dir
-        # To use relative paths, we use our tmp dir at the root of the code
+        # To use relative paths, we use our tmp dir at the root of the code tree
         from os.path import dirname, join, abspath
         import tempfile
         import shutil
@@ -1511,7 +1511,7 @@ def test_extract_twice_with_rpm_with_xz_compressed_cpio(self):
     def test_extract_twice_can_extract_to_relative_paths(self):
         # The setup is a tad complex because we want to have a relative dir
         # to the base dir where we run tests from, ie the scancode-toolkit/ dir
-        # To use relative paths, we use our tmp dir at the root of the code
+        # To use relative paths, we use our tmp dir at the root of the code tree
         from os.path import dirname, join, abspath, exists
         import shutil
         import tempfile
diff --git a/tests/extractcode/test_extract.py b/tests/extractcode/test_extract.py
index d5d9f11e96f..5c3a051d472 100644
--- a/tests/extractcode/test_extract.py
+++ b/tests/extractcode/test_extract.py
@@ -873,7 +873,7 @@ def test_walk_can_be_extended_while_walking(self):
     def test_extract_can_extract_to_relative_paths(self):
         # The setup is a tad complex because we want to have a relative dir
         # to the base dir where we run tests from, ie the scancode-toolkit/ dir
-        # To use relative paths, we use our tmp dir at the root of the code
+        # To use relative paths, we use our tmp dir at the root of the code tree
         from os.path import dirname, join, abspath
         scancode_root = dirname(dirname(dirname(__file__)))
         scancode_tmp = join(scancode_root, 'tmp')

From ab4a3a09e4c60a19f6565086e0c72d34ffee9097 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 19 Jan 2018 19:57:34 +0100
Subject: [PATCH 059/122] Remove housekeeping stage which is not needed #787

 * the plugin for license reindexing is updated in next commit

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 setup.py                       | 13 -------
 src/plugincode/housekeeping.py | 64 ----------------------------------
 src/scancode/plugin_license.py | 20 -----------
 3 files changed, 97 deletions(-)
 delete mode 100644 src/plugincode/housekeeping.py

diff --git a/setup.py b/setup.py
index 04d9d16bec0..3a97ae6e01a 100644
--- a/setup.py
+++ b/setup.py
@@ -275,18 +275,5 @@ def read(*names, **kwargs):
             'jsonlines = formattedcode.output_jsonlines:JsonLinesOutput',
             'template = formattedcode.output_html:CustomTemplateOutput',
         ],
-
-        # scancode_housekeeping is the entry point for miscellaneous eager
-        # housekeeping plugins that only run their own Click callback instead of
-        # running the scans.
-        #
-        # Each entry hast this form:
-        #   plugin-name = fully.qualified.module:PluginClass
-        # where plugin-name must be a unique name for this entrypoint.
-        #
-        # See also plugincode.housekeeping module for details and doc.
-        'scancode_housekeeping': [
-            'ignore = scancode.plugin_license:LicenseIndexer',
-        ],
     },
 )
diff --git a/src/plugincode/housekeeping.py b/src/plugincode/housekeeping.py
deleted file mode 100644
index f9a475c6223..00000000000
--- a/src/plugincode/housekeeping.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
-# http://nexb.com and https://github.com/nexB/scancode-toolkit/
-# The ScanCode software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode require an acknowledgment.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# When you publish or redistribute any data created with ScanCode or any ScanCode
-# derivative work, you must accompany this data with the following acknowledgment:
-#
-#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-#  ScanCode should be considered or used as legal advice. Consult an Attorney
-#  for any legal advice.
-#  ScanCode is a free software code scanning tool from nexB Inc. and others.
-#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-from plugincode import BasePlugin
-from plugincode import PluginManager
-from plugincode import HookimplMarker
-from plugincode import HookspecMarker
-
-
-stage = 'housekeeping'
-entrypoint = 'scancode_housekeeping'
-
-housekeeping_spec = HookspecMarker(project_name=stage)
-housekeeping_impl = HookimplMarker(project_name=stage)
-
-
-@housekeeping_spec
-class HousekeepingPlugin(BasePlugin):
-    """
-    Base plugin class for miscellaneous housekeeping plugins that are executed
-    eagerly and exclusively of all other options.
-    They must define only eager option flags that run with a Click callback
-    options. They scan nothing.
-    """
-    pass
-
-    def is_enabled(self):
-        """
-        By design and because they are executed eagerly through a callback, an
-        HousekeepingPlugin is never "enabled" during scan processing.
-        """
-        return False
-
-
-housekeeping_plugins = PluginManager(
-    stage=stage,
-    module_qname=__name__,
-    entrypoint=entrypoint,
-    plugin_base_class=HousekeepingPlugin
-)
diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index ee4f8bd1d45..065960a13b2 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -92,27 +92,7 @@ def get_scanner(self, license_score=0, license_text=False,
                        license_url_template=license_url_template)
 
 
-def reindex_licenses(ctx, param, value):
-    if not value or ctx.resilient_parsing:
-        return
-
-    # TODO: check for temp file configuration and use that for the cache!!!
-    from licensedcode.cache import reindex
-    import click
-    click.echo('Checking and rebuilding the license index...')
-    reindex()
-    click.echo('Done.')
-    ctx.exit()
-
 
 @housekeeping_impl
 class LicenseIndexer(HousekeepingPlugin):
 
-    options = [
-        CommandLineOption(
-            ('--reindex-licenses',),
-            is_eager=True, is_flag=True, default=False,
-            callback=reindex_licenses,
-            help='Check the license index cache and reindex if needed and exit',
-            help_group=MISC_GROUP)
-    ]

From 66047acc88f661778d2c99a7893631d9ebf8cde6 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 23 Jan 2018 18:43:33 +0100
Subject: [PATCH 060/122] Implement new cache and temp_dir #685 #357

This is based on the design in
https://github.com/nexB/scancode-toolkit/issues/685#issuecomment-358929114

 * add new scancode_config.py with centralized global defaults for cache
   and temp_dir, SCANCODE_DEV_MODE, and scancode version.
 * add --cache-dir and --temp-dir as new CLI options
 * ensure that plugins can receive all CLI args when they are called
 * ensure that all accesses to temp-dirs and all accesses cache files
   are properly using the top level cache and temp args
 * refactor code that creates temp directories codebase-wide to always
   accept an argument which is the base dir under which this is created
 * refactor licensedcode cache to use the the cache_dir as an option
 * refactor scancode.cli to use the the temp_dir for the per-scan cache

 * Fixed bug when an output option is followed by another option and not
   a file name (@JonoYang reported this). This will raise an error.

 * Fixed bug on dates that were not properly filtered in the test
   results comparison

 * refactor output filter plugins to be regular codebase plugins that
   process a  whole codebase. They now set an is_filtered Resource
   attribute.
  * move output filter processing entirely inside the Codebase/Resource
    processing
  * Modified resource.Codebase/resource walking code accrodingly,
    removed the  sort option from walk(): walk() and children() are
    always returning sorted resources now: default sort order of the
    resource tree is by file, then directories, then case-insentive name
  * fix bug on incorrect file_counts

 * wrap call to plugins in try/except to catch plugins errors on plugins
   runs and exit cleanly with a message. This is now done in a function
   for all plugins except scanners
 * add concrete kwargs for options to plugin methods. Plugins now
   receive all the CLI options as kwargs and there is no Command Option
   ugly tuple anymore.
 * cleanup output to use only a process_codebase and not a save_results
 * Since all errors stack trace is now fully reported, ensure that
   only the last and first line of an error message is used for test
   results comparison.

 * add siblings(), has_(children, parent, siblings) methods to
   resource.Resource
 * add size_count for descendants size to a Resource. Also available
   in JSON outputs. The size attribute of a dir is now always 0.

 * removed plugincode.output._TEST_MODE flag.
 * renamed SCANCODE_DEBUG* flags.
 * other minor refactorings and formatting

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/scripts/synclic.py                        |  38 +-
 etc/scripts/testdata/livescan/expected.csv    |  40 +-
 src/cluecode/copyrights.py                    |   4 +-
 src/commoncode/command.py                     |   4 +-
 src/commoncode/fetch.py                       |   4 +-
 src/commoncode/fileutils.py                   |  53 +-
 src/commoncode/system.py                      |  26 +-
 src/commoncode/testcase.py                    |   7 +-
 src/extractcode/archive.py                    |  10 +-
 src/extractcode/extract.py                    |   4 +-
 src/extractcode/uncompress.py                 |   4 +-
 src/formattedcode/output_csv.py               |  13 +-
 src/formattedcode/output_html.py              |  48 +-
 src/formattedcode/output_json.py              |  53 +-
 src/formattedcode/output_jsonlines.py         |  31 +-
 src/formattedcode/output_spdx.py              |  37 +-
 src/licensedcode/__init__.py                  |  26 +-
 src/licensedcode/cache.py                     | 188 +++---
 src/licensedcode/index.py                     |  18 +-
 src/licensedcode/match.py                     |   1 -
 src/licensedcode/models.py                    |  21 +-
 src/plugincode/__init__.py                    |  43 +-
 src/plugincode/output.py                      | 153 +----
 src/plugincode/output_filter.py               |  17 +-
 src/plugincode/scan.py                        |   1 +
 src/scancode/__init__.py                      |  41 +-
 src/scancode/api.py                           |   9 +-
 src/scancode/cli.py                           | 606 +++++++++++-------
 src/scancode/cli_test_utils.py                |  70 +-
 src/scancode/extract_cli.py                   |   8 +-
 src/scancode/plugin_copyright.py              |   6 +-
 src/scancode/plugin_email.py                  |   4 +-
 src/scancode/plugin_ignore.py                 |  13 +-
 src/scancode/plugin_license.py                |  40 +-
 src/scancode/plugin_mark_source.py            |   9 +-
 src/scancode/plugin_only_findings.py          |  16 +-
 src/scancode/plugin_package.py                |   6 +-
 src/scancode/plugin_url.py                    |   4 +-
 src/scancode/resource.py                      | 405 ++++++------
 src/scancode/utils.py                         |   2 +-
 src/scancode_config.py                        | 123 ++++
 src/textcode/markup.py                        |   4 +-
 src/textcode/pdf.py                           |   1 -
 .../data/csv/livescan/expected.csv            |  38 +-
 .../formattedcode/data/csv/tree/expected.csv  |  18 +-
 .../data/json/simple-expected.json            |   6 +-
 .../data/json/simple-expected.jsonlines       |   6 +-
 .../data/json/simple-expected.jsonpp          |   6 +-
 .../data/json/tree/expected.json              |  12 +-
 tests/formattedcode/test_output_csv.py        |   3 -
 tests/formattedcode/test_output_json.py       |   2 -
 tests/formattedcode/test_output_jsonlines.py  |   2 -
 tests/formattedcode/test_output_templated.py  |   5 +-
 tests/licensedcode/test_cache.py              | 224 +++----
 .../data/altpath/copyright.expected.json      |   1 +
 .../data/failing/patchelf.expected.json       |   2 +-
 tests/scancode/data/help/help.txt             |  31 +-
 tests/scancode/data/info/all.expected.json    |  23 +-
 .../data/info/all.rooted.expected.json        |   2 +-
 tests/scancode/data/info/basic.expected.json  |  21 +-
 .../data/info/basic.rooted.expected.json      |  24 +-
 .../data/info/email_url_info.expected.json    |  23 +-
 .../scancode/data/license_text/test.expected  |   2 +-
 .../data/non_utf8/expected-linux.json         |  19 +
 .../scancode/data/non_utf8/expected-mac.json  |  45 +-
 .../scancode/data/non_utf8/expected-win.json  |  20 +
 .../plugin_license/license_url.expected.json  |  67 ++
 .../license_url/apache-1.0.txt                |   0
 .../with_info.expected.json                   |  28 +-
 .../without_info.expected.json                |  29 +-
 .../data/plugin_only_findings/expected.json   |   8 +-
 .../{ => resource}/cache/package/package.json |   0
 tests/scancode/data/resource/codebase/abc     |   0
 .../scancode/data/resource/codebase/dir/that  |   0
 .../scancode/data/resource/codebase/dir/this  |   0
 .../scancode/data/resource/codebase/et131x.h  |  47 ++
 .../data/resource/codebase/other dir/file     |   0
 .../data/single/iproute.expected.json         |   2 +-
 .../unicodepath.expected-linux.json           |   8 +-
 .../unicodepath/unicodepath.expected-mac.json |   9 +-
 .../unicodepath/unicodepath.expected-win.json |   8 +-
 .../data/weird_file_name/expected-linux.json  |   5 +
 .../data/weird_file_name/expected-mac.json    |   7 +-
 .../data/weird_file_name/expected-win.json    |   7 +-
 tests/scancode/test_cli.py                    |  18 +-
 tests/scancode/test_plugin_ignore.py          | 130 ++--
 tests/scancode/test_plugin_mark_source.py     |   3 -
 tests/scancode/test_plugin_only_findings.py   |  10 +-
 tests/scancode/test_resource.py               | 232 ++++++-
 89 files changed, 1997 insertions(+), 1367 deletions(-)
 create mode 100644 src/scancode_config.py
 create mode 100644 tests/scancode/data/plugin_license/license_url.expected.json
 rename tests/scancode/data/{ => plugin_license}/license_url/apache-1.0.txt (100%)
 rename tests/scancode/data/{ => resource}/cache/package/package.json (100%)
 create mode 100644 tests/scancode/data/resource/codebase/abc
 create mode 100644 tests/scancode/data/resource/codebase/dir/that
 create mode 100644 tests/scancode/data/resource/codebase/dir/this
 create mode 100644 tests/scancode/data/resource/codebase/et131x.h
 create mode 100644 tests/scancode/data/resource/codebase/other dir/file

diff --git a/etc/scripts/synclic.py b/etc/scripts/synclic.py
index 7bc7ae63a30..a7a3b3e1b96 100644
--- a/etc/scripts/synclic.py
+++ b/etc/scripts/synclic.py
@@ -31,18 +31,22 @@
 from collections import OrderedDict
 import json
 import os
+from os import mkdir
+from os.path import exists
+from os.path import join
 import zipfile
 
 import click
+from os.path import realpath
 click.disable_unicode_literals_warning = True
 import requests
 
-from commoncode import fileutils
 from commoncode import fetch
+from commoncode import fileutils
 
 import licensedcode
-from licensedcode.cache import get_licenses_db
 from licensedcode.cache import get_index
+from licensedcode.cache import get_licenses_db
 from licensedcode.models import load_licenses
 from licensedcode.models import License
 
@@ -80,30 +84,30 @@ def __init__(self, src_dir, match_text=False, match_approx=False):
         """
         `src_dir` is where the License objects are dumped.
         """
-        src_dir = os.path.realpath(src_dir)
+        src_dir = realpath(src_dir)
         self.src_dir = src_dir
 
         self.match_text = match_text
         self.match_approx = match_approx
 
         self.fetched = False
-        if os.path.exists(src_dir):
+        if exists(src_dir):
             # fetch ONLY if the directory is empty
             self.fetched = True
         else:
-            os.mkdir(src_dir)
+            mkdir(src_dir)
 
         self.update_dir = self.src_dir.rstrip('\\/') + '-update'
-        if not os.path.exists(self.update_dir):
-            os.mkdir(self.update_dir)
+        if not exists(self.update_dir):
+            mkdir(self.update_dir)
 
         self.new_dir = self.src_dir.rstrip('\\/') + '-new'
-        if not os.path.exists(self.new_dir):
-            os.mkdir(self.new_dir)
+        if not exists(self.new_dir):
+            mkdir(self.new_dir)
 
         self.del_dir = self.src_dir.rstrip('\\/') + '-del'
-        if not os.path.exists(self.del_dir):
-            os.mkdir(self.del_dir)
+        if not exists(self.del_dir):
+            mkdir(self.del_dir)
 
         self.scancodes_by_key = get_licenses_db()
 
@@ -111,13 +115,15 @@ def __init__(self, src_dir, match_text=False, match_approx=False):
             for l in self.scancodes_by_key.values()
             if l.spdx_license_key}
 
-        composites_dir = os.path.join(licensedcode.data_dir, 'composites', 'licenses')
+        composites_dir = join(
+            licensedcode.models.data_dir, 'composites', 'licenses')
         self.composites_by_key = load_licenses(composites_dir, with_deprecated=True)
         self.composites_by_spdx_key = {l.spdx_license_key.lower(): l
             for l in self.composites_by_key.values()
             if l.spdx_license_key}
 
-        foreign_dir = os.path.join(licensedcode.data_dir, 'non-english', 'licenses')
+        foreign_dir = join(
+            licensedcode.models.data_dir, 'non-english', 'licenses')
         self.non_english_by_key = load_licenses(foreign_dir, with_deprecated=True)
         self.non_english_by_spdx_key = {l.spdx_license_key.lower(): l
             for l in self.non_english_by_key.values()
@@ -449,8 +455,8 @@ def __init__(self, src_dir, match_text=False, match_approx=False,
                  api_base_url=None, api_key=None):
         super(DejaSource, self).__init__(src_dir, match_text, match_approx)
 
-        self.api_base_url = api_base_url or os.environ.get('DEJACODE_API_URL', None)
-        self.api_key = api_key or os.environ.get('DEJACODE_API_KEY', None)
+        self.api_base_url = api_base_url or os.getenv('DEJACODE_API_URL')
+        self.api_key = api_key or os.getenv('DEJACODE_API_KEY')
 
         assert (self.api_key and self.api_base_url), (
             'You must set the DEJACODE_API_URL and DEJACODE_API_KEY ' +
@@ -781,7 +787,7 @@ def synchronize_licenses(external_source):
         if not TRACE:print('.', end='')
 
         # Create a new ScanCode license
-        sc_license = ot_license.relocate(licensedcode.licenses_data_dir, o_key)
+        sc_license = ot_license.relocate(licensedcode.models.data_dir, o_key)
         scancodes_added.add(sc_license.key)
         scancodes_by_key[sc_license.key] = sc_license
         if TRACE: print('Other license key not in ScanCode:', ot_license.key, 'created in ScanCode.')
diff --git a/etc/scripts/testdata/livescan/expected.csv b/etc/scripts/testdata/livescan/expected.csv
index a3e69945d13..12a85b45888 100644
--- a/etc/scripts/testdata/livescan/expected.csv
+++ b/etc/scripts/testdata/livescan/expected.csv
@@ -1,20 +1,20 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
-/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1599,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
-/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
+Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count,size_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1599,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,0,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
+/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
diff --git a/src/cluecode/copyrights.py b/src/cluecode/copyrights.py
index faeecb4b8a7..d16757ba54c 100644
--- a/src/cluecode/copyrights.py
+++ b/src/cluecode/copyrights.py
@@ -39,11 +39,11 @@
 
 COPYRIGHT_TRACE = 0
 logger = logging.getLogger(__name__)
-if os.environ.get('SCANCODE_COPYRIGHT_DEBUG'):
+if os.environ.get('SCANCODE_DEBUG_COPYRIGHT'):
     import sys
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
-    COPYRIGHT_TRACE = 0
+    COPYRIGHT_TRACE = 1
 
 """
 Detect and collect copyright statements.
diff --git a/src/commoncode/command.py b/src/commoncode/command.py
index de922b6fb0c..405b3d48f53 100644
--- a/src/commoncode/command.py
+++ b/src/commoncode/command.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -110,7 +110,7 @@ def execute(cmd, args, root_dir=None, cwd=None, env=None, to_files=False):
     cwd = cwd or curr_dir
 
     # temp files for stderr and stdout
-    tmp_dir = get_temp_dir(base_dir='cmd')
+    tmp_dir = get_temp_dir(prefix='cmd-')
     sop = join(tmp_dir, 'stdout')
     sep = join(tmp_dir, 'stderr')
 
diff --git a/src/commoncode/fetch.py b/src/commoncode/fetch.py
index 6f4c34ae0a3..2df0dc399cb 100644
--- a/src/commoncode/fetch.py
+++ b/src/commoncode/fetch.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -65,7 +65,7 @@ def download_url(url, file_name=None, verify=True, timeout=10):
         logger.error(msg)
         raise Exception(msg)
 
-    tmp_dir = fileutils.get_temp_dir(base_dir='fetch')
+    tmp_dir = fileutils.get_temp_dir(prefix='fetch-')
     output_file = os.path.join(tmp_dir, file_name)
     with open(output_file, 'wb') as out:
         out.write(response.content)
diff --git a/src/commoncode/fileutils.py b/src/commoncode/fileutils.py
index 2d61487b4f0..9772b1f9a95 100644
--- a/src/commoncode/fileutils.py
+++ b/src/commoncode/fileutils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -23,8 +23,8 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import unicode_literals
 from __future__ import print_function
+from __future__ import unicode_literals
 
 # Python 2 and 3 support
 try:
@@ -42,7 +42,6 @@
     from backports.os import fsencode
     from backports.os import fsdecode  # @UnusedImport
 
-
 import codecs
 import errno
 import os
@@ -53,12 +52,17 @@
 import sys
 import tempfile
 
+try:
+    from scancode_config import scancode_temp_dir
+except ImportError:
+    scancode_temp_dir = None
+
 from commoncode import filetype
 from commoncode.filetype import is_rwx
-from commoncode import system
 from commoncode.system import on_linux
 from commoncode import text
 
+
 # this exception is not available on posix
 try:
     WindowsError  # @UndefinedVariable
@@ -137,32 +141,33 @@ def create_dir(location):
                 raise
 
 
-def system_temp_dir():
+def get_temp_dir(base_dir=scancode_temp_dir, prefix=''):
     """
-    Return the global temp directory for the current user.
+    Return the path to a new existing unique temporary directory, created under
+    the `base_dir` base directory using the `prefix` prefix.
+    If `base_dir` is not provided, use the 'SCANCODE_TMP' env var or the system
+    temp directory.
+
+    WARNING: do not change this code without changing scancode_config.py too
     """
-    temp_dir = os.getenv('SCANCODE_TMP')
-    if not temp_dir:
-        sc = text.python_safe_name('scancode_' + system.username)
-        temp_dir = os.path.join(tempfile.gettempdir(), sc)
-    if on_linux:
-        temp_dir = fsencode(temp_dir)
-    create_dir(temp_dir)
-    return temp_dir
 
+    has_base = bool(base_dir)
+    if not has_base:
+        base_dir = os.getenv('SCANCODE_TMP')
+        if not base_dir:
+            base_dir = tempfile.gettempdir()
+        else:
+            if on_linux:
+                base_dir = fsencode(base_dir)
+            create_dir(base_dir)
+
+    if not has_base:
+        prefix = 'scancode-tk-'
 
-def get_temp_dir(base_dir, prefix=''):
-    """
-    Return the path to a new existing unique temporary directory, created under
-    the system-wide `system_temp_dir` temp directory as a subdir of the base_dir
-    path (a path relative to the `system_temp_dir`).
-    """
     if on_linux:
-        base_dir = fsencode(base_dir)
         prefix = fsencode(prefix)
-    base = os.path.join(system_temp_dir(), base_dir)
-    create_dir(base)
-    return tempfile.mkdtemp(prefix=prefix, dir=base)
+
+    return tempfile.mkdtemp(prefix=prefix, dir=base_dir)
 
 #
 # FILE READING
diff --git a/src/commoncode/system.py b/src/commoncode/system.py
index 4cfc520e726..c0264a1ac45 100644
--- a/src/commoncode/system.py
+++ b/src/commoncode/system.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -105,20 +105,16 @@ def os_arch():
 #
 # Python versions
 #
-py27 = (sys.version_info[0] == 2 and sys.version_info[1] == 7)
-py34 = (sys.version_info[0] == 3 and sys.version_info[1] == 4)
-py35 = (sys.version_info[0] == 3 and sys.version_info[1] == 5)
-py35 = (sys.version_info[0] == 3 and sys.version_info[1] == 6)
-#
-# User related
-#
-if on_windows:
-    user_home = os.path.join(os.path.expandvars('$HOMEDRIVE'),
-                             os.path.expandvars('$HOMEPATH'))
-else:
-    user_home = os.path.expanduser('~')
-
-username = getpass.getuser()
+_sys_v0 = sys.version_info[0]
+py2 = _sys_v0 == 2
+py3 = _sys_v0 == 3
+
+_sys_v1 = sys.version_info[1]
+py27 = py2 and _sys_v1 == 7
+py34 = py3 and _sys_v1 == 4
+py35 = py3 and _sys_v1 == 5
+py36 = py3 and _sys_v1 == 6
+py37 = py3 and _sys_v1 == 7
 
 
 # Do not let Windows error pop up messages with default SetErrorMode
diff --git a/src/commoncode/testcase.py b/src/commoncode/testcase.py
index 73907b1a327..1238a846ef0 100644
--- a/src/commoncode/testcase.py
+++ b/src/commoncode/testcase.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -211,11 +211,12 @@ def get_temp_dir(self, sub_dir_path=None):
         # ensure that we have a new unique temp directory for each test run
         global test_run_temp_dir
         if not test_run_temp_dir:
-            test_run_temp_dir = fileutils.get_temp_dir(base_dir='tst', prefix=' ')
+            # not we add a space in the path for testing path with spaces
+            test_run_temp_dir = fileutils.get_temp_dir(prefix='tests -')
         if on_linux:
             test_run_temp_dir = fsencode(test_run_temp_dir)
 
-        new_temp_dir = fileutils.get_temp_dir(base_dir=test_run_temp_dir)
+        new_temp_dir = fileutils.get_temp_dir(base_dir=test_run_temp_dir, prefix='')
 
         if sub_dir_path:
             # create a sub directory hierarchy if requested
diff --git a/src/extractcode/archive.py b/src/extractcode/archive.py
index e0a170be59d..8344d6c1062 100644
--- a/src/extractcode/archive.py
+++ b/src/extractcode/archive.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -315,7 +315,7 @@ def extract_twice(location, target_dir, extractor1, extractor2):
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = unicode(os.path.abspath(os.path.expanduser(target_dir)))
     # extract first the intermediate payload to a temp dir
-    temp_target = unicode(fileutils.get_temp_dir('extract'))
+    temp_target = unicode(fileutils.get_temp_dir(prefix='extract-'))
     warnings = extractor1(abs_location, temp_target)
     if TRACE:
         logger.debug('extract_twice: temp_target: %(temp_target)r' % locals())
@@ -348,7 +348,7 @@ def extract_with_fallback(location, target_dir, extractor1, extractor2):
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = unicode(os.path.abspath(os.path.expanduser(target_dir)))
     # attempt extract first to a temp dir
-    temp_target1 = unicode(fileutils.get_temp_dir('extract1'))
+    temp_target1 = unicode(fileutils.get_temp_dir(prefix='extract1-'))
     try:
         warnings = extractor1(abs_location, temp_target1)
         if TRACE:
@@ -356,7 +356,7 @@ def extract_with_fallback(location, target_dir, extractor1, extractor2):
         fileutils.copytree(temp_target1, abs_target_dir)
     except:
         try:
-            temp_target2 = unicode(fileutils.get_temp_dir('extract2'))
+            temp_target2 = unicode(fileutils.get_temp_dir(prefix='extract2-'))
             warnings = extractor2(abs_location, temp_target2)
             if TRACE:
                 logger.debug('extract_with_fallback: temp_target2: %(temp_target2)r' % locals())
@@ -378,7 +378,7 @@ def try_to_extract(location, target_dir, extractor):
     """
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = unicode(os.path.abspath(os.path.expanduser(target_dir)))
-    temp_target = unicode(fileutils.get_temp_dir('extract1'))
+    temp_target = unicode(fileutils.get_temp_dir(prefix='extract1-'))
     warnings = []
     try:
         warnings = extractor(abs_location, temp_target)
diff --git a/src/extractcode/extract.py b/src/extractcode/extract.py
index 2e3c8103b86..d0f938a28fc 100644
--- a/src/extractcode/extract.py
+++ b/src/extractcode/extract.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -184,7 +184,7 @@ def extract_file(location, target, kinds=extractcode.default_kinds):
             # extract first to a temp directory.
             # if there is an error,  the extracted files will not be moved
             # to target
-            tmp_tgt = fileutils.get_temp_dir('extract')
+            tmp_tgt = fileutils.get_temp_dir(prefix='extract-')
             abs_location = abspath(expanduser(location))
             warnings.extend(extractor(abs_location, tmp_tgt))
             fileutils.copytree(tmp_tgt, target)
diff --git a/src/extractcode/uncompress.py b/src/extractcode/uncompress.py
index d6469e6906d..83fcd4fa50b 100644
--- a/src/extractcode/uncompress.py
+++ b/src/extractcode/uncompress.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -79,7 +79,7 @@ def uncompress_file(location, decompressor):
 
     warnings = []
     base_name = fileutils.file_base_name(location)
-    target_location = os.path.join(fileutils.get_temp_dir(base_dir='extract'), base_name)
+    target_location = os.path.join(fileutils.get_temp_dir(prefix='extract-'), base_name)
     with decompressor(location, 'rb') as compressed:
         with open(target_location, 'wb') as uncompressed:
             buffer_size = 32 * 1024 * 1024
diff --git a/src/formattedcode/output_csv.py b/src/formattedcode/output_csv.py
index dd977b8299b..75c1a6a6a31 100644
--- a/src/formattedcode/output_csv.py
+++ b/src/formattedcode/output_csv.py
@@ -47,16 +47,15 @@ class CsvOutput(OutputPlugin):
             metavar='FILE',
             help='Write scan output as CSV to FILE.',
             help_group=OUTPUT_GROUP,
-            sort_order= 30),
+            sort_order=30),
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('output_csv')
+    def is_enabled(self, output_csv, **kwargs):
+        return output_csv
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_csv').value
-        self.create_parent_directory(output_file)
-        return write_csv(results, output_file)
+    def process_codebase(self, codebase, output_csv, **kwargs):
+        results = self.get_results(codebase, **kwargs)
+        write_csv(results, output_csv)
 
 
 def write_csv(results, output_file):
diff --git a/src/formattedcode/output_html.py b/src/formattedcode/output_html.py
index 5b492047976..3614bab2d1a 100644
--- a/src/formattedcode/output_html.py
+++ b/src/formattedcode/output_html.py
@@ -76,13 +76,13 @@ class HtmlOutput(OutputPlugin):
             sort_order=50),
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('output_html')
+    def is_enabled(self, output_html, **kwargs):
+        return output_html
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_html').value
-        self.create_parent_directory(output_file)
-        write_templated(output_file, results, version, template_or_format='html')
+    def process_codebase(self, codebase, output_html, scancode_version, **kwargs):
+        results = self.get_results(codebase, **kwargs)
+        write_templated(output_html, results, scancode_version,
+                        template_or_format='html')
 
 
 @output_impl
@@ -109,19 +109,17 @@ class CustomTemplateOutput(OutputPlugin):
             sort_order=65),
     ]
 
-    def is_enabled(self):
-        return (
-            self.is_command_option_enabled('output_custom')
-            and self.is_command_option_enabled('custom_template')
-        )
+    def is_enabled(self, output_custom, custom_template, **kwargs):
+        return output_custom and custom_template
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_custom').value
-        self.create_parent_directory(output_file)
-        template_path = self.get_command_option('custom_template').value
+    def process_codebase(self, codebase, output_custom, custom_template,
+                         scancode_version, **kwargs):
+
+        results = self.get_results(codebase, **kwargs)
         if on_linux:
-            template_path = fsencode(template_path)
-        write_templated(output_file, results, version, template_or_format=template_path)
+            custom_template = fsencode(custom_template)
+        write_templated(output_custom, results, scancode_version,
+                        template_or_format=custom_template)
 
 
 @output_impl
@@ -138,15 +136,15 @@ class HtmlAppOutput(OutputPlugin):
             sort_order=70),
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('output_html_app')
+    def is_enabled(self, output_html_app, **kwargs):
+        return output_html_app
+
+    def process_codebase(self, codebase, input, output_html_app, 
+                         scancode_version, **kwargs):
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_html_app').value
-        scanned_path = codebase.location
-        self.create_parent_directory(output_file)
-        output_file.write(as_html_app(output_file, scanned_path, version))
-        create_html_app_assets(results, output_file)
+        results = self.get_results(codebase, **kwargs)
+        output_html_app.write(as_html_app(output_html_app, input, scancode_version))
+        create_html_app_assets(results, output_html_app)
 
 
 def write_templated(output_file, results, version, template_or_format):
diff --git a/src/formattedcode/output_json.py b/src/formattedcode/output_json.py
index ca95353ccab..7eba8590d59 100644
--- a/src/formattedcode/output_json.py
+++ b/src/formattedcode/output_json.py
@@ -49,16 +49,23 @@ class JsonCompactOutput(OutputPlugin):
             metavar='FILE',
             help='Write scan output as compact JSON to FILE.',
             help_group=OUTPUT_GROUP,
-            sort_order= 10),
+            sort_order=10),
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('output_json')
+    def is_enabled(self, output_json, **kwargs):
+        return output_json
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_json').value
-        self.create_parent_directory(output_file)
-        write_json(results, output_file, files_count, version, notice, options, pretty=False)
+    def process_codebase(self, codebase, output_json, files_count,
+                         scancode_version, scancode_notice, pretty_options, 
+                         **kwargs):
+
+        results = self.get_results(codebase, **kwargs)
+        write_json(results=results, output_file=output_json,
+                   files_count=files_count,
+                   scancode_version=scancode_version,
+                   scancode_notice=scancode_notice,
+                   pretty_options=pretty_options,
+                   pretty=False)
 
 
 @output_impl
@@ -70,23 +77,33 @@ class JsonPrettyOutput(OutputPlugin):
             metavar='FILE',
             help='Write scan output as pretty-printed JSON to FILE.',
             help_group=OUTPUT_GROUP,
-            sort_order= 10),
+            sort_order=10),
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('output_json_pp')
+    def is_enabled(self, output_json_pp, **kwargs):
+        return output_json_pp
+
+    def process_codebase(self, codebase, output_json_pp, files_count,
+                         scancode_version, scancode_notice, pretty_options, 
+                         **kwargs):
+
+        results = self.get_results(codebase, **kwargs)
+        write_json(results=results, output_file=output_json_pp,
+                   files_count=files_count,
+                   scancode_version=scancode_version,
+                   scancode_notice=scancode_notice,
+                   pretty_options=pretty_options,
+                   pretty=True)
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_json_pp').value
-        self.create_parent_directory(output_file)
-        write_json(results, output_file, files_count, version, notice, options, pretty=True)
 
+def write_json(results, output_file, files_count,
+               scancode_version, scancode_notice,
+               pretty_options, pretty=False):
 
-def write_json(results, output_file, files_count, version, notice, options, pretty=False):
     scan = OrderedDict([
-        ('scancode_notice', notice),
-        ('scancode_version', version),
-        ('scancode_options', options),
+        ('scancode_notice', scancode_notice),
+        ('scancode_version', scancode_version),
+        ('scancode_options', pretty_options),
         ('files_count', files_count),
         ('files', results),
     ])
diff --git a/src/formattedcode/output_jsonlines.py b/src/formattedcode/output_jsonlines.py
index ea3cedee245..38f15235fb8 100644
--- a/src/formattedcode/output_jsonlines.py
+++ b/src/formattedcode/output_jsonlines.py
@@ -40,33 +40,36 @@
 class JsonLinesOutput(OutputPlugin):
 
     options = [
-        CommandLineOption(('--json-lines','output_json_lines',),
+        CommandLineOption(('--json-lines', 'output_json_lines',),
             type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
             help='Write scan output as JSON Lines to FILE.',
             help_group=OUTPUT_GROUP,
-            sort_order= 15),
+            sort_order=15),
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('output_json_lines')
+    def is_enabled(self, output_json_lines, **kwargs):
+        return output_json_lines
+
+    def process_codebase(self, codebase, output_json_lines, files_count,
+                         scancode_version, scancode_notice, pretty_options,
+                         **kwargs):
+
+        results = self.get_results(codebase, **kwargs)
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_json_lines').value
-        self.create_parent_directory(output_file)
         header = dict(header=OrderedDict([
-            ('scancode_notice', notice),
-            ('scancode_version', version),
-            ('scancode_options', options),
+            ('scancode_notice', scancode_notice),
+            ('scancode_version', scancode_version),
+            ('scancode_options', pretty_options),
             ('files_count', files_count)
         ]))
 
         kwargs = dict(
             iterable_as_array=True, encoding='utf-8', separators=(',', ':',))
-        output_file.write(simplejson.dumps(header, **kwargs))
-        output_file.write('\n')
+        output_json_lines.write(simplejson.dumps(header, **kwargs))
+        output_json_lines.write('\n')
 
         for scanned_file in results:
             scanned_file_line = {'files': [scanned_file]}
-            output_file.write(simplejson.dumps(scanned_file_line, **kwargs))
-            output_file.write('\n')
+            output_json_lines.write(simplejson.dumps(scanned_file_line, **kwargs))
+            output_json_lines.write('\n')
diff --git a/src/formattedcode/output_spdx.py b/src/formattedcode/output_spdx.py
index 25e3e21315d..b3c769d9b80 100644
--- a/src/formattedcode/output_spdx.py
+++ b/src/formattedcode/output_spdx.py
@@ -101,14 +101,15 @@ class SpdxTvOutput(OutputPlugin):
             help_group=OUTPUT_GROUP)
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('output_spdx_tv')
+    def is_enabled(self, output_spdx_tv, **kwargs):
+        return output_spdx_tv
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_spdx_tv').value
-        self.create_parent_directory(output_file)
-        input_file = codebase.location
-        write_spdx(output_file, results, version, notice, input_file, as_tagvalue=True)
+    def process_codebase(self, codebase, input, output_spdx_tv,
+                         scancode_version, scancode_notice, **kwargs):
+
+        results = self.get_results(codebase, **kwargs)
+        write_spdx(output_spdx_tv, results, scancode_version, scancode_notice,
+                   input, as_tagvalue=True)
 
 
 @output_impl
@@ -123,17 +124,19 @@ class SpdxRdfOutput(OutputPlugin):
             help_group=OUTPUT_GROUP)
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('output_spdx_rdf')
+    def is_enabled(self, output_spdx_rdf, **kwargs):
+        return output_spdx_rdf
+
+    def process_codebase(self, codebase, input, output_spdx_rdf,
+                         scancode_version, scancode_notice, **kwargs):
 
-    def save_results(self, codebase, results, files_count, version, notice, options):
-        output_file = self.get_command_option('output_spdx_rdf').value
-        self.create_parent_directory(output_file)
-        input_file = codebase.location
-        write_spdx(output_file, results, version, notice, input_file, as_tagvalue=False)
+        results = self.get_results(codebase, **kwargs)
+        write_spdx(output_spdx_rdf, results, scancode_version, scancode_notice,
+                   input, as_tagvalue=False)
 
 
-def write_spdx(output_file, results, version, notice, input_file, as_tagvalue=True):
+def write_spdx(output_file, results, scancode_version, scancode_notice,
+               input_file, as_tagvalue=True):
     """
     Write scan output as SPDX Tag/value or RDF.
     """
@@ -145,9 +148,9 @@ def write_spdx(output_file, results, version, notice, input_file, as_tagvalue=Tr
         input_path = dirname(absinput)
 
     doc = Document(Version(2, 1), License.from_identifier('CC0-1.0'))
-    doc.comment = notice
+    doc.comment = scancode_notice
 
-    doc.creation_info.add_creator(Tool('ScanCode ' + version))
+    doc.creation_info.add_creator(Tool('ScanCode ' + scancode_version))
     doc.creation_info.set_created_now()
 
     package = doc.package = Package(
diff --git a/src/licensedcode/__init__.py b/src/licensedcode/__init__.py
index 972c5bde04b..ecfc6d7ffd3 100644
--- a/src/licensedcode/__init__.py
+++ b/src/licensedcode/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -22,31 +22,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-
 from __future__ import absolute_import
 
-from os.path import dirname
-from os.path import abspath
-from os.path import getsize
-from os.path import getmtime
-from os.path import join
-from os.path import exists
-
-from commoncode import fileutils
-
-
-lic_src_dir = abspath(dirname(__file__))
-src_dir = dirname(lic_src_dir)
-data_dir = join(lic_src_dir, 'data')
-licenses_data_dir = join(data_dir, 'licenses')
-rules_data_dir = join(data_dir, 'rules')
-root_dir = dirname(src_dir)
-cache_dir = join(root_dir, '.cache')
-license_index_cache_dir = join(cache_dir, 'license_index')
-
-if not exists(license_index_cache_dir):
-    fileutils.create_dir(license_index_cache_dir)
-
 # minimum number of tokens a match should have to be considered as worthy keeping
 MIN_MATCH_LENGTH = 4
 MIN_MATCH_HIGH_LENGTH = 3
@@ -55,4 +32,3 @@
 # eventually this should be skipped early right during the matching too
 # maximum distance between two matches to merge
 MAX_DIST = 120
-
diff --git a/src/licensedcode/cache.py b/src/licensedcode/cache.py
index dd486de32ad..a0f9f25edc8 100644
--- a/src/licensedcode/cache.py
+++ b/src/licensedcode/cache.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -26,7 +26,6 @@
 
 from functools import partial
 from hashlib import md5
-import os
 from os.path import exists
 from os.path import getmtime
 from os.path import getsize
@@ -35,11 +34,12 @@
 import yg.lockfile  # @UnresolvedImport
 
 from commoncode.fileutils import resource_iter
+from commoncode.fileutils import create_dir
 from commoncode import ignore
 
-from licensedcode import root_dir
-from licensedcode import src_dir
-from licensedcode import license_index_cache_dir
+from scancode_config import scancode_cache_dir
+from scancode_config import scancode_src_dir
+from scancode_config import SCANCODE_DEV_MODE
 
 
 """
@@ -48,160 +48,158 @@
 cached index is safe to use across multiple processes using lock files.
 """
 
-index_lock_file = join(license_index_cache_dir, 'lockfile')
-tree_checksum_file = join(license_index_cache_dir, 'tree_checksums')
-index_cache_file = join(license_index_cache_dir, 'index_cache')
 
+LICENSE_INDEX_LOCK_TIMEOUT = 60 * 3
 
-_ignored_from_hash = partial(
-    ignore.is_ignored,
-    ignores={'*.pyc': 'pyc files', '*~': 'temp gedit files', '*.swp': 'vi swap files'},
-    unignores={}
-)
+# global in-memory cache of the main license index instance
+_LICENSES_INDEX = None
 
 
-def tree_checksum(tree_base_dir=src_dir, _ignored=_ignored_from_hash):
+def get_index(cache_dir=scancode_cache_dir):
     """
-    Return a checksum computed from a file tree using the file paths,
-    size and last modified time stamps.
-    The purpose is to detect is there has been any modification to
-    source code or data files and use this as a proxy to verify the
-    cache consistency.
-
-    NOTE: this is not 100% fool proof but good enough in practice.
+    Return and eventually cache an index built from an iterable of rules.
+    Build the index from the built-in rules dataset.
     """
-    hashable = (pth + str(getmtime(pth)) + str(getsize(pth))
-                for pth in resource_iter(tree_base_dir, ignored=_ignored, with_dirs=False))
-    return md5(''.join(sorted(hashable))).hexdigest()
-
-
-LICENSE_INDEX_LOCK_TIMEOUT = 60 * 3
+    global _LICENSES_INDEX
+    if not _LICENSES_INDEX:
+        _LICENSES_INDEX = get_cached_index(cache_dir=scancode_cache_dir)
+    return _LICENSES_INDEX
 
 
-# If this file exists at the root, the cache is always checked for consistency
-DEV_MODE = os.path.exists(os.path.join(root_dir, 'SCANCODE_DEV_MODE'))
+# global in-memory cache of a mapping of key -> license instance
+_LICENSES = {}
 
 
-def get_or_build_index_through_cache(
-        check_consistency=DEV_MODE,
-        return_index=True,
-        # used for testing only
-        _tree_base_dir=src_dir,
-        _tree_checksum_file=tree_checksum_file,
-        _index_lock_file=index_lock_file,
-        _index_cache_file=index_cache_file,
-        _licenses_data_dir=None,
-        _rules_data_dir=None,
-        _timeout=LICENSE_INDEX_LOCK_TIMEOUT,
-        ):
+def get_licenses_db(licenses_data_dir=None):
+    """
+    Return a mapping of license key -> license object.
     """
-    Check and build or rebuild the LicenseIndex cache.
-    If the cache does not exist, a new index is built an cached.
-    Return the LicenseIndex if return_index is True.
+    global _LICENSES
+    if not _LICENSES :
+        from licensedcode.models import load_licenses
+        if not licenses_data_dir:
+            from licensedcode.models import licenses_data_dir as ldd
+            licenses_data_dir = ldd
+        _LICENSES = load_licenses(licenses_data_dir)
+    return _LICENSES
+
 
-    If `check_consistency` is True, the cache is checked for consistency
-    and rebuilt if inconsistent or stale.
+def get_cached_index(cache_dir=scancode_cache_dir, check_consistency=SCANCODE_DEV_MODE,
 
-    If `check_consistency` is False, the cache is NOT checked for consistency
-    If the cache files exist but stale, the cache WILL NOT be rebuilt
+                     # used for testing only
+                     timeout=LICENSE_INDEX_LOCK_TIMEOUT,
+                     tree_base_dir=scancode_src_dir,
+                     licenses_data_dir=None, rules_data_dir=None,):
+    """
+    Return a LicenseIndex: either load a cached index or build and cache the
+    index.
+    - If the cache does not exist, a new index is built an cached.
+    - If `check_consistency` is True, the cache is checked for consistency and
+      rebuilt if inconsistent or stale.
+    - If `check_consistency` is False, the cache is NOT checked for consistency
+      If the cache files exist but ARE stale, the cache WILL NOT be rebuilt
     """
     from licensedcode.index import LicenseIndex
+    from licensedcode.models import licenses_data_dir as ldd
+    from licensedcode.models import rules_data_dir as rdd
     from licensedcode.models import get_rules
-    from licensedcode.models import licenses_data_dir
-    from licensedcode.models import rules_data_dir
-    _licenses_data_dir = _licenses_data_dir or licenses_data_dir
-    _rules_data_dir = _rules_data_dir or rules_data_dir
 
-    has_cache = exists(_index_cache_file)
-    has_tree_checksum = exists(_tree_checksum_file)
+    licenses_data_dir = licenses_data_dir or ldd
+    rules_data_dir = rules_data_dir or rdd
+
+    lock_file, checksum_file, cache_file = get_license_cache_paths(cache_dir)
+
+    has_cache = exists(cache_file)
+    has_tree_checksum = exists(checksum_file)
 
     # bypass check if no consistency check is needed
     if has_cache and has_tree_checksum and not check_consistency:
-        return return_index and _load_index(_index_cache_file)
+        return load_index(cache_file)
 
     # here, we have no cache or we want a validity check: lock, check
     # and build or rebuild as needed
     try:
         # acquire lock and wait until timeout to get a lock or die
-        with yg.lockfile.FileLock(_index_lock_file, timeout=_timeout):
+        with yg.lockfile.FileLock(lock_file, timeout=timeout):
             current_checksum = None
             # is the current cache consistent or stale?
             if has_cache and has_tree_checksum:
                 # if we have a saved cached index
                 # load saved tree_checksum and compare with current tree_checksum
-                with open(_tree_checksum_file, 'rb') as etcs:
+                with open(checksum_file, 'rb') as etcs:
                     existing_checksum = etcs.read()
-                current_checksum = tree_checksum(tree_base_dir=_tree_base_dir)
+                current_checksum = tree_checksum(tree_base_dir=tree_base_dir)
                 if current_checksum == existing_checksum:
                     # The cache is consistent with the latest code and data
                     # load and return
-                    return return_index and _load_index(_index_cache_file)
+                    return load_index(cache_file)
 
             # Here, the cache is not consistent with the latest code and
             # data: It is either stale or non-existing: we need to
             # rebuild the index and cache it
             rules = get_rules(
-                licenses_data_dir=_licenses_data_dir,
-                rules_data_dir=_rules_data_dir)
+                licenses_data_dir=licenses_data_dir,
+                rules_data_dir=rules_data_dir)
+
             idx = LicenseIndex(rules)
-            with open(_index_cache_file, 'wb') as ifc:
+
+            with open(cache_file, 'wb') as ifc:
                 ifc.write(idx.dumps())
 
             # save the new checksums tree
-            with open(_tree_checksum_file, 'wb') as ctcs:
-                ctcs.write(current_checksum or tree_checksum(tree_base_dir=_tree_base_dir))
+            with open(checksum_file, 'wb') as ctcs:
+                ctcs.write(current_checksum
+                           or tree_checksum(tree_base_dir=tree_base_dir))
 
-            return return_index and idx
+            return idx
 
     except yg.lockfile.FileLockTimeout:
         # TODO: handle unable to lock in a nicer way
         raise
 
 
-def _load_index(_index_cache_file=index_cache_file):
+def load_index(cache_file):
     """
     Return a LicenseIndex loaded from cache.
     """
     from licensedcode.index import LicenseIndex
-
-    with open(_index_cache_file, 'rb') as ifc:
+    with open(cache_file, 'rb') as ifc:
         # Note: weird but read() + loads() is much (twice++???) faster than load()
         idx = LicenseIndex.loads(ifc.read())
     return idx
 
 
-"""Check the license index and reindex if needed."""
-reindex = partial(get_or_build_index_through_cache, check_consistency=True, return_index=False)
-
-
-# global in-memory cache of the main license index instance
-_LICENSES_INDEX = None
+_ignored_from_hash = partial(
+    ignore.is_ignored,
+    ignores={'*.pyc': 'pyc files', '*~': 'temp gedit files', '*.swp': 'vi swap files'},
+    unignores={}
+)
 
 
-def get_index(_return_index=True):
-    """
-    Return and eventually cache an index built from an iterable of rules.
-    Build the index from the built-in rules dataset.
+def tree_checksum(tree_base_dir=scancode_src_dir, _ignored=_ignored_from_hash):
     """
-    global _LICENSES_INDEX
-    if not _LICENSES_INDEX:
-        _LICENSES_INDEX = get_or_build_index_through_cache()
-    return _return_index and _LICENSES_INDEX
-
+    Return a checksum computed from a file tree using the file paths,
+    size and last modified time stamps.
+    The purpose is to detect is there has been any modification to
+    source code or data files and use this as a proxy to verify the
+    cache consistency.
 
-# global in-memory cache of a mapping of key -> license instance
-_LICENSES = {}
+    NOTE: this is not 100% fool proof but good enough in practice.
+    """
+    resources = resource_iter(tree_base_dir, ignored=_ignored, with_dirs=False)
+    hashable = (pth + str(getmtime(pth)) + str(getsize(pth)) for pth in resources)
+    return md5(''.join(sorted(hashable))).hexdigest()
 
 
-def get_licenses_db(licenses_data_dir=None):
+def get_license_cache_paths(cache_dir=scancode_cache_dir):
     """
-    Return a mapping of license key -> license object.
+    Return a tuple of index cache files given a master `cache_dir`
     """
-    global _LICENSES
-    if not _LICENSES :
-        from licensedcode.models import load_licenses
-        if not licenses_data_dir:
-            from licensedcode.models import licenses_data_dir as ldd
-            licenses_data_dir = ldd
-        _LICENSES = load_licenses(licenses_data_dir)
-    return _LICENSES
+    idx_cache_dir = join(cache_dir, 'license_index')
+    create_dir(idx_cache_dir)
+
+    lock_file = join(idx_cache_dir, 'lockfile')
+    checksum_file = join(idx_cache_dir, 'tree_checksums')
+    cache_file = join(idx_cache_dir, 'index_cache')
+
+    return lock_file, checksum_file, cache_file
diff --git a/src/licensedcode/index.py b/src/licensedcode/index.py
index 049f36fe00b..bc444ba66e4 100644
--- a/src/licensedcode/index.py
+++ b/src/licensedcode/index.py
@@ -38,12 +38,12 @@
 import sys
 from time import time
 
-from commoncode.dict_utils import sparsify
+# import early
+from scancode_config import scancode_cache_dir
 
+from commoncode.dict_utils import sparsify
 from licensedcode import MAX_DIST
-from licensedcode.cache import get_index
 from licensedcode.frequent_tokens import global_tokens_by_ranks
-
 from licensedcode import match
 from licensedcode import match_aho
 from licensedcode import match_hash
@@ -83,8 +83,8 @@
 def logger_debug(*args):
     pass
 
-if (TRACE or TRACE_INDEXING_PERF or TRACE_QUERY_RUN_SIMPLE 
-    or os.environ.get('SCANCODE_LICENSE_DEBUG') or TRACE_NEGATIVE):
+if (TRACE or TRACE_INDEXING_PERF or TRACE_QUERY_RUN_SIMPLE
+    or os.environ.get('SCANCODE_DEBUG_LICENSE') or TRACE_NEGATIVE):
     import logging
 
     logger = logging.getLogger(__name__)
@@ -96,7 +96,8 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, basestring) and a or repr(a) for a in args))
 
 
-def get_license_matches(location=None, query_string=None, min_score=0):
+def get_license_matches(location=None, query_string=None, min_score=0,
+                        cache_dir=scancode_cache_dir):
     """
     Yield detected license matches in the file at `location` or the
     `query_string` string.
@@ -108,7 +109,8 @@ def get_license_matches(location=None, query_string=None, min_score=0):
     The minimum length for an approximate match is four tokens.
     Spurrious matched are always filtered.
     """
-    return get_index().match(location=location, query_string=query_string, min_score=min_score)
+    from licensedcode.cache import get_index
+    return get_index(cache_dir).match(location=location, query_string=query_string, min_score=min_score)
 
 
 # Feature switch to enable or not ngram fragments detection
@@ -565,7 +567,7 @@ def negative_match(self, query_run):
         from the query run.
         """
         matches = match_aho.exact_match(self, query_run, self.negative_automaton)
-        
+
         if TRACE_NEGATIVE and matches: logger_debug('     ##final _negative_matches:....', len(matches))
         return matches
 
diff --git a/src/licensedcode/match.py b/src/licensedcode/match.py
index 440357e5ff4..9a404ecdde7 100644
--- a/src/licensedcode/match.py
+++ b/src/licensedcode/match.py
@@ -430,7 +430,6 @@ def merge_matches(matches, max_dist=MAX_DIST):
     returned as-is.
     For being merged two matches must also be in increasing query and index positions.
     """
-    from licensedcode.match_seq import MATCH_SEQ
 
     # shortcut for single matches
     if len(matches) < 2:
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index 81ee0cc42e7..d79bd418138 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -23,9 +23,9 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import unicode_literals
-from __future__ import print_function
 from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
 import codecs
 from collections import Counter
@@ -34,9 +34,12 @@
 from collections import OrderedDict
 from itertools import chain
 from operator import itemgetter
+from os.path import abspath
+from os.path import dirname
 from os.path import exists
 from os.path import join
 
+from commoncode.fileutils import copyfile
 from commoncode.fileutils import file_base_name
 from commoncode.fileutils import file_name
 from commoncode.fileutils import resource_iter
@@ -45,11 +48,15 @@
 
 from licensedcode import MIN_MATCH_LENGTH
 from licensedcode import MIN_MATCH_HIGH_LENGTH
-from licensedcode import licenses_data_dir
-from licensedcode import rules_data_dir
 from licensedcode.tokenize import rule_tokenizer
 from licensedcode.tokenize import query_tokenizer
-from commoncode import fileutils
+
+
+# these are globals but always side-by-side with the code so not moving
+data_dir = join(abspath(dirname(__file__)), 'data')
+licenses_data_dir = join(data_dir, 'licenses')
+rules_data_dir = join(data_dir, 'rules')
+
 
 
 """
@@ -180,7 +187,7 @@ def relocate(self, target_dir, new_key=None):
 
         # save it all to files
         if self.text:
-            fileutils.copyfile(self.text_file, newl.text_file)
+            copyfile(self.text_file, newl.text_file)
         newl.dump()
         return newl
 
diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 7fffe18068d..3cdfa01c318 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -68,17 +68,14 @@ class BasePlugin(object):
     # set to True for testing
     _test_mode = False
 
-
-    def __init__(self, command_options, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
         """
-        Initialize a new plugin with a list of user `command_options` (e.g.
-        CommandOption tuples based on CLI keyword arguments).
+        Initialize a new plugin with a user kwargs.
         Plugins can override as needed (still calling super).
         """
         self.options_by_name = {o.name: o for o in self.options}
 
-        self.command_options = command_options or []
-        self.command_options_by_name = {co.name: co for co in command_options}
+        self.kwargs = kwargs
 
         # mapping of scan summary data and statistics.
         # This is populated automatically on the plugin instance.
@@ -90,6 +87,7 @@ def is_enabled(self, **kwargs):
         """
         Return True is this plugin is enabled by user-selected options.
         Subclasses must override.
+        This receives all the ScanCode call arguments as kwargs.
         """
         raise NotImplementedError
 
@@ -100,6 +98,7 @@ def setup(self, **kwargs):
         exactly one time at initialization if this plugin is enabled.
         Must raise an Exception on failure.
         Subclasses can override as needed.
+        This receives all the ScanCode call arguments as kwargs.
         """
         pass
 
@@ -118,35 +117,6 @@ def get_option(self, name):
         """
         return self.options_by_name.get(name)
 
-    def get_command_option(self, name):
-        """
-        Return a global CommandOption with `name` or None.
-        """
-        return self.command_options_by_name.get(name)
-
-    def is_command_option_enabled(self, name):
-        """
-        Return True if the CommandOption with `name` is enabled.
-        """
-        opt = self.get_command_option(name)
-        if opt:
-            return opt.value
-
-    def get_own_command_options(self):
-        """
-        Return a mapping of {name: CommandOption} that belong to this plugin.
-        """
-        return {nco: co for nco, co in self.command_options_by_name.items()
-                if nco in self.options_by_name}
-
-    def get_own_command_options_kwargs(self):
-        """
-        Return a mapping of {name: value} for CommandOption objects that belong
-        to this plugin and suitable to use as kwargs for a function or method
-        call.
-        """
-        return {nco: co.value for nco, co in  self.get_own_command_options().items()}
-
     def is_active(self, plugins, *args, **kwargs):
         """
         Return True is this plugin is enabled meaning it is enabled and all its
@@ -213,10 +183,11 @@ class CodebasePlugin(BasePlugin):
     # Subclasses should set this as needed.
     needs_info = False
 
-    def process_codebase(self, codebase, *args, **kwargs):
+    def process_codebase(self, codebase, **kwargs):
         """
         Process a `codebase` Codebase object updating its Reousrce as needed.
         Subclasses should override.
+        This receives all the ScanCode call arguments as kwargs.
         """
         raise NotImplementedError
 
diff --git a/src/plugincode/output.py b/src/plugincode/output.py
index c3cd0630b54..c0378f6cd29 100644
--- a/src/plugincode/output.py
+++ b/src/plugincode/output.py
@@ -27,17 +27,9 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from collections import OrderedDict
 from functools import partial
-from os.path import abspath
-from os.path import dirname
-from os.path import expanduser
-from sys import stderr
-from sys import stdout
-
-from commoncode.fileutils import create_dir
-from commoncode.fileutils import fsdecode
-from commoncode.system import on_linux
+from itertools import imap
+
 from plugincode import CodebasePlugin
 from plugincode import PluginManager
 from plugincode import HookimplMarker
@@ -66,9 +58,10 @@ def logger_debug(*args):
 
 if TRACE or TRACE_DEEP:
     import logging
+    import sys
 
     logger = logging.getLogger(__name__)
-    logging.basicConfig(stream=stdout)
+    logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
@@ -89,146 +82,24 @@ class OutputPlugin(CodebasePlugin):
     Base plugin class for scan output formatters all output plugins must extend.
     """
 
-    # TODO: pass own command options name/values as concrete kwargs
     def process_codebase(self, codebase, **kwargs):
         """
-        FIXME: this is a stopgap, intermediate implementation
         Write scan output for the `codebase`.
         """
-        serializer = partial(Resource.to_dict,
-            full_root=codebase.full_root,
-            strip_root=codebase.strip_root,
-            with_info=codebase.with_info)
-
-        filtered_rids = codebase.filtered_rids
-        if TRACE_DEEP:
-            logger_debug('OutputPlugin.process_codebase: filtered_rids:', filtered_rids)
-        resources = [res for res in codebase.walk(
-            topdown=True, sort=True, skip_root=codebase.strip_root)
-            # we apply any filter plugins here
-            if res.rid not in filtered_rids
-        ]
-        # TODO: add dirs to results
-        files_count, _dirs_count = codebase.resource_counts(resources)
-        
-        results = [serializer(res)
-            for res in codebase.walk(topdown=True, sort=True, skip_root=codebase.strip_root)
-            # we apply any filter plugins here
-            if res.rid not in filtered_rids
-        ]
-
-        version = codebase.summary['scancode_version']
-        notice = codebase.summary['scancode_notice']
-
-        # TODO: consider getting this from the codebase?
-        options = get_pretty_options(self.command_options, self._test_mode)
-
-        return self.save_results(codebase, results, files_count, version, notice, options)
-
-    def save_results(self, codebase, results, files_count, version, notice, options, *args, **kwargs):
-        """
-        FIXME: this is a stopgap, intermediate implementation
-        Write scan `results` to `output_file`
-        """
         raise NotImplementedError
 
-    def create_parent_directory(self, output_file):
-        """
-        Create parent directory for the `output_file` file-like object if needed.
-        """
-        # FIXME: this IS NOT RIGHT!!!
-
-        # We use this to check if this is a real filesystem file or not.
-        # note: sys.stdout.name == '<stdout>' so it has a name.
-        has_name = hasattr(output, 'name')
-        output_is_real_file = output not in (stdout, stderr) and has_name
-        if output_is_real_file:
-            # we are writing to a real filesystem file: create directories!
-            parent_dir = dirname(output_file.name)
-            if parent_dir:
-                create_dir(abspath(expanduser(parent_dir)))
-
-    def setup_output_file(self, output_file):
+    @classmethod
+    def get_results(cls, codebase, info, full_root, strip_root, **kwargs):
         """
-        Return `output_file` fully resolved and in the proper OS encoding.
-        Create intermediate directoties if needed.
+        Return an iterable of serialized scan results from a codebase.
         """
-        if on_linux:
-            output_file = fsdecode(output_file)
-        output_file = abspath(expanduser(output_file))
-        self.create_parent_directory(output_file)
-        return output_file
+        serializer = partial(Resource.to_dict, full_root=full_root,
+                             strip_root=strip_root, with_info=info)
 
+        resources = codebase.walk(topdown=True, skip_root=strip_root,
+                                  skip_filtered=True)
 
-def get_pretty_options(command_options, generic_paths=False):
-    """
-    Return a sorted mapping of {CLI option: pretty value string} for the
-    `command_options` list of CommandOption as in:
-        {"--license": True, "input": ~some/path}
-
-    Skip options with with None or empty seq values or a value set to its
-    default. Skip eager and hidden options.
-
-    If `generic_paths` is True, click.File and click.Path parameters are made
-    "generic" replacing their value with a placeholder. This is used mostly for
-    testing.
-    """
-    import click
-
-    if TRACE:
-        logger_debug('get_pretty_options: generic_paths', generic_paths)
-    args = []
-    options = []
-    for option in command_options:
-        value = option.value
-        param = option.param
-        if value == param.default:
-            continue
-
-        if param.is_eager:  
-            continue
-
-        if value is None:
-            continue
-
-        # not yet in Click 6.7 or param.hidden:
-        if option.name == 'test_mode':
-            continue
-
-        if value in (tuple(), [],):
-            # option with multiple values, the value is a tuple
-            continue
-
-        if isinstance(param.type, click.Path) and generic_paths:
-            value = '<path>'
-
-        if isinstance(param.type, click.File):
-            if generic_paths:
-                value = '<file>'
-            else:
-                # the value cannot be displayed as-is as this may be an opened file-
-                # like object
-                vname = getattr(value, 'name', None)
-                if vname:
-                    value = vname
-                else:
-                    value = '<file>'
-
-        # coerce to string for non-basic supported types
-        if not (value in (True, False, None)
-            or isinstance(value, (str, unicode, bytes, tuple, list, dict, OrderedDict))):
-            value = repr(value)
-
-        # opts is a list of CLI options as in "--strip-root": the last opt is
-        # the CLI option long form by convention
-        cli_opt = param.opts[-1]
-
-        if isinstance(param, click.Argument):
-            args.append((cli_opt, value))
-        else:
-            options.append((cli_opt, value))
-
-    return OrderedDict(sorted(args) + sorted(options))
+        return imap(serializer, resources)
 
 
 output_plugins = PluginManager(
diff --git a/src/plugincode/output_filter.py b/src/plugincode/output_filter.py
index 1e0e0981dd8..e42eec527db 100644
--- a/src/plugincode/output_filter.py
+++ b/src/plugincode/output_filter.py
@@ -27,7 +27,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from plugincode import BasePlugin
+from plugincode import CodebasePlugin
 from plugincode import PluginManager
 from plugincode import HookimplMarker
 from plugincode import HookspecMarker
@@ -41,20 +41,15 @@
 
 
 @output_filter_spec
-class OutputFilterPlugin(BasePlugin):
+class OutputFilterPlugin(CodebasePlugin):
     """
     Base plugin class for Resource output filter plugins that all output filter
     plugins must extend.
-    """
 
-    # TODO: pass own command options name/values as concrete kwargs
-    def process_resource(self, resource, **kwargs):
-        """
-        Return True is the `resource` should be kept, False if it should omitted
-        aka. filtered out of the Resource stream.
-        Subclasses must override.
-        """
-        raise NotImplementedError
+    Filter plugins SHOULD NOT modify the codebase beyond setting the
+    Resource.is_filtered flag on resources.
+    """
+    pass
 
 
 output_filter_plugins = PluginManager(
diff --git a/src/plugincode/scan.py b/src/plugincode/scan.py
index 5ea12edd915..29f61c33f42 100644
--- a/src/plugincode/scan.py
+++ b/src/plugincode/scan.py
@@ -60,6 +60,7 @@ def get_scanner(self, **kwargs):
         This callable (typically a bare function) should carry as little state
         as possible as it may be executed through multiprocessing.
         Subclasses must override.
+        This receives all the ScanCode call arguments as kwargs.
         """
         raise NotImplementedError
 
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index cba072672ca..bff9c6d289f 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -64,14 +64,6 @@
     fileutils.create_dir(scans_cache_dir)
 
 
-from pkg_resources import get_distribution, DistributionNotFound
-try:
-    __version__ = get_distribution('scancode-toolkit').version
-except DistributionNotFound:
-    # package is not installed ??
-    __version__ = '2.2.1'
-
-
 # Tracing flags
 TRACE = False
 
@@ -104,10 +96,6 @@ def logger_debug(*args):
 CORE_GROUP = 'core'
 
 
-# Holds a CLI option actual name/value and its corresponding
-# click.Parameter instance
-CommandOption = namedtuple('CommandOption', 'help_group name value param')
-
 # Holds a scan plugin result "key and the corresponding function.
 # click.Parameter instance
 Scanner = namedtuple('Scanner', 'key function')
@@ -124,20 +112,22 @@ def __init__(self, param_decls=None, show_default=False,
                  prompt=False, confirmation_prompt=False,
                  hide_input=False, is_flag=None, flag_value=None,
                  multiple=False, count=False, allow_from_autoenv=True,
-                 type=None, help=None,
+                 type=None, help=None,  # @ReservedAssignment
                  # custom additions #
                  # a string that set the CLI help group for this option
                  help_group=MISC_GROUP,
                  # a relative sort order number (integer or float) for this
                  # option within a help group: the sort is by increasing
                  # sort_order then by option declaration.
-                 sort_order = 100,
+                 sort_order=100,
                  # a sequence of other option name strings that this option
                  # requires to be set
                  requires=(),
                  # a sequence of other option name strings that this option
                  # conflicts with if they are set
                  conflicts=(),
+                 # a flag set to True if this option should be hidden from the CLI help
+                 hidden=False,
                  **attrs):
 
         super(CommandLineOption, self).__init__(param_decls, show_default,
@@ -150,6 +140,7 @@ def __init__(self, param_decls=None, show_default=False,
         self.sort_order = sort_order
         self.requires = requires
         self.conflicts = conflicts
+        self.hidden = hidden
 
     def __repr__(self, *args, **kwargs):
         name = self.name
@@ -284,34 +275,16 @@ def _is_set(_value, _default, typ):
             raise click.UsageError(msg)
 
 
-def get_command_options(ctx):
-    """
-    Yield CommandOption tuples for each click.Option option in the `ctx` Click
-    context. Ignore eager flags.
-    """
-    param_values = ctx.params
-    for param in ctx.command.params:
-        if param.is_eager:
-            continue
-        if param.name == 'test_mode':
-            continue
-
-        help_group = getattr(param, 'help_group', None)
-        name = param.name
-        value = param_values.get(name)
-        yield CommandOption(help_group, name, value, param)
-
-
 class FileOptionType(click.File):
     """
     A click.File subclass that ensures that a file name is not set to an
     existing option parameter to avoid mistakes.
     """
     def convert(self, value, param, ctx):
-        known_opts = set(chain.from_iterable(p.opts for p in ctx.command.params 
+        known_opts = set(chain.from_iterable(p.opts for p in ctx.command.params
                                              if isinstance(p, click.Option)))
         if value in known_opts:
-            self.fail('Illegal file name conflicting with an option name: %s. ' 
+            self.fail('Illegal file name conflicting with an option name: %s. '
                       'Use the special "-" file name to print results on screen/stdout.'
                 % (click.types.filename_to_ui(value),
             ), param, ctx)
diff --git a/src/scancode/api.py b/src/scancode/api.py
index c8488aafdf8..25a14ca8bad 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -107,7 +107,9 @@ def get_urls(location, **kwargs):
 
 
 def get_licenses(location, min_score=0, include_text=False, diag=False,
-                 license_url_template=DEJACODE_LICENSE_URL, **kwargs):
+                 license_url_template=DEJACODE_LICENSE_URL,
+                 cache_dir=None,
+                 **kwargs):
     """
     Return a list of mappings for licenses detected in the file at `location`.
 
@@ -120,10 +122,13 @@ def get_licenses(location, min_score=0, include_text=False, diag=False,
     If `diag` is True, additional license match details are returned with the
     matched_rule key of the returned mapping.
     """
+    if not cache_dir:
+        from scancode_config import scancode_cache_dir as cache_dir
+
     from licensedcode.cache import get_index
     from licensedcode.cache import get_licenses_db
 
-    idx = get_index()
+    idx = get_index(cache_dir)
     licenses = get_licenses_db()
 
     results = []
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 4e678cc6b0c..cece0204022 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -27,7 +27,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-# Import early because this import has monkey-patching side effects
+# Import first because this import has monkey-patching side effects
 from scancode.pool import get_pool
 
 from collections import OrderedDict
@@ -43,6 +43,10 @@
 import click
 click.disable_unicode_literals_warning = True
 
+# import early
+from scancode_config import __version__ as scancode_version
+from scancode_config import scancode_temp_dir, scancode_cache_dir
+
 from commoncode.fileutils import PATH_TYPE
 from commoncode.timeutils import time2tstamp
 
@@ -50,14 +54,12 @@
 from plugincode import PluginManager
 
 # these are important to register plugin managers
-from plugincode import housekeeping
 from plugincode import pre_scan
 from plugincode import scan
 from plugincode import post_scan
 from plugincode import output_filter
 from plugincode import output
 
-from scancode import __version__ as version
 from scancode import CORE_GROUP
 from scancode import DOC_GROUP
 from scancode import MISC_GROUP
@@ -69,7 +71,6 @@
 from scancode import PRE_SCAN_GROUP
 from scancode import SCAN_GROUP
 from scancode import SCAN_OPTIONS_GROUP
-from scancode import get_command_options
 from scancode import Scanner
 from scancode import validate_option_dependencies
 from scancode.api import get_file_info
@@ -221,7 +222,7 @@ def print_examples(ctx, param, value):
 def print_version(ctx, param, value):
     if not value or ctx.resilient_parsing:
         return
-    click.echo('ScanCode version ' + version)
+    click.echo('ScanCode version ' + scancode_version)
     ctx.exit()
 
 
@@ -319,6 +320,7 @@ def print_plugins(ctx, param, value):
     if not value or ctx.resilient_parsing:
         return
     for plugin_cls in sorted(plugin_classes, key=lambda pc: (pc.stage, pc.name)):
+        click.echo('--------------------------------------------')
         click.echo('Plugin: scancode_{self.stage}:{self.name}'.format(self=plugin_cls), nl=False)
         click.echo('  class: {self.__module__}:{self.__name__}'.format(self=plugin_cls))
         requires = ', '.join(plugin_cls.requires)
@@ -334,7 +336,8 @@ def print_plugins(ctx, param, value):
             name = option.name
             opts = ', '.join(option.opts)
             help_group = option.help_group
-            click.echo('    {help_group!s}, {name!s}: {opts}'.format(**locals()))
+            help = option.help  # noqa
+            click.echo('    help_group: {help_group!s}, name: {name!s}: {opts}\n      help: {help!s}'.format(**locals()))
         click.echo('')
     ctx.exit()
 
@@ -380,7 +383,7 @@ def print_plugins(ctx, param, value):
 
 @click.option('--timeout',
     type=float, default=DEFAULT_TIMEOUT,
-    metavar='<seconds>',
+    metavar='<secs>',
     help='Stop an unfinished file scan after a timeout in seconds.  '
          '[default: %d seconds]' % DEFAULT_TIMEOUT,
     help_group=CORE_GROUP, sort_order=10, cls=CommandLineOption)
@@ -398,47 +401,72 @@ def print_plugins(ctx, param, value):
          'Print a verbose scan summary.',
     help_group=CORE_GROUP, sort_order=20, cls=CommandLineOption)
 
-@click.option('--no-cache',
-    is_flag=True,
-    help='Do not use on-disk cache for intermediate results. Uses more memory.',
-    help_group=CORE_GROUP, sort_order=200, cls=CommandLineOption)
+@click.option('--cache-dir',
+    type=click.Path(
+        exists=True, file_okay=False, dir_okay=True,
+        readable=True, path_type=PATH_TYPE),
+    default=scancode_cache_dir,
+    metavar='DIR',
+    sort_order=210,
 
-@click.option('--timing',
-    is_flag=True,
-    help='Collect execution timing for each scan and scanned file.',
-    help_group=CORE_GROUP, cls=CommandLineOption)
+    help='Set the path to an existing directory where ScanCode can cache '
+         'files available across runs.'
+
+         'If not set, the value of the `SCANCODE_CACHE` environment variable is '
+         'used if available. If `SCANCODE_CACHE` is not set, a default '
+         'sub-directory in the user home directory is used instead. '
+         '[default: ~/.cache/scancode-tk/version]',
+    help_group=CORE_GROUP,
+    cls=CommandLineOption)
 
 @click.option('--temp-dir',
     type=click.Path(
         exists=True, file_okay=False, dir_okay=True,
         readable=True, path_type=PATH_TYPE),
-    default=None, sort_order=200,
+    default=scancode_temp_dir,
+    show_default=False,
     metavar='DIR',
-    help='Set the path to the temporary directory to use for ScanCode '
-         'cache and temporary files.',
+    sort_order=210,
+    help='Set the path to an existing directory where ScanCode can create '
+         'temporary files. '
+         'If not set, the value of the `SCANCODE_TMP` environment variable is '
+         'used if available. If `SCANCODE_TMP` is not set, a default '
+         'sub-directory in the system temp directory is used instead.  '
+         '[default: TMP/scancode-tk-<key>]',
     help_group=CORE_GROUP,
     cls=CommandLineOption)
 
-@click.help_option('-h', '--help',
-    help_group=DOC_GROUP, sort_order= 10,cls=CommandLineOption)
+@click.option('--timing',
+    is_flag=True,
+    help='Collect scan timing for each scan/scanned file.',
+    help_group=CORE_GROUP, sort_order=250, cls=CommandLineOption)
 
-@click.option('--examples',
-    is_flag=True, is_eager=True,
-    callback=print_examples,
-    help=('Show command examples and exit.'),
-    help_group=DOC_GROUP, sort_order= 50,cls=CommandLineOption)
+@click.option('--on-disk-results',
+    is_flag=True, default=True,
+    show_default=True,
+    help='Save intermediate scan results in temporary files. Uses less memory.',
+    help_group=CORE_GROUP, sort_order=300, cls=CommandLineOption)
+
+@click.help_option('-h', '--help',
+    help_group=DOC_GROUP, sort_order=10, cls=CommandLineOption)
 
 @click.option('--about',
     is_flag=True, is_eager=True,
     callback=print_about,
     help='Show information about ScanCode and licensing and exit.',
-    help_group=DOC_GROUP, sort_order= 20,cls=CommandLineOption)
+    help_group=DOC_GROUP, sort_order=20, cls=CommandLineOption)
 
 @click.option('--version',
     is_flag=True, is_eager=True,
     callback=print_version,
     help='Show the version and exit.',
-    help_group=DOC_GROUP, sort_order= 20,cls=CommandLineOption)
+    help_group=DOC_GROUP, sort_order=20, cls=CommandLineOption)
+
+@click.option('--examples',
+    is_flag=True, is_eager=True,
+    callback=print_examples,
+    help=('Show command examples and exit.'),
+    help_group=DOC_GROUP, sort_order=50, cls=CommandLineOption)
 
 @click.option('--plugins',
     is_flag=True, is_eager=True,
@@ -448,60 +476,61 @@ def print_plugins(ctx, param, value):
 
 @click.option('--test-mode',
     is_flag=True, default=False,
-    # not yet supported in Click 6.7
-    # hidden = True,
+    # not yet supported in Click 6.7 but added in CommandLineOption
+    hidden=True,
     help='Run ScanCode in a special "test mode". Only for testing.',
-    help_group=MISC_GROUP, sort_order= 1000,cls=CommandLineOption)
+    help_group=MISC_GROUP, sort_order=1000, cls=CommandLineOption)
 
-def scancode(ctx, input, info,  # @ReservedAssignment
+def scancode(ctx, input,
+             info,
              strip_root, full_root,
-             verbose, quiet,
              processes, timeout,
-             no_cache,
+             quiet, verbose,
+             cache_dir, temp_dir,
              timing,
-             temp_dir,
+             on_disk_results,
              test_mode,
              *args, **kwargs):
     """scan the <input> file or directory for license, origin and packages and save results to FILE(s) using one or more ouput format option.
 
-    Error and progress is printed to stderr.
+    Error and progress are printed to stderr.
     """
 
     # notes: the above docstring of this function is used in the CLI help Here is
     # it's actual docstring:
     """
-    Return a return code of 0 on success or 1 on error from running all the
-    scanning "stages" in the `input` file and saving results inthe `format` format
-    to `output_file`.
+    This function is the main ScanCode CLI entry point.
+
+    Return a return code of 0 on success or a positive integer on error from
+    running all the scanning "stages" with the `input` file or
+    directory.
+
     The scanning stages are:
 
-    - `inventory`: collect the codebase inventory resources tree for the `input`.
-      This is a built-in stage that does not accept plugins.
+    - `inventory`: collect the codebase inventory resources tree for the
+      `input`. This is a built-in stage that does not accept plugins.
 
     - `setup`: as part of the plugins system, each plugin is loaded and
-      its `setup` class method is called if it is enabled.
+      its `setup` method is called if it is enabled.
 
     - `pre-scan`: each enabled pre-scan plugin `process_codebase(codebase)`
-       method is called to update/transforme the whole codebase
+      method is called to update/transforme the whole codebase.
 
     - `scan`: the codebase is walked and each enabled scan plugin
-      `process_resource(resource.location)` method is called for each codebase
-      resource.
+      `get_scanner()(resource.location)` scanner function is called once for
+      each codebase resource.
 
     - `post-scan`: each enabled post-scan plugin `process_codebase(codebase)`
-       method is called to update/transforme the whole codebase
-
-    # !!!!!TODO: this is not yet true!!!!
-    - `output`: each enabled output plugin `process_codebase(codebase)`
-       method is called to create an output for the codebase
+      method is called to update/transforme the whole codebase.
 
-    This function is the main CLI entry point.
+    - `output_filter`: the `process_resource` method of each enabled
+      output_filter plugin is called on each resource to determine if the
+      resource should be kept or not in the output stage.
 
-    The other arguments are:
+    - `output`: each enabled output plugin `process_codebase(codebase)`
+      method is called to create an output for the codebase filtered resources.
 
-    - `quiet` and `verbose`: boolean flags: Do not display any message if
-      `quiet` is True. Otherwise, display extra verbose messages if `quiet` is
-      False and `verbose` is True. These two options are mutually exclusive.
+    Beside `input`, the other arguments are:
 
     - `strip_root` and `full_root`: boolean flags: In the outputs, strip the
       first path segment of a file if `strip_root` is True unless the `input` is
@@ -516,12 +545,19 @@ def scancode(ctx, input, info,  # @ReservedAssignment
       if the license scan is interrupted they other scans may complete, each
       withing the timeout)
 
-    - `no_cache`: boolean flag: disable on-disk caching of intermediate scan
-      results and store these in memory instead if True
+    - `quiet` and `verbose`: boolean flags: Do not display any message if
+      `quiet` is True. Otherwise, display extra verbose messages if `quiet` is
+      False and `verbose` is True. These two options are mutually exclusive.
+
+    - `cache_dir` and `temp_dir`: paths to alternative directories for caching
+      and temporary files.
 
     - `timing`: boolean flag: collect per-scan and per-file scan timings if
       True.
 
+    - `on_disk_results`: boolean flag: default to True to enable on-disk saving
+      of intermediate scan results.
+
     - `temp_dir`: path to a non-default temporary directory fo caching and other
       temporary files. If not provided, the default is used.
 
@@ -529,6 +565,20 @@ def scancode(ctx, input, info,  # @ReservedAssignment
     through Click context machinery.
     """
 
+    # build mappings of all kwargs to pass down to plugins
+    standard_kwargs = dict(
+        input=input,
+        info=info,
+        strip_root=strip_root, full_root=full_root,
+        processes=processes, timeout=timeout,
+        quiet=quiet, verbose=verbose,
+        cache_dir=cache_dir, temp_dir=temp_dir,
+        timing=timing,
+        on_disk_results=on_disk_results,
+        test_mode=test_mode
+    )
+    kwargs.update(standard_kwargs)
+
     success = True
     codebase = None
     processing_start = time()
@@ -537,35 +587,37 @@ def scancode(ctx, input, info,  # @ReservedAssignment
     scan_start = time2tstamp()
 
     try:
-        # validate_exclusive(ctx, ['strip_root', 'full_root'])
 
         if not processes and not quiet:
             echo_stderr('Disabling multi-processing.', fg='yellow')
 
-        ############################################################################
+        ########################################################################
         # 1. get command options and create all plugin instances
-        ############################################################################
+        ########################################################################
         validate_option_dependencies(ctx)
-        command_options = sorted(get_command_options(ctx))
+
         if TRACE_DEEP:
-            logger_debug('scancode: command_options:')
-            for co in command_options:
-                logger_debug('  scancode: command_option:', co)
+            ctx_params = sorted(ctx.params.items())
+            logger_debug('scancode: ctx.params:')
+            for co in ctx.params:
+                logger_debug('  scancode: ctx.params:', co)
 
         enabled_plugins = OrderedDict()
 
         for stage, manager in PluginManager.managers.items():
-            if stage == housekeeping.stage:
-                continue
-
             enabled_plugins[stage] = stage_plugins = OrderedDict()
             for name, plugin_cls in manager.plugin_classes.items():
-                # TODO: manage errors: this will error out loudly if there are errors
-                plugin = plugin_cls(command_options)
-                if plugin.is_enabled():
-                    # Set special test mode flag that plugins can leverage
-                    plugin._test_mode = test_mode
-                    stage_plugins[name] = plugin
+                try:
+                    plugin = plugin_cls(**kwargs)
+                    if plugin.is_enabled(**kwargs):
+                        # Set special test mode flag that plugins can leverage
+                        plugin._test_mode = test_mode
+                        stage_plugins[name] = plugin
+                except:
+                    msg = 'ERROR: failed to load plugin: %(stage)s:%(name)s:' % locals()
+                    echo_stderr(msg, fg='red')
+                    echo_stderr(traceback.format_exc())
+                    ctx.exit(2)
 
         # these are plugin instances, not classes
         pre_scan_plugins = enabled_plugins[pre_scan.stage]
@@ -579,18 +631,16 @@ def scancode(ctx, input, info,  # @ReservedAssignment
                    'option is needed to save scan results.')
             raise click.UsageError(msg)
 
+        # Use default info scan when no other scan options are requested
         if not scanner_plugins and not info:
-            # Use default info scan when no scan option is requested
-            info = True
-            for co in command_options:
-                if co.name == 'info':
-                    co._replace(value=True)
+            # add info scan as scan option/kwarg/locals()
+            info = ctx.params['info'] = kwargs['info'] = True
 
         # TODO: check for plugin dependencies and if a plugin is ACTIVE!!!
 
-        ############################################################################
+        ########################################################################
         # 2. setup enabled plugins
-        ############################################################################
+        ########################################################################
 
         setup_timings = OrderedDict()
         plugins_setup_start = time()
@@ -602,25 +652,27 @@ def scancode(ctx, input, info,  # @ReservedAssignment
         for stage, stage_plugins in enabled_plugins.items():
             for name, plugin in stage_plugins.items():
                 plugin_setup_start = time()
-                if not quiet and verbose:
-                    echo_stderr('Setup plugin: %(stage)s:%(name)s...' % locals(),
+                if verbose:
+                    echo_stderr(' Setup plugin: %(stage)s:%(name)s...' % locals(),
                                 fg='green')
                 try:
-                    plugin.setup()
+                    plugin.setup(**kwargs)
                 except:
                     msg = 'ERROR: failed to setup plugin: %(stage)s:%(name)s:' % locals()
                     echo_stderr(msg, fg='red')
                     echo_stderr(traceback.format_exc())
                     ctx.exit(2)
 
-                timing_key = 'setup_%(stage)s_%(name)s' % locals()
+                timing_key = 'setup_%(stage)s:%(name)s' % locals()
                 setup_timings[timing_key] = time() - plugin_setup_start
 
         setup_timings['setup'] = time() - plugins_setup_start
 
-        ############################################################################
+        ########################################################################
         # 3. collect codebase inventory
-        ############################################################################
+        ########################################################################
+
+        inventory_start = time()
 
         if not quiet:
             echo_stderr('Collect file inventory...', fg='green')
@@ -628,29 +680,29 @@ def scancode(ctx, input, info,  # @ReservedAssignment
         # TODO: add progress indicator
         # note: inventory timing collection is built in Codebase initialization
         try:
-            codebase = Codebase(location=input, use_cache=not no_cache)
+            codebase = Codebase(
+                location=input, use_cache=on_disk_results, temp_dir=temp_dir)
         except:
             msg = 'ERROR: failed to collect codebase at: %(input)r' % locals()
             echo_stderr(msg, fg='red')
             echo_stderr(traceback.format_exc())
             ctx.exit(2)
 
-        if TRACE: logger_debug('scancode: codebase.use_cache:', codebase.use_cache)
-
-        codebase.strip_root = strip_root
-        codebase.full_root = full_root
+        if TRACE:
+            logger_debug('scancode: codebase.use_cache:', codebase.use_cache)
 
         codebase.timings.update(setup_timings)
 
-        # TODO: thse are noy YET used in outputs!!
-        codebase.summary['scancode_notice'] = notice
-        codebase.summary['scancode_version'] = version
-        # TODO: this is NOT the pretty options
-        codebase.summary['scancode_options'] = command_options
+        codebase.timings['inventory'] = time() - inventory_start
+
+        files_count, dirs_count, size_count = codebase.compute_counts()
+        codebase.summary['initial_files_count'] = files_count
+        codebase.summary['initial_dirs_count'] = dirs_count
+        codebase.summary['initial_size_count'] = size_count
 
-        ############################################################################
+        ########################################################################
         # 4. if any prescan plugins needs_info run an info scan first
-        ############################################################################
+        ########################################################################
 
         # do we need to collect info before prescan?
         pre_scan_needs_info = any(p.needs_info for p in pre_scan_plugins.values())
@@ -658,6 +710,9 @@ def scancode(ctx, input, info,  # @ReservedAssignment
         info_is_collected = False
 
         if pre_scan_needs_info:
+            # add info scan as scan option/kwarg/locals()
+            info = ctx.params['info'] = kwargs['info'] = True
+
             info_start = time()
 
             progress_manager = None
@@ -671,61 +726,48 @@ def scancode(ctx, input, info,  # @ReservedAssignment
             scanners = [Scanner(key='infos', function=get_file_info)]
             # TODO: add CLI option to bypass cache entirely
             info_success = scan_codebase(codebase, scanners, processes, timeout,
-                with_timing=timing, with_info=True, progress_manager=progress_manager)
+                with_timing=timing, progress_manager=progress_manager)
 
-            codebase.timings['collect-info'] = time() - info_start
             info_is_collected = True
+            codebase.timings['collect-info'] = time() - info_start
 
             success = success and info_success
 
-        ############################################################################
+        ########################################################################
         # 5. run prescans
-        ############################################################################
-
-        pre_scan_start = time()
-        if not quiet and not verbose and pre_scan_plugins:
-            echo_stderr('Run pre-scan plugins...', fg='green')
+        ########################################################################
 
         # TODO: add progress indicator
-        for name, plugin in pre_scan_plugins.items():
-            plugin_prescan_start = time()
-            if verbose:
-                echo_stderr('Run pre-scan plugin: %(name)s...' % locals(),
-                            fg='green')
-
-            try:
-                plugin.process_codebase(codebase)
-            except:
-                msg = 'ERROR: failed to run pre-scan plugin: %(name)s:' % locals()
-                echo_stderr(msg, fg='red')
-                echo_stderr(traceback.format_exc())
-                ctx.exit(2)
+        run_plugins(ctx, plugins=pre_scan_plugins, stage='pre-scan',
+                    codebase=codebase, kwargs=kwargs,
+                    quiet=quiet, verbose=verbose,
+                    stage_msg='Run %(stage)ss...',
+                    plugin_msg=' Run %(stage)s: %(name)s...')
 
-            codebase.update_counts()
-            timing_key = 'prescan_%(name)s' % locals()
-            setup_timings[timing_key] = time() - plugin_prescan_start
-
-        codebase.timings['pre-scan'] = time() - pre_scan_start
-
-        ############################################################################
+        ########################################################################
         # 6. run scans.
-        ############################################################################
+        ########################################################################
 
         scan_start = time()
         scanners = []
-        # add info is requested or needed but not yet collected
-        stages_needs_info = any(p.needs_info for p in
-            (post_scan_plugins.values() + output_plugins.values()))
 
-        with_info = info or stages_needs_info
-        codebase.with_info = with_info
-        if not info_is_collected and with_info:
+        if not info:
+            next_stages = (post_scan_plugins.values()
+                           + output_filter_plugins.values()
+                           + output_plugins.values())
+            next_stages_need_info = any(p.needs_info for p in next_stages)
+            # add info is requested or needed but not yet collected
+            if next_stages_need_info:
+                # add info scan as scan option
+                info = True
+                ctx.params['info'] = info
+
+        if info and not info_is_collected:
             scanners = [Scanner(key='infos', function=get_file_info)]
 
         scan_sorter = lambda s: (s.sort_order, s.name)
         for scanner in sorted(scanner_plugins.values(), key=scan_sorter):
-            scanner_kwargs = scanner.get_own_command_options_kwargs()
-            func = scanner.get_scanner(**scanner_kwargs)
+            func = scanner.get_scanner(**kwargs)
             scanners.append(Scanner(key=scanner.name, function=func))
 
         if TRACE_DEEP: logger_debug('scancode: scanners:', scanners)
@@ -745,101 +787,74 @@ def scancode(ctx, input, info,  # @ReservedAssignment
 
             # TODO: add CLI option to bypass cache entirely
             scan_success = scan_codebase(codebase, scanners, processes, timeout,
-                with_timing=timing, with_info=with_info, progress_manager=progress_manager)
+                                         with_timing=timing, progress_manager=progress_manager)
 
-            scanned_count, _, scanned_size = codebase.counts(
-                update=True, skip_root=False)
+            scanned_fc, scanned_dc, scanned_sc = codebase.compute_counts()
 
             codebase.summary['scan_names'] = scan_names
-            codebase.summary['scanned_count'] = scanned_count
-            codebase.summary['scanned_size'] = scanned_size
+            codebase.summary['scanned_files_count'] = scanned_fc
+            codebase.summary['scanned_dirs_count'] = scanned_dc
+            codebase.summary['scanned_size_count'] = scanned_sc
             codebase.timings['scan'] = time() - scan_start
 
             success = success and scan_success
 
-        ############################################################################
+        ########################################################################
         # 7. run postscans
-        ############################################################################
+        ########################################################################
 
-        post_scan_start = time()
         # TODO: add progress indicator
-        if not quiet and not verbose and post_scan_plugins:
-            echo_stderr('Run post-scan plugins...', fg='green')
-        for name, plugin in post_scan_plugins.items():
-            if not quiet and verbose:
-                echo_stderr('Run post-scan plugin: %(name)s...' % locals(), fg='green')
+        run_plugins(ctx, plugins=post_scan_plugins, stage='post-scan',
+                    codebase=codebase, kwargs=kwargs,
+                    quiet=quiet, verbose=verbose,
+                    stage_msg='Run %(stage)ss...',
+                    plugin_msg=' Run %(stage)s: %(name)s...')
 
-            try:
-                plugin.process_codebase(codebase)
-            except:
-                msg = 'ERROR: failed to run post-scan plugin: %(name)s:' % locals()
-                echo_stderr(msg, fg='red')
-                echo_stderr(traceback.format_exc())
-                ctx.exit(2)
-            codebase.update_counts()
-
-        codebase.timings['post-scan'] = time() - post_scan_start
-
-        ############################################################################
+        ########################################################################
         # 8. apply output filters
-        ############################################################################
-        output_filter_start = time()
-        # TODO: add progress indicator
-        if not quiet and not verbose and output_filter_plugins:
-            echo_stderr('Run output filter plugins...', fg='green')
+        ########################################################################
 
-        filters = tuple(plugin.process_resource for plugin in output_filter_plugins.values())
-        if filters:
-            # This is a set of resource ids to filter out from the final outputs
-            filtered_rids_add = codebase.filtered_rids.add
-            try:
-                for rid, resource in codebase.get_resources_with_rid():
-                    if all(to_keep(resource) for to_keep in filters):
-                        continue
-                    filtered_rids_add(rid)
-            finally:
-                msg = 'ERROR: failed to run output filter plugins'
-                echo_stderr(msg, fg='red')
-                echo_stderr(traceback.format_exc())
-                ctx.exit(2)
-
-        codebase.timings['output-filter'] = time() - post_scan_start
-
-        ############################################################################
-        # 9. run outputs
-        ############################################################################
-        output_start = time()
         # TODO: add progress indicator
-        if not quiet and not verbose:
-            echo_stderr('Save results...' , fg='green')
+        run_plugins(ctx, plugins=output_filter_plugins, stage='output-filter',
+                    codebase=codebase, kwargs=kwargs,
+                    quiet=quiet, verbose=verbose,
+                    stage_msg='Apply %(stage)ss...',
+                    plugin_msg=' Apply %(stage)s: %(name)s...')
 
-        for name, plugin in output_plugins.items():
-            if not quiet and verbose:
-                echo_stderr('Save results as: %(name)s...' % locals(), fg='green')
+        ########################################################################
+        # 9. run outputs
+        ########################################################################
 
-            try:
-                plugin.process_codebase(codebase)
-            except:
-                msg = 'ERROR: failed to save output with plugin: %(name)s:' % locals()
-                echo_stderr(msg, fg='red')
-                echo_stderr(traceback.format_exc())
-                ctx.exit(2)
+        # TODO: cleanup kwargs vs. codebase attrs
+        files_count, dirs_count, size_count = codebase.compute_counts(
+            skip_root=strip_root, skip_filtered=True)
 
-            codebase.update_counts()
+        codebase.summary['final_files_count'] = files_count
+        codebase.summary['final_dirs_count'] = dirs_count
+        codebase.summary['final_size_count'] = size_count
 
-        codebase.timings['output'] = time() - output_start
+        kwargs['files_count'] = files_count
+        kwargs['pretty_options'] = get_pretty_params(ctx, info=info, generic_paths=test_mode)
+        kwargs['scancode_notice'] = notice
+        kwargs['scancode_version'] = scancode_version
 
-        ############################################################################
+        # TODO: add progress indicator
+        run_plugins(ctx, plugins=output_plugins, stage='output',
+                    codebase=codebase, kwargs=kwargs,
+                    quiet=quiet, verbose=verbose,
+                    stage_msg='Save scan results...',
+                    plugin_msg=' Save scan results as: %(name)s...',
+                    exit_on_fail=False)
+
+        ########################################################################
         # 9. display summary
-        ############################################################################
+        ########################################################################
         codebase.timings['total'] = time() - processing_start
 
         # TODO: compute summary for output plugins too??
         if not quiet:
             echo_stderr('Scanning done.', fg='green' if success else 'red')
-            display_summary(codebase, scan_names, processes,
-                skip_root=strip_root, verbose=verbose)
-
+            display_summary(codebase, scan_names, processes, verbose=verbose)
     finally:
         # cleanup including cache cleanup
         if codebase:
@@ -849,8 +864,48 @@ def scancode(ctx, input, info,  # @ReservedAssignment
     ctx.exit(rc)
 
 
+def run_plugins(ctx, stage, plugins, codebase, kwargs, quiet, verbose,
+                stage_msg='', plugin_msg='', exit_on_fail=True):
+    """
+    Run the `stage` `plugins` (a mapping of {name: plugin} on `codebase`.
+    Display errors.
+    Exit the CLI on failure if `exit_on_fail` is True.
+    """
+    stage_start = time()
+    if verbose and plugins:
+        echo_stderr(stage_msg % locals(), fg='green')
+
+    # TODO: add progress indicator
+    for name, plugin in plugins.items():
+        plugin_start = time()
+
+        if verbose:
+            echo_stderr(plugin_msg % locals(), fg='green')
+
+        try:
+            if TRACE_DEEP:
+                from pprint import pformat
+                logger_debug('run_plugins: kwargs passed to %(stage)s:%(name)s' % locals())
+                logger_debug(pformat(sorted(kwargs.item())))
+                logger_debug()
+
+            plugin.process_codebase(codebase, **kwargs)
+
+        except:
+            msg = 'ERROR: failed to run %(stage)s plugin: %(name)s:' % locals()
+            echo_stderr(msg, fg='red')
+            echo_stderr(traceback.format_exc())
+            if exit_on_fail:
+                ctx.exit(2)
+
+        timing_key = '%(stage)s:%(name)s' % locals()
+        codebase.timings[timing_key] = time() - plugin_start
+
+    codebase.timings['stage'] = time() - stage_start
+
+
 def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
-                  with_timing=False, with_info=False, progress_manager=None):
+                  with_timing=False, progress_manager=None):
     """
     Run the `scanners` Scanner object on the `codebase` Codebase. Return True on
     success or False otherwise.
@@ -871,18 +926,14 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
 
     # FIXME: this path computation is super inefficient
     # tuples of  (absolute location, resource id)
-    # TODO: should we alk topdown or not???
+    # TODO: should we walk topdown or not???
 
     resources = ((r.get_path(absolute=True), r.rid) for r in codebase.walk())
 
     runner = partial(scan_resource, scanners=scanners, timeout=timeout)
 
-    has_info_scanner = with_info
-    lscan = len(scanners)
-    has_other_scanners = lscan > 1 if has_info_scanner else lscan
     if TRACE:
         logger_debug('scan_codebase: scanners:', '\n'.join(repr(s) for s in scanners))
-        logger_debug('scan_codebase: has_other_scanners:', bool(has_other_scanners))
 
     get_resource = codebase.get_resource
 
@@ -929,15 +980,14 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
                     success = False
                     resource.errors.extend(scan_errors)
 
-                if has_info_scanner:
-                    # always set info directly on resources
-                    info = scan_result.pop('infos', [])
-                    resource.set_info(info)
-                    if TRACE: logger_debug('scan_codebase: set_info:', info)
+                # always set info directly on resources
+                infos = scan_result.pop('infos', [])
+                if TRACE: logger_debug('scan_codebase: infos:', infos)
+                if infos:
+                    resource.set_info(infos)
 
-                if has_other_scanners and scan_result:
-                    resource.put_scans(scan_result, update=True)
-                    if TRACE: logger_debug('scan_codebase: pu_scans:', scan_result)
+                saved_scans = resource.put_scans(scan_result, update=True)
+                if TRACE: logger_debug('scan_codebase: saved_scans:', saved_scans)
 
             except StopIteration:
                 break
@@ -1011,23 +1061,36 @@ def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT, with_timing=F
         return location, rid, errors, scan_time, results
 
 
-def display_summary(codebase, scan_names, processes, skip_root, verbose):
+def display_summary(codebase, scan_names, processes, verbose):
     """
     Display a scan summary.
     """
-    counts = codebase.counts(update=False, skip_root=skip_root)
 
     initial_files_count = codebase.summary.get('initial_files_count', 0)
     initial_dirs_count = codebase.summary.get('initial_dirs_count', 0)
     initial_res_count = initial_files_count + initial_dirs_count
+    initial_size_count = codebase.summary.get('initial_size_count', 0)
+    if initial_size_count:
+        initial_size_count = format_size(initial_size_count)
+        initial_size_count = 'for %(initial_size_count)s' % locals()
+    else:
+        initial_size_count = ''
 
-    final_files_count, final_dirs_count, final_size = counts
+    final_files_count = codebase.summary.get('final_files_count', 0)
+    final_dirs_count = codebase.summary.get('final_dirs_count', 0)
     final_res_count = final_files_count + final_dirs_count
+    final_size_count = codebase.summary.get('final_size_count', 0)
+    if final_size_count:
+        final_size_count = format_size(final_size_count)
+        final_size_count = 'for %(final_size_count)s' % locals()
+    else:
+        final_size_count = ''
 
     top_errors = codebase.errors
-    path_errors = [(r.get_path(decode=True, posix=True), r.errors) for r in codebase.walk() if r.errors]
+    path_and_errors = [(r.get_path(decode=True, posix=True), r.errors)
+                       for r in codebase.walk() if r.errors]
 
-    has_errors = top_errors or path_errors
+    has_errors = top_errors or path_and_errors
 
     errors_count = 0
     if has_errors:
@@ -1035,7 +1098,8 @@ def display_summary(codebase, scan_names, processes, skip_root, verbose):
         for error in top_errors:
             echo_stderr(error)
             errors_count += 1
-        for errored_path, errors in path_errors:
+
+        for errored_path, errors in path_and_errors:
             echo_stderr('Path: ' + errored_path, fg='red')
             if not verbose:
                 continue
@@ -1044,25 +1108,31 @@ def display_summary(codebase, scan_names, processes, skip_root, verbose):
                     echo_stderr('  ' + emsg, fg='red')
                 errors_count += 1
 
-    scanned_size = codebase.summary.get('scanned_size', 0)
     scan_time = codebase.timings.get('scan', 0.)
-    scan_size_speed = format_size(scanned_size / scan_time)
-    scanned_count = codebase.summary.get('scanned_count', 0)
-    scan_file_speed = round(float(scanned_count) / scan_time , 2)
-    final_size = format_size(final_size)
+
+    scanned_size_count = codebase.summary.get('scanned_size_count', 0)
+    if scanned_size_count:
+        scan_size_speed = format_size(scanned_size_count / scan_time)
+        scan_size_speed = '%(scan_size_speed)s/sec.' % locals()
+    else:
+        scan_size_speed = ''
+
+    scanned_files_count = codebase.summary.get('scanned_files_count', 0)
+    scan_file_speed = round(float(scanned_files_count) / scan_time , 2)
 
     echo_stderr('Summary:        %(scan_names)s with %(processes)d process(es)' % locals())
     echo_stderr('Errors count:   %(errors_count)d' % locals())
-    echo_stderr('Scan Speed:     %(scan_file_speed).2f files/sec. %(scan_size_speed)s/sec.' % locals())
+    echo_stderr('Scan Speed:     %(scan_file_speed).2f files/sec. %(scan_size_speed)s' % locals())
 
     echo_stderr('Initial counts: %(initial_res_count)d resource(s): '
                                 '%(initial_files_count)d file(s) '
-                                'and %(initial_dirs_count)d directorie(s)' % locals())
+                                'and %(initial_dirs_count)d directorie(s) '
+                                '%(initial_size_count)s' % locals())
 
     echo_stderr('Final counts:   %(final_res_count)d resource(s): '
                                 '%(final_files_count)d file(s) '
                                 'and %(final_dirs_count)d directorie(s) '
-                                'for %(final_size)s' % locals())
+                                '%(final_size_count)s' % locals())
 
     echo_stderr('Timings:')
     for key, value, in codebase.timings.items():
@@ -1113,3 +1183,75 @@ def format_size(size):
             return '%(size).2f %(symbol)s' % locals()
         size = size / 1024.
     return '%(size).2f %(symbol)s' % locals()
+
+
+def get_pretty_params(ctx, info=False, generic_paths=False):
+    """
+    Return a sorted mapping of {CLI option: pretty value string} for the
+    `ctx` Click.context, putting arguments first then options:
+
+        {"input": ~/some/path, "--license": True}
+
+    Skip options that are not set or hidden.
+
+    If `generic_paths` is True, click.File and click.Path parameters are made
+    "generic" replacing their value with a placeholder. This is used mostly for
+    testing.
+    """
+
+    if TRACE:
+        logger_debug('get_pretty_params: generic_paths', generic_paths)
+    args = []
+    # hack since info option can be changed to True if default
+    options = [('--info', info)] if info else []
+
+    param_values = ctx.params
+    for param in ctx.command.params:
+        name = param.name
+        value = param_values.get(name)
+
+        if param.is_eager:
+            continue
+        # This attribute is not yet in Click 6.7 but in head
+        if getattr(param, 'hidden', False):
+            continue
+
+        if value == param.default:
+            continue
+        if value is None:
+            continue
+        if value in (tuple(), [],):
+            # option with multiple values, the value is a tuple
+            continue
+
+        if isinstance(param.type, click.Path) and generic_paths:
+            value = '<path>'
+
+        if isinstance(param.type, click.File):
+            if generic_paths:
+                value = '<file>'
+            else:
+                # the value cannot be displayed as-is as this may be an opened file-
+                # like object
+                vname = getattr(value, 'name', None)
+                if vname:
+                    value = vname
+                else:
+                    value = '<file>'
+
+        # coerce to string for non-basic supported types
+        if not (value in (True, False, None)
+            or isinstance(value, (str, unicode, bytes, tuple, list, dict, OrderedDict))):
+            value = repr(value)
+
+        # opts is a list of CLI options as in "--strip-root": the last opt is
+        # the CLI option long form by convention
+        cli_opt = param.opts[-1]
+
+        if isinstance(param, click.Argument):
+            args.append((cli_opt, value))
+        else:
+            options.append((cli_opt, value))
+
+    return OrderedDict(sorted(args) + sorted(options))
+
diff --git a/src/scancode/cli_test_utils.py b/src/scancode/cli_test_utils.py
index 6f323734408..aa5ff08692f 100644
--- a/src/scancode/cli_test_utils.py
+++ b/src/scancode/cli_test_utils.py
@@ -31,6 +31,7 @@
 from collections import OrderedDict
 import json
 import os
+
 from commoncode.system import on_linux
 
 
@@ -39,32 +40,68 @@ def remove_dates(scan_result):
     Remove date fields from scan.
     """
     for scanned_file in scan_result['files']:
-        if 'date' in scanned_file:
-            del scanned_file['date']
+        scanned_file.pop('date', None)
 
 
-def check_json_scan(expected_file, result_file, regen=False, strip_dates=False):
+def clean_errors(scan_results):
+    """
+    Clean error fields from scan by keeping only the first and last line
+    (removing the stack traces).
     """
-    Check the scan result_file JSON results against the expected_file expected JSON
-    results. Removes references to test_dir for the comparison. If regen is True the
-    expected_file WILL BE overwritten with the results. This is convenient for
-    updating tests expectations. But use with caution.
+
+    def clean(_errors):
+        """Modify the __errors list in place"""
+        for _i, _error in enumerate(_errors[:]):
+            _error_split = _error.splitlines(True)
+            if len(_error_split) <= 1:
+                continue
+            # keep first and last line
+            _clean_error = ''.join([_error_split[0] + _error_split[-1]])
+            _errors[_i] = _clean_error
+
+    top_level = scan_results.get('scan_errors')
+    if top_level:
+        clean(top_level)
+
+    for result in scan_results['files']:
+        file_level = result.get('scan_errors')
+        if file_level:
+            clean(file_level)
+
+
+def check_json_scan(expected_file, result_file, regen=False,
+                    strip_dates=False, clean_errs=True):
     """
-    result = _load_json_result(result_file)
+    Check the scan result_file JSON results against the expected_file expected
+    JSON results. Removes references to test_dir for the comparison. If regen is
+    True the expected_file WILL BE overwritten with the results. This is
+    convenient for updating tests expectations. But use with caution.
+    """
+    scan_results = _load_json_result(result_file)
+
     if strip_dates:
-        remove_dates(result)
+        remove_dates(scan_results)
+
+    if clean_errs:
+        clean_errors(scan_results)
+
     if regen:
         with open(expected_file, 'wb') as reg:
-            json.dump(result, reg, indent=2, separators=(',', ': '))
+            json.dump(scan_results, reg, indent=2, separators=(',', ': '))
+
     expected = _load_json_result(expected_file)
+
     if strip_dates:
         remove_dates(expected)
+    if clean_errs:
+        clean_errors(expected)
 
     # NOTE we redump the JSON as a string for a more efficient comparison of
     # failures
+    # TODO: remove sort, this should no longer be needed
     expected = json.dumps(expected, indent=2, sort_keys=True, separators=(',', ': '))
-    result = json.dumps(result, indent=2, sort_keys=True, separators=(',', ': '))
-    assert expected == result
+    scan_results = json.dumps(scan_results, indent=2, sort_keys=True, separators=(',', ': '))
+    assert expected == scan_results
 
 
 def _load_json_result(result_file):
@@ -78,18 +115,19 @@ def _load_json_result(result_file):
     if scan_result.get('scancode_version'):
         del scan_result['scancode_version']
 
+    # TODO: remove sort, this should no longer be needed
     scan_result['files'].sort(key=lambda x: x['path'])
     return scan_result
 
 
-def run_scan_plain(options, cwd=None):
+def run_scan_plain(options, cwd=None, test_mode=True):
     """
     Run a scan as a plain subprocess. Return rc, stdout, stderr.
     """
     from commoncode.command import execute
     import scancode
 
-    if '--test-mode' not in options:
+    if test_mode and '--test-mode' not in options:
         options.append('--test-mode')
 
     scmd = b'scancode' if on_linux else 'scancode'
@@ -97,7 +135,7 @@ def run_scan_plain(options, cwd=None):
     return execute(scan_cmd, options, cwd=cwd)
 
 
-def run_scan_click(options, monkeypatch=None):
+def run_scan_click(options, monkeypatch=None, test_mode=True):
     """
     Run a scan as a Click-controlled subprocess
     If monkeypatch is provided, a tty with a size (80, 43) is mocked.
@@ -107,7 +145,7 @@ def run_scan_click(options, monkeypatch=None):
     from click.testing import CliRunner
     from scancode import cli
 
-    if '--test-mode' not in options:
+    if test_mode and '--test-mode' not in options:
         options.append('--test-mode')
 
     if monkeypatch:
diff --git a/src/scancode/extract_cli.py b/src/scancode/extract_cli.py
index cac6fc02e4d..0930205e70a 100644
--- a/src/scancode/extract_cli.py
+++ b/src/scancode/extract_cli.py
@@ -38,7 +38,7 @@
 
 from scancode.api import extract_archives
 from scancode.cli import print_about
-from scancode.cli import version
+from scancode_config import __version__
 from scancode import utils
 
 
@@ -46,10 +46,10 @@
 try:
     # Python 2
     unicode
-    str = unicode
+    str = unicode  # @ReservedAssignment
 except NameError:
     # Python 3
-    unicode = str
+    unicode = str  # @ReservedAssignment
 
 
 echo_stderr = partial(click.secho, err=True)
@@ -58,7 +58,7 @@
 def print_version(ctx, param, value):
     if not value or ctx.resilient_parsing:
         return
-    echo_stderr('ScanCode extractcode version ' + version)
+    echo_stderr('ScanCode extractcode version ' + __version__)
     ctx.exit()
 
 
diff --git a/src/scancode/plugin_copyright.py b/src/scancode/plugin_copyright.py
index e8c07dfca34..838f64dfbe0 100644
--- a/src/scancode/plugin_copyright.py
+++ b/src/scancode/plugin_copyright.py
@@ -45,11 +45,11 @@ class CopyrightScanner(ScanPlugin):
             is_flag=True, default=False,
             help='Scan <input> for copyrights.',
             help_group=SCAN_GROUP,
-            sort_order= 50),
+            sort_order=50),
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('copyright')
+    def is_enabled(self, copyright, **kwargs):  # @ReservedAssignment
+        return copyright
 
     def get_scanner(self, **kwargs):
         from scancode.api import get_copyrights
diff --git a/src/scancode/plugin_email.py b/src/scancode/plugin_email.py
index fc3e95a3ff4..76000123c2f 100644
--- a/src/scancode/plugin_email.py
+++ b/src/scancode/plugin_email.py
@@ -47,8 +47,8 @@ class EmailScanner(ScanPlugin):
             help_group=OTHER_SCAN_GROUP)
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('email')
+    def is_enabled(self, email, **kwargs):
+        return email
 
     def get_scanner(self, **kwargs):
         from scancode.api import get_emails
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 93a509b6dec..280f5f002f4 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -48,20 +48,19 @@ class ProcessIgnore(PreScanPlugin):
            help_group=PRE_SCAN_GROUP)
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('ignore')
+    def is_enabled(self, ignore, **kwargs):
+        return ignore
 
-    def process_codebase(self, codebase):
+    def process_codebase(self, codebase, ignore=(), **kwargs):
         """
         Remove ignored Resources from the resource tree.
         """
-        ignore_opt = self.get_command_option('ignore')
-        ignores = ignore_opt and ignore_opt.value or  []
-        if not ignores:
+
+        if not ignore:
             return
 
         ignores = {
-            pattern: 'User ignore: Supplied by --ignore' for pattern in ignores
+            pattern: 'User ignore: Supplied by --ignore' for pattern in ignore
         }
 
         ignorable = partial(is_ignored, ignores=ignores)
diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index 065960a13b2..d4c3a5e86eb 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -31,8 +31,6 @@
 
 from plugincode.scan import ScanPlugin
 from plugincode.scan import scan_impl
-from plugincode.housekeeping import HousekeepingPlugin
-from plugincode.housekeeping import housekeeping_impl
 from scancode import CommandLineOption
 from scancode import MISC_GROUP
 from scancode import SCAN_OPTIONS_GROUP
@@ -40,6 +38,19 @@
 from scancode.api import DEJACODE_LICENSE_URL
 
 
+def reindex_licenses(ctx, param, value):
+    if not value or ctx.resilient_parsing:
+        return
+
+    # TODO: check for temp file configuration and use that for the cache!!!
+    from licensedcode.cache import get_cached_index
+    import click
+    click.echo('Checking and rebuilding the license index...')
+    get_cached_index(cache_dir=value, check_consistency=True,)
+    click.echo('Done.')
+    ctx.exit(0)
+
+
 @scan_impl
 class LicenseScanner(ScanPlugin):
     """
@@ -79,20 +90,25 @@ class LicenseScanner(ScanPlugin):
             requires=['license'],
             help='Include diagnostic information in license scan results.',
             help_group=SCAN_OPTIONS_GROUP),
+
+        CommandLineOption(
+            ('--reindex-licenses',),
+            is_eager=True, is_flag=False, default=False,
+            metavar='DIR',
+            callback=reindex_licenses,
+            help='Check the license index cache and reindex if needed and exit.',
+            help_group=MISC_GROUP)
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('license')
+    def is_enabled(self, license, **kwargs):  # @ReservedAssignment
+        return license
 
     def get_scanner(self, license_score=0, license_text=False,
-                    license_url_template=DEJACODE_LICENSE_URL, license_diag=False, **kwargs):
+                    license_url_template=DEJACODE_LICENSE_URL,
+                    license_diag=False, cache_dir=None, **kwargs):
+
         from scancode.api import get_licenses
         return partial(get_licenses, min_score=license_score,
                        include_text=license_text, diag=license_diag,
-                       license_url_template=license_url_template)
-
-
-
-@housekeeping_impl
-class LicenseIndexer(HousekeepingPlugin):
-
+                       license_url_template=license_url_template,
+                       cache_dir=cache_dir)
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 8585840c773..f22e25f3e62 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -52,14 +52,17 @@ class MarkSource(PostScanPlugin):
             help_group=POST_SCAN_GROUP)
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('mark_source')
+    def is_enabled(self, mark_source, **kwargs):
+        return mark_source
 
-    def process_codebase(self, codebase):
+    def process_codebase(self, codebase, mark_source, **kwargs):
         """
         Set the `is_source` to True in directories if they contain over 90% of
         source code files at full depth.
         """
+        if not mark_source:
+            return
+
         # TODO: these two nested walk() calls are not super efficient
         for resource in codebase.walk(topdown=False):
             if resource.is_file:
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index f40238448f6..ffe3e127fe8 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -45,19 +45,23 @@ class OnlyFindings(OutputFilterPlugin):
             help_group=OUTPUT_FILTER_GROUP)
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('only_findings')
+    def is_enabled(self, only_findings, **kwargs):
+        return only_findings
 
-    def process_resource(self, resource):
+    def process_codebase(self, codebase, **kwargs):
         """
-        Return True if `resource` has finding e.g. if they have no scan data, no
+        Set Resource.is_filtered to True for resources from the codebase that do
+        not have findings e.g. if they have no scan data (excluding info) and no
         errors.
         """
-        return has_findings(resource)
+        resources = codebase.walk(topdown=True, skip_filtered=True)
+        for resource in resources:
+            if not has_findings(resource):
+                resource.is_filtered = True
 
 
 def has_findings(resource):
     """
     Return True if this resource has findings.
     """
-    return any(resource.get_scans().values() + resource.errors)
+    return bool(resource.errors or resource.get_scans().values())
diff --git a/src/scancode/plugin_package.py b/src/scancode/plugin_package.py
index d48a8c6de6e..d67a6df0743 100644
--- a/src/scancode/plugin_package.py
+++ b/src/scancode/plugin_package.py
@@ -45,11 +45,11 @@ class PackageScanner(ScanPlugin):
             is_flag=True, default=False,
             help='Scan <input> for packages.',
             help_group=SCAN_GROUP,
-            sort_order= 20),
+            sort_order=20),
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('package')
+    def is_enabled(self, package, **kwargs):
+        return package
 
     def get_scanner(self, **kwargs):
         from scancode.api import get_package_info
diff --git a/src/scancode/plugin_url.py b/src/scancode/plugin_url.py
index 7dad1b20456..d9e1ca2f93a 100644
--- a/src/scancode/plugin_url.py
+++ b/src/scancode/plugin_url.py
@@ -47,8 +47,8 @@ class UrlScanner(ScanPlugin):
             help_group=OTHER_SCAN_GROUP)
     ]
 
-    def is_enabled(self):
-        return self.is_command_option_enabled('url')
+    def is_enabled(self, url, **kwargs):
+        return url
 
     def get_scanner(self, **kwargs):
         from scancode.api import get_urls
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index 72fe7182a53..fa7a58e82d3 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -38,13 +38,14 @@
 from os.path import expanduser
 from os.path import join
 from os.path import normpath
-from time import time
 import traceback
 import sys
 
 import attr
 import yg.lockfile  # @UnresolvedImport
 
+from scancode_config import scancode_temp_dir
+
 from commoncode.filetype import is_file as filetype_is_file
 from commoncode.filetype import is_special
 
@@ -54,15 +55,10 @@
 from commoncode.fileutils import file_name
 from commoncode.fileutils import fsdecode
 from commoncode.fileutils import fsencode
-from commoncode.fileutils import get_temp_dir
 from commoncode.fileutils import parent_directory
-from commoncode.functional import iter_skip
-from commoncode.timeutils import time2tstamp
 from commoncode import ignore
 from commoncode.system import on_linux
 
-from scancode import cache_dir
-from scancode import scans_cache_dir
 
 # Python 2 and 3 support
 try:
@@ -90,11 +86,12 @@
 
 # Tracing flags
 TRACE = False
+TRACE_DEEP = False
 
 def logger_debug(*args):
     pass
 
-if TRACE:
+if TRACE or TRACE_DEEP:
     import logging
 
     logger = logging.getLogger(__name__)
@@ -116,7 +113,7 @@ def logger_debug(*args):
 # TODO: consider using a class variable instead of a module variable?
 _CODEBASES = {}
 
-_cache_lock_file = join(cache_dir, 'codebases-lockfile')
+_cache_lock_file = join(scancode_temp_dir, 'codebases-lockfile')
 
 
 def add_codebase(codebase, cache_lock_file=_cache_lock_file):
@@ -174,7 +171,7 @@ class Codebase(object):
 
     # TODO: add populate progress manager!!!
 
-    def __init__(self, location, use_cache=True, cache_base_dir=scans_cache_dir):
+    def __init__(self, location, use_cache=True, temp_dir=scancode_temp_dir):
         """
         Initialize a new codebase rooted at the `location` existing file or
         directory.
@@ -183,7 +180,6 @@ def __init__(self, location, use_cache=True, cache_base_dir=scans_cache_dir):
         Resource in a new unique directory under `cache_base_dir`. Otherwise,
         scans are kept as Resource attributes.
         """
-        start = time()
         self.original_location = location
 
         if on_linux:
@@ -226,41 +222,39 @@ def __init__(self, location, use_cache=True, cache_base_dir=scans_cache_dir):
 
         # setup cache
         self.use_cache = use_cache
-        self.cache_base_dir = self.cache_dir = None
-        self.cache_base_dir = cache_base_dir
+        self.temp_dir = temp_dir
+        self.cache_dir = None
         if use_cache:
             # this is unique to this run and valid for the lifetime of this codebase
-            self.cache_dir = get_cache_dir(cache_base_dir)
-            create_dir(self.cache_dir)
+            self.cache_dir = get_results_cache_dir(temp_dir=temp_dir)
 
         # this updates the global cache using a file lock
         self.cid = add_codebase(self)
 
         self.populate()
 
-        self.timings['inventory'] = time() - start
-        files_count, dirs_count = self.resource_counts()
-        self.summary['initial_files_count'] = files_count
-        self.summary['initial_dirs_count'] = dirs_count
-
         # Flag set to True if file information was requested for results output
         self.with_info = False
 
-        # Flag set to True is strip root was requested for results output
-        self.strip_root = False
-        # Flag set to True is full root was requested for results output
-        self.full_root = False
-
         # set of resource rid to exclude from outputs
         # This is populated automatically.
         self.filtered_rids = set()
 
+    def _get_next_rid(self):
+        """
+        Return the next available resource id.
+        """
+        return len(self.resources)
 
     def populate(self):
         """
-        Populate this codebase with Resource objects for this codebase by
-        walking its `location` topdown, returning directories then files, each
-        in sorted order.
+        Populate this codebase with Resource objects.
+
+        The codebase must be populated by walking its `location` topdown,
+        breadth-first, creating files first then directories both in in sorted
+        case-insensitive name order.
+
+        Special files, links and VCS files are ignored.
         """
         # clear things
         self.resources = []
@@ -283,15 +277,17 @@ def populate(self):
 
         res_by_loc = {rloc: root}
 
-        def err(error):
+        def err(_error):
             self.errors.append(
-                'ERROR: cannot collect files: %(error)s\n' % dict(error=error)
+                'ERROR: cannot collect files: %(error)s\n' % dict(error=_error)
                 + traceback.format_exc()
             )
 
         # we always ignore VCS and some filetypes.
         ignored = partial(ignore.is_ignored, ignores=ignore.ignores_VCS)
 
+        sorter = lambda p: (p.lower(), p)
+
         # TODO: this is where we would plug archive walking??
         for top, dirs, files in os_walk(rloc, topdown=True, onerror=err):
 
@@ -306,60 +302,89 @@ def err(error):
 
             if TRACE: logger_debug('Codebase.collect: parent:', parent)
 
-            for name in sorted(dirs):
+            files.sort(key=sorter)
+            for name in sorted(files):
                 loc = join(top, name)
 
                 if is_special(loc) or ignored(loc):
                     if TRACE: logger_debug(
-                        'Codebase.collect: walk: dir ignored:', loc, 'ignored:',
+                        'Codebase.collect: walk: file ignored:', loc, 'ignored:',
                         ignored(loc), 'is_special:', is_special(loc))
                     continue
 
                 rid += 1
-                res = parent._add_child(name, rid, is_file=False)
+                res = parent._add_child(name, rid, is_file=True)
                 res_by_loc[loc] = res
                 resources_append(res)
-                if TRACE: logger_debug('Codebase.collect: dir:', res)
+                if TRACE: logger_debug(' Codebase.collect: file:', res)
 
-            for name in sorted(files):
+            dirs.sort(key=sorter)
+            for name in dirs:
                 loc = join(top, name)
 
                 if is_special(loc) or ignored(loc):
                     if TRACE: logger_debug(
-                        'Codebase.collect: walk: file ignored:', loc, 'ignored:',
+                        'Codebase.collect: walk: dir ignored:', loc, 'ignored:',
                         ignored(loc), 'is_special:', is_special(loc))
                     continue
 
                 rid += 1
-                res = parent._add_child(name, rid, is_file=True)
+                res = parent._add_child(name, rid, is_file=False)
                 res_by_loc[loc] = res
                 resources_append(res)
-                if TRACE: logger_debug('Codebase.collect: file:', res)
-
+                if TRACE: logger_debug(' Codebase.collect: dir:', res)
 
-    def walk(self, topdown=True, sort=False, skip_root=False):
+    def walk(self, topdown=True, skip_root=False, skip_filtered=False):
         """
-        Yield all Resources for this Codebase.
-        Walks the tree top-down in pre-order traversal if `topdown` is True.
-        Walks the tree bottom-up in post-order traversal if `topdown` is False.
-        If `sort` is True, each level is sorted by Resource name, directories
-        first then files.
+        Yield all resources for this Codebase walking its resource tree.
+        Walk the tree top-down, depth-first if `topdown` is True, otherwise walk
+        bottom-up.
+
+        Each level is sorted by children sort order (e.g. without-children, then
+        with-children and each group by case-insensitive name)
+
         If `skip_root` is True, the root resource is not returned.
+        If `skip_filtered` is True, resources with `is_filtered` set to True are
+        not returned.
         """
-        # single resources without children
-        if not self.root.children_rids:
-            return [self.root]
+        root = self.root
+
+        # do not skip root if has no children (e.g, single root resource)
+        without_root = root.is_filtered or (skip_root and root.has_children())
 
-        return self.root.walk(topdown, sort, skip_root)
+        if topdown and not without_root:
+            yield root
+
+        for res in root.walk(topdown):
+            if skip_filtered and res.is_filtered:
+                continue
+            yield res
+
+        if not topdown and not without_root:
+            yield root
 
     def get_resource(self, rid):
         """
         Return the Resource with `rid` or None if it does not exists.
         """
-        try:
-            return self.resources[rid]
-        except IndexError:
-            pass
+        if rid is not None:
+            try:
+                res = self.resources[rid]
+                if res:
+                    return res
+            except IndexError:
+                pass
+
+    def get_resources(self, rids=None):
+        """
+        Return a list of Resource with their rid the in the list `rids`.
+        if `rids` is None, return all resources
+        """
+        if rids is None:
+            return self.resources[:]
+
+        rids = set(rids)
+        return [res for res in self.resources if res.rid in rids]
 
     def add_resource(self, name, parent, is_file=False):
         """
@@ -368,12 +393,6 @@ def add_resource(self, name, parent, is_file=False):
         """
         return parent.add_child(name, is_file)
 
-    def _get_next_rid(self):
-        """
-        Return the next available resource id.
-        """
-        return len([r for r in self.resources if r is not None])
-
     def remove_resource(self, resource):
         """
         Remove the `resource` Resource object and all its children from the
@@ -398,71 +417,51 @@ def remove_resource(self, resource):
                         'at location:', resource.get_path(absolute=True, decode=True))
         return rids
 
-    def counts(self, update=True, skip_root=False):
+    def compute_counts(self, skip_root=False, skip_filtered=False):
         """
-        Return a tuple of counters (files_count, dirs_count, size) for this
-        codebase.
-        If `update` is True, update the codebase counts before returning.
-        Do not include the root Resource in the counts if `skip_root` is True.
+        Compute and update the counts of every resource.
+        Return a tuple of top level counters (files_count, dirs_count,
+        size_count) for this codebase.
+
+        - If `skip_root` is True, the root resource is not included in counts.
+        - If `skip_filtered` is True, resources with `is_filtered` set to True
+          are not included in counts.
         """
-        if update:
-            self.update_counts()
+        self.update_counts(skip_filtered=skip_filtered)
+
         root = self.root
+        files_count = root.files_count
+        dirs_count = root.dirs_count
+        size_count = root.size_count
+
+        if (skip_root and not root.is_file) or (skip_filtered and root.is_filtered):
+            return files_count, dirs_count, size_count
 
-        if skip_root and not self.is_file:
-            counts = [(c.files_count, c.dirs_count, c.size) for c in root.children()]
-            files_count, dirs_count, size = map(sum, zip(*counts))
+        if root.is_file:
+            files_count += 1
         else:
-            files_count = root.files_count
-            dirs_count = root.dirs_count
-            size = root.size
-            if self.is_file:
-                files_count += 1
-            else:
-                dirs_count += 1
-        return files_count, dirs_count, size
+            dirs_count += 1
+        size_count += root.size
 
-    def update_counts(self):
-        """
-        Update files_count, dirs_count and size attributes of each Resource in
-        this codebase based on the current state.
-        """
-        # note: we walk bottom up to update things in the proper order
-        for resource in self.walk(topdown=False):
-            resource._update_children_counts()
+        return files_count, dirs_count, size_count
 
-    def resource_counts(self, resources=None):
-        """
-        Return a tuple of quick counters (files_count, dirs_count) for this
-        codebase or an optional list of resources.
-        """
-        resources = resources or self.resources
-        
-        files_count = 0
-        dirs_count = 0
-        for res in resources:
-            if res is None:
-                continue
-            if res.is_file:
-                files_count += 1
-            else:
-                dirs_count += 1
-        return files_count, dirs_count
 
-    def get_resources_with_rid(self):
+    def update_counts(self, skip_filtered=False):
         """
-        Return an iterable of (rid, resource) for all the resources.
-        The order is topdown.
+        Update files_count, dirs_count and size_count attributes of each
+        Resource in this codebase based on the current state.
+
+        If `skip_filtered` is True, resources with `is_filtered` set to True are
+        not included in counts.
         """
-        for rid, res in enumerate(self.resources):
-            if res is None:
-                continue
-            yield rid, res
+        # note: we walk bottom up to update things in the proper order
+        for resource in self.walk(topdown=False):
+            resource._compute_children_counts(skip_filtered)
 
     def clear(self):
         """
         Purge the codebase cache(s) by deleting the corresponding cached data
-        files and in-memodyr structures.
+        files and in-memory data.
         """
         delete(self.cache_dir)
         del_codebase(self.cid)
@@ -489,16 +488,21 @@ class Resource(object):
     name = attr.ib()
 
     # a integer resource id
-    rid = attr.ib(type=int, repr=False)
+    rid = attr.ib(type=int)
 
     # the root of a Resource tree has a pid==None by convention
-    pid = attr.ib(type=int, repr=False)
+    pid = attr.ib(type=int)
 
     # a integer codebase id
     cid = attr.ib(default=None, type=int, repr=False)
 
+    # True for file, False for directory
     is_file = attr.ib(default=False, type=bool)
 
+    # True if this Resource should be filtered out, e.g. skipped from the
+    # returned list of resources
+    is_filtered = attr.ib(default=False, type=bool)
+
     # a list of rids
     children_rids = attr.ib(default=attr.Factory(list), repr=False)
 
@@ -509,6 +513,8 @@ class Resource(object):
 
     # True is the cache is used. Set at creation time from the codebase settings
     use_cache = attr.ib(default=None, type=bool, repr=False)
+
+    # FIXME: this may not need to be saved??
     # tuple of cache keys: dir and file name
     cache_keys = attr.ib(default=None, repr=False)
 
@@ -517,6 +523,7 @@ class Resource(object):
     base_name = attr.ib(default=None, repr=False)
     extension = attr.ib(default=None, repr=False)
     date = attr.ib(default=None, repr=False)
+    size = attr.ib(default=0, type=int)
     sha1 = attr.ib(default=None, repr=False)
     md5 = attr.ib(default=None, repr=False)
     mime_type = attr.ib(default=None, repr=False)
@@ -530,16 +537,19 @@ class Resource(object):
     is_script = attr.ib(default=False, type=bool, repr=False)
 
     # These attributes are re/computed for directories and files with children
-    size = attr.ib(default=0, type=int, repr=False)
+    # they represent are the for the full descendants of a Resource
+    size_count = attr.ib(default=0, type=int, repr=False)
     files_count = attr.ib(default=0, type=int, repr=False)
     dirs_count = attr.ib(default=0, type=int, repr=False)
 
     # Duration in seconds as float to run all scans for this resource
     scan_time = attr.ib(default=0, repr=False)
+
     # mapping of timings for each scan as {scan_key: duration in seconds as a float}
     scan_timings = attr.ib(default=None, repr=False)
 
     def __attrs_post_init__(self):
+        # TODO: compute rather than store
         # build simple cache keys for this resource based on the hex
         # representation of the resource id: they are guaranteed to be unique
         # within a codebase.
@@ -553,39 +563,39 @@ def __attrs_post_init__(self):
     def is_root(self):
         return self.pid is None
 
-    def _update_children_counts(self):
+    def _compute_children_counts(self, skip_filtered=False):
         """
         Compute counts and update self with these counts from direct children.
-        """
-        files, dirs, size = self._children_counts()
-        if not self.is_file:
-            # only set the size for directories
-            self.size = size
-        self.files_count = files
-        self.dirs_count = dirs
-
-    def _children_counts(self):
-        """
-        Return a tuple of counters (files_count, dirs_count, size) for the
+        Return a tuple of counters (files_count, dirs_count, size_count) for the
         direct children of this Resource.
 
+        If `skip_filtered` is True, skip resources with the `is_filtered` flag
+        set to True.
+
         Note: because certain files such as archives can have children, they may
         have a files and dirs counts. The size of a directory is aggregated size
         of its files (including the count of files inside archives).
         """
-        files_count = dirs_count = size = 0
-        if not self.children_rids:
-            return files_count, dirs_count, size
-
+        files_count = dirs_count = size_count = 0
         for res in self.children():
+            if skip_filtered and res.is_filtered:
+                continue
             files_count += res.files_count
             dirs_count += res.dirs_count
-            if res.is_file:
-                files_count += 1
-            else:
-                dirs_count += 1
-            size += res.size
-        return files_count, dirs_count, size
+            size_count += res.size_count
+
+            if not (skip_filtered and res.is_filtered):
+                if res.is_file:
+                    files_count += 1
+                else:
+                    dirs_count += 1
+                size_count += res.size
+
+        self.files_count = files_count
+        self.dirs_count = dirs_count
+        self.size_count = size_count
+
+        return files_count, dirs_count, size_count
 
     @property
     def codebase(self):
@@ -672,44 +682,24 @@ def put_scans(self, scans, update=True):
 
         return existing
 
-    def walk(self, topdown=True, sort=False, skip_root=False):
-        """
-        Yield Resources for this Resource tree.
-        Walks the tree top-down in pre-order traversal if `topdown` is True.
-        Walks the tree bottom-up in post-order traversal if `topdown` is False.
-        If `sort` is True, each level is sorted by Resource name, directories
-        first then files.
-        If `skip_root` is True, the root resource is not returned.
+    def walk(self, topdown=True):
         """
-        # single root resource without children
-        if self.pid == None and not self.children_rids:
-            return [self]
-
-        walked = self._walk(topdown, sort)
-        if skip_root:
-            skip_first = skip_last = False
-            if topdown:
-                skip_first = True
-            else:
-                skip_last = True
-            walked = iter_skip(walked, skip_first, skip_last)
-        return walked
+        Yield all descendant Resources of this Resource. Does not include self.
 
-    def _walk(self, topdown=True, sort=False):
-        if topdown:
-            yield self
+        Walk the tree top-down, depth-first if `topdown` is True, otherwise walk
+        bottom-up.
 
-        children = self.children()
-        if sort and children:
-            sorter = lambda r: (r.is_file, r.name)
-            children.sort(key=sorter)
+        Each level is sorted by children sort order (e.g. without-children, then
+        with-children and each group by case-insensitive name)
+        """
 
-        for child in children:
-            for subchild in child._walk(topdown, sort):
+        for child in self.children():
+            if topdown:
+                yield child
+            for subchild in child.walk(topdown):
                 yield subchild
-
-        if not topdown:
-            yield self
+            if not topdown:
+                yield child
 
     def add_child(self, name, is_file=False):
         """
@@ -718,7 +708,7 @@ def add_child(self, name, is_file=False):
         """
         rid = self.codebase._get_next_rid()
         child = self._add_child(name, rid, is_file)
-        self.codebase.resources.append(rid)
+        self.codebase.resources.append(child)
         return child
 
     def _add_child(self, name, rid, is_file=False):
@@ -731,25 +721,56 @@ def _add_child(self, name, rid, is_file=False):
         self.children_rids.append(rid)
         return res
 
+    def has_children(self):
+        """
+        Return True is this Resource has children.
+        """
+        return bool(self.children_rids)
+
     def children(self):
         """
-        Return a sequence of direct children Resource objects for this Resource
-        or None.
+        Return a sorted sequence of direct children Resource objects for this Resource
+        or an empty sequence.
+        Sorting is by resources without children, then resource with children
+        (e.g. directories or files with children), then case-insentive name.
         """
+        _sorter = lambda r: (r.has_children(), r.name.lower(), r.name)
         resources = self.codebase.resources
-        return [resources[rid] for rid in self.children_rids]
+        return sorted((resources[rid] for rid in self.children_rids), key=_sorter)
+
+    def has_parent(self):
+        """
+        Return True is this Resource has children.
+        """
+        return not self.is_root()
 
     def parent(self):
         """
         Return the parent Resource object for this Resource or None.
         """
-        if self.pid is not None:
-            return self.codebase.resources[self.pid]
+        return self.codebase.get_resource(self.pid)
+
+    def has_siblings(self):
+        """
+        Return True is this Resource has siblings.
+        """
+        return self.has_parent() and self.parent().has_children()
+
+    def siblings(self):
+        """
+        Return a sequence of sibling Resource objects for this Resource
+        or an empty sequence.
+        """
+        if self.has_parent():
+            return self.parent().children()
+        return []
 
     def ancestors(self):
         """
         Return a sequence of ancestor Resource objects from root to self.
         """
+        if self.pid is None:
+            return [self]
         resources = self.codebase.resources
         ancestors = deque()
         ancestors_append = ancestors.appendleft
@@ -764,7 +785,7 @@ def ancestors(self):
     def get_path(self, absolute=False, strip_root=False, decode=False, posix=False):
         """
         Return a path to self using the preferred OS encoding (bytes on Linux,
-        Unicode elsewhere) or Unicode is decode=True.
+        Unicode elsewhere) or Unicode if `decode`=True.
 
         - If `absolute` is True, return an absolute path. Otherwise return a
           relative path where the first segment is the root name.
@@ -802,23 +823,31 @@ def get_path(self, absolute=False, strip_root=False, decode=False, posix=False):
 
     def set_info(self, info):
         """
-        Set `info` file information for this Resource.
-        Info is a list of mappings of file information.
+        Set each mapping attribute from the `info` list of mappings of file
+        information as attributes of this Resource.
         """
+        if TRACE:
+            from pprint import pformat
+            logger_debug()
+            logger_debug('Resource.set_info:', self, '\n  info:', pformat(info))
+
         if not info:
             return
+
         for inf in info:
             for key, value in inf.items():
                 setattr(self, key, value)
 
+        if TRACE:
+            logger_debug('Resource.set_info: to_dict():', pformat(info))
+
     def to_dict(self, full_root=False, strip_root=False, with_info=False):
         """
         Return a mapping of representing this Resource and its scans.
         """
         res = OrderedDict()
-        res['path'] = fsdecode(
-            self.get_path(absolute=full_root, strip_root=strip_root,
-                          decode=True, posix=True))
+        res['path'] = fsdecode(self.get_path(
+            absolute=full_root, strip_root=strip_root, decode=True, posix=True))
         if with_info:
             res['type'] = self.type
             res['name'] = fsdecode(self.name)
@@ -830,6 +859,7 @@ def to_dict(self, full_root=False, strip_root=False, with_info=False):
             res['md5'] = self.md5
             res['files_count'] = self.files_count
             res['dirs_count'] = self.dirs_count
+            res['size_count'] = self.size_count
             res['mime_type'] = self.mime_type
             res['file_type'] = self.file_type
             res['programming_language'] = self.programming_language
@@ -841,19 +871,22 @@ def to_dict(self, full_root=False, strip_root=False, with_info=False):
             res['is_script'] = self.is_script
         res['scan_errors'] = self.errors
         res.update(self.get_scans())
+        if TRACE:
+            logger_debug('Resource.to_dict:', res)
         return res
 
 
-def get_cache_dir(cache_base_dir):
+def get_results_cache_dir(temp_dir=scancode_temp_dir):
     """
     Return a new, created and unique cache storage directory path rooted at the
-    `cache_base_dir` in the OS- preferred representation (either bytes on Linux
-    and Unicode elsewhere).
+    `cache_dir` base temp directory in the OS- preferred representation (either
+    bytes on Linux and Unicode elsewhere).
     """
-    create_dir(cache_base_dir)
-    # create a unique temp directory in cache_dir
-    prefix = time2tstamp() + u'-'
-    cache_dir = get_temp_dir(cache_base_dir, prefix=prefix)
+    from commoncode.fileutils import get_temp_dir
+    from commoncode.timeutils import time2tstamp
+
+    prefix = 'scan-results-cache-' + time2tstamp() + '-'
+    cache_dir = get_temp_dir(base_dir=temp_dir, prefix=prefix)
     if on_linux:
         cache_dir = fsencode(cache_dir)
     else:
diff --git a/src/scancode/utils.py b/src/scancode/utils.py
index b84857353c5..c51207928f7 100644
--- a/src/scancode/utils.py
+++ b/src/scancode/utils.py
@@ -135,7 +135,7 @@ def render_finish(self):
 def progressmanager(iterable=None, length=None, label=None, show_eta=True,
                     show_percent=None, show_pos=True, item_show_func=None,
                     fill_char='#', empty_char='-', bar_template=None,
-                    info_sep=BAR_SEP, width=BAR_WIDTH, file=None, color=None,
+                    info_sep=BAR_SEP, width=BAR_WIDTH, file=None, color=None,  # @ReservedAssignment
                     verbose=False):
 
     """
diff --git a/src/scancode_config.py b/src/scancode_config.py
new file mode 100644
index 00000000000..a89b01b988f
--- /dev/null
+++ b/src/scancode_config.py
@@ -0,0 +1,123 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import os
+from os.path import abspath
+from os.path import dirname
+from os.path import expanduser
+from os.path import join
+from os.path import exists
+import tempfile
+
+
+"""
+Core configuration globals.
+
+Note: this module MUST import ONLY from the standard library.
+"""
+
+
+def _create_dir(location):
+    """
+    Create all the directories are location
+    """
+    if not exists(location):
+        os.makedirs(location)
+
+
+################################################################################
+# INVARIABLE INSTALLATION-SPECIFIC, BUILT-IN LOCATIONS AND FLAGS
+################################################################################
+# these are guaranteed to be there and are entirely based on and relative to the
+# current installation location. This is where the source code and static data
+# lives.
+
+from pkg_resources import get_distribution, DistributionNotFound
+try:
+    __version__ = get_distribution('scancode-toolkit').version
+except DistributionNotFound:
+    # package is not installed ??
+    __version__ = '2.2.1'
+
+system_temp_dir = tempfile.gettempdir()
+scancode_src_dir = dirname(__file__)
+scancode_root_dir = dirname(scancode_src_dir)
+
+
+################################################################################
+# USAGE MODE FLAGS
+################################################################################
+
+# tag file or env var to determined if we are in dev mode
+SCANCODE_DEV_MODE = (os.getenv('SCANCODE_DEV_MODE')
+                     or exists(join(scancode_root_dir, 'SCANCODE_DEV_MODE')))
+
+################################################################################
+# USAGE MODE-, INSTALLATION- and IMPORT- and RUN-SPECIFIC DIRECTORIES
+################################################################################
+# These vary based on the usage mode: dev or not: we define two locations:
+
+# - scancode_cache_dir: for long-lived caches which are installation-specific:
+# this is for cached data which are infrequently written to and mostly readed,
+# such as the license index cache. The same location is used across runs of
+# a given version of ScanCode
+
+# - scancode_temp_dir: for short-lived temporary files which are import- or run-
+# specific that may live for the duration of a function call or for the duration
+# of a whole scancode run, such as any temp file and the per-run scan results
+# cache. A new unique location is used for each run of ScanCode (e.g. for the
+# lifetime of the Python interpreter process)
+
+if SCANCODE_DEV_MODE:
+    # in dev mode the cache and temp files are stored execlusively under the
+    # scancode_root_dir
+    scancode_cache_dir = join(scancode_root_dir, '.cache')
+    scancode_temp_dir = join(scancode_root_dir, 'tmp')
+
+else:
+    # in other usage modes (as a CLI or as a library, regardless of how
+    # installed) we use sensible defaults in the user home directory
+    # these are version specific
+
+    # WARNING: do not change this code without changing
+    # commoncode.fileutils.get_temp_dir too
+
+    user_home = abspath(expanduser('~'))
+    scancode_cache_dir = os.getenv('SCANCODE_CACHE')
+    if not scancode_cache_dir:
+        scancode_cache_dir = join(user_home, '.cache', 'scancode-tk', __version__)
+
+    scancode_temp_dir = os.getenv('SCANCODE_TMP')
+    if not scancode_temp_dir:
+        _prefix = 'scancode-tk-' + __version__ + '-'
+        # NOTE: for now this is in the system_temp_dir
+        scancode_temp_dir = tempfile.mkdtemp(prefix=_prefix, dir=system_temp_dir)
+
+_create_dir(scancode_cache_dir)
+_create_dir(scancode_temp_dir)
diff --git a/src/textcode/markup.py b/src/textcode/markup.py
index 672c74ec56d..d95a8a86616 100644
--- a/src/textcode/markup.py
+++ b/src/textcode/markup.py
@@ -146,7 +146,7 @@ def convert_to_utf8(location):
     if encoding:
         encoding = encoding.get('encoding', None)
         if encoding:
-            target = os.path.join(fileutils.get_temp_dir('markup'),
+            target = os.path.join(fileutils.get_temp_dir(prefix='markup'),
                                   fileutils.file_name(location))
             with codecs.open(location, 'rb', encoding=encoding,
                              errors='replace', buffering=16384) as inf:
@@ -166,7 +166,7 @@ def convert_to_text(location, _retrying=False):
     if not is_markup(location):
         return
 
-    temp_file = os.path.join(fileutils.get_temp_dir('markup'), 'text')
+    temp_file = os.path.join(fileutils.get_temp_dir(prefix='markup'), 'text')
     from bs4 import BeautifulSoup
     with open(location, 'rb') as input_text:
         soup = BeautifulSoup(input_text.read(), 'html5lib')
diff --git a/src/textcode/pdf.py b/src/textcode/pdf.py
index afb677f10b8..53cac168139 100644
--- a/src/textcode/pdf.py
+++ b/src/textcode/pdf.py
@@ -43,7 +43,6 @@ def get_text_lines(location):
     `location`. May raise exceptions.
     """
     extracted_text = BytesIO()
-    lines = []
     laparams = LAParams()
     with open(location, 'rb') as pdf_file:
         with contextlib.closing(PDFParser(pdf_file)) as parser:
diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv
index 6e6ffc0c478..bbf4af81230 100644
--- a/tests/formattedcode/data/csv/livescan/expected.csv
+++ b/tests/formattedcode/data/csv/livescan/expected.csv
@@ -1,19 +1,19 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
-/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1014,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
-/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
+Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count,size_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1014,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,0,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
+/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,
diff --git a/tests/formattedcode/data/csv/tree/expected.csv b/tests/formattedcode/data/csv/tree/expected.csv
index 7ec9a67980f..3a646d8148f 100644
--- a/tests/formattedcode/data/csv/tree/expected.csv
+++ b/tests/formattedcode/data/csv/tree/expected.csv
@@ -1,5 +1,14 @@
 Resource,scan_errors,copyright,start_line,end_line,copyright_holder
 /scan,,,,,
+/scan/copy1.c,,,,,
+/scan/copy1.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
+/scan/copy1.c,,,1,1,"ACME, Inc."
+/scan/copy2.c,,,,,
+/scan/copy2.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
+/scan/copy2.c,,,1,1,"ACME, Inc."
+/scan/copy3.c,,,,,
+/scan/copy3.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
+/scan/copy3.c,,,1,1,"ACME, Inc."
 /scan/subdir,,,,,
 /scan/subdir/copy1.c,,,,,
 /scan/subdir/copy1.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
@@ -13,12 +22,3 @@ Resource,scan_errors,copyright,start_line,end_line,copyright_holder
 /scan/subdir/copy4.c,,,,,
 /scan/subdir/copy4.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
 /scan/subdir/copy4.c,,,1,1,"ACME, Inc."
-/scan/copy1.c,,,,,
-/scan/copy1.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
-/scan/copy1.c,,,1,1,"ACME, Inc."
-/scan/copy2.c,,,,,
-/scan/copy2.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
-/scan/copy2.c,,,1,1,"ACME, Inc."
-/scan/copy3.c,,,,,
-/scan/copy3.c,,"Copyright (c) 2000 ACME, Inc.",1,1,
-/scan/copy3.c,,,1,1,"ACME, Inc."
diff --git a/tests/formattedcode/data/json/simple-expected.json b/tests/formattedcode/data/json/simple-expected.json
index e486fceb276..aaeae70f17e 100644
--- a/tests/formattedcode/data/json/simple-expected.json
+++ b/tests/formattedcode/data/json/simple-expected.json
@@ -4,8 +4,8 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--license": true,
     "--json": "<file>",
+    "--license": true,
     "--package": true
   },
   "files_count": 1,
@@ -16,11 +16,12 @@
       "name": "simple",
       "base_name": "simple",
       "extension": "",
-      "size": 55,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 1,
       "dirs_count": 0,
+      "size_count": 55,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -46,6 +47,7 @@
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index 9f8b7f25e2c..2d6420943a1 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -18,11 +18,12 @@
         "name": "simple",
         "base_name": "simple",
         "extension": "",
-        "size": 55,
+        "size": 0,
         "sha1": null,
         "md5": null,
         "files_count": 1,
         "dirs_count": 0,
+        "size_count": 55,
         "mime_type": null,
         "file_type": null,
         "programming_language": null,
@@ -49,6 +50,7 @@
         "md5": "bdf7c572beb4094c2059508fa73c05a4",
         "files_count": 0,
         "dirs_count": 0,
+        "size_count": 0,
         "mime_type": "text/plain",
         "file_type": "UTF-8 Unicode text, with no line terminators",
         "programming_language": "C",
@@ -62,4 +64,4 @@
       }
     ]
   }
-]
+]
\ No newline at end of file
diff --git a/tests/formattedcode/data/json/simple-expected.jsonpp b/tests/formattedcode/data/json/simple-expected.jsonpp
index f95c296408d..75e606fe7e3 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonpp
+++ b/tests/formattedcode/data/json/simple-expected.jsonpp
@@ -4,8 +4,8 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--license": true,
     "--json-pp": "<file>",
+    "--license": true,
     "--package": true
   },
   "files_count": 1,
@@ -16,11 +16,12 @@
       "name": "simple",
       "base_name": "simple",
       "extension": "",
-      "size": 55,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 1,
       "dirs_count": 0,
+      "size_count": 55,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -46,6 +47,7 @@
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
index 5df9c60529a..c9a2259e987 100644
--- a/tests/formattedcode/data/json/tree/expected.json
+++ b/tests/formattedcode/data/json/tree/expected.json
@@ -4,9 +4,9 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
+    "--json-pp": "<file>",
     "--license": true,
     "--package": true,
-    "--json-pp": "<file>",
     "--strip-root": true
   },
   "files_count": 7,
@@ -22,6 +22,7 @@
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -59,6 +60,7 @@
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -96,6 +98,7 @@
       "md5": "e999e21c9d7de4d0f943aefbb6f21b99",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -128,11 +131,12 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "size": 361,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 4,
       "dirs_count": 0,
+      "size_count": 361,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -158,6 +162,7 @@
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -195,6 +200,7 @@
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -232,6 +238,7 @@
       "md5": "290627a1387288ef77ae7e07946f3ecf",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -269,6 +276,7 @@
       "md5": "88e46475db9b1a68f415f6a3544eeb16",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
diff --git a/tests/formattedcode/test_output_csv.py b/tests/formattedcode/test_output_csv.py
index 68a12da100c..4328fd7d32a 100644
--- a/tests/formattedcode/test_output_csv.py
+++ b/tests/formattedcode/test_output_csv.py
@@ -40,9 +40,6 @@
 
 from formattedcode.output_csv import flatten_scan
 
-from plugincode import output
-output._TEST_MODE = True
-
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
diff --git a/tests/formattedcode/test_output_json.py b/tests/formattedcode/test_output_json.py
index f18177c35d1..6985a05f3c9 100644
--- a/tests/formattedcode/test_output_json.py
+++ b/tests/formattedcode/test_output_json.py
@@ -33,8 +33,6 @@
 from scancode.cli_test_utils import check_json_scan
 from scancode.cli_test_utils import run_scan_click
 
-from plugincode import output
-output._TEST_MODE = True
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
diff --git a/tests/formattedcode/test_output_jsonlines.py b/tests/formattedcode/test_output_jsonlines.py
index a01bb8071b1..03709147a6e 100644
--- a/tests/formattedcode/test_output_jsonlines.py
+++ b/tests/formattedcode/test_output_jsonlines.py
@@ -35,8 +35,6 @@
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
 
-from plugincode import output
-output._TEST_MODE = True
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
diff --git a/tests/formattedcode/test_output_templated.py b/tests/formattedcode/test_output_templated.py
index b044ceef1f7..f40c0a90e75 100644
--- a/tests/formattedcode/test_output_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -30,13 +30,12 @@
 import os
 import re
 
+from scancode_config import __version__
+
 from commoncode import fileutils
 from commoncode.testcase import FileDrivenTesting
-from scancode import __version__
 from scancode.cli_test_utils import run_scan_click
 
-from plugincode import output
-output._TEST_MODE = True
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
diff --git a/tests/licensedcode/test_cache.py b/tests/licensedcode/test_cache.py
index 6dcaf2d0b4c..3e65aea5719 100644
--- a/tests/licensedcode/test_cache.py
+++ b/tests/licensedcode/test_cache.py
@@ -33,6 +33,7 @@
 from commoncode import fileutils
 from commoncode import hash
 from licensedcode import cache
+from licensedcode.cache import get_license_cache_paths
 
 
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
@@ -113,197 +114,122 @@ def test_tree_checksum_is_different_when_file_is_removed(self):
         after = cache.tree_checksum(test_dir)
         assert before != after
 
-    def test_get_or_build_index_through_cache(self):
+    def test_build_index(self):
         # note: this is a rather complex test because caching involves some globals
-        license_index_cache_dir = self.get_temp_dir('index_cache')
-        _index_lock_file = os.path.join(license_index_cache_dir, 'lockfile')
-        _tree_checksum_file = os.path.join(license_index_cache_dir, 'tree_checksums')
-        _index_cache_file = os.path.join(license_index_cache_dir, 'index_cache')
+        cache_dir = self.get_temp_dir('index_cache')
+        lock_file, checksum_file, cache_file = get_license_cache_paths(cache_dir=cache_dir)
+        tree_base_dir = self.get_temp_dir('src_dir')
+        licenses_data_dir = self.get_test_loc('cache/data/licenses', copy=True)
+        rules_data_dir = self.get_test_loc('cache/data/rules', copy=True)
 
-        _tree_base_dir = self.get_temp_dir('src_dir')
+        timeout = 10
 
-        _licenses_dir = self.get_test_loc('cache/data', copy=True)
-        _licenses_data_dir = os.path.join(_licenses_dir, 'licenses')
-        _rules_data_dir = os.path.join(_licenses_dir, 'rules')
-
-        _timeout = 10
-
-        assert not os.path.exists(_tree_checksum_file)
-        assert not os.path.exists(_index_cache_file)
-        assert not os.path.exists(_index_lock_file)
+        assert not os.path.exists(checksum_file)
+        assert not os.path.exists(cache_file)
+        assert not os.path.exists(lock_file)
 
         check_consistency = True
-        return_index = False
 
         # when a new index is built, new index files are created
-        cache.get_or_build_index_through_cache(
-            check_consistency,
-            return_index,
-            _tree_base_dir,
-            _tree_checksum_file,
-            _index_lock_file,
-            _index_cache_file,
-            _licenses_data_dir,
-            _rules_data_dir,
-            _timeout)
-
-        assert os.path.exists(_tree_checksum_file)
-        assert os.path.exists(_index_cache_file)
-        assert not os.path.exists(_index_lock_file)
+        cache.get_cached_index(cache_dir, check_consistency, timeout,
+                               tree_base_dir, licenses_data_dir, rules_data_dir)
+
+        assert os.path.exists(checksum_file)
+        assert os.path.exists(cache_file)
+        assert not os.path.exists(lock_file)
 
         # when nothing changed a new index files is not created
-        tree_before = open(_tree_checksum_file).read()
-        idx_checksum_before = hash.sha1(_index_cache_file)
-        idx_date_before = date.get_file_mtime(_index_cache_file)
-        cache.get_or_build_index_through_cache(
-            check_consistency,
-            return_index,
-            _tree_base_dir,
-            _tree_checksum_file,
-            _index_lock_file,
-            _index_cache_file,
-            _licenses_data_dir,
-            _rules_data_dir,
-            _timeout)
-        assert tree_before == open(_tree_checksum_file).read()
-        assert idx_checksum_before == hash.sha1(_index_cache_file)
-        assert idx_date_before == date.get_file_mtime(_index_cache_file)
+        tree_before = open(checksum_file).read()
+        idx_checksum_before = hash.sha1(cache_file)
+        idx_date_before = date.get_file_mtime(cache_file)
+        cache.get_cached_index(cache_dir, check_consistency, timeout,
+                               tree_base_dir, licenses_data_dir, rules_data_dir)
+        assert tree_before == open(checksum_file).read()
+        assert idx_checksum_before == hash.sha1(cache_file)
+        assert idx_date_before == date.get_file_mtime(cache_file)
 
         # now add some file in the source tree
-        new_file = os.path.join(_tree_base_dir, 'some file')
+        new_file = os.path.join(tree_base_dir, 'some file')
         with open(new_file, 'wb') as nf:
             nf.write('somthing')
 
         # when check_consistency is False, the index is not rebuild when
         # new files are added
         check_consistency = False
-        cache.get_or_build_index_through_cache(
-            check_consistency,
-            return_index,
-            _tree_base_dir,
-            _tree_checksum_file,
-            _index_lock_file,
-            _index_cache_file,
-            _licenses_data_dir,
-            _rules_data_dir,
-            _timeout)
-        assert tree_before == open(_tree_checksum_file).read()
-        assert idx_checksum_before == hash.sha1(_index_cache_file)
-        assert idx_date_before == date.get_file_mtime(_index_cache_file)
+        cache.get_cached_index(cache_dir, check_consistency, timeout,
+                               tree_base_dir, licenses_data_dir, rules_data_dir)
+        assert tree_before == open(checksum_file).read()
+        assert idx_checksum_before == hash.sha1(cache_file)
+        assert idx_date_before == date.get_file_mtime(cache_file)
 
         # when check_consistency is True, the index is rebuilt when new
         # files are added
         check_consistency = True
-        cache.get_or_build_index_through_cache(
-            check_consistency,
-            return_index,
-            _tree_base_dir,
-            _tree_checksum_file,
-            _index_lock_file,
-            _index_cache_file,
-            _licenses_data_dir,
-            _rules_data_dir,
-            _timeout)
-        assert tree_before != open(_tree_checksum_file).read()
-        assert idx_date_before != date.get_file_mtime(_index_cache_file)
+        cache.get_cached_index(cache_dir, check_consistency, timeout,
+                               tree_base_dir, licenses_data_dir, rules_data_dir)
+        assert tree_before != open(checksum_file).read()
+        assert idx_date_before != date.get_file_mtime(cache_file)
 
         # now add some ignored file in the source tree
-        tree_before = open(_tree_checksum_file).read()
-        idx_checksum_before = hash.sha1(_index_cache_file)
-        idx_date_before = date.get_file_mtime(_index_cache_file)
-        new_file = os.path.join(_tree_base_dir, 'some file.pyc')
+        tree_before = open(checksum_file).read()
+        idx_checksum_before = hash.sha1(cache_file)
+        idx_date_before = date.get_file_mtime(cache_file)
+        new_file = os.path.join(tree_base_dir, 'some file.pyc')
         with open(new_file, 'wb') as nf:
             nf.write('somthing')
 
         check_consistency = True
-        cache.get_or_build_index_through_cache(
-            check_consistency,
-            return_index,
-            _tree_base_dir,
-            _tree_checksum_file,
-            _index_lock_file,
-            _index_cache_file,
-            _licenses_data_dir,
-            _rules_data_dir,
-            _timeout)
-
-        assert tree_before == open(_tree_checksum_file).read()
-        assert idx_checksum_before == hash.sha1(_index_cache_file)
-        assert idx_date_before == date.get_file_mtime(_index_cache_file)
+        cache.get_cached_index(cache_dir, check_consistency, timeout,
+                               tree_base_dir, licenses_data_dir, rules_data_dir)
+
+        assert tree_before == open(checksum_file).read()
+        assert idx_checksum_before == hash.sha1(cache_file)
+        assert idx_date_before == date.get_file_mtime(cache_file)
 
         # if the treechecksum file dies the index is rebuilt
-        fileutils.delete(_tree_checksum_file)
-        idx_checksum_before = hash.sha1(_index_cache_file)
+        fileutils.delete(checksum_file)
+        idx_checksum_before = hash.sha1(cache_file)
 
         check_consistency = False
-        cache.get_or_build_index_through_cache(
-            check_consistency,
-            return_index,
-            _tree_base_dir,
-            _tree_checksum_file,
-            _index_lock_file,
-            _index_cache_file,
-            _licenses_data_dir,
-            _rules_data_dir,
-            _timeout)
-
-        assert tree_before == open(_tree_checksum_file).read()
-        assert idx_date_before != date.get_file_mtime(_index_cache_file)
+        cache.get_cached_index(cache_dir, check_consistency, timeout,
+                               tree_base_dir, licenses_data_dir, rules_data_dir)
+
+        assert tree_before == open(checksum_file).read()
+        assert idx_date_before != date.get_file_mtime(cache_file)
 
         # if the index cache file dies the index is rebuilt
-        fileutils.delete(_index_cache_file)
+        fileutils.delete(cache_file)
 
         check_consistency = False
-        cache.get_or_build_index_through_cache(
-            check_consistency,
-            return_index,
-            _tree_base_dir,
-            _tree_checksum_file,
-            _index_lock_file,
-            _index_cache_file,
-            _licenses_data_dir,
-            _rules_data_dir,
-            _timeout)
-
-        assert tree_before == open(_tree_checksum_file).read()
-        assert os.path.exists(_index_cache_file)
+        cache.get_cached_index(cache_dir, check_consistency, timeout,
+                               tree_base_dir, licenses_data_dir, rules_data_dir)
 
-    def test__load_index(self):
-        license_index_cache_dir = self.get_temp_dir('index_cache')
-        _index_lock_file = os.path.join(license_index_cache_dir, 'lockfile')
-        _tree_checksum_file = os.path.join(license_index_cache_dir, 'tree_checksums')
-        _index_cache_file = os.path.join(license_index_cache_dir, 'index_cache')
+        assert tree_before == open(checksum_file).read()
+        assert os.path.exists(cache_file)
 
-        _tree_base_dir = self.get_temp_dir('src_dir')
+    def test__load_index(self):
+        cache_dir = self.get_temp_dir('index_cache')
 
-        _licenses_dir = self.get_test_loc('cache/data', copy=True)
-        _licenses_data_dir = os.path.join(_licenses_dir, 'licenses')
-        _rules_data_dir = os.path.join(_licenses_dir, 'rules')
+        lock_file, checksum_file, cache_file = get_license_cache_paths(cache_dir=cache_dir)
+        tree_base_dir = self.get_temp_dir('src_dir')
+        licenses_data_dir = self.get_test_loc('cache/data/licenses', copy=True)
+        rules_data_dir = self.get_test_loc('cache/data/rules', copy=True)
 
-        _timeout = 10
+        timeout = 10
 
-        assert not os.path.exists(_tree_checksum_file)
-        assert not os.path.exists(_index_cache_file)
-        assert not os.path.exists(_index_lock_file)
+        assert not os.path.exists(checksum_file)
+        assert not os.path.exists(cache_file)
+        assert not os.path.exists(lock_file)
 
         check_consistency = True
-        return_index = True
 
         # Create a basic index
-        idx1 = cache.get_or_build_index_through_cache(
-            check_consistency,
-            return_index,
-            _tree_base_dir,
-            _tree_checksum_file,
-            _index_lock_file,
-            _index_cache_file,
-            _licenses_data_dir,
-            _rules_data_dir,
-            _timeout)
-
-        assert os.path.exists(_tree_checksum_file)
-        assert os.path.exists(_index_cache_file)
-        assert not os.path.exists(_index_lock_file)
-
-        idx2 = cache._load_index(_index_cache_file)
+        idx1 = cache.get_cached_index(cache_dir, check_consistency, timeout,
+                                      tree_base_dir, licenses_data_dir, rules_data_dir)
+
+        assert os.path.exists(checksum_file)
+        assert os.path.exists(cache_file)
+        assert not os.path.exists(lock_file)
+
+        idx2 = cache.load_index(cache_file)
         assert idx1.to_dict(True) == idx2.to_dict(True)
diff --git a/tests/scancode/data/altpath/copyright.expected.json b/tests/scancode/data/altpath/copyright.expected.json
index 36501a48536..77c1c876a4d 100644
--- a/tests/scancode/data/altpath/copyright.expected.json
+++ b/tests/scancode/data/altpath/copyright.expected.json
@@ -20,6 +20,7 @@
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
diff --git a/tests/scancode/data/failing/patchelf.expected.json b/tests/scancode/data/failing/patchelf.expected.json
index f21c12de299..3666b1f8f92 100644
--- a/tests/scancode/data/failing/patchelf.expected.json
+++ b/tests/scancode/data/failing/patchelf.expected.json
@@ -11,7 +11,7 @@
     {
       "path": "patchelf.pdf",
       "scan_errors": [
-        "ERROR: for scanner: copyrights:\nERROR: Unknown error:\nTraceback (most recent call last):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/scancode/interrupt.py\", line 88, in interruptible\n    return NO_ERROR, func(*(args or ()), **(kwargs or {}))\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/scancode/api.py\", line 59, in get_copyrights\n    for copyrights, authors, _years, holders, start_line, end_line in detect_copyrights(location):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/cluecode/copyrights.py\", line 71, in detect_copyrights\n    for numbered_lines in candidate_lines(analysis.text_lines(location)):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/cluecode/copyrights.py\", line 1270, in candidate_lines\n    for line_number, line in enumerate(lines):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/textcode/analysis.py\", line 125, in unicode_text_lines_from_pdf\n    for line in pdf.get_text_lines(location):\n  File \"/home/pombreda/w421/scancode-toolkit-master/src/textcode/pdf.py\", line 57, in get_text_lines\n    interpreter.process_page(page)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 852, in process_page\n    self.render_contents(page.resources, page.contents, ctm=ctm)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 862, in render_contents\n    self.init_resources(resources)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 362, in init_resources\n    self.fontmap[fontid] = self.rsrcmgr.get_font(objid, spec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 212, in get_font\n    font = self.get_font(None, subspec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdfinterp.py\", line 203, in get_font\n    font = PDFCIDFont(self, spec)\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdffont.py\", line 667, in __init__\n    BytesIO(self.fontfile.get_data()))\n  File \"/home/pombreda/w421/scancode-toolkit-master/lib/python2.7/site-packages/pdfminer/pdffont.py\", line 386, in __init__\n    (ntables, _1, _2, _3) = struct.unpack('>HHHH', fp.read(8))\nerror: unpack requires a string argument of length 8\n"
+        "ERROR: for scanner: copyrights:\nerror: unpack requires a string argument of length 8\n"
       ],
       "copyrights": []
     }
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index f5717f4fbd3..5f595d5bde8 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -3,7 +3,7 @@ Usage: scancode [OPTIONS] <input> <OUTPUT FORMAT OPTION(s)>
   scan the <input> file or directory for license, origin and packages and save
   results to FILE(s) using one or more ouput format option.
 
-  Error and progress is printed to stderr.
+  Error and progress are printed to stderr.
 
 Options:
 
@@ -66,23 +66,34 @@ Options:
                    running the --info scan.
 
   core:
-    --timeout <seconds>  Stop an unfinished file scan after a timeout in seconds.
+    --timeout <secs>     Stop an unfinished file scan after a timeout in seconds.
                          [default: 120 seconds]
     -n, --processes INT  Set the number of parallel processes to use. Disable
                          parallel processing if 0.  [default: 1]
     --quiet              Do not print summary or progress.
     --verbose            Print progress  as file-by-file path instead of a
                          progress bar. Print a verbose scan summary.
-    --timing             Collect execution timing for each scan and scanned file.
-    --no-cache           Do not use on-disk cache for intermediate results. Uses
-                         more memory.
-    --temp-dir DIR       Set the path to the temporary directory to use for
-                         ScanCode cache and temporary files.
+    --cache-dir DIR      Set the path to an existing directory where ScanCode can
+                         cache files available across runs.If not set, the value
+                         of the `SCANCODE_CACHE` environment variable is used if
+                         available. If `SCANCODE_CACHE` is not set, a default sub-
+                         directory in the user home directory is used instead.
+                         [default: ~/.cache/scancode-tk/version]
+    --temp-dir DIR       Set the path to an existing directory where ScanCode can
+                         create temporary files. If not set, the value of the
+                         `SCANCODE_TMP` environment variable is used if available.
+                         If `SCANCODE_TMP` is not set, a default sub-directory in
+                         the system temp directory is used instead.  [default: TMP
+                         /scancode-tk-<key>]
+    --timing             Collect scan timing for each scan/scanned file.
+    --on-disk-results    Save intermediate scan results in temporary files. Uses
+                         less memory.  [default: True]
 
   miscellaneous:
-    --reindex-licenses  Check the license index cache and reindex if needed and
-                        exit
-    --test-mode         Run ScanCode in a special "test mode". Only for testing.
+    --reindex-licenses DIR  Check the license index cache and reindex if needed
+                            and exit.
+    --test-mode             Run ScanCode in a special "test mode". Only for
+                            testing.
 
   documentation:
     -h, --help  Show this message and exit.
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 720f0f5a1cc..ab9f38c9a44 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -4,8 +4,8 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
-    "--license": true,
     "--json": "<file>",
+    "--license": true,
     "--strip-root": true
   },
   "files_count": 6,
@@ -17,11 +17,12 @@
       "base_name": "basic",
       "extension": "",
       "date": null,
-      "size": 57066,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 6,
       "dirs_count": 4,
+      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -47,6 +48,7 @@
       "md5": "15240737ec72b9e88b485a663bd045f9",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -67,11 +69,12 @@
       "base_name": "dir",
       "extension": "",
       "date": null,
-      "size": 18486,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 1,
+      "size_count": 18486,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -97,6 +100,7 @@
       "md5": "393e789f4e4b2be93a46d0619380b445",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -117,11 +121,12 @@
       "base_name": "subdir",
       "extension": "",
       "date": null,
-      "size": 8246,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 1,
       "dirs_count": 0,
+      "size_count": 8246,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -147,6 +152,7 @@
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -167,11 +173,12 @@
       "base_name": "dir2",
       "extension": "",
       "date": null,
-      "size": 36457,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 1,
+      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -192,11 +199,12 @@
       "base_name": "subdir",
       "extension": "",
       "date": null,
-      "size": 36457,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 0,
+      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -222,6 +230,7 @@
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -290,6 +299,7 @@
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -315,6 +325,7 @@
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index cee14d0b0c6..d4ab5003188 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -4,8 +4,8 @@
     "input": "<path>",
     "--copyright": true,
     "--email": true,
-    "--license": true,
     "--json": "<file>",
+    "--license": true,
     "--url": true
   },
   "files_count": 6,
diff --git a/tests/scancode/data/info/basic.expected.json b/tests/scancode/data/info/basic.expected.json
index d88eda56291..a226ed9ca2d 100644
--- a/tests/scancode/data/info/basic.expected.json
+++ b/tests/scancode/data/info/basic.expected.json
@@ -15,11 +15,12 @@
       "base_name": "basic",
       "extension": "",
       "date": null,
-      "size": 57066,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 6,
       "dirs_count": 4,
+      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -43,6 +44,7 @@
       "md5": "15240737ec72b9e88b485a663bd045f9",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -61,11 +63,12 @@
       "base_name": "dir",
       "extension": "",
       "date": null,
-      "size": 18486,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 1,
+      "size_count": 18486,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -89,6 +92,7 @@
       "md5": "393e789f4e4b2be93a46d0619380b445",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -107,11 +111,12 @@
       "base_name": "subdir",
       "extension": "",
       "date": null,
-      "size": 8246,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 1,
       "dirs_count": 0,
+      "size_count": 8246,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -135,6 +140,7 @@
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -153,11 +159,12 @@
       "base_name": "dir2",
       "extension": "",
       "date": null,
-      "size": 36457,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 1,
+      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -176,11 +183,12 @@
       "base_name": "subdir",
       "extension": "",
       "date": null,
-      "size": 36457,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 0,
+      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -204,6 +212,7 @@
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -227,6 +236,7 @@
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -250,6 +260,7 @@
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/info/basic.rooted.expected.json b/tests/scancode/data/info/basic.rooted.expected.json
index 825ae5dd263..da3feca0ee1 100644
--- a/tests/scancode/data/info/basic.rooted.expected.json
+++ b/tests/scancode/data/info/basic.rooted.expected.json
@@ -14,11 +14,12 @@
       "base_name": "basic.tgz",
       "extension": "",
       "date": null,
-      "size": 57066,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 6,
       "dirs_count": 5,
+      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -37,11 +38,12 @@
       "base_name": "basic",
       "extension": "",
       "date": null,
-      "size": 57066,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 6,
       "dirs_count": 4,
+      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -65,6 +67,7 @@
       "md5": "15240737ec72b9e88b485a663bd045f9",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -83,11 +86,12 @@
       "base_name": "dir",
       "extension": "",
       "date": null,
-      "size": 18486,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 1,
+      "size_count": 18486,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -111,6 +115,7 @@
       "md5": "393e789f4e4b2be93a46d0619380b445",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -129,11 +134,12 @@
       "base_name": "subdir",
       "extension": "",
       "date": null,
-      "size": 8246,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 1,
       "dirs_count": 0,
+      "size_count": 8246,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -157,6 +163,7 @@
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -175,11 +182,12 @@
       "base_name": "dir2",
       "extension": "",
       "date": null,
-      "size": 36457,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 1,
+      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -198,11 +206,12 @@
       "base_name": "subdir",
       "extension": "",
       "date": null,
-      "size": 36457,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 0,
+      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -226,6 +235,7 @@
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -249,6 +259,7 @@
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -272,6 +283,7 @@
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/info/email_url_info.expected.json b/tests/scancode/data/info/email_url_info.expected.json
index 604f5d0610e..cf9340c1f28 100644
--- a/tests/scancode/data/info/email_url_info.expected.json
+++ b/tests/scancode/data/info/email_url_info.expected.json
@@ -4,8 +4,8 @@
     "input": "<path>",
     "--email": true,
     "--info": true,
-    "--strip-root": true,
     "--json": "<file>",
+    "--strip-root": true,
     "--url": true
   },
   "files_count": 6,
@@ -17,11 +17,12 @@
       "base_name": "basic",
       "extension": "",
       "date": null,
-      "size": 57066,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 6,
       "dirs_count": 4,
+      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -47,6 +48,7 @@
       "md5": "15240737ec72b9e88b485a663bd045f9",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -67,11 +69,12 @@
       "base_name": "dir",
       "extension": "",
       "date": null,
-      "size": 18486,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 1,
+      "size_count": 18486,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -97,6 +100,7 @@
       "md5": "393e789f4e4b2be93a46d0619380b445",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -117,11 +121,12 @@
       "base_name": "subdir",
       "extension": "",
       "date": null,
-      "size": 8246,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 1,
       "dirs_count": 0,
+      "size_count": 8246,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -147,6 +152,7 @@
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -167,11 +173,12 @@
       "base_name": "dir2",
       "extension": "",
       "date": null,
-      "size": 36457,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 1,
+      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -192,11 +199,12 @@
       "base_name": "subdir",
       "extension": "",
       "date": null,
-      "size": 36457,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 2,
       "dirs_count": 0,
+      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -222,6 +230,7 @@
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -259,6 +268,7 @@
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -290,6 +300,7 @@
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index 8d3d9669255..b1411758535 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -2,9 +2,9 @@
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
     "input": "<path>",
+    "--json": "<file>",
     "--license": true,
     "--license-text": true,
-    "--json": "<file>",
     "--strip-root": true
   },
   "files_count": 1,
diff --git a/tests/scancode/data/non_utf8/expected-linux.json b/tests/scancode/data/non_utf8/expected-linux.json
index 02edc3a9c67..505c1e8cb9c 100644
--- a/tests/scancode/data/non_utf8/expected-linux.json
+++ b/tests/scancode/data/non_utf8/expected-linux.json
@@ -20,6 +20,7 @@
       "md5": null,
       "files_count": 18,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -43,6 +44,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -66,6 +68,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -89,6 +92,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -112,6 +116,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -135,6 +140,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -158,6 +164,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -181,6 +188,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -204,6 +212,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -227,6 +236,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -250,6 +260,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -273,6 +284,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -296,6 +308,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -319,6 +332,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -342,6 +356,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -365,6 +380,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -388,6 +404,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -411,6 +428,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -434,6 +452,7 @@
       "md5": null,
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
diff --git a/tests/scancode/data/non_utf8/expected-mac.json b/tests/scancode/data/non_utf8/expected-mac.json
index 554d938f04f..6dbfabdabeb 100644
--- a/tests/scancode/data/non_utf8/expected-mac.json
+++ b/tests/scancode/data/non_utf8/expected-mac.json
@@ -10,26 +10,27 @@
   "files": [
     {
       "path": "non_unicode",
+      "type": "directory",
+      "name": "non_unicode",
       "base_name": "non_unicode",
-      "date": null,
       "extension": "",
-      "file_type": null,
+      "date": null,
+      "size": 0,
+      "sha1": null,
+      "md5": null,
       "files_count": 18,
       "dirs_count": 0,
-      "is_archive": false,
+      "size_count": 0,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
       "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
       "is_media": false,
-      "is_script": false,
       "is_source": false,
-      "is_text": false,
-      "md5": null,
-      "mime_type": null,
-      "name": "non_unicode",
-      "programming_language": null,
-      "scan_errors": [],
-      "sha1": null,
-      "size": 0,
-      "type": "directory"
+      "is_script": false,
+      "scan_errors": []
     },
     {
       "path": "non_unicode/foo%B1bar",
@@ -39,6 +40,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -61,6 +63,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -84,6 +87,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -107,6 +111,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -130,6 +135,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -153,6 +159,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -176,6 +183,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -199,6 +207,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -222,6 +231,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -245,6 +255,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -268,6 +279,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -291,6 +303,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -314,6 +327,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -337,6 +351,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -360,6 +375,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -383,6 +399,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -406,6 +423,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -429,6 +447,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
diff --git a/tests/scancode/data/non_utf8/expected-win.json b/tests/scancode/data/non_utf8/expected-win.json
index 1924b62eab8..7b58f6536d0 100644
--- a/tests/scancode/data/non_utf8/expected-win.json
+++ b/tests/scancode/data/non_utf8/expected-win.json
@@ -15,6 +15,8 @@
       "extension": "",
       "file_type": null,
       "files_count": 18,
+      "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -38,6 +40,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -60,6 +63,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -83,6 +87,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -106,6 +111,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -129,6 +135,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -152,6 +159,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -175,6 +183,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -198,6 +207,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -221,6 +231,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -244,6 +255,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -267,6 +279,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -290,6 +303,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -313,6 +327,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -336,6 +351,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -359,6 +375,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -382,6 +399,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -405,6 +423,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
@@ -428,6 +447,7 @@
       "file_type": "empty",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "is_archive": false,
       "is_binary": false,
       "is_media": false,
diff --git a/tests/scancode/data/plugin_license/license_url.expected.json b/tests/scancode/data/plugin_license/license_url.expected.json
new file mode 100644
index 00000000000..b61b7e94328
--- /dev/null
+++ b/tests/scancode/data/plugin_license/license_url.expected.json
@@ -0,0 +1,67 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--json-pp": "<file>",
+    "--license": true,
+    "--license-url-template": "https://example.com/urn:{}"
+  },
+  "files_count": 1,
+  "files": [
+    {
+      "path": "license_url",
+      "scan_errors": [],
+      "licenses": []
+    },
+    {
+      "path": "license_url/apache-1.0.txt",
+      "scan_errors": [],
+      "licenses": [
+        {
+          "key": "apache-1.0",
+          "score": 100.0,
+          "short_name": "Apache 1.0",
+          "category": "Permissive",
+          "owner": "Apache Software Foundation",
+          "homepage_url": "http://www.apache.org/licenses/",
+          "text_url": "http://www.apache.org/licenses/LICENSE-1.0",
+          "reference_url": "https://example.com/urn:apache-1.0",
+          "spdx_license_key": "Apache-1.0",
+          "spdx_url": "https://spdx.org/licenses/Apache-1.0",
+          "start_line": 2,
+          "end_line": 54,
+          "matched_rule": {
+            "identifier": "apache-1.0_group_template2.RULE",
+            "license_choice": false,
+            "licenses": [
+              "apache-1.0",
+              "public-domain"
+            ]
+          }
+        },
+        {
+          "key": "public-domain",
+          "score": 100.0,
+          "short_name": "Public Domain",
+          "category": "Public Domain",
+          "owner": "Unspecified",
+          "homepage_url": "http://www.linfo.org/publicdomain.html",
+          "text_url": "",
+          "reference_url": "https://example.com/urn:public-domain",
+          "spdx_license_key": "",
+          "spdx_url": "",
+          "start_line": 2,
+          "end_line": 54,
+          "matched_rule": {
+            "identifier": "apache-1.0_group_template2.RULE",
+            "license_choice": false,
+            "licenses": [
+              "apache-1.0",
+              "public-domain"
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/license_url/apache-1.0.txt b/tests/scancode/data/plugin_license/license_url/apache-1.0.txt
similarity index 100%
rename from tests/scancode/data/license_url/apache-1.0.txt
rename to tests/scancode/data/plugin_license/license_url/apache-1.0.txt
diff --git a/tests/scancode/data/plugin_mark_source/with_info.expected.json b/tests/scancode/data/plugin_mark_source/with_info.expected.json
index 5a47eb70388..a3a002ba4d3 100644
--- a/tests/scancode/data/plugin_mark_source/with_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/with_info.expected.json
@@ -3,8 +3,8 @@
   "scancode_options": {
     "input": "<path>",
     "--info": true,
-    "--mark-source": true,
-    "--json": "<file>"
+    "--json": "<file>",
+    "--mark-source": true
   },
   "files_count": 12,
   "files": [
@@ -15,11 +15,12 @@
       "base_name": "JGroups.tgz",
       "extension": "",
       "date": null,
-      "size": 206642,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 12,
       "dirs_count": 3,
+      "size_count": 206642,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -38,11 +39,12 @@
       "base_name": "JGroups",
       "extension": "",
       "date": null,
-      "size": 206642,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 12,
       "dirs_count": 2,
+      "size_count": 206642,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -61,11 +63,12 @@
       "base_name": "licenses",
       "extension": "",
       "date": null,
-      "size": 54552,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 5,
       "dirs_count": 0,
+      "size_count": 54552,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -89,6 +92,7 @@
       "md5": "276982197c941f4cbf3d218546e17ae2",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -112,6 +116,7 @@
       "md5": "d273d63619c9aeaf15cdaf76422c4f87",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -135,6 +140,7 @@
       "md5": "9fffd8de865a5705969f62b128381f85",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -158,6 +164,7 @@
       "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -181,6 +188,7 @@
       "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -199,11 +207,12 @@
       "base_name": "src",
       "extension": "",
       "date": null,
-      "size": 152090,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 7,
       "dirs_count": 0,
+      "size_count": 152090,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -227,6 +236,7 @@
       "md5": "aca9640ec8beee21b098bcf8ecc91442",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -250,6 +260,7 @@
       "md5": "c5064400f759d3e81771005051d17dc1",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -273,6 +284,7 @@
       "md5": "48ca3c72fb9a65c771a321222f118b88",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -296,6 +308,7 @@
       "md5": "4626bdbc48871b55513e1a12991c61a8",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -319,6 +332,7 @@
       "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -342,6 +356,7 @@
       "md5": "20bee9631b7c82a45c250e095352aec7",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -365,6 +380,7 @@
       "md5": "83d8324f37d0e3f120bc89865cf0bd39",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
diff --git a/tests/scancode/data/plugin_mark_source/without_info.expected.json b/tests/scancode/data/plugin_mark_source/without_info.expected.json
index ecce7fc5482..a3a002ba4d3 100644
--- a/tests/scancode/data/plugin_mark_source/without_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/without_info.expected.json
@@ -2,8 +2,9 @@
   "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
   "scancode_options": {
     "input": "<path>",
-    "--mark-source": true,
-    "--json": "<file>"
+    "--info": true,
+    "--json": "<file>",
+    "--mark-source": true
   },
   "files_count": 12,
   "files": [
@@ -14,11 +15,12 @@
       "base_name": "JGroups.tgz",
       "extension": "",
       "date": null,
-      "size": 206642,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 12,
       "dirs_count": 3,
+      "size_count": 206642,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -37,11 +39,12 @@
       "base_name": "JGroups",
       "extension": "",
       "date": null,
-      "size": 206642,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 12,
       "dirs_count": 2,
+      "size_count": 206642,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -60,11 +63,12 @@
       "base_name": "licenses",
       "extension": "",
       "date": null,
-      "size": 54552,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 5,
       "dirs_count": 0,
+      "size_count": 54552,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -88,6 +92,7 @@
       "md5": "276982197c941f4cbf3d218546e17ae2",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -111,6 +116,7 @@
       "md5": "d273d63619c9aeaf15cdaf76422c4f87",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -134,6 +140,7 @@
       "md5": "9fffd8de865a5705969f62b128381f85",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -157,6 +164,7 @@
       "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -180,6 +188,7 @@
       "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -198,11 +207,12 @@
       "base_name": "src",
       "extension": "",
       "date": null,
-      "size": 152090,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 7,
       "dirs_count": 0,
+      "size_count": 152090,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -226,6 +236,7 @@
       "md5": "aca9640ec8beee21b098bcf8ecc91442",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -249,6 +260,7 @@
       "md5": "c5064400f759d3e81771005051d17dc1",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -272,6 +284,7 @@
       "md5": "48ca3c72fb9a65c771a321222f118b88",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -295,6 +308,7 @@
       "md5": "4626bdbc48871b55513e1a12991c61a8",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -318,6 +332,7 @@
       "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -341,6 +356,7 @@
       "md5": "20bee9631b7c82a45c250e095352aec7",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -364,6 +380,7 @@
       "md5": "83d8324f37d0e3f120bc89865cf0bd39",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
diff --git a/tests/scancode/data/plugin_only_findings/expected.json b/tests/scancode/data/plugin_only_findings/expected.json
index 93ddcfe9f57..cccddcda568 100644
--- a/tests/scancode/data/plugin_only_findings/expected.json
+++ b/tests/scancode/data/plugin_only_findings/expected.json
@@ -4,9 +4,9 @@
     "input": "<path>",
     "--copyright": true,
     "--info": true,
+    "--json": "<file>",
     "--license": true,
     "--only-findings": true,
-    "--json": "<file>",
     "--package": true
   },
   "files_count": 3,
@@ -17,12 +17,12 @@
       "name": "e.tar",
       "base_name": "e",
       "extension": ".tar",
-      "date": "2015-06-19",
       "size": 10240,
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -88,12 +88,12 @@
       "name": "bcopy.s",
       "base_name": "bcopy",
       "extension": ".s",
-      "date": "2015-06-19",
       "size": 32452,
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -157,12 +157,12 @@
       "name": "main.c",
       "base_name": "main",
       "extension": ".c",
-      "date": "2015-06-19",
       "size": 1940,
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/cache/package/package.json b/tests/scancode/data/resource/cache/package/package.json
similarity index 100%
rename from tests/scancode/data/cache/package/package.json
rename to tests/scancode/data/resource/cache/package/package.json
diff --git a/tests/scancode/data/resource/codebase/abc b/tests/scancode/data/resource/codebase/abc
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/scancode/data/resource/codebase/dir/that b/tests/scancode/data/resource/codebase/dir/that
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/scancode/data/resource/codebase/dir/this b/tests/scancode/data/resource/codebase/dir/this
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/scancode/data/resource/codebase/et131x.h b/tests/scancode/data/resource/codebase/et131x.h
new file mode 100644
index 00000000000..4ffb839292b
--- /dev/null
+++ b/tests/scancode/data/resource/codebase/et131x.h
@@ -0,0 +1,47 @@
+/* Copyright © 2005 Agere Systems Inc.
+ * All rights reserved.
+ *   http://www.agere.com
+ *
+ * SOFTWARE LICENSE
+ *
+ * This software is provided subject to the following terms and conditions,
+ * which you should read carefully before using the software.  Using this
+ * software indicates your acceptance of these terms and conditions.  If you do
+ * not agree with these terms and conditions, do not use the software.
+ *
+ * Copyright © 2005 Agere Systems Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source or binary forms, with or without
+ * modifications, are permitted provided that the following conditions are met:
+ *
+ * . Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following Disclaimer as comments in the code as
+ *    well as in the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * . Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following Disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * . Neither the name of Agere Systems Inc. nor the names of the contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * Disclaimer
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ */
+
diff --git a/tests/scancode/data/resource/codebase/other dir/file b/tests/scancode/data/resource/codebase/other dir/file
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/scancode/data/single/iproute.expected.json b/tests/scancode/data/single/iproute.expected.json
index 4209a272004..28aaa76b8a8 100644
--- a/tests/scancode/data/single/iproute.expected.json
+++ b/tests/scancode/data/single/iproute.expected.json
@@ -14,12 +14,12 @@
       "name": "iproute.c",
       "base_name": "iproute",
       "extension": ".c",
-      "date": "2017-10-03",
       "size": 469,
       "sha1": "f0f352c14a8d0b0510cbbeae056542ae7f252151",
       "md5": "b8e7112a6e82921687fd1e008e72058f",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "C",
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
index 0ef2a32d400..ed205e707c1 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
@@ -5,8 +5,8 @@
     "--copyright": true,
     "--email": true,
     "--info": true,
-    "--license": true,
     "--json": "<file>",
+    "--license": true,
     "--package": true,
     "--strip-root": true,
     "--url": true
@@ -19,11 +19,12 @@
       "name": "unicodepath",
       "base_name": "unicodepath",
       "extension": "",
-      "size": 20,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 3,
       "dirs_count": 0,
+      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -51,6 +52,7 @@
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -78,6 +80,7 @@
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -105,6 +108,7 @@
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
index ab613f6f0da..2ce6074370d 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
@@ -5,8 +5,8 @@
     "--copyright": true,
     "--email": true,
     "--info": true,
-    "--license": true,
     "--json": "<file>",
+    "--license": true,
     "--package": true,
     "--strip-root": true,
     "--url": true
@@ -19,12 +19,12 @@
       "name": "unicodepath",
       "base_name": "unicodepath",
       "extension": "",
-      "date": null,
-      "size": 20,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 3,
       "dirs_count": 0,
+      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -53,6 +53,7 @@
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -81,6 +82,7 @@
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -109,6 +111,7 @@
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
index df29dc49ab7..a26b6f2f782 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-win.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
@@ -5,8 +5,8 @@
     "--copyright": true,
     "--email": true,
     "--info": true,
-    "--license": true,
     "--json": "<file>",
+    "--license": true,
     "--package": true,
     "--strip-root": true,
     "--url": true
@@ -19,11 +19,12 @@
       "name": "unicodepath",
       "base_name": "unicodepath",
       "extension": "",
-      "size": 20,
+      "size": 0,
       "sha1": null,
       "md5": null,
       "files_count": 3,
       "dirs_count": 0,
+      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -51,6 +52,7 @@
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -78,6 +80,7 @@
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -105,6 +108,7 @@
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
diff --git a/tests/scancode/data/weird_file_name/expected-linux.json b/tests/scancode/data/weird_file_name/expected-linux.json
index 7dc15860da0..ea6cd36210d 100644
--- a/tests/scancode/data/weird_file_name/expected-linux.json
+++ b/tests/scancode/data/weird_file_name/expected-linux.json
@@ -21,6 +21,7 @@
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -45,6 +46,7 @@
       "md5": "e99c06d03836700154f01778ac782d50",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -69,6 +71,7 @@
       "md5": "41ac81497162f2ff48a0442847238ad7",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -93,6 +96,7 @@
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -117,6 +121,7 @@
       "md5": "e99c06d03836700154f01778ac782d50",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
diff --git a/tests/scancode/data/weird_file_name/expected-mac.json b/tests/scancode/data/weird_file_name/expected-mac.json
index 25559d68408..f90c93144e5 100644
--- a/tests/scancode/data/weird_file_name/expected-mac.json
+++ b/tests/scancode/data/weird_file_name/expected-mac.json
@@ -21,6 +21,7 @@
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -45,6 +46,7 @@
       "md5": "e99c06d03836700154f01778ac782d50",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -69,6 +71,7 @@
       "md5": "41ac81497162f2ff48a0442847238ad7",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "a /usr/bin/env node script, ASCII text executable",
       "programming_language": null,
@@ -93,6 +96,7 @@
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "a /usr/bin/env node script, ASCII text executable",
       "programming_language": null,
@@ -117,6 +121,7 @@
       "md5": "e99c06d03836700154f01778ac782d50",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -130,4 +135,4 @@
       "copyrights": []
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/tests/scancode/data/weird_file_name/expected-win.json b/tests/scancode/data/weird_file_name/expected-win.json
index 2ba5a36d7d7..16a8764c062 100644
--- a/tests/scancode/data/weird_file_name/expected-win.json
+++ b/tests/scancode/data/weird_file_name/expected-win.json
@@ -20,6 +20,7 @@
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -43,6 +44,7 @@
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -66,6 +68,7 @@
       "md5": "e99c06d03836700154f01778ac782d50",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -89,6 +92,7 @@
       "md5": "41ac81497162f2ff48a0442847238ad7",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -112,6 +116,7 @@
       "md5": "e99c06d03836700154f01778ac782d50",
       "files_count": 0,
       "dirs_count": 0,
+      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -125,4 +130,4 @@
       "copyrights": []
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index ffd5d7f74a0..afe0b6efdfd 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -47,9 +47,6 @@
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import run_scan_plain
 
-from plugincode import output
-output._TEST_MODE = True
-
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -200,19 +197,21 @@ def test_scan_info_license_copyrights():
     result_file = test_env.get_temp_file('json')
 
     result = run_scan_click(['--info', '--license', '--copyright', '--strip-root', test_dir, '--json', result_file])
-    assert result.exit_code == 0
     assert 'Scanning done' in result.output
     check_json_scan(test_env.get_test_loc('info/all.expected.json'), result_file)
+    assert result.exit_code == 0
 
 
 def test_scan_license_with_url_template():
-    test_dir = test_env.get_test_loc('license_url', copy=True)
+    test_dir = test_env.get_test_loc('plugin_license/license_url', copy=True)
+    result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--license', '--license-url-template', 'https://example.com/urn:{}', test_dir, '--json', '-'])
+    result = run_scan_click(
+        ['--license', '--license-url-template', 'https://example.com/urn:{}', 
+         test_dir, '--json-pp', result_file])
+
+    check_json_scan(test_env.get_test_loc('plugin_license/license_url.expected.json'), result_file)
     assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-    assert 'https://example.com/urn:apache-1.0' in result.output
-    assert 'https://example.com/urn:public-domain' in result.output
 
 
 def test_scan_noinfo_license_copyrights_with_root():
@@ -246,7 +245,6 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
     assert 'Some files failed to scan' in result.output
     assert 'patchelf.pdf' in result.output
 
-
 def test_scan_with_errors_always_includes_full_traceback():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
index ab5f183688b..6239ddd8603 100644
--- a/tests/scancode/test_plugin_ignore.py
+++ b/tests/scancode/test_plugin_ignore.py
@@ -29,16 +29,12 @@
 from os.path import join
 
 from commoncode.testcase import FileDrivenTesting
-from scancode import CommandOption
-from scancode.plugin_ignore import is_ignored
-from scancode.plugin_ignore import ProcessIgnore
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import _load_json_result
+from scancode.plugin_ignore import is_ignored
+from scancode.plugin_ignore import ProcessIgnore
 from scancode.resource import Codebase
 
-from plugincode import output
-output._TEST_MODE = True
-
 
 class TestPluginIgnoreFiles(FileDrivenTesting):
 
@@ -69,10 +65,17 @@ def test_is_ignored_glob_file(self):
         ignores = {'*.txt': 'test ignore'}
         assert is_ignored(location=location, ignores=ignores)
 
+    def check_ProcessIgnore(self, test_dir, expected, ignore):
+        codebase = Codebase(test_dir)
+        test_plugin = ProcessIgnore()
+        test_plugin.process_codebase(codebase, ignore=ignore)
+        resources = [res.get_path(strip_root=True, decode=True)
+                     for res in codebase.walk(skip_root=True)]
+        assert expected == sorted(resources)
+
     def test_ProcessIgnore_with_single_file(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(help_group=None, name='ignore', value=('sample.doc',), param=None)
-        test_plugin = ProcessIgnore([option])
+        ignore = ('sample.doc',)
         expected = [
             'user',
             'user/ignore.doc',
@@ -81,81 +84,50 @@ def test_ProcessIgnore_with_single_file(self):
             'user/src/test',
             'user/src/test/sample.txt'
         ]
-
-        codebase = Codebase(test_dir)
-        test_plugin.process_codebase(codebase)
-        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
-        assert expected == sorted(resources)
+        self.check_ProcessIgnore(test_dir, expected, ignore)
 
     def test_ProcessIgnore_with_multiple_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(help_group=None, name='ignore', value=('ignore.doc', 'sample.doc',), param=None)
-        test_plugin = ProcessIgnore([option])
+        ignore = ('ignore.doc', 'sample.doc',)
         expected = [
             'user',
             'user/src',
             'user/src/test',
             'user/src/test/sample.txt'
         ]
-
-        codebase = Codebase(test_dir)
-        test_plugin.process_codebase(codebase)
-        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
-        assert expected == sorted(resources)
+        self.check_ProcessIgnore(test_dir, expected, ignore)
 
     def test_ProcessIgnore_with_glob_for_extension(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(help_group=None, name='ignore', value=('*.doc',), param=None)
-        test_plugin = ProcessIgnore([option])
-
+        ignore = ('*.doc',)
         expected = [
             'user',
             'user/src',
             'user/src/test',
             'user/src/test/sample.txt'
         ]
-
-        codebase = Codebase(test_dir)
-        test_plugin.process_codebase(codebase)
-        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
-        assert expected == sorted(resources)
+        self.check_ProcessIgnore(test_dir, expected, ignore)
 
     def test_ProcessIgnore_with_glob_for_path(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        option = CommandOption(help_group=None, name='ignore', value=('*/src/test',), param=None)
-        test_plugin = ProcessIgnore([option])
-
+        ignore = ('*/src/test',)
         expected = [
             'user',
             'user/ignore.doc',
             'user/src',
             'user/src/ignore.doc'
         ]
+        self.check_ProcessIgnore(test_dir, expected, ignore)
 
-        codebase = Codebase(test_dir)
-        test_plugin.process_codebase(codebase)
-        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
-        assert expected == sorted(resources)
-
-    def test_ProcessIgnore_with_multiple_plugins(self):
+    def test_ProcessIgnore_with_multiple_ignores(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
-        test_plugins = [
-            ProcessIgnore([CommandOption(help_group=None, name='ignore', value=('*.doc',), param=None)]),
-            ProcessIgnore([CommandOption(help_group=None, name='ignore', value=('*/src/test/*',), param=None)]),
-        ]
-
+        ignore = ('*.doc', '*/src/test/*',)
         expected = [
             'user',
             'user/src',
             'user/src/test'
         ]
-
-        codebase = Codebase(test_dir)
-        for plugin in test_plugins:
-            plugin.process_codebase(codebase)
-
-        resources = [res.get_path(strip_root=True, decode=True) for res in codebase.walk(sort=True, skip_root=True)]
-        assert expected == sorted(resources)
+        self.check_ProcessIgnore(test_dir, expected, ignore)
 
 
 class TestScanPluginIgnoreFiles(FileDrivenTesting):
@@ -166,20 +138,27 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
         test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', test_dir, '--json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root', test_dir,
+                                 '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
-        # a single test.tst file and its directory that is not a VCS file should be listed
+        # a single test.tst file and its directory that is not a VCS file should
+        # be listed
         assert 1 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
         assert [u'vcs', u'vcs/test.txt'] == scan_locs
+
     def test_scancode_ignore_vcs_files_and_dirs_by_default_no_multiprocess(self):
         test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
         result_file = self.get_temp_file('json')
-        result = run_scan_click(['--copyright', '--strip-root', '--processes', '0', test_dir, '--json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root',
+                                 '--processes', '0',
+                                 test_dir,
+                                 '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
-        # a single test.tst file and its directory that is not a VCS file should be listed
+        # a single test.tst file and its directory that is not a VCS file should
+        # be listed
         assert 1 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
         assert [u'vcs', u'vcs/test.txt'] == scan_locs
@@ -189,7 +168,8 @@ def test_scancode_ignore_single_file(self):
         result_file = self.get_temp_file('json')
 
         result = run_scan_click(
-            ['--copyright', '--strip-root', '--ignore', 'sample.doc', test_dir, '--json', result_file])
+            ['--copyright', '--strip-root', '--ignore', 'sample.doc',
+             test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 3 == scan_result['files_count']
@@ -209,40 +189,68 @@ def test_scancode_ignore_multiple_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', 'ignore.doc', test_dir, '--json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root',
+                                 '--ignore', 'ignore.doc', test_dir,
+                                 '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 2 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
-        assert [u'user', u'user/src', u'user/src/test', u'user/src/test/sample.doc', u'user/src/test/sample.txt'] == scan_locs
+        expected = [
+            u'user',
+            u'user/src',
+            u'user/src/test',
+            u'user/src/test/sample.doc',
+            u'user/src/test/sample.txt']
+        assert expected == scan_locs
 
     def test_scancode_ignore_glob_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*.doc', test_dir, '--json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root',
+                                 '--ignore', '*.doc', test_dir,
+                                 '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 1 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
-        assert [u'user', u'user/src', u'user/src/test', u'user/src/test/sample.txt'] == scan_locs
+        expected = [
+            u'user',
+            u'user/src',
+            u'user/src/test',
+            u'user/src/test/sample.txt'
+        ]
+        assert expected == scan_locs
 
     def test_scancode_ignore_glob_path(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test/*', test_dir, '--json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root',
+                                 '--ignore', '*/src/test/*', test_dir,
+                                 '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 2 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
-        assert [u'user', u'user/ignore.doc', u'user/src', u'user/src/ignore.doc', u'user/src/test'] == scan_locs
+        expected = [
+            u'user', 
+            u'user/ignore.doc', 
+            u'user/src', 
+            u'user/src/ignore.doc', 
+            u'user/src/test'
+        ]
+        assert expected == scan_locs
 
     def test_scancode_multiple_ignores(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
 
-        result = run_scan_click(['--copyright', '--strip-root', '--ignore', '*/src/test', '--ignore', '*.doc', test_dir, '--json', result_file])
+        result = run_scan_click(['--copyright', '--strip-root', 
+                                 '--ignore', '*/src/test', 
+                                 '--ignore', '*.doc', 
+                                 test_dir, '--json', result_file])
         assert result.exit_code == 0
         scan_result = _load_json_result(result_file)
         assert 0 == scan_result['files_count']
diff --git a/tests/scancode/test_plugin_mark_source.py b/tests/scancode/test_plugin_mark_source.py
index 80ddf16b0bd..3a33e156c68 100644
--- a/tests/scancode/test_plugin_mark_source.py
+++ b/tests/scancode/test_plugin_mark_source.py
@@ -33,9 +33,6 @@
 from scancode.cli_test_utils import run_scan_click
 from scancode.plugin_mark_source import is_source_directory
 
-from plugincode import output
-output._TEST_MODE = True
-
 
 class TestMarkSource(FileDrivenTesting):
 
diff --git a/tests/scancode/test_plugin_only_findings.py b/tests/scancode/test_plugin_only_findings.py
index 0d18991d617..453e530fb7b 100644
--- a/tests/scancode/test_plugin_only_findings.py
+++ b/tests/scancode/test_plugin_only_findings.py
@@ -34,9 +34,6 @@
 from scancode.plugin_only_findings import has_findings
 from scancode.resource import Resource
 
-from plugincode import output
-output._TEST_MODE = True
-
 
 class TestHasFindings(FileDrivenTesting):
 
@@ -64,5 +61,8 @@ def test_scan_only_findings(self):
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_only_findings/expected.json')
 
-        _result = run_scan_click(['-clip','--only-findings', test_dir, '--json', result_file])
-        check_json_scan(expected_file, result_file, regen=False)
+        result= run_scan_click(['-clip','--only-findings','--json', result_file,  test_dir])
+        print(result.output)
+        assert result.exit_code == 0
+        
+        check_json_scan(expected_file, result_file, strip_dates=True)
diff --git a/tests/scancode/test_resource.py b/tests/scancode/test_resource.py
index 37b0d277a67..66a56093603 100644
--- a/tests/scancode/test_resource.py
+++ b/tests/scancode/test_resource.py
@@ -38,15 +38,239 @@
 from commoncode.fileutils import parent_directory
 
 
+class TestCodebase(FileBasedTesting):
+    test_data_dir = join(dirname(__file__), 'data')
+
+    def test_walk_defaults(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        results = list(codebase.walk())
+        expected = [
+            ('codebase', False),
+              ('abc', True),
+              ('et131x.h', True),
+              ('dir', False),
+                ('that', True),
+                ('this', True),
+              ('other dir', False),
+                ('file', True),
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_topdown(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        results = list(codebase.walk(topdown=True))
+        expected = [
+            ('codebase', False),
+              ('abc', True),
+              ('et131x.h', True),
+              ('dir', False),
+                ('that', True),
+                ('this', True),
+              ('other dir', False),
+                ('file', True),
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_bottomup(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        results = list(codebase.walk(topdown=False))
+        expected = [
+              ('abc', True),
+              ('et131x.h', True),
+                ('that', True),
+                ('this', True),
+              ('dir', False),
+                ('file', True),
+              ('other dir', False),
+            ('codebase', False),
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_root_basic(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        results = list(codebase.walk(skip_root=True))
+        expected = [
+            ('abc', True),
+            ('et131x.h', True),
+            ('dir', False),
+              ('that', True),
+              ('this', True),
+            ('other dir', False),
+              ('file', True),
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_filtered_root(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        codebase.root.is_filtered = True
+        results = list(codebase.walk(skip_filtered=True))
+        expected = [
+            ('abc', True),
+            ('et131x.h', True),
+            ('dir', False),
+            ('that', True),
+            ('this', True),
+            ('other dir', False),
+            ('file', True),
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_filtered_all(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        for res in codebase.get_resources(None):
+            res.is_filtered = True
+        results = list(codebase.walk(skip_filtered=True))
+        expected = []
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_filtered_skip_root(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        codebase.root.is_filtered = True
+        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        expected = [
+            ('abc', True),
+            ('et131x.h', True),
+            ('dir', False),
+            ('that', True),
+            ('this', True),
+            ('other dir', False),
+            ('file', True),
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_filtered_all_skip_root(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        for res in codebase.get_resources(None):
+            res.is_filtered = True
+        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        expected = []
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_root_single_file(self):
+        test_codebase = self.get_test_loc('resource/codebase/et131x.h')
+        codebase = Codebase(test_codebase, use_cache=False)
+        results = list(codebase.walk(skip_root=True))
+        expected = [
+            ('et131x.h', True)
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_root_not_filtered_single_file(self):
+        test_codebase = self.get_test_loc('resource/codebase/et131x.h')
+        codebase = Codebase(test_codebase, use_cache=False)
+        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        expected = [
+            ('et131x.h', True)
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_root_filtered_single_file(self):
+        test_codebase = self.get_test_loc('resource/codebase/et131x.h')
+        codebase = Codebase(test_codebase, use_cache=False)
+        codebase.root.is_filtered = True
+        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        expected = [
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_root_single_file_with_children(self):
+        test_codebase = self.get_test_loc('resource/codebase/et131x.h')
+        codebase = Codebase(test_codebase, use_cache=False)
+        c1 = codebase.root.add_child('some child', is_file=True)
+        _c2 = c1.add_child('some child2', is_file=False)
+        results = list(codebase.walk(skip_root=True))
+        expected = [
+            (u'some child', True), (u'some child2', False)
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_root_skip_filtered_single_file_with_children(self):
+        test_codebase = self.get_test_loc('resource/codebase/et131x.h')
+        codebase = Codebase(test_codebase, use_cache=False)
+
+        c1 = codebase.root.add_child('some child', is_file=True)
+        c2 = c1.add_child('some child2', is_file=False)
+        c2.is_filtered = True
+        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        expected = [(u'some child', True)]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+        c1.is_filtered = True
+        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        expected = []
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_walk_skip_root_single_dir(self):
+        test_codebase = self.get_temp_dir('walk')
+        codebase = Codebase(test_codebase, use_cache=False)
+        results = list(codebase.walk(skip_root=True))
+        expected = [
+            ('walk', False)
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_add_child_can_add_child_to_file(self):
+        test_codebase = self.get_test_loc('resource/codebase/et131x.h')
+        codebase = Codebase(test_codebase, use_cache=False)
+        codebase.root.add_child('some child', is_file=True)
+        results = list(codebase.walk())
+        expected = [('et131x.h', True), (u'some child', True)]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_add_child_can_add_child_to_dir(self):
+        test_codebase = self.get_temp_dir('resource')
+        codebase = Codebase(test_codebase, use_cache=False)
+        codebase.root.add_child('some child', is_file=False)
+        results = list(codebase.walk())
+        expected = [('resource', False), (u'some child', False)]
+        assert expected == [(r.name, r.is_file) for r in results]
+
+    def test_get_resource(self):
+        test_codebase = self.get_temp_dir('resource')
+        codebase = Codebase(test_codebase, use_cache=False)
+        assert codebase.root is codebase.get_resource(0)
+
+    def test_get_resources(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        expected = [
+            ('codebase', False),
+            ('abc', True),
+            ('et131x.h', True),
+              ('dir', False),
+              ('other dir', False),
+                ('that', True),
+                ('this', True),
+                ('file', True),
+        ]
+        assert expected == [(r.name, r.is_file) for r in codebase.get_resources(None)]
+
+        expected = [
+            ('codebase', False),
+            ('abc', True),
+              ('dir', False),
+                ('this', True),
+        ]
+
+        assert expected == [(r.name, r.is_file) for r in codebase.get_resources([0,1,3,6])]
+
 class TestCodebaseCache(FileBasedTesting):
     test_data_dir = join(dirname(__file__), 'data')
 
     def test_codebase_with_use_cache(self):
-        test_codebase = self.get_test_loc('cache/package')
+        test_codebase = self.get_test_loc('resource/cache/package')
         codebase = Codebase(test_codebase, use_cache=True)
-        assert codebase.cache_base_dir
+        assert codebase.temp_dir
         assert codebase.cache_dir
-        
+        codebase.cache_dir
         root = codebase.root
 
         assert ('00', '00000000') == root.cache_keys
@@ -94,7 +318,7 @@ def test_codebase_with_use_cache(self):
         assert exists (root._get_cached_path(create=False))
 
     def test_codebase_without_use_cache(self):
-        test_codebase = self.get_test_loc('cache/package')
+        test_codebase = self.get_test_loc('resource/cache/package')
         codebase = Codebase(test_codebase, use_cache=False)
         assert not codebase.cache_dir
 

From 2d4aa6bf9d0b1da1f1af4f144b8d0057b4183b9c Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 23 Jan 2018 23:57:56 +0100
Subject: [PATCH 061/122] Cosmetic

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/licensedcode/cache.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/licensedcode/cache.py b/src/licensedcode/cache.py
index a0f9f25edc8..a50be2b98e3 100644
--- a/src/licensedcode/cache.py
+++ b/src/licensedcode/cache.py
@@ -84,8 +84,8 @@ def get_licenses_db(licenses_data_dir=None):
     return _LICENSES
 
 
-def get_cached_index(cache_dir=scancode_cache_dir, check_consistency=SCANCODE_DEV_MODE,
-
+def get_cached_index(cache_dir=scancode_cache_dir, 
+                     check_consistency=SCANCODE_DEV_MODE,
                      # used for testing only
                      timeout=LICENSE_INDEX_LOCK_TIMEOUT,
                      tree_base_dir=scancode_src_dir,

From 73cea2a23a4ceb67e43316e5decb2174d619e477 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 23 Jan 2018 23:58:59 +0100
Subject: [PATCH 062/122] Make license reindex use default cache for now #685
 #357

 *also do not use metavar in help

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/plugin_license.py    | 5 ++---
 tests/scancode/data/help/help.txt | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index d4c3a5e86eb..44184f7d8c9 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -46,7 +46,7 @@ def reindex_licenses(ctx, param, value):
     from licensedcode.cache import get_cached_index
     import click
     click.echo('Checking and rebuilding the license index...')
-    get_cached_index(cache_dir=value, check_consistency=True,)
+    get_cached_index(check_consistency=True,)
     click.echo('Done.')
     ctx.exit(0)
 
@@ -93,8 +93,7 @@ class LicenseScanner(ScanPlugin):
 
         CommandLineOption(
             ('--reindex-licenses',),
-            is_eager=True, is_flag=False, default=False,
-            metavar='DIR',
+            is_flag=True, is_eager=True,
             callback=reindex_licenses,
             help='Check the license index cache and reindex if needed and exit.',
             help_group=MISC_GROUP)
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index 5f595d5bde8..2c007bfb209 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -90,10 +90,9 @@ Options:
                          less memory.  [default: True]
 
   miscellaneous:
-    --reindex-licenses DIR  Check the license index cache and reindex if needed
-                            and exit.
-    --test-mode             Run ScanCode in a special "test mode". Only for
-                            testing.
+    --reindex-licenses  Check the license index cache and reindex if needed and
+                        exit.
+    --test-mode         Run ScanCode in a special "test mode". Only for testing.
 
   documentation:
     -h, --help  Show this message and exit.

From 6285f0e979eab6ab027c6663619e950cba4fe06f Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 00:00:55 +0100
Subject: [PATCH 063/122] Add test for compute_counts

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/scancode/test_resource.py | 80 +++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/tests/scancode/test_resource.py b/tests/scancode/test_resource.py
index 66a56093603..f12c004ec16 100644
--- a/tests/scancode/test_resource.py
+++ b/tests/scancode/test_resource.py
@@ -129,6 +129,86 @@ def test_walk_skip_filtered_all(self):
         expected = []
         assert expected == [(r.name, r.is_file) for r in results]
 
+    def test_compute_counts_filtered_None(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        results = codebase.compute_counts(skip_filtered=True)
+        expected = (5, 3, 0)
+        assert expected == results
+
+    def test_compute_counts_filtered_None_with_size(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        for res in codebase.walk():
+            if res.is_file:
+                res.size = 10
+
+        results = codebase.compute_counts(skip_filtered=True)
+        expected = (5, 3, 50)
+        assert expected == results
+
+    def test_compute_counts_filtered_None_with_cache(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=True)
+        results = codebase.compute_counts(skip_filtered=True)
+        expected = (5, 3, 0)
+        assert expected == results
+
+    def test_compute_counts_filtered_all(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        for res in codebase.get_resources(None):
+            res.is_filtered = True
+        results = codebase.compute_counts(skip_filtered=True)
+        expected = (0,0,0)
+        assert expected == results
+
+    def test_compute_counts_filtered_all_with_cache(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=True)
+        for res in codebase.get_resources(None):
+            res.is_filtered = True
+        results = codebase.compute_counts(skip_filtered=True)
+        expected = (0,0,0)
+        assert expected == results
+
+    def test_compute_counts_filtered_files(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        for res in codebase.get_resources(None):
+            if res.is_file:
+                res.is_filtered = True
+        results = codebase.compute_counts(skip_filtered=True)
+        expected = (0, 3, 0)
+        assert expected == results
+
+    def test_compute_counts_filtered_dirs(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        for res in codebase.get_resources(None):
+            if not res.is_file:
+                res.is_filtered = True
+        results = codebase.compute_counts(skip_filtered=True)
+        expected = (5, 0, 0)
+        assert expected == results
+
+    def test_walk_filtered_dirs(self):
+        test_codebase = self.get_test_loc('resource/codebase')
+        codebase = Codebase(test_codebase, use_cache=False)
+        for res in codebase.get_resources(None):
+            if not res.is_file:
+                res.is_filtered = True
+
+        results = list(codebase.walk(topdown=True, skip_filtered=True))
+        expected = [
+              ('abc', True),
+              ('et131x.h', True),
+                ('that', True),
+                ('this', True),
+                ('file', True),
+        ]
+        assert expected == [(r.name, r.is_file) for r in results]
+
     def test_walk_skip_filtered_skip_root(self):
         test_codebase = self.get_test_loc('resource/codebase')
         codebase = Codebase(test_codebase, use_cache=False)

From 533ff3688cee906c5e28ef0f65fbd605331f87e2 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 00:01:42 +0100
Subject: [PATCH 064/122] Use correct location for version file #685 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .bumpversion.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2ee4362a384..534457e0992 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
 current_version = 2.2.1
-files = setup.py src/scancode/__init__.py
+files = setup.py src/scancode_config.py
 commit = False
 tag = False
 

From 43ba290b80e9911633ebedb07709eb875d5bb4a0 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 00:02:15 +0100
Subject: [PATCH 065/122] Use proper plugin name for only-findings

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 3a97ae6e01a..8c98901422c 100644
--- a/setup.py
+++ b/setup.py
@@ -253,7 +253,7 @@ def read(*names, **kwargs):
         #
         # See also plugincode.post_scan module for details and doc.
         'scancode_output_filter': [
-            'only-findings2 = scancode.plugin_only_findings:OnlyFindings',
+            'only-findings = scancode.plugin_only_findings:OnlyFindings',
         ],
 
         # scancode_output is the entry point for ouput plugins that write a scan

From f2fe20f78a143a73de93e6c227e73d8004b0f280 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 00:02:59 +0100
Subject: [PATCH 066/122] Use proper name for setup stage #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index cece0204022..373dfbaf41a 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -901,7 +901,7 @@ def run_plugins(ctx, stage, plugins, codebase, kwargs, quiet, verbose,
         timing_key = '%(stage)s:%(name)s' % locals()
         codebase.timings[timing_key] = time() - plugin_start
 
-    codebase.timings['stage'] = time() - stage_start
+    codebase.timings['setup'] = time() - stage_start
 
 
 def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,

From cefb0f67745d068d0ed71a6dc2095fcffe1e6f9d Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 00:03:03 +0100
Subject: [PATCH 067/122] Use proper name for setup stage #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

From 92de6c688928d5c539f8647a06406c48105dcea8 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 00:04:09 +0100
Subject: [PATCH 068/122] Simplify only-findings codebase.walk #685 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/plugin_only_findings.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index ffe3e127fe8..567eb8d725e 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -54,8 +54,7 @@ def process_codebase(self, codebase, **kwargs):
         not have findings e.g. if they have no scan data (excluding info) and no
         errors.
         """
-        resources = codebase.walk(topdown=True, skip_filtered=True)
-        for resource in resources:
+        for resource in codebase.walk():
             if not has_findings(resource):
                 resource.is_filtered = True
 
@@ -64,4 +63,4 @@ def has_findings(resource):
     """
     Return True if this resource has findings.
     """
-    return bool(resource.errors or resource.get_scans().values())
+    return bool(resource.errors or any(resource.get_scans().values()))

From 0b3064913bfa517e1b271e065bca28f985e1ff02 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 00:06:31 +0100
Subject: [PATCH 069/122] Correct codebase.compute_counts #685 #357

 * make sure skip_filtered is used where needed and only there
 * ensure counts are correct in various cases

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/resource.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index fa7a58e82d3..c56a8635b3a 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -350,7 +350,7 @@ def walk(self, topdown=True, skip_root=False, skip_filtered=False):
         root = self.root
 
         # do not skip root if has no children (e.g, single root resource)
-        without_root = root.is_filtered or (skip_root and root.has_children())
+        without_root = (skip_filtered and root.is_filtered) or (skip_root and root.has_children())
 
         if topdown and not without_root:
             yield root
@@ -455,7 +455,8 @@ def update_counts(self, skip_filtered=False):
         not included in counts.
         """
         # note: we walk bottom up to update things in the proper order
-        for resource in self.walk(topdown=False):
+        # and the walk MUST MNOT skip filtered, only the compute
+        for resource in self.walk(topdown=False, skip_filtered=False):
             resource._compute_children_counts(skip_filtered)
 
     def clear(self):
@@ -577,24 +578,23 @@ def _compute_children_counts(self, skip_filtered=False):
         of its files (including the count of files inside archives).
         """
         files_count = dirs_count = size_count = 0
-        for res in self.children():
-            if skip_filtered and res.is_filtered:
+        for child in self.children():
+            files_count += child.files_count
+            dirs_count += child.dirs_count
+            size_count += child.size_count
+
+            if skip_filtered and child.is_filtered:
                 continue
-            files_count += res.files_count
-            dirs_count += res.dirs_count
-            size_count += res.size_count
 
-            if not (skip_filtered and res.is_filtered):
-                if res.is_file:
-                    files_count += 1
-                else:
-                    dirs_count += 1
-                size_count += res.size
+            if child.is_file:
+                files_count += 1
+            else:
+                dirs_count += 1
+            size_count += child.size
 
         self.files_count = files_count
         self.dirs_count = dirs_count
         self.size_count = size_count
-
         return files_count, dirs_count, size_count
 
     @property

From fae1e7609d87bc2bc2b68ca63804469d14197590 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 07:35:06 +0100
Subject: [PATCH 070/122] Do not reindex licenses during configure #685 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/conf/base.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/etc/conf/base.py b/etc/conf/base.py
index 6f1b431d30a..f716895d59c 100644
--- a/etc/conf/base.py
+++ b/etc/conf/base.py
@@ -41,19 +41,3 @@ def unsupported(platform):
 arches = supported_combos[os]
 if arch not in arches:
     unsupported(os + arch)
-
-
-"""
-Re/build the license cache on every configure run.
-"""
-
-def build_license_cache():
-    """
-    Force a rebuild of the license cache on configure.
-    """
-    from licensedcode import cache
-    print('* Building license index...')
-    cache.reindex()
-
-
-build_license_cache()

From 01a87b6bd740e534a6df3ee069808c77c74ea85f Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 11:52:06 +0100
Subject: [PATCH 071/122] Prefix all temp dirs with "scancode-" configure #685
 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/command.py     | 2 +-
 src/commoncode/fetch.py       | 2 +-
 src/commoncode/testcase.py    | 2 +-
 src/extractcode/archive.py    | 8 ++++----
 src/extractcode/extract.py    | 2 +-
 src/extractcode/uncompress.py | 2 +-
 src/scancode/resource.py      | 8 ++++----
 src/textcode/markup.py        | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/commoncode/command.py b/src/commoncode/command.py
index 405b3d48f53..829ba3bc68e 100644
--- a/src/commoncode/command.py
+++ b/src/commoncode/command.py
@@ -110,7 +110,7 @@ def execute(cmd, args, root_dir=None, cwd=None, env=None, to_files=False):
     cwd = cwd or curr_dir
 
     # temp files for stderr and stdout
-    tmp_dir = get_temp_dir(prefix='cmd-')
+    tmp_dir = get_temp_dir(prefix='scancode-cmd-')
     sop = join(tmp_dir, 'stdout')
     sep = join(tmp_dir, 'stderr')
 
diff --git a/src/commoncode/fetch.py b/src/commoncode/fetch.py
index 2df0dc399cb..0e003e2d7df 100644
--- a/src/commoncode/fetch.py
+++ b/src/commoncode/fetch.py
@@ -65,7 +65,7 @@ def download_url(url, file_name=None, verify=True, timeout=10):
         logger.error(msg)
         raise Exception(msg)
 
-    tmp_dir = fileutils.get_temp_dir(prefix='fetch-')
+    tmp_dir = fileutils.get_temp_dir(prefix='scancode-fetch-')
     output_file = os.path.join(tmp_dir, file_name)
     with open(output_file, 'wb') as out:
         out.write(response.content)
diff --git a/src/commoncode/testcase.py b/src/commoncode/testcase.py
index 1238a846ef0..1f53a6898da 100644
--- a/src/commoncode/testcase.py
+++ b/src/commoncode/testcase.py
@@ -212,7 +212,7 @@ def get_temp_dir(self, sub_dir_path=None):
         global test_run_temp_dir
         if not test_run_temp_dir:
             # not we add a space in the path for testing path with spaces
-            test_run_temp_dir = fileutils.get_temp_dir(prefix='tests -')
+            test_run_temp_dir = fileutils.get_temp_dir(prefix='scancode-tests -')
         if on_linux:
             test_run_temp_dir = fsencode(test_run_temp_dir)
 
diff --git a/src/extractcode/archive.py b/src/extractcode/archive.py
index 8344d6c1062..e641d9014c1 100644
--- a/src/extractcode/archive.py
+++ b/src/extractcode/archive.py
@@ -315,7 +315,7 @@ def extract_twice(location, target_dir, extractor1, extractor2):
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = unicode(os.path.abspath(os.path.expanduser(target_dir)))
     # extract first the intermediate payload to a temp dir
-    temp_target = unicode(fileutils.get_temp_dir(prefix='extract-'))
+    temp_target = unicode(fileutils.get_temp_dir(prefix='scancode-extract-'))
     warnings = extractor1(abs_location, temp_target)
     if TRACE:
         logger.debug('extract_twice: temp_target: %(temp_target)r' % locals())
@@ -348,7 +348,7 @@ def extract_with_fallback(location, target_dir, extractor1, extractor2):
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = unicode(os.path.abspath(os.path.expanduser(target_dir)))
     # attempt extract first to a temp dir
-    temp_target1 = unicode(fileutils.get_temp_dir(prefix='extract1-'))
+    temp_target1 = unicode(fileutils.get_temp_dir(prefix='scancode-extract1-'))
     try:
         warnings = extractor1(abs_location, temp_target1)
         if TRACE:
@@ -356,7 +356,7 @@ def extract_with_fallback(location, target_dir, extractor1, extractor2):
         fileutils.copytree(temp_target1, abs_target_dir)
     except:
         try:
-            temp_target2 = unicode(fileutils.get_temp_dir(prefix='extract2-'))
+            temp_target2 = unicode(fileutils.get_temp_dir(prefix='scancode-extract2-'))
             warnings = extractor2(abs_location, temp_target2)
             if TRACE:
                 logger.debug('extract_with_fallback: temp_target2: %(temp_target2)r' % locals())
@@ -378,7 +378,7 @@ def try_to_extract(location, target_dir, extractor):
     """
     abs_location = os.path.abspath(os.path.expanduser(location))
     abs_target_dir = unicode(os.path.abspath(os.path.expanduser(target_dir)))
-    temp_target = unicode(fileutils.get_temp_dir(prefix='extract1-'))
+    temp_target = unicode(fileutils.get_temp_dir(prefix='scancode-extract1-'))
     warnings = []
     try:
         warnings = extractor(abs_location, temp_target)
diff --git a/src/extractcode/extract.py b/src/extractcode/extract.py
index d0f938a28fc..08935a1ab1d 100644
--- a/src/extractcode/extract.py
+++ b/src/extractcode/extract.py
@@ -184,7 +184,7 @@ def extract_file(location, target, kinds=extractcode.default_kinds):
             # extract first to a temp directory.
             # if there is an error,  the extracted files will not be moved
             # to target
-            tmp_tgt = fileutils.get_temp_dir(prefix='extract-')
+            tmp_tgt = fileutils.get_temp_dir(prefix='scancode-extract-')
             abs_location = abspath(expanduser(location))
             warnings.extend(extractor(abs_location, tmp_tgt))
             fileutils.copytree(tmp_tgt, target)
diff --git a/src/extractcode/uncompress.py b/src/extractcode/uncompress.py
index 83fcd4fa50b..df6dfc03d39 100644
--- a/src/extractcode/uncompress.py
+++ b/src/extractcode/uncompress.py
@@ -79,7 +79,7 @@ def uncompress_file(location, decompressor):
 
     warnings = []
     base_name = fileutils.file_base_name(location)
-    target_location = os.path.join(fileutils.get_temp_dir(prefix='extract-'), base_name)
+    target_location = os.path.join(fileutils.get_temp_dir(prefix='scancode-extract-'), base_name)
     with decompressor(location, 'rb') as compressed:
         with open(target_location, 'wb') as uncompressed:
             buffer_size = 32 * 1024 * 1024
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index c56a8635b3a..daa20e95a7c 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -878,14 +878,14 @@ def to_dict(self, full_root=False, strip_root=False, with_info=False):
 
 def get_results_cache_dir(temp_dir=scancode_temp_dir):
     """
-    Return a new, created and unique cache storage directory path rooted at the
-    `cache_dir` base temp directory in the OS- preferred representation (either
-    bytes on Linux and Unicode elsewhere).
+    Return a new, created and unique per-run cache storage directory path rooted
+    at the `temp_dir` base temp directory in the OS- preferred representation
+    (either bytes on Linux and Unicode elsewhere).
     """
     from commoncode.fileutils import get_temp_dir
     from commoncode.timeutils import time2tstamp
 
-    prefix = 'scan-results-cache-' + time2tstamp() + '-'
+    prefix = 'scancode-scans-' + time2tstamp() + '-'
     cache_dir = get_temp_dir(base_dir=temp_dir, prefix=prefix)
     if on_linux:
         cache_dir = fsencode(cache_dir)
diff --git a/src/textcode/markup.py b/src/textcode/markup.py
index d95a8a86616..d675e8be83c 100644
--- a/src/textcode/markup.py
+++ b/src/textcode/markup.py
@@ -146,7 +146,7 @@ def convert_to_utf8(location):
     if encoding:
         encoding = encoding.get('encoding', None)
         if encoding:
-            target = os.path.join(fileutils.get_temp_dir(prefix='markup'),
+            target = os.path.join(fileutils.get_temp_dir(prefix='scancode-markup-'),
                                   fileutils.file_name(location))
             with codecs.open(location, 'rb', encoding=encoding,
                              errors='replace', buffering=16384) as inf:
@@ -166,7 +166,7 @@ def convert_to_text(location, _retrying=False):
     if not is_markup(location):
         return
 
-    temp_file = os.path.join(fileutils.get_temp_dir(prefix='markup'), 'text')
+    temp_file = os.path.join(fileutils.get_temp_dir(prefix='scancode-markup-'), 'text')
     from bs4 import BeautifulSoup
     with open(location, 'rb') as input_text:
         soup = BeautifulSoup(input_text.read(), 'html5lib')

From 45a080a405bb0d470f1d9720834b75365d67be71 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 12:05:12 +0100
Subject: [PATCH 072/122] Use cache_dir and SCANCODE_DEV_MODE correctly  #685
 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/api.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/scancode/api.py b/src/scancode/api.py
index 25a14ca8bad..7883a46e1c8 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -122,13 +122,15 @@ def get_licenses(location, min_score=0, include_text=False, diag=False,
     If `diag` is True, additional license match details are returned with the
     matched_rule key of the returned mapping.
     """
+    from scancode_config import SCANCODE_DEV_MODE
     if not cache_dir:
         from scancode_config import scancode_cache_dir as cache_dir
 
     from licensedcode.cache import get_index
     from licensedcode.cache import get_licenses_db
 
-    idx = get_index(cache_dir)
+    from scancode_config import SCANCODE_DEV_MODE
+    idx = get_index(cache_dir, SCANCODE_DEV_MODE)
     licenses = get_licenses_db()
 
     results = []

From 2c94a7060bd900fdfd6c7895dd39e40c2828ae58 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 12:05:41 +0100
Subject: [PATCH 073/122] Add setup() to plugin_license #685 #357

 * this restore the proper cache warmup

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/plugin_license.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index 44184f7d8c9..9b5b1bde085 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -102,6 +102,12 @@ class LicenseScanner(ScanPlugin):
     def is_enabled(self, license, **kwargs):  # @ReservedAssignment
         return license
 
+    def setup(self, cache_dir, **kwargs):
+        return
+        from scancode_config import SCANCODE_DEV_MODE
+        from licensedcode.cache import get_index
+        get_index(cache_dir, check_consistency=SCANCODE_DEV_MODE)
+
     def get_scanner(self, license_score=0, license_text=False,
                     license_url_template=DEJACODE_LICENSE_URL,
                     license_diag=False, cache_dir=None, **kwargs):

From aeef8f99b6ae73990cf121bcf5116973df60343f Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 12:06:20 +0100
Subject: [PATCH 074/122] Remove SCANCODE_DEBUG_LICENSE env var. Not used

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/licensedcode/index.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/licensedcode/index.py b/src/licensedcode/index.py
index bc444ba66e4..8f9b8afe15d 100644
--- a/src/licensedcode/index.py
+++ b/src/licensedcode/index.py
@@ -83,8 +83,7 @@
 def logger_debug(*args):
     pass
 
-if (TRACE or TRACE_INDEXING_PERF or TRACE_QUERY_RUN_SIMPLE
-    or os.environ.get('SCANCODE_DEBUG_LICENSE') or TRACE_NEGATIVE):
+if TRACE or TRACE_INDEXING_PERF or TRACE_QUERY_RUN_SIMPLE or TRACE_NEGATIVE:
     import logging
 
     logger = logging.getLogger(__name__)

From cdd4179effaa4dd51d8408fb6c10170ad9af3f49 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 12:07:35 +0100
Subject: [PATCH 075/122] Use cache_dir and SCANCODE_DEV_MODE correctly  #685
 #357

 * in licensedcode.cached

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/licensedcode/cache.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/licensedcode/cache.py b/src/licensedcode/cache.py
index a50be2b98e3..384dcd7c6ff 100644
--- a/src/licensedcode/cache.py
+++ b/src/licensedcode/cache.py
@@ -55,14 +55,14 @@
 _LICENSES_INDEX = None
 
 
-def get_index(cache_dir=scancode_cache_dir):
+def get_index(cache_dir=scancode_cache_dir, check_consistency=SCANCODE_DEV_MODE):
     """
     Return and eventually cache an index built from an iterable of rules.
     Build the index from the built-in rules dataset.
     """
     global _LICENSES_INDEX
     if not _LICENSES_INDEX:
-        _LICENSES_INDEX = get_cached_index(cache_dir=scancode_cache_dir)
+        _LICENSES_INDEX = get_cached_index(cache_dir, check_consistency)
     return _LICENSES_INDEX
 
 
@@ -84,7 +84,7 @@ def get_licenses_db(licenses_data_dir=None):
     return _LICENSES
 
 
-def get_cached_index(cache_dir=scancode_cache_dir, 
+def get_cached_index(cache_dir=scancode_cache_dir,
                      check_consistency=SCANCODE_DEV_MODE,
                      # used for testing only
                      timeout=LICENSE_INDEX_LOCK_TIMEOUT,

From d00b75db77753cc828e762a539880883328f7728 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 12:10:08 +0100
Subject: [PATCH 076/122] Improve license matching thresholds #889

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/licensedcode/match_set.py | 14 ++++++--
 src/licensedcode/models.py    | 68 +++++++++++++++++++++--------------
 2 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/src/licensedcode/match_set.py b/src/licensedcode/match_set.py
index b96a95fee44..4aa99e05865 100644
--- a/src/licensedcode/match_set.py
+++ b/src/licensedcode/match_set.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -270,7 +270,10 @@ def compute_candidates(query_run, idx, rules_subset, top=30):
                 logger_debug('candidate: ihigh:', [(idx.tokens_by_tid[tid], val) for tid, val in enumerate(ihigh, idx.len_junk)])
 
             thresholds = thresholds_getter(rule)
-            compared = compare_sets(qhigh, qlow, ihigh, ilow, thresholds, intersector, counter)
+            if TRACE_DEEP:
+                compared = compare_sets(qhigh, qlow, ihigh, ilow, thresholds, intersector, counter, rule, idx)
+            else:
+                compared = compare_sets(qhigh, qlow, ihigh, ilow, thresholds, intersector, counter)
             if compared:
                 sort_order, intersection = compared
                 sortable_candidates.append((sort_order, rid, rule, intersection))
@@ -309,7 +312,7 @@ def compute_candidates(query_run, idx, rules_subset, top=30):
     return candidates
 
 
-def compare_sets(qhigh, qlow, ihigh, ilow, thresholds, intersector, counter):
+def compare_sets(qhigh, qlow, ihigh, ilow, thresholds, intersector, counter, _rule=None, _idx=None):
     """
     Compare a query qhigh and qlow sets with an index rule ihigh and ilow sets.
     Return a tuple suitable for sorting and the computed sets intersection or None if
@@ -383,4 +386,9 @@ def compare_sets(qhigh, qlow, ihigh, ilow, thresholds, intersector, counter):
     inter = low_inter
     low_inter.update(high_inter)
 
+    if TRACE_DEEP:
+        logger_debug('compare_sets: intersected rule:', _rule.identifier)
+        logger_debug('  compare_sets: thresholds:', thresholds)
+        logger_debug('  compare_sets: high_inter:', ' '.join(_idx.tokens_by_tid[tid] for tid in high_inter))
+
     return sort_order, inter
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index d79bd418138..e6eaa931d0a 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -747,30 +747,37 @@ def thresholds(self):
         Return a Thresholds tuple considering the occurrence of all tokens.
         """
         if not self._thresholds:
-            min_high = min([self.high_length, MIN_MATCH_HIGH_LENGTH])
-            min_len = MIN_MATCH_LENGTH
+            length = self.length 
+            high_length = self.high_length
+            if length > 200:
+                min_high = high_length//10
+                min_len = length//10
+            else:
+                min_high = min([high_length, MIN_MATCH_HIGH_LENGTH])
+                min_len = MIN_MATCH_LENGTH
 
             # note: we cascade ifs from largest to smallest lengths
             # FIXME: this is not efficient
+
             if self.length < 30:
-                min_len = self.length // 2
+                min_len = length // 2
 
             if self.length < 10:
-                min_high = self.high_length
-                min_len = self.length
+                min_high = high_length
+                min_len = length
                 self.minimum_coverage = 80
 
             if self.length < 3:
-                min_high = self.high_length
-                min_len = self.length
+                min_high = high_length
+                min_len = length
                 self.minimum_coverage = 100
 
             if self.minimum_coverage == 100:
-                min_high = self.high_length
-                min_len = self.length
+                min_high = high_length
+                min_len = length
 
             self._thresholds = Thresholds(
-                self.high_length, self.low_length, self.length,
+                high_length, self.low_length, length,
                 self.small(), min_high, min_len
             )
         return self._thresholds
@@ -780,31 +787,40 @@ def thresholds_unique(self):
         Return a Thresholds tuple considering the occurrence of only unique tokens.
         """
         if not self._thresholds_unique:
-            highu = (int(self.high_unique // 2)) or self.high_unique
-            min_high = min([highu, MIN_MATCH_HIGH_LENGTH])
-            min_len = MIN_MATCH_LENGTH
+            length = self.length
+            high_unique = self.high_unique
+            length_unique = self.length_unique
+
+            if length > 200:
+                min_high = high_unique//10
+                min_len = length//10
+            else:
+                highu = (int(high_unique // 2)) or high_unique
+                min_high = min([highu, MIN_MATCH_HIGH_LENGTH])
+                min_len = MIN_MATCH_LENGTH
+
             # note: we cascade IFs from largest to smallest lengths
-            if self.length < 20:
-                min_high = self.high_unique
+            if length < 20:
+                min_high = high_unique
                 min_len = min_high
 
-            if self.length < 10:
-                min_high = self.high_unique
-                if self.length_unique < 2:
-                    min_len = self.length_unique
+            if length < 10:
+                min_high = high_unique
+                if length_unique < 2:
+                    min_len = length_unique
                 else:
-                    min_len = self.length_unique - 1
+                    min_len = length_unique - 1
 
-            if self.length < 5:
-                min_high = self.high_unique
-                min_len = self.length_unique
+            if length < 5:
+                min_high = high_unique
+                min_len = length_unique
 
             if self.minimum_coverage == 100:
-                min_high = self.high_unique
-                min_len = self.length_unique
+                min_high = high_unique
+                min_len = length_unique
 
             self._thresholds_unique = Thresholds(
-                self.high_unique, self.low_unique, self.length_unique,
+                high_unique, self.low_unique, length_unique,
                 self.small(), min_high, min_len)
         return self._thresholds_unique
 

From b34989c3fd8bc502acc981f26686f9d7a6e8735e Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 14:27:32 +0100
Subject: [PATCH 077/122] Fix scan logging  #787

 * reported by @haikoschol at
  https://github.com/nexB/scancode-toolkit/pull/885#discussion_r162937339

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 373dfbaf41a..cb041056b33 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -965,7 +965,9 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
                     location, rid, scan_errors, scan_result, scan_time, scan_result, scan_timings = scans.next()
                 else:
                     location, rid, scan_errors, scan_time, scan_result = scans.next()
-                    if TRACE_DEEP: logger_debug('scan_codebase: results:', scan_result)
+
+                if TRACE_DEEP: logger_debug('scan_codebase: results:', scan_result)
+
                 resource = get_resource(rid)
                 if not resource:
                     # this should never happen

From 622c5a0b8ccea796d0c2b051a58cd53581af47e4 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 14:57:56 +0100
Subject: [PATCH 078/122] Compute stage and scan timing correctly #787

 * reported by @haikoschol

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index cb041056b33..04c4200056c 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -901,7 +901,7 @@ def run_plugins(ctx, stage, plugins, codebase, kwargs, quiet, verbose,
         timing_key = '%(stage)s:%(name)s' % locals()
         codebase.timings[timing_key] = time() - plugin_start
 
-    codebase.timings['setup'] = time() - stage_start
+    codebase.timings[stage] = time() - stage_start
 
 
 def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
@@ -1053,10 +1053,11 @@ def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT, with_timing=F
             msg = 'ERROR: for scanner: ' + scanner.key + ':\n' + traceback.format_exc()
             errors.append(msg)
         finally:
-            scan_time = time() - scan_time
             if with_timing:
                 timings[scanner.key] = time() - start
 
+    scan_time = time() - scan_time
+
     if with_timing:
         return location, rid, errors, scan_time, results, timings
     else:

From 69d2bc60433f3b661395bc86b64e49f919a8f5e8 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 18:08:59 +0100
Subject: [PATCH 079/122] Ensure that the new --timing CLI options works #787

 * reported by @haikoschol
 * timings are now correctly added if requested to each Resource
 * there is a test to ensure this works and is included in JSON
   and JSON lines outputs
 * minor refactor of cli_test_utils.py and other minor clieanups

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/output.py                     |   7 +-
 src/scancode/cli.py                          |  57 ++++----
 src/scancode/cli_test_utils.py               | 129 +++++++++----------
 src/scancode/resource.py                     |   6 +-
 tests/formattedcode/test_output_jsonlines.py |  26 +++-
 tests/scancode/data/timing/basic.tgz         | Bin 0 -> 17425 bytes
 tests/scancode/test_cli.py                   |  56 +++++++-
 tests/scancode/test_plugin_ignore.py         |  16 +--
 8 files changed, 189 insertions(+), 108 deletions(-)
 create mode 100644 tests/scancode/data/timing/basic.tgz

diff --git a/src/plugincode/output.py b/src/plugincode/output.py
index c0378f6cd29..d861bc1c84d 100644
--- a/src/plugincode/output.py
+++ b/src/plugincode/output.py
@@ -89,12 +89,13 @@ def process_codebase(self, codebase, **kwargs):
         raise NotImplementedError
 
     @classmethod
-    def get_results(cls, codebase, info, full_root, strip_root, **kwargs):
+    def get_results(cls, codebase, info, full_root, strip_root, timing, **kwargs):
         """
         Return an iterable of serialized scan results from a codebase.
         """
-        serializer = partial(Resource.to_dict, full_root=full_root,
-                             strip_root=strip_root, with_info=info)
+        serializer = partial(Resource.to_dict, 
+                             full_root=full_root,strip_root=strip_root, 
+                             with_info=info, with_timing=timing)
 
         resources = codebase.walk(topdown=True, skip_root=strip_root,
                                   skip_filtered=True)
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 04c4200056c..265522ac255 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -755,6 +755,7 @@ def scancode(ctx, input,
             next_stages = (post_scan_plugins.values()
                            + output_filter_plugins.values()
                            + output_plugins.values())
+
             next_stages_need_info = any(p.needs_info for p in next_stages)
             # add info is requested or needed but not yet collected
             if next_stages_need_info:
@@ -783,11 +784,13 @@ def scancode(ctx, input,
             if not quiet:
                 item_show_func = partial(path_progress_message, verbose=verbose)
                 progress_manager = partial(progressmanager,
-                    item_show_func=item_show_func, verbose=verbose, file=sys.stderr)
+                    item_show_func=item_show_func,
+                    verbose=verbose, file=sys.stderr)
 
-            # TODO: add CLI option to bypass cache entirely
-            scan_success = scan_codebase(codebase, scanners, processes, timeout,
-                                         with_timing=timing, progress_manager=progress_manager)
+            # TODO: add CLI option to bypass cache entirely?
+            scan_success = scan_codebase(
+                codebase, scanners, processes, timeout,
+                with_timing=timing, progress_manager=progress_manager)
 
             scanned_fc, scanned_dc, scanned_sc = codebase.compute_counts()
 
@@ -930,7 +933,8 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
 
     resources = ((r.get_path(absolute=True), r.rid) for r in codebase.walk())
 
-    runner = partial(scan_resource, scanners=scanners, timeout=timeout)
+    runner = partial(scan_resource, scanners=scanners,
+                     timeout=timeout, with_timing=with_timing)
 
     if TRACE:
         logger_debug('scan_codebase: scanners:', '\n'.join(repr(s) for s in scanners))
@@ -961,12 +965,10 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
 
         while True:
             try:
-                if with_timing:
-                    location, rid, scan_errors, scan_result, scan_time, scan_result, scan_timings = scans.next()
-                else:
-                    location, rid, scan_errors, scan_time, scan_result = scans.next()
+                location, rid, scan_errors, scan_time, scan_result, scan_timings = scans.next()
 
-                if TRACE_DEEP: logger_debug('scan_codebase: results:', scan_result)
+                if TRACE_DEEP: logger_debug(
+                    'scan_codebase: location:', location, 'results:', scan_result)
 
                 resource = get_resource(rid)
                 if not resource:
@@ -988,6 +990,13 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
                 if infos:
                     resource.set_info(infos)
 
+                if TRACE: logger_debug('scan_codebase: scan_timings:', scan_timings)
+                if with_timing and scan_timings:
+                    if resource.scan_timings:
+                        resource.scan_timings.update(scan_timings)
+                    else:
+                        resource.scan_timings = scan_timings
+
                 saved_scans = resource.put_scans(scan_result, update=True)
                 if TRACE: logger_debug('scan_codebase: saved_scans:', saved_scans)
 
@@ -1012,23 +1021,26 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
     return success
 
 
-def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT, with_timing=False):
+def scan_resource(location_rid, scanners,
+                  timeout=DEFAULT_TIMEOUT,
+                  with_timing=False):
     """
-    Return a tuple of (location, rid, errors, scan_time, scan_results)
+    Return a tuple of (location, rid, errors, scan_time, scan_results, timings)
     by running the `scanners` Scanner objects for the file or directory resource
     with id `rid` at `location` provided as a `location_rid` tuple of (location,
     rid) for up to `timeout` seconds.
     In the returned tuple:
-    - `errors` is a list of error strings
-    - `scan_time` is the duration in seconds as float to run all scans for this resource
-    - `scan_results` is a mapping of scan results keyed by scanner name.
-
-    If `with_timing` is True, the execution time of each scanner is also
-    collected as a float in seconds and the returned tuple contains an extra
-    trailing item as a mapping of {scanner.key: execution time}.
+    - `location` and `rid` are the orginal arguments.
+    - `errors` is a list of error strings.
+    - `scan_results` is a mapping of scan results keyed by scanner.key.
+    - `scan_time` is the duration in seconds to run all scans for this resource.
+    - `timings` is a mapping of scan {scanner.key: execution time in seconds}
+      tracking the execution duration each each scan individually.
+      `timings` is empty unless `with_timing` is True.
     """
     scan_time = time()
 
+    timings = None
     if with_timing:
         timings = OrderedDict((scanner.key, 0) for scanner in scanners)
 
@@ -1040,6 +1052,7 @@ def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT, with_timing=F
     for scanner, scanner_result in zip(scanners, results.values()):
         if with_timing:
             start = time()
+
         try:
             error, value = interruptible(
                 partial(scanner.function, location), timeout=timeout)
@@ -1049,6 +1062,7 @@ def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT, with_timing=F
             if value:
                 # a scanner function MUST return a sequence
                 scanner_result.extend(value)
+
         except Exception:
             msg = 'ERROR: for scanner: ' + scanner.key + ':\n' + traceback.format_exc()
             errors.append(msg)
@@ -1058,10 +1072,7 @@ def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT, with_timing=F
 
     scan_time = time() - scan_time
 
-    if with_timing:
-        return location, rid, errors, scan_time, results, timings
-    else:
-        return location, rid, errors, scan_time, results
+    return location, rid, errors, scan_time, results, timings
 
 
 def display_summary(codebase, scan_names, processes, verbose):
diff --git a/src/scancode/cli_test_utils.py b/src/scancode/cli_test_utils.py
index aa5ff08692f..d2899fd71b4 100644
--- a/src/scancode/cli_test_utils.py
+++ b/src/scancode/cli_test_utils.py
@@ -35,38 +35,40 @@
 from commoncode.system import on_linux
 
 
-def remove_dates(scan_result):
+def run_scan_plain(options, cwd=None, test_mode=True):
     """
-    Remove date fields from scan.
+    Run a scan as a plain subprocess. Return rc, stdout, stderr.
     """
-    for scanned_file in scan_result['files']:
-        scanned_file.pop('date', None)
+    from commoncode.command import execute
+    import scancode
 
+    if test_mode and '--test-mode' not in options:
+        options.append('--test-mode')
 
-def clean_errors(scan_results):
+    scmd = b'scancode' if on_linux else 'scancode'
+    scan_cmd = os.path.join(scancode.root_dir, scmd)
+    return execute(scan_cmd, options, cwd=cwd)
+
+
+def run_scan_click(options, monkeypatch=None, test_mode=True):
     """
-    Clean error fields from scan by keeping only the first and last line
-    (removing the stack traces).
+    Run a scan as a Click-controlled subprocess
+    If monkeypatch is provided, a tty with a size (80, 43) is mocked.
+    Return a click.testing.Result object.
     """
+    import click
+    from click.testing import CliRunner
+    from scancode import cli
 
-    def clean(_errors):
-        """Modify the __errors list in place"""
-        for _i, _error in enumerate(_errors[:]):
-            _error_split = _error.splitlines(True)
-            if len(_error_split) <= 1:
-                continue
-            # keep first and last line
-            _clean_error = ''.join([_error_split[0] + _error_split[-1]])
-            _errors[_i] = _clean_error
+    if test_mode and '--test-mode' not in options:
+        options.append('--test-mode')
 
-    top_level = scan_results.get('scan_errors')
-    if top_level:
-        clean(top_level)
+    if monkeypatch:
+        monkeypatch.setattr(click._termui_impl, 'isatty', lambda _: True)
+        monkeypatch.setattr(click , 'get_terminal_size', lambda : (80, 43,))
+    runner = CliRunner()
 
-    for result in scan_results['files']:
-        file_level = result.get('scan_errors')
-        if file_level:
-            clean(file_level)
+    return runner.invoke(cli.scancode, options, catch_exceptions=False)
 
 
 def check_json_scan(expected_file, result_file, regen=False,
@@ -77,24 +79,13 @@ def check_json_scan(expected_file, result_file, regen=False,
     True the expected_file WILL BE overwritten with the results. This is
     convenient for updating tests expectations. But use with caution.
     """
-    scan_results = _load_json_result(result_file)
-
-    if strip_dates:
-        remove_dates(scan_results)
-
-    if clean_errs:
-        clean_errors(scan_results)
+    scan_results = load_json_result(result_file, strip_dates, clean_errs)
 
     if regen:
         with open(expected_file, 'wb') as reg:
             json.dump(scan_results, reg, indent=2, separators=(',', ': '))
 
-    expected = _load_json_result(expected_file)
-
-    if strip_dates:
-        remove_dates(expected)
-    if clean_errs:
-        clean_errors(expected)
+    expected = load_json_result(expected_file, strip_dates, clean_errs)
 
     # NOTE we redump the JSON as a string for a more efficient comparison of
     # failures
@@ -104,53 +95,57 @@ def check_json_scan(expected_file, result_file, regen=False,
     assert expected == scan_results
 
 
-def _load_json_result(result_file):
+def load_json_result(result_file, strip_dates=False, clean_errs=True):
     """
     Load the result file as utf-8 JSON
     Sort the results by location.
     """
     with codecs.open(result_file, encoding='utf-8') as res:
-        scan_result = json.load(res, object_pairs_hook=OrderedDict)
+        scan_results = json.load(res, object_pairs_hook=OrderedDict)
+
+    if strip_dates:
+        remove_dates(scan_results)
+
+    if clean_errs:
+        clean_errors(scan_results)
 
-    if scan_result.get('scancode_version'):
-        del scan_result['scancode_version']
+    if scan_results.get('scancode_version'):
+        del scan_results['scancode_version']
 
     # TODO: remove sort, this should no longer be needed
-    scan_result['files'].sort(key=lambda x: x['path'])
-    return scan_result
+    scan_results['files'].sort(key=lambda x: x['path'])
+    return scan_results
 
 
-def run_scan_plain(options, cwd=None, test_mode=True):
+def remove_dates(scan_result):
     """
-    Run a scan as a plain subprocess. Return rc, stdout, stderr.
+    Remove date fields from scan.
     """
-    from commoncode.command import execute
-    import scancode
-
-    if test_mode and '--test-mode' not in options:
-        options.append('--test-mode')
-
-    scmd = b'scancode' if on_linux else 'scancode'
-    scan_cmd = os.path.join(scancode.root_dir, scmd)
-    return execute(scan_cmd, options, cwd=cwd)
+    for scanned_file in scan_result['files']:
+        scanned_file.pop('date', None)
 
 
-def run_scan_click(options, monkeypatch=None, test_mode=True):
+def clean_errors(scan_results):
     """
-    Run a scan as a Click-controlled subprocess
-    If monkeypatch is provided, a tty with a size (80, 43) is mocked.
-    Return a click.testing.Result object.
+    Clean error fields from scan by keeping only the first and last line
+    (removing the stack traces).
     """
-    import click
-    from click.testing import CliRunner
-    from scancode import cli
 
-    if test_mode and '--test-mode' not in options:
-        options.append('--test-mode')
+    def clean(_errors):
+        """Modify the __errors list in place"""
+        for _i, _error in enumerate(_errors[:]):
+            _error_split = _error.splitlines(True)
+            if len(_error_split) <= 1:
+                continue
+            # keep first and last line
+            _clean_error = ''.join([_error_split[0] + _error_split[-1]])
+            _errors[_i] = _clean_error
 
-    if monkeypatch:
-        monkeypatch.setattr(click._termui_impl, 'isatty', lambda _: True)
-        monkeypatch.setattr(click , 'get_terminal_size', lambda : (80, 43,))
-    runner = CliRunner()
+    top_level = scan_results.get('scan_errors')
+    if top_level:
+        clean(top_level)
 
-    return runner.invoke(cli.scancode, options, catch_exceptions=False)
+    for result in scan_results['files']:
+        file_level = result.get('scan_errors')
+        if file_level:
+            clean(file_level)
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index daa20e95a7c..afdab6cafc1 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -841,7 +841,8 @@ def set_info(self, info):
         if TRACE:
             logger_debug('Resource.set_info: to_dict():', pformat(info))
 
-    def to_dict(self, full_root=False, strip_root=False, with_info=False):
+    def to_dict(self, full_root=False, strip_root=False,
+                with_info=False, with_timing=False):
         """
         Return a mapping of representing this Resource and its scans.
         """
@@ -869,6 +870,9 @@ def to_dict(self, full_root=False, strip_root=False, with_info=False):
             res['is_media'] = self.is_media
             res['is_source'] = self.is_source
             res['is_script'] = self.is_script
+        if with_timing:
+            res['scan_timings'] = self.scan_timings or {}
+
         res['scan_errors'] = self.errors
         res.update(self.get_scans())
         if TRACE:
diff --git a/tests/formattedcode/test_output_jsonlines.py b/tests/formattedcode/test_output_jsonlines.py
index 03709147a6e..f1406bd141f 100644
--- a/tests/formattedcode/test_output_jsonlines.py
+++ b/tests/formattedcode/test_output_jsonlines.py
@@ -66,7 +66,7 @@ def check_jsonlines_scan(expected_file, result_file, regen=False):
     if regen:
         with open(expected_file, 'wb') as reg:
             json.dump(result, reg, indent=2, separators=(',', ': '))
-    expected = _load_json_result(expected_file)
+    expected = _load_json_result_for_jsonlines(expected_file)
     remove_variable_data(expected)
 
     assert expected == result
@@ -80,7 +80,7 @@ def _load_jsonlines_result(result_file):
         return [json.loads(line, object_pairs_hook=OrderedDict) for line in res]
 
 
-def _load_json_result(result_file):
+def _load_json_result_for_jsonlines(result_file):
     """
     Load the result file as utf-8 JSON
     """
@@ -98,3 +98,25 @@ def test_jsonlines():
 
     expected = test_env.get_test_loc('json/simple-expected.jsonlines')
     check_jsonlines_scan(test_env.get_test_loc(expected), result_file, regen=False)
+
+
+def test_jsonlines_with_timing():
+    test_dir = test_env.get_test_loc('json/simple')
+    result_file = test_env.get_temp_file('jsonline')
+
+    result = run_scan_click(['-i', '--timing', test_dir, '--json-lines', result_file])
+    assert result.exit_code == 0
+    assert 'Scanning done' in result.output
+    file_results = _load_jsonlines_result(result_file)
+    first =True
+
+    for res in file_results:
+        if first:
+            # skip header
+            first = False
+            continue
+        scan_timings = res['files'][0]['scan_timings']
+        assert scan_timings
+        for scanner, timing in scan_timings.items():
+            assert scanner in ('infos',)
+            assert timing
diff --git a/tests/scancode/data/timing/basic.tgz b/tests/scancode/data/timing/basic.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..e9a24f937b4fd4fdd4fd5ef8fb13a85e182103b6
GIT binary patch
literal 17425
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
UKnt`$`>SgI52prP!vGio0L{N1WB>pF

literal 0
HcmV?d00001

diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index afe0b6efdfd..3b76fa294bc 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -38,12 +38,12 @@
 from commoncode import fileutils
 from commoncode.fileutils import fsencode
 from commoncode.testcase import FileDrivenTesting
-# from commoncode.testcase import FileBasedTesting
 from commoncode.system import on_linux
 from commoncode.system import on_mac
 from commoncode.system import on_windows
 
 from scancode.cli_test_utils import check_json_scan
+from scancode.cli_test_utils import load_json_result
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import run_scan_plain
 
@@ -207,7 +207,7 @@ def test_scan_license_with_url_template():
     result_file = test_env.get_temp_file('json')
 
     result = run_scan_click(
-        ['--license', '--license-url-template', 'https://example.com/urn:{}', 
+        ['--license', '--license-url-template', 'https://example.com/urn:{}',
          test_dir, '--json-pp', result_file])
 
     check_json_scan(test_env.get_test_loc('plugin_license/license_url.expected.json'), result_file)
@@ -652,7 +652,7 @@ def test_scan_to_json_without_FILE_does_not_write_to_next_option():
 def test_scan_errors_out_with_conflicting_root_options():
     test_file = test_env.get_test_loc('license_text/test.txt')
     result_file = test_env.get_temp_file('results.json')
-    result = run_scan_click(['--strip-root', '--full-root','--json', result_file, '--info', test_file])
+    result = run_scan_click(['--strip-root', '--full-root', '--json', result_file, '--info', test_file])
     assert result.exit_code == 2
     assert ('Error: The option --strip-root cannot be used together with the '
             '--full-root option(s) and --full-root is used.') in result.output
@@ -661,9 +661,57 @@ def test_scan_errors_out_with_conflicting_root_options():
 def test_scan_errors_out_with_conflicting_verbosity_options():
     test_file = test_env.get_test_loc('license_text/test.txt')
     result_file = test_env.get_temp_file('results.json')
-    result = run_scan_click(['--quiet', '--verbose','--json', result_file, '--info', test_file])
+    result = run_scan_click(['--quiet', '--verbose', '--json', result_file, '--info', test_file])
     assert result.exit_code == 2
     print(result.output)
     assert ('Error: The option --quiet cannot be used together with the '
             '--verbose option(s) and --verbose is used. You can set only one of '
             'these options at a time.') in result.output
+
+
+def test_scan_with_timing_json():
+    test_dir = test_env.extract_test_tar('timing/basic.tgz')
+    result_file = test_env.get_temp_file('json')
+
+    result = run_scan_click(
+        ['--email', '--url', '--license', '--copyright', '--info', '--package',
+         '--timing', '--json', result_file, test_dir, ])
+
+    assert result.exit_code == 0
+    assert 'Scanning done' in result.output
+
+    file_results = load_json_result(result_file)['files']
+
+    expected_scanners = set(
+        ['emails', 'urls', 'licenses', 'copyrights', 'infos', 'packages'])
+
+    for res in file_results:
+        scan_timings = res['scan_timings']
+        assert scan_timings
+        for scanner, timing in scan_timings.items():
+            assert scanner in expected_scanners
+            assert timing
+
+
+def test_scan_with_timing_jsonpp():
+    test_dir = test_env.extract_test_tar('timing/basic.tgz')
+    result_file = test_env.get_temp_file('json')
+
+    result = run_scan_click(
+        ['--email', '--url', '--license', '--copyright', '--info', '--package',
+         '--timing', '--json-pp', result_file, test_dir, ])
+
+    assert result.exit_code == 0
+    assert 'Scanning done' in result.output
+
+    file_results = load_json_result(result_file)['files']
+
+    expected_scanners = set(
+        ['emails', 'urls', 'licenses', 'copyrights', 'infos', 'packages'])
+
+    for res in file_results:
+        scan_timings = res['scan_timings']
+        assert scan_timings
+        for scanner, timing in scan_timings.items():
+            assert scanner in expected_scanners
+            assert timing
diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
index 6239ddd8603..ee364356e1a 100644
--- a/tests/scancode/test_plugin_ignore.py
+++ b/tests/scancode/test_plugin_ignore.py
@@ -30,7 +30,7 @@
 
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
-from scancode.cli_test_utils import _load_json_result
+from scancode.cli_test_utils import load_json_result
 from scancode.plugin_ignore import is_ignored
 from scancode.plugin_ignore import ProcessIgnore
 from scancode.resource import Codebase
@@ -141,7 +141,7 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
         result = run_scan_click(['--copyright', '--strip-root', test_dir,
                                  '--json', result_file])
         assert result.exit_code == 0
-        scan_result = _load_json_result(result_file)
+        scan_result = load_json_result(result_file)
         # a single test.tst file and its directory that is not a VCS file should
         # be listed
         assert 1 == scan_result['files_count']
@@ -156,7 +156,7 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default_no_multiprocess(self):
                                  test_dir,
                                  '--json', result_file])
         assert result.exit_code == 0
-        scan_result = _load_json_result(result_file)
+        scan_result = load_json_result(result_file)
         # a single test.tst file and its directory that is not a VCS file should
         # be listed
         assert 1 == scan_result['files_count']
@@ -171,7 +171,7 @@ def test_scancode_ignore_single_file(self):
             ['--copyright', '--strip-root', '--ignore', 'sample.doc',
              test_dir, '--json', result_file])
         assert result.exit_code == 0
-        scan_result = _load_json_result(result_file)
+        scan_result = load_json_result(result_file)
         assert 3 == scan_result['files_count']
         # FIXME: add assert 3 == scan_result['dirs_count']
         scan_locs = [x['path'] for x in scan_result['files']]
@@ -193,7 +193,7 @@ def test_scancode_ignore_multiple_files(self):
                                  '--ignore', 'ignore.doc', test_dir,
                                  '--json', result_file])
         assert result.exit_code == 0
-        scan_result = _load_json_result(result_file)
+        scan_result = load_json_result(result_file)
         assert 2 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
         expected = [
@@ -212,7 +212,7 @@ def test_scancode_ignore_glob_files(self):
                                  '--ignore', '*.doc', test_dir,
                                  '--json', result_file])
         assert result.exit_code == 0
-        scan_result = _load_json_result(result_file)
+        scan_result = load_json_result(result_file)
         assert 1 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
         expected = [
@@ -231,7 +231,7 @@ def test_scancode_ignore_glob_path(self):
                                  '--ignore', '*/src/test/*', test_dir,
                                  '--json', result_file])
         assert result.exit_code == 0
-        scan_result = _load_json_result(result_file)
+        scan_result = load_json_result(result_file)
         assert 2 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
         expected = [
@@ -252,7 +252,7 @@ def test_scancode_multiple_ignores(self):
                                  '--ignore', '*.doc', 
                                  test_dir, '--json', result_file])
         assert result.exit_code == 0
-        scan_result = _load_json_result(result_file)
+        scan_result = load_json_result(result_file)
         assert 0 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
         assert [u'user', u'user/src'] == scan_locs

From ac28e69c0f09574048fe3ecd374f297e7e505cfc Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 18:12:38 +0100
Subject: [PATCH 080/122] Use posix paths for tests on all OSes #787

 * tests were failing on Windows otehrwise

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/scancode/test_plugin_ignore.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
index ee364356e1a..474a9a62fcd 100644
--- a/tests/scancode/test_plugin_ignore.py
+++ b/tests/scancode/test_plugin_ignore.py
@@ -69,7 +69,7 @@ def check_ProcessIgnore(self, test_dir, expected, ignore):
         codebase = Codebase(test_dir)
         test_plugin = ProcessIgnore()
         test_plugin.process_codebase(codebase, ignore=ignore)
-        resources = [res.get_path(strip_root=True, decode=True)
+        resources = [res.get_path(strip_root=True, decode=True, posix=True)
                      for res in codebase.walk(skip_root=True)]
         assert expected == sorted(resources)
 

From 9230d818c29ebd6f814d02c11a771a4f3127f209 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 18:22:34 +0100
Subject: [PATCH 081/122] Make scancode_config._create_dir work on Win #685
 #357

 * this is now essentailly a copy of commoncode.fileutils.create_dir()

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode_config.py | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/scancode_config.py b/src/scancode_config.py
index a89b01b988f..f2a206de96a 100644
--- a/src/scancode_config.py
+++ b/src/scancode_config.py
@@ -27,6 +27,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import errno
 import os
 from os.path import abspath
 from os.path import dirname
@@ -43,13 +44,47 @@
 """
 
 
+# this exception is not available on posix
+try:
+    WindowsError  # @UndefinedVariable
+except NameError:
+    WindowsError = None  # @ReservedAssignment
+
 def _create_dir(location):
     """
-    Create all the directories are location
+    Create directory and all sub-directories recursively at `location`.
+    Raise Exceptions if it fails to create the directory.
+    NOTE: this is essentailly a copy of commoncode.fileutils.create_dir()
     """
-    if not exists(location):
+
+    if exists(location):
+        if not os.path.isdir(location):
+            err = ('Cannot create directory: existing file '
+                   'in the way ''%(location)s.')
+            raise OSError(err % locals())
+        return
+
+    # may fail on win if the path is too long
+    # FIXME: consider using UNC ?\\ paths
+    try:
         os.makedirs(location)
 
+    # avoid multi-process TOCTOU conditions when creating dirs
+    # the directory may have been created since the exist check
+    except WindowsError, e:
+        # [Error 183] Cannot create a file when that file already exists
+        if e and e.winerror == 183:
+            if not os.path.isdir(location):
+                raise
+        else:
+            raise
+    except (IOError, OSError), o:
+        if o.errno == errno.EEXIST:
+            if not os.path.isdir(location):
+                raise
+        else:
+            raise
+
 
 ################################################################################
 # INVARIABLE INSTALLATION-SPECIFIC, BUILT-IN LOCATIONS AND FLAGS

From 017bc818f79333eb551248b04901a5f389a048c6 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 22:17:21 +0100
Subject: [PATCH 082/122] Add extra timeout for failing windows tests  #685
 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/scancode/test_cli.py | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index 3b76fa294bc..17a15626524 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -111,7 +111,10 @@ def test_license_option_detects_licenses():
     test_dir = test_env.get_test_loc('license', copy=True)
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(['--license', test_dir, '--json', result_file])
+    args = ['--license', test_dir, '--json', result_file]
+    if on_windows:
+        args += ['--timeout', 400]
+    result = run_scan_click(args)
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
     assert os.path.exists(result_file)
@@ -238,7 +241,10 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
 
-    result = run_scan_click([ '--copyright', '--strip-root', test_file, '--json', result_file])
+    args = ['--copyright', '--strip-root', test_file, '--json', result_file]
+    if on_windows:
+        args += ['--timeout', 400]
+    result = run_scan_click(args)
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
     check_json_scan(test_env.get_test_loc('failing/patchelf.expected.json'), result_file)
@@ -249,7 +255,10 @@ def test_scan_with_errors_always_includes_full_traceback():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
 
-    result = run_scan_click([ '--copyright', test_file, '--json', result_file])
+    args = ['--copyright', test_file, '--json', result_file]
+    if on_windows:
+        args += ['--timeout', 400]
+    result = run_scan_click(args)
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
     assert 'Some files failed to scan' in result.output
@@ -540,7 +549,10 @@ def test_scan_can_run_from_other_directory():
 
 def test_scan_logs_errors_messages_not_verbosely_on_stderr():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', '-n', '0', test_file, '--json', '-'])
+    args = ['-pi', '-n', '0', test_file, '--json', '-']
+    if on_windows:
+        args += ['--timeout', 400]
+    rc, stdout, stderr = run_scan_plain(args)
     assert rc == 1
     assert 'Path: errors/package.json' in stderr
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
@@ -549,7 +561,10 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr():
 
 def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', '-n', '2', test_file, '--json', '-'])
+    args = ['-pi', '-n', '2', test_file, '--json', '-']
+    if on_windows:
+        args += ['--timeout', 400]
+    rc, stdout, stderr = run_scan_plain(args)
     assert rc == 1
     assert 'Path: errors/package.json' in stderr
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
@@ -558,7 +573,10 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing(
 
 def test_scan_logs_errors_messages_verbosely_with_verbose():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', '--verbose', '-n', '0', test_file, '--json', '-'])
+    args = ['-pi', '--verbose', '-n', '0', test_file, '--json', '-']
+    if on_windows:
+        args += ['--timeout', 400]
+    rc, stdout, stderr = run_scan_plain(args)
     assert rc == 1
     assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout
@@ -568,7 +586,10 @@ def test_scan_logs_errors_messages_verbosely_with_verbose():
 
 def test_scan_logs_errors_messages_verbosely_with_verbose_and_multiprocessing():
     test_file = test_env.get_test_loc('errors', copy=True)
-    rc, stdout, stderr = run_scan_plain(['-pi', '--verbose', '-n', '2', test_file, '--json', '-'])
+    args = ['-pi', '--verbose', '-n', '2', test_file, '--json', '-']
+    if on_windows:
+        args += ['--timeout', 400]
+    rc, stdout, stderr = run_scan_plain(args)
     assert rc == 1
     assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout

From 0efe66c7f3878a1d67de0e397bf45517b1ddd13d Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 22:17:21 +0100
Subject: [PATCH 083/122] Add extra timeout for failing windows tests  #685
 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/formattedcode/test_output_templated.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/formattedcode/test_output_templated.py b/tests/formattedcode/test_output_templated.py
index f40c0a90e75..a3b5febaf4b 100644
--- a/tests/formattedcode/test_output_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -33,6 +33,7 @@
 from scancode_config import __version__
 
 from commoncode import fileutils
+from commoncode.system import on_windows
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
 
@@ -77,7 +78,7 @@ def test_scanned_path_is_present_in_html_app_output():
     assert 'Scanning done' in result.output
 
     results = open(result_file).read()
-    
+
     assert '<title>ScanCode scan results for: %(test_dir)s</title>' % locals() in results
     assert '<div class="row" id = "scan-result-header">' % locals() in results
     assert '<strong>scan results for:</strong>' % locals() in results
@@ -89,9 +90,12 @@ def test_scan_html_output_does_not_truncate_copyright_html():
     test_dir = test_env.get_test_loc('templated/tree/scan/')
     result_file = test_env.get_temp_file('test.html')
 
-    result = run_scan_click(
-        ['-clip', '--strip-root', '-n', '3', test_dir,
-         '--output-html', result_file])
+    args = ['-clip', '--strip-root', '-n', '3', test_dir,
+            '--output-html', result_file]
+    if on_windows:
+        args += ['--timeout', 400]
+
+    result = run_scan_click(args)
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
 

From 911e8cb10ee43238b73c935c5643b5d50a8af81c Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Wed, 24 Jan 2018 23:55:32 +0100
Subject: [PATCH 084/122] Add extra debug infor for failing windows tests  #685
 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/formattedcode/test_output_templated.py |  8 ++++++--
 tests/scancode/test_cli.py                   | 14 +++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/tests/formattedcode/test_output_templated.py b/tests/formattedcode/test_output_templated.py
index a3b5febaf4b..63eb341e69b 100644
--- a/tests/formattedcode/test_output_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -93,10 +93,12 @@ def test_scan_html_output_does_not_truncate_copyright_html():
     args = ['-clip', '--strip-root', '-n', '3', test_dir,
             '--output-html', result_file]
     if on_windows:
-        args += ['--timeout', 400]
+        args += ['--timeout', '400']
 
     result = run_scan_click(args)
-    assert result.exit_code == 0
+    print('------------------------------------------------')
+    print(result.output)
+    print('------------------------------------------------')
     assert 'Scanning done' in result.output
 
     results = open(result_file).read()
@@ -130,6 +132,8 @@ def test_scan_html_output_does_not_truncate_copyright_html():
         check = re.findall(exp, results, re.MULTILINE)
         assert check
 
+    assert result.exit_code == 0
+
 
 def test_custom_format_with_custom_filename_fails_for_directory():
     test_dir = test_env.get_temp_dir('html')
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index 17a15626524..bbeb6db0371 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -113,7 +113,7 @@ def test_license_option_detects_licenses():
 
     args = ['--license', test_dir, '--json', result_file]
     if on_windows:
-        args += ['--timeout', 400]
+        args += ['--timeout', '400']
     result = run_scan_click(args)
     assert result.exit_code == 0
     assert 'Scanning done' in result.output
@@ -243,7 +243,7 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
 
     args = ['--copyright', '--strip-root', test_file, '--json', result_file]
     if on_windows:
-        args += ['--timeout', 400]
+        args += ['--timeout', '400']
     result = run_scan_click(args)
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
@@ -257,7 +257,7 @@ def test_scan_with_errors_always_includes_full_traceback():
 
     args = ['--copyright', test_file, '--json', result_file]
     if on_windows:
-        args += ['--timeout', 400]
+        args += ['--timeout', '400']
     result = run_scan_click(args)
     assert result.exit_code == 1
     assert 'Scanning done' in result.output
@@ -551,7 +551,7 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr():
     test_file = test_env.get_test_loc('errors', copy=True)
     args = ['-pi', '-n', '0', test_file, '--json', '-']
     if on_windows:
-        args += ['--timeout', 400]
+        args += ['--timeout', '400']
     rc, stdout, stderr = run_scan_plain(args)
     assert rc == 1
     assert 'Path: errors/package.json' in stderr
@@ -563,7 +563,7 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing(
     test_file = test_env.get_test_loc('errors', copy=True)
     args = ['-pi', '-n', '2', test_file, '--json', '-']
     if on_windows:
-        args += ['--timeout', 400]
+        args += ['--timeout', '400']
     rc, stdout, stderr = run_scan_plain(args)
     assert rc == 1
     assert 'Path: errors/package.json' in stderr
@@ -575,7 +575,7 @@ def test_scan_logs_errors_messages_verbosely_with_verbose():
     test_file = test_env.get_test_loc('errors', copy=True)
     args = ['-pi', '--verbose', '-n', '0', test_file, '--json', '-']
     if on_windows:
-        args += ['--timeout', 400]
+        args += ['--timeout', '400']
     rc, stdout, stderr = run_scan_plain(args)
     assert rc == 1
     assert 'package.json' in stderr
@@ -588,7 +588,7 @@ def test_scan_logs_errors_messages_verbosely_with_verbose_and_multiprocessing():
     test_file = test_env.get_test_loc('errors', copy=True)
     args = ['-pi', '--verbose', '-n', '2', test_file, '--json', '-']
     if on_windows:
-        args += ['--timeout', 400]
+        args += ['--timeout', '400']
     rc, stdout, stderr = run_scan_plain(args)
     assert rc == 1
     assert 'package.json' in stderr

From 2efcd99a88318906e568ef54b6e075365241cecd Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 25 Jan 2018 12:07:55 +0100
Subject: [PATCH 085/122] Ensure that to_dict works with not-set values #787

 * this can happen if info scan failed somehow

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/resource.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index afdab6cafc1..298e09d4098 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -851,9 +851,9 @@ def to_dict(self, full_root=False, strip_root=False,
             absolute=full_root, strip_root=strip_root, decode=True, posix=True))
         if with_info:
             res['type'] = self.type
-            res['name'] = fsdecode(self.name)
-            res['base_name'] = fsdecode(self.base_name)
-            res['extension'] = self.extension and fsdecode(self.extension)
+            res['name'] = self.name and fsdecode(self.name) or ''
+            res['base_name'] = self.base_name and fsdecode(self.base_name) or ''
+            res['extension'] = self.extension and fsdecode(self.extension)  or ''
             res['date'] = self.date
             res['size'] = self.size
             res['sha1'] = self.sha1

From ca2621f863ecc35a9d8100a04e4f26f90057d3bc Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 25 Jan 2018 14:29:51 +0100
Subject: [PATCH 086/122] Use less deep path on Windows

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 ...variant.0 variant => copyright_wxWindows Library .0 variant} | 0
 tests/cluecode/test_copyrights.py                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/cluecode/data/copyrights/{copyright_license_text_lgpl_wxwindows_library_licence_v3_0_variant-LGPL wxWindows Library Licence v_ variant.0 variant => copyright_wxWindows Library .0 variant} (100%)

diff --git a/tests/cluecode/data/copyrights/copyright_license_text_lgpl_wxwindows_library_licence_v3_0_variant-LGPL wxWindows Library Licence v_ variant.0 variant b/tests/cluecode/data/copyrights/copyright_wxWindows Library .0 variant
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_lgpl_wxwindows_library_licence_v3_0_variant-LGPL wxWindows Library Licence v_ variant.0 variant
rename to tests/cluecode/data/copyrights/copyright_wxWindows Library .0 variant
diff --git a/tests/cluecode/test_copyrights.py b/tests/cluecode/test_copyrights.py
index 26a0dbc9bc5..a1fb550ae1d 100644
--- a/tests/cluecode/test_copyrights.py
+++ b/tests/cluecode/test_copyrights.py
@@ -2271,7 +2271,7 @@ def test_copyright_license_text_lgpl_v3(self):
         check_detection(expected, test_file)
 
     def test_copyright_license_text_lgpl_wxwindows_library_licence_v3_0_variant(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_lgpl_wxwindows_library_licence_v3_0_variant-LGPL wxWindows Library Licence v_ variant.0 variant')
+        test_file = self.get_test_loc('copyrights/copyright_wxWindows Library .0 variant')
         expected = [
             'Copyright (c) 1998 Julian Smart, Robert Roebling',
         ]

From 8d77d0ad2d213b9889fd2f2b74f2a7e08e8bd468 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 00:47:14 +0100
Subject: [PATCH 087/122] Shorten cpoyright test file names for Windows #787

 * otherwise some test fail in somce layouts

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/cluecode/cluecode_assert_utils.py       |   29 +-
 .../03e16f6c_0-e_f_c.0}                       |    0
 .../3a3b02ce_0-a_b_ce.0}                      |    0
 .../ABC_cpp-Case_cpp.cpp}                     |    0
 .../ABC_file_cpp-File_cpp.cpp}                |    0
 .../copyright_abc => copyright_lines/abc}     |    0
 .../abc_loss_of_holder_c-c.c}                 |    0
 .../abiword_common.copyright}                 |    0
 .../acme_c-c.c}                               |    0
 ...ldattribute_cs-ActiveFieldAttribute_cs.cs} |    0
 .../addr_c-addr_c.c}                          |    0
 .../adler_inflate_c-inflate_c.c}              |    0
 .../aleal-c.c}                                |    0
 .../andre_darcy-c.c}                          |    0
 .../android_c-c.c}                            |    0
 .../apache_notice-NOTICE}                     |    0
 .../aptitude-aptitude.label}                  |    0
 .../atheros_spanning_lines-py.py}             |    0
 .../att_in_c-9_c.c}                           |    0
 .../audio_c-c.c}                              |    0
 .../babkin_txt.txt}                           |    0
 .../blender_debian-blender.copyright}         |    0
 .../company_name_in_java-9_java.java          |   20 +
 .../essential_smoke-ibm_c.c}                  |    0
 .../heunrich_c-c.c}                           |    0
 .../isc-c.c}                                  |    0
 .../sample_py-py.py}                          |    0
 .../data/copyright_lines/vector50.hpp         |  174 ++
 .../data/copyrights/03e16f6c_0-e_f_c.0        |   78 +
 .../data/copyrights/3a3b02ce_0-a_b_ce.0       |   84 +
 .../data/copyrights/ABC_cpp-Case_cpp.cpp      |   14 +
 .../data/copyrights/ABC_file_cpp-File_cpp.cpp |   14 +
 ...NG_gpl.gpl => COPYING_gpl-COPYING_gpl.gpl} |    0
 ...PYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi} |    0
 ...pyright_in_README-README => README-README} |    0
 ...opyright_Yocto-SPDX.pdf => Yocto-SPDX.pdf} |  Bin
 tests/cluecode/data/copyrights/abc            |    2 +
 .../data/copyrights/abc_loss_of_holder_c-c.c  |    2 +
 .../data/copyrights/abiword_common.copyright  |  152 ++
 tests/cluecode/data/copyrights/acme_c-c.c     |    1 +
 ...eldattribute_cs-ActiveFieldAttribute_cs.cs |   40 +
 ...daptive v.0 => adaptive_v1_0-Adaptive v.0} |    0
 .../cluecode/data/copyrights/addr_c-addr_c.c  |   23 +
 .../copyrights/adler_inflate_c-inflate_c.c    |  952 +++++++++
 ...t_license_text_adobe-Adobe => adobe-Adobe} |    0
 ...adobe_flashplugin-adobe_flashplugin.label} |    0
 ...beflex_sdk => adobeflex2sdk-Adobeflex_sdk} |    0
 ...plv1-AfferoGPLv => afferogplv1-AfferoGPLv} |    0
 ...plv2-AfferoGPLv => afferogplv2-AfferoGPLv} |    0
 ...plv3-AfferoGPLv => afferogplv3-AfferoGPLv} |    0
 ...text_afl_v3_0-AFL_v.0 => afl_v3_0-AFL_v.0} |    0
 ...ublic_license-Aladdin Free Public License} |    0
 tests/cluecode/data/copyrights/aleal-c.c      |    3 +
 ...mazondsb-AmazonDSb => amazondsb-AmazonDSb} |    0
 ...xt_ampasbsd-AMPASBSD => ampasbsd-AMPASBSD} |    0
 .../cluecode/data/copyrights/andre_darcy-c.c  |   28 +
 ...colin_android-bsdiff_c.c => android_c-c.c} |    0
 ..._debian_trailing_name_missed-apache.label} |    0
 ...pache_in_html.html => apache_in_html.html} |    0
 .../data/copyrights/apache_notice-NOTICE      |   35 +
 ...chev1_0-Apachev.0 => apachev1_0-Apachev.0} |    0
 ...chev1_1-Apachev.1 => apachev1_1-Apachev.1} |    0
 ...-Apachev_b.0b => apachev2_0b-Apachev_b.0b} |    0
 ..._0-Apple Common Documentation License v.0} |    0
 ...ense_v1_0-Apple Public Source License v.0} |    0
 ...ense_v1_1-Apple Public Source License v.1} |    0
 ...ense_v1_2-Apple Public Source License v.2} |    0
 ...text_apslv2_0-APSLv.0 => apslv2_0-APSLv.0} |    0
 .../data/copyrights/aptitude-aptitude.label   |    6 +
 ...rtistic v.0 => artistic_v1_0-Artistic v.0} |    0
 ...stic_v1_0_short-Artistic v_ short.0 short} |    0
 ...artistic_v2_0beta4-Artistic v_beta.0beta4} |    0
 ...0-Artisticv.0 => artisticv2_0-Artisticv.0} |    0
 .../copyrights/atheros_spanning_lines-py.py   |   16 +
 tests/cluecode/data/copyrights/att_in_c-9_c.c |   18 +
 ...urancelicense-AttributionAssuranceLicense} |    0
 tests/cluecode/data/copyrights/audio_c-c.c    |    5 +
 tests/cluecode/data/copyrights/babkin_txt.txt |    5 +
 ...t_in_bash-shell_sh.sh => bash-shell_sh.sh} |    0
 ...w&Holmes => bigelow_holmes-Bigelow&Holmes} |    0
 ...d_lib.lib => binary_lib-php_embed_lib.lib} |  Bin
 ...xt_bitstream-Bi_ream => bitstream-Bi_ream} |    0
 .../blender_debian-blender.copyright          |   57 +
 ..._in_name-c.c => blue_sky_dash_in_name-c.c} |    0
 ...license-LICENSE => bouncy_license-LICENSE} |    0
 ...notice-9_NOTICE => bouncy_notice-9_NOTICE} |    0
 ...cense_text_bsdnrl-BSDNRL => bsdnrl-BSDNRL} |    0
 ...plot_py.py => btt_plot1_py-btt_plot_py.py} |    0
 .../copyrights/{copyright_in_c-c.c => c-c.c}  |    0
 ...pyright_in_c_include-h.h => c_include-h.h} |    0
 ...lcase_br_diagnostics_h-br_diagnostics_h.h} |    0
 ...d_psipstack_c-br_fcc_thread_psipstack_c.c} |    0
 ...{copyright_ccube_txt.txt => ccube_txt.txt} |    0
 ...k_java-java.java => cedrik_java-java.java} |    0
 ..._java.java => cern-TestMatrix_D_java.java} |    0
 ...cern_matrix2d_java-TestMatrix_D_java.java} |    0
 ..._S.S => chameleon_assembly-9_9_setjmp_S.S} |    0
 ...right_license_text_cnri-CNRI => cnri-CNRI} |    0
 ...-copyright_java.java => co_cust-java.java} |    0
 .../data/copyrights/colin_android-bsdiff_c.c  |  410 ++++
 ...pany_in_txt-9.txt => company_in_txt-9.txt} |    0
 ...=> complex_4_line_statement_in_text-9.txt} |    0
 ...ex_notice-NOTICE => complex_notice-NOTICE} |    0
 ...sun_microsystems_on_multiple_lines-NOTICE} |    0
 ...tra_For-Condor => condor_extra_For-Condor} |    0
 ..._guess.guess => config-config_guess.guess} |    0
 ...guess => config1_guess-config_guess.guess} |    0
 .../copyright_license_text_gsoap-gSOAP        |  158 --
 ...t => coreutils_debian-coreutils.copyright} |    0
 ...ht_dag_c-s_fabsl_c.c => dag_c-s_fabsl_c.c} |    0
 ...notice-NOTICE => dag_elring_notice-NOTICE} |    0
 ...in_name-Makefile => dash_in_name-Makefile} |    0
 ...yright_label.label => dasher-dasher.label} |    0
 ...hua_in_c-c.c => date_range_dahua_in_c-c.c} |    0
 ...ate_range_in_c-c.c => date_range_in_c-c.c} |    0
 ...range_in_c_2-c.c => date_range_in_c_2-c.c} |    0
 ..._keyring-debian_archive_keyring.copyright} |    0
 ...l => debian_lib_1-libmono_cairo_cil.label} |    0
 ... debian_lib_2-libmono_cairo_cil.copyright} |    0
 ...bian_lib_3-libmono_security_cil.copyright} |    0
 ...ulti_names_on_one_line-libgdata.copyright} |    0
 ...opyright_dionysos_c-c.c => dionysos_c-c.c} |    0
 ...opyright_disclaimed-c.c => disclaimed-c.c} |    0
 ...libre_desktop-djvulibre_desktop.copyright} |    0
 ...ll-9_msvci_dll.dll => dll-9_msvci_dll.dll} |  Bin
 ...copyright_license_text_doc-DOC => doc-DOC} |    0
 ...l_doc_html-docbook_xsl_doc_html.copyright} |    0
 ...rand48_c-drand_c.c => drand48_c-drand_c.c} |    0
 ...Dual MPL GPL => dual_mpl_gpl-Dual MPL GPL} |    0
 ...it-DualMPL_MIT => dualmpl_mit-DualMPL_MIT} |    0
 ...nse_text_eclv1_0-ECLv.0 => eclv1_0-ECLv.0} |    0
 ...text_ecosv2_0-eCosv.0 => ecosv2_0-eCosv.0} |    0
 ...ed_copyright.copyright => ed-ed.copyright} |    0
 ...e_text_entessa-Entessa => entessa-Entessa} |    0
 ..._browser_data-epiphany_browser_data.label} |    0
 ..._eplv1_0b-EPLv_b.0b => eplv1_0b-EPLv_b.0b} |    0
 ...ight_eric_young_c-c.c => eric_young_c-c.c} |    0
 ...ht_errno_atheros-c.c => errno_atheros-c.c} |    0
 ..._ah_h-ah_h.h => errno_atheros_ah_h-ah_h.h} |    0
 .../{copyright_errno_c-c.c => errno_c-c.c}    |    0
 ...java-java.java => esmertec_java-java.java} |    0
 .../data/copyrights/essential_smoke-ibm_c.c   |   24 +
 ...agrid-EUDatagrid => eudatagrid-EUDatagrid} |    0
 ...2-Eurosym_v.v2 => eurosym_v2-Eurosym_v.v2} |    0
 ...ht_expat_h-expat_h.h => expat_h-expat_h.h} |    0
 ...ext_all_js.js => ext_all_js-ext_all_js.js} |    0
 .../{copyright_extjs_c-c.c => extjs_c-c.c}    |    0
 ...> false_positive_in_c-false_positives_c.c} |    0
 ...false_positive_in_js-editor_beta_de_js.js} |    0
 ...ENSE => false_positive_in_license-LICENSE} |    0
 ...rameworxv.0 => frameworxv1_0-Frameworxv.0} |    0
 ...e_text_freebsd-FreeBSD => freebsd-FreeBSD} |    0
 ...xt_freetype-FreeType => freetype-FreeType} |    0
 ...ight_fsf_py-999_py.py => fsf_py-999_py.py} |    0
 .../{copyright_gailly-c.c => gailly-c.c}      |    0
 ...opyright_geoff_js-js.js => geoff_js-js.js} |    0
 ...text_gfdlv1_2-GFDLv.2 => gfdlv1_2-GFDLv.2} |    0
 ...text_gfdlv1_3-GFDLv.3 => gfdlv1_3-GFDLv.3} |    0
 ...t_license_text_glide-Glide => glide-Glide} |    0
 ... => gnome_session-gnome_session.copyright} |    0
 ...em_monitor-gnome_system_monitor.copyright} |    0
 ...system_monitor-gnome_system_monitor.label} |    0
 ...e_text_gnuplot-gnuplot => gnuplot-gnuplot} |    0
 ...ht.copyright => gobjc_4_3-gobjc.copyright} |    0
 ...gle_closure_templates_java_html-html.html} |    0
 ...ogle_view_layout1_xml-view_layout_xml.xml} |    0
 ...license_text_gpl_v1-GPL_v => gpl_v1-GPL_v} |    0
 ...license_text_gpl_v2-GPL_v => gpl_v2-GPL_v} |    0
 ...license_text_gpl_v3-GPL_v => gpl_v3-GPL_v} |    0
 .../{copyright_group-c.c => group-c.c}        |    0
 .../{copyright_gsoap-gSOAP => gsoap-gSOAP}    |    0
 ...luendo_mp3-gstreamer_fluendo_mp.copyright} |    0
 .../copyrights/{copyright_in_h-h.h => h-h.h}  |    0
 ..._hall-copyright.txt => hall-copyright.txt} |    0
 ..._html.html => hans_jurgen_htm-9_html.html} |    0
 ...yright_hansen_cs-cs.cs => hansen_cs-cs.cs} |    0
 ...attach_qualcomm1_c-hciattach_qualcomm_c.c} |    0
 ...t_license_text_helix-Helix => helix-Helix} |    0
 tests/cluecode/data/copyrights/heunrich_c-c.c |    6 +
 ...ackard => hewlett_packard-Hewlett_Packard} |    0
 ..._label.label => hibernate-hibernate.label} |    0
 ...mm_c.c => holtmann-hciattach_qualcomm_c.c} |    0
 ..._cli_c.c => hostapd_cli_c-hostapd_cli_c.c} |    0
 ...ailable.c => hostapd_trailing_available.c} |    0
 ...ight_hp_notice-NOTICE => hp_notice-NOTICE} |    0
 ...abel.label => hpijs_ppds-hpijs_ppds.label} |    0
 .../{copyright_in_html.html => html.html}     |    0
 ...ents-html.html => html_comments-html.html} |    0
 ...html => html_incorrect-detail_9_html.html} |    0
 ...{copyright_ibm_c-ibm_c.c => ibm_c-ibm_c.c} |    0
 ...pl_v1_0-IBMPL_v.0 => ibmpl_v1_0-IBMPL_v.0} |    0
 ...yright_label.label => icedax-icedax.label} |    0
 ...right_license_text_ietf-IETF => ietf-IETF} |    0
 ...c-ifrename_c.c => ifrename_c-ifrename_c.c} |    0
 ...copyright_license_text_ijg-IJG => ijg-IJG} |    0
 ...-9_html.html => illinois_html-9_html.html} |    0
 ...cense_text_imatix-iMatix => imatix-iMatix} |    0
 ...license_text_imlib2-Imlib => imlib2-Imlib} |    0
 ...older_c-c.c => inria_loss_of_holder_c-c.c} |    0
 ...t_license_text_intel-Intel => intel-Intel} |    0
 tests/cluecode/data/copyrights/isc-c.c        |    4 +
 ...cense_text_jabber-Jabber => jabber-Jabber} |    0
 ...opyright_java-java.java => java-java.java} |    0
 ...{copyright_jdoe-copyright_c.c => jdoe-c.c} |    0
 ...e_text_jpython-JPython => jpython-JPython} |    0
 ..._phps.phps => json_in_phps-JSON_phps.phps} |    0
 ... => json_in_phps_incorrect-JSON_phps.phps} |    0
 ...tml => json_phps_html-JSON_phps_html.html} |    0
 ...n_phps_html_incorrect-JSON_phps_html.html} |    0
 ..._all_CAPS-jsp.jsp => jsp_all_CAPS-jsp.jsp} |    0
 ...ight.copyright => kaboom-kaboom.copyright} |    0
 ...ight.copyright => kbuild-kbuild.copyright} |    0
 ...t => kde_l10n_zhcn-kde_l_n_zhcn.copyright} |    0
 ...rosen-LarryRosen => larryrosen-LarryRosen} |    0
 ...ex_v1_0-LaTeX_v.0 => latex_v1_0-LaTeX_v.0} |    0
 ...ex_v1_1-LaTeX_v.1 => latex_v1_1-LaTeX_v.1} |    0
 ...ex_v1_2-LaTeX_v.2 => latex_v1_2-LaTeX_v.2} |    0
 ...-LaTeX_v_a.3a => latex_v1_3a-LaTeX_v_a.3a} |    0
 ...f => latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref} |    0
 ...-LaTeX_v_c.3c => latex_v1_3c-LaTeX_v_c.3c} |    0
 ...opyright_leonardo_c-c.c => leonardo_c-c.c} |    0
 ..._lgpl_v2_0-LGPL_v.0 => lgpl_v2_0-LGPL_v.0} |    0
 ..._lgpl_v2_1-LGPL_v.1 => lgpl_v2_1-LGPL_v.1} |    0
 ...nse_text_lgpl_v3-LGPL_v => lgpl_v3-LGPL_v} |    0
 ...t.copyright => libadns1-libadns.copyright} |    0
 ....copyright => libc6_i686-libc_i.copyright} |    0
 ...ht_label.label => libcdio10-libcdio.label} |    0
 ...t.copyright => libcelt0-libcelt.copyright} |    0
 ..._perl-libcompress_raw_zlib_perl.copyright} |    0
 ...right => libcpufreq0-libcpufreq.copyright} |    0
 ...sleay_perl-libcrypt_ssleay_perl.copyright} |    0
 ...ht => libepc_ui_1_0_1-libepc_ui.copyright} |    0
 ....label => libepc_ui_1_0_2-libepc_ui.label} |    0
 ...copyright => libfltk1_1-libfltk.copyright} |    0
 ...ht_label.label => libgail18-libgail.label} |    0
 ...mh0_target_x-libggiwmh_target_x.copyright} |    0
 ...nome_desktop_2-libgnome_desktop.copyright} |    0
 ... libgnome_media0-libgnome_media.copyright} |    0
 ....label => libgoffice_0_8-libgoffice.label} |    0
 ...ght => libgtkhtml2_0-libgtkhtml.copyright} |    0
 ...ht.copyright => libisc44-libisc.copyright} |    0
 ...yright => libisccfg30-libisccfg.copyright} |    0
 ...yright => libisccfg40-libisccfg.copyright} |    0
 ....copyright => libjpeg62-libjpeg.copyright} |    0
 ...l.label => libkeyutils1-libkeyutils.label} |    0
 ...ale_gettext_perl-liblocale_get_perl.label} |    0
 ...bel.label => libopenraw1-libopenraw.label} |    0
 ...libopenthreads12-libopenthreads.copyright} |    0
 ...k_connector-libpam_ck_connector.copyright} |    0
 ...right => libpoppler3-libpoppler.copyright} |    0
 ...4_scripttools-libqt_scripttools.copyright} |    0
 ...ibqtscript4_gui-libqtscript_gui.copyright} |    0
 ...copyright => libsocks4-libsocks.copyright} |    0
 ...libsox_fmt_alsa-libsox_fmt_alsa.copyright} |    0
 ...copyright => libspeex1-libspeex.copyright} |    0
 ...> libstlport4_6ldbl-libstlport_ldbl.label} |    0
 ...ght.copyright => libtdb1-libtdb.copyright} |    0
 ...ght.copyright => libuim6-libuim.copyright} |    0
 ...t.copyright => libxext6-libxext.copyright} |    0
 ...ght => libxmlrpc_c3-libxmlrpc_c.copyright} |    0
 ...pyright_label.label => libxt6-libxt.label} |    0
 ...L_v.0 => license_qpl_v1_0_perfect-QPL_v.0} |    0
 ...> linux_source_2_6-linux_source.copyright} |    0
 ...v1_0-Logica_v.0 => logica_v1_0-Logica_v.0} |    0
 ...s_of_holder_c-c.c => loss_of_holder_c-c.c} |    0
 ...fonts-Luxi_fonts => luxi_fonts-Luxi_fonts} |    0
 ...right_license_text_maia-Maia => maia-Maia} |    0
 ...c => matroska_demux1_c-matroska_demux_c.c} |    0
 ....c => matroska_demux_c-matroska_demux_c.c} |    0
 ...atroska_demux_muller_c-matroska_demux_c.c} |    0
 ..._xml.xml => maven_pom_xstream-pom_xml.xml} |    0
 ...ght_in_media-a_png.png => media-a_png.png} |  Bin
 ...cmp_S.S => memcmp_assembly-9_9_memcmp_S.S} |    0
 ...ava => mergesort_java-MergeSort_java.java} |    0
 ...right_in_phps-phps.phps => michal_txt.txt} |    0
 ...1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu} |    0
 ...xt => missing_statement_file_txt-file.txt} |    0
 .../copyrights/{copyright_mit.txt => mit.txt} |    0
 ...obeGlyph => mit_adobeglyph-MIT_AdobeGlyph} |    0
 ...e_text_mit_cmu-MIT_CMU => mit_cmu-MIT_CMU} |    0
 ...it_danse-MIT_Danse => mit_danse-MIT_Danse} |    0
 ...it_danse-MIT_danse => mit_danse-MIT_danse} |    0
 ...xt_mit_enna-MIT_enna => mit_enna-MIT_enna} |    0
 ...ax-MIT_hylafax => mit_hylafax-MIT_hylafax} |    0
 ...e_text_mit_icu-MIT_ICU => mit_icu-MIT_ICU} |    0
 ...ucent-MIT_Lucent => mit_lucent-MIT_Lucent} |    0
 ...it_mlton-MIT_MLton => mit_mlton-MIT_MLton} |    0
 ...style_disclaimer4-MIT_OldStyle_disclaimer} |    0
 ...de-MIT_unicode => mit_unicode-MIT_unicode} |    0
 ...et-MIT_WordNet => mit_wordnet-MIT_WordNet} |    0
 ...t_license_text_mitre-MITRE => mitre-MITRE} |    0
 ...ixedcaps_c.c => mixedcaps_c-mixedcaps_c.c} |    0
 ...e_company_name_in_c-lowercase_company_c.c} |    0
 ...ht.copyright => mkisofs-mkisofs.copyright} |    0
 ...opyright_moto_broad-c.c => moto_broad-c.c} |    0
 ...opyright_motorola_c-c.c => motorola_c-c.c} |    0
 ...mobility_c-c.c => motorola_mobility_c-c.c} |    0
 ...yer_skin_blue-mplayer_skin_blue.copyright} |    0
 ...t_license_text_ms_pl-Ms_PL => ms_pl-Ms_PL} |    0
 ...t_license_text_ms_rl-Ms_RL => ms_rl-Ms_RL} |    0
 ...cense_text_ms_rsl-Ms_RSL => ms_rsl-Ms_RSL} |    0
 ...t_license_text_msntp-MSNTP => msntp-MSNTP} |    0
 .../{copyright_muller-c.c => muller-c.c}      |    0
 ...istorical.txt => multiline-Historical.txt} |    0
 ...al.txt => multiline_george-Historical.txt} |    0
 .../{copyright_mycorp_c-c.c => mycorp_c-c.c}  |    0
 ... => mysql_gplexception-MySQL_gplexception} |    0
 ...fore_copyright_c-c.c => name_before_c-c.c} |    0
 ...correct-c.c => name_sign_year_correct-c.c} |    0
 ...cense_text_naumen-Naumen => naumen-Naumen} |    0
 ...opyright_naumen_txt.txt => naumen_txt.txt} |    0
 ...ight => ncurses_bin-ncurses_bin.copyright} |    0
 .../{copyright_nederlof.txt => nederlof.txt}  |    0
 ...Components => netcomponents-NetComponents} |    0
 ...e_text_nethack-Nethack => nethack-Nethack} |    0
 ...opyright_nnp_and_co.txt => nnp_and_co.txt} |    0
 ...pyright_no_copyright_in_c-c.c => no_c-c.c} |    0
 ..._file_1-PersistentArrayHolder_class.class} |  Bin
 ...ile_2-PersistentElementHolder_class.class} |  Bin
 ...ersistentIndexedElementHolder_class.class} |  Bin
 ...4-PersistentListElementHolder_class.class} |  Bin
 ...ava-java.java => no_holder_java-java.java} |    0
 ...t_license_text_nokia-Nokia => nokia-Nokia} |    0
 ...ht_nokia_cpp-cpp.cpp => nokia_cpp-cpp.cpp} |    0
 ...opyright_north_c-99_c.c => north_c-99_c.c} |    0
 ...ight_notice2-9_NOTICE => notice2-9_NOTICE} |    0
 ..._txt-NOTICE.txt => notice2_txt-NOTICE.txt} |    0
 ...CE => notice_name_before_statement-NOTICE} |    0
 ...e_txt-NOTICE.txt => notice_txt-NOTICE.txt} |    0
 ...text_npl_v1_0-NPL_v.0 => npl_v1_0-NPL_v.0} |    0
 ...dia_source => nvidia_source-Nvidia_source} |    0
 ..._style_name.txt => o_brien_style_name.txt} |    0
 ...ummer_c_code-c.c => oberhummer_c_code-c.c} |    0
 ...berhummer_text.txt => oberhummer_text.txt} |    0
 ...jectiveC_m.m => objectivec-objectiveC_m.m} |    0
 ..._oclc_v1_0-OCLC_v.0 => oclc_v1_0-OCLC_v.0} |    0
 ..._oclc_v2_0-OCLC_v.0 => oclc_v2_0-OCLC_v.0} |    0
 ....label => openhackware-openhackware.label} |    0
 ...xt_openldap-OpenLDAP => openldap-OpenLDAP} |    0
 ...penmotif-OpenMotif => openmotif-OpenMotif} |    0
 ...enoffice_org_report_builder_bin.copyright} |    0
 ...noffice_org_report_builder_bin.copyright2} |    0
 ...e_text_openpbs-OpenPBS => openpbs-OpenPBS} |    0
 ... => openpublicationref-OpenPublicationref} |    0
 ...e_text_openssl-OpenSSL => openssl-OpenSSL} |    0
 .../{copyright_openssl-c.c => openssl-c.c}    |    0
 ...text_osl_v3_0-OSL_v.0 => osl_v3_0-OSL_v.0} |    0
 ...al_detection.txt => partial_detection.txt} |    0
 ...tion_mit.txt => partial_detection_mit.txt} |    0
 ...opyright => perl_base-perl_base.copyright} |    0
 ...ht_perl_module-pm.pm => perl_module-pm.pm} |    0
 .../{copyright_peter_c-c.c => peter_c-c.c}    |    0
 ...cense_text_phorum-Phorum => phorum-Phorum} |    0
 ...opyright_michal_txt.txt => phps-phps.phps} |    0
 ...va.java => piersol-TestMatrix_D_java.java} |    0
 ...right_license_text_pine-Pine => pine-Pine} |    0
 ...yright_pixelstream.rgb => pixelstream.rgb} |    0
 ...n_postcript-9__ps.ps => postcript-9_ps.ps} |  Bin
 ....label => postgresql_8_3-postgresql.label} |    0
 ...f_informatics.txt => prof_informatics.txt} |    0
 ...ght.txt => professional_txt-copyright.txt} |    0
 ...rties => properties-properties.properties} |    0
 ...or_py.py => psf_in_python-BitVector_py.py} |    0
 ...python_dateutil-python_dateutil.copyright} |    0
 ...ht => python_psyco-python_psyco.copyright} |    0
 ...l => python_reportbug-python_report.label} |    0
 ...ties-python_software_properties.copyright} |    0
 ...v1_6-Python_v.6 => python_v1_6-Python_v.6} |    0
 ..._1-Python_v.1 => python_v1_6_1-Python_v.1} |    0
 ..._python_v2-Python_v => python_v2-Python_v} |    0
 ...text_qpl_v1_0-QPL_v.0 => qpl_v1_0-QPL_v.0} |    0
 ...0-RealCSL_v.0 => realcsl_v2_0-RealCSL_v.0} |    0
 ...0-RealPSL_v.0 => realpsl_v1_0-RealPSL_v.0} |    0
 ...ref => realpsl_v1_0ref-RealPSL_v_ref.0ref} |    0
 ...cal_v.5 => reciprocal_v1_5-Reciprocal_v.5} |    0
 ...enoffice_org_report_builder_bin.copyright} |    0
 ...teula-RedHatEULA => redhateula-RedHatEULA} |    0
 ...edhatref-RedHatref => redhatref-RedHatref} |    0
 ...-strtol_c.c => regents_complex-strtol_c.c} |    0
 ...icense-LICENSE => regents_license-LICENSE} |    0
 ...opyright_resig_js-js.js => resig_js-js.js} |    0
 ...oh_v1_0-Ricoh_v.0 => ricoh_v1_0-Ricoh_v.0} |    0
 .../{copyright_rusty.txt => rusty.txt}        |    0
 .../{copyright_rusty_c-c.c => rusty_c-c.c}    |    0
 ...sl_c-s_fabsl_c.c => s_fabsl_c-s_fabsl_c.c} |    0
 ...e_java-java.java => sample_java-java.java} |    0
 ..._sample_no_copyright-c.c => sample_no-c.c} |    0
 .../cluecode/data/copyrights/sample_py-py.py  |    9 +
 ...cense_text_scilab-Scilab => scilab-Scilab} |    0
 ...ahorse_plugins-seahorse_plugins.copyright} |    0
 ...0-SGI_CID_v.0 => sgi_cid_v1_0-SGI_CID_v.0} |    0
 ...0-SGI_GLX_v.0 => sgi_glx_v1_0-SGI_GLX_v.0} |    0
 ...pyright => simgear1_0_0-simgear.copyright} |    0
 ...refa => sissl_v1_1refa-SISSL_v_refa.1refa} |    0
 ...leepycat-Sleepycat => sleepycat-Sleepycat} |    0
 ...yright_snippet_no_copyright => snippet_no} |    0
 ...nmptrapd_c.c => snmptrapd_c-snmptrapd_c.c} |    0
 ...{copyright_some_co-9_h.h => some_co-9_h.h} |    0
 ..._cpp.cpp => somefile_cpp-somefile_cpp.cpp} |    0
 ...or_projectinfo_java-ProjectInfo_java.java} |    0
 ....cpp => stacktrace_cpp-stacktrace_cpp.cpp} |    0
 ...ight_stmicro_in_h-h.h => stmicro_in_h-h.h} |    0
 ..._stmicro_in_txt.txt => stmicro_in_txt.txt} |    0
 ...chr_S.S => strchr_assembly-9_9_strchr_S.S} |    0
 ...ight_super_tech_c-c.c => super_tech_c-c.c} |    0
 ...ybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0} |    0
 ..._copyright.copyright => tcl-tcl.copyright} |    0
 .../{copyright_tech_sys.txt => tech_sys.txt}  |    0
 ...fo_tex.tex => texinfo_tex-texinfo_tex.tex} |    0
 ...e_lang_greek-texlive_lang_greek.copyright} |    0
 ...ng_spanish-texlive_lang_spanish.copyright} |    0
 ..._vietnamese-texlive_lang_vietnamese.label} |    0
 .../{copyright_tfc_c-c.c => tfc_c-c.c}        |    0
 ...yproject_prop-ThirdPartyProject_prop.prop} |    0
 ...ing_For-copyright_c.c => trailing_For-c.c} |    0
 ...ing_copyleft.txt => trailing_copyleft.txt} |    0
 ...yright.txt => trailing_name-copyright.txt} |    0
 ....c => trailing_redistribution-bspatch_c.c} |    0
 ... => transcode_doc-transcode_doc.copyright} |    0
 ...=> transfig_with_parts-transfig.copyright} |    0
 ...pter_java-TreeTableModelAdapter_java.java} |    0
 ...ated_dmv_c-9_c.c => truncated_dmv_c-9_c.c} |    0
 ...ht_truncated_doe-c.c => truncated_doe-c.c} |    0
 ...runcated_inria.txt => truncated_inria.txt} |    0
 ...runcated_rusty-c.c => truncated_rusty-c.c} |    0
 ...=> truncated_swfobject_js-swfobject_js.js} |    0
 ...yalam_fonts-ttf_malayalam_fonts.copyright} |    0
 ...unnel_h-tunnel_h.h => tunnel_h-tunnel_h.h} |    0
 ...digits_c.c => two_digits_years-digits_c.c} |    0
 .../{copyright_in_txt.txt => txt.txt}         |    0
 ...ofu_rfpl-UofU_RFPL => uofu_rfpl-UofU_RFPL} |    0
 ...ml.html => url_in_html-detail_9_html.html} |    0
 ...ies_js.js => utilities_js-utilities_js.js} |    0
 ...ar_route_c.c => var_route_c-var_route_c.c} |    0
 ...l => view_layout2_xml-view_layout_xml.xml} |    0
 ...D_vsd.vsd => visio_doc-Glitch_ERD_vsd.vsd} |  Bin
 ...v1_0-Vovida_v.0 => vovida_v1_0-Vovida_v.0} |    0
 ...ing_empty_text-controlpanel_anjuta.anjuta} |    0
 ....dtd => web_app_dtd_b_sun-web_app_dtd.dtd} |    0
 ...> web_app_dtd_sun_twice-web_app_b_dtd.dtd} |    0
 .../{copyright_wide_c-c.c => wide_c-c.c}      |    0
 .../{copyright_wide_txt.txt => wide_txt.txt}  |    0
 ...{copyright_with_apos.txt => with_apos.txt} |    0
 ..._with_ascii_art.txt => with_ascii_art.txt} |    0
 .../{copyright_with_colon => with_colon}      |    0
 ...ailing_words.js => with_trailing_words.js} |    0
 ...f_c.c => with_verbatim_lf-verbatim_lf_c.c} |    0
 ...t_license_text_wtfpl-WTFPL => wtfpl-WTFPL} |    0
 ...0 variant => wxWindows Library .0 variant} |    0
 ...e_text_x_net-X_Net.Net => x_net-X_Net.Net} |    0
 ...tium_sh-9_sh.sh => xconsortium_sh-9_sh.sh} |    0
 ...ht => xfonts_utils-xfonts_utils.copyright} |    0
 ..._label.label => xresprobe-xresprobe.label} |    0
 ...opyright_label.label => xsane-xsane.label} |    0
 ...right_license_text_zend-Zend => zend-Zend} |    0
 ...e_text_zliback-zLibAck => zliback-zLibAck} |    0
 ..._zope_v1_0-Zope_v.0 => zope_v1_0-Zope_v.0} |    0
 ..._zope_v2_0-Zope_v.0 => zope_v2_0-Zope_v.0} |    0
 tests/cluecode/test_copyrights.py             | 1855 ++++++++---------
 tests/cluecode/test_copyrights_lines.py       |   54 +-
 460 files changed, 3149 insertions(+), 1129 deletions(-)
 rename tests/cluecode/data/{copyrights/copyright_03e16f6c_0-e_f_c.0 => copyright_lines/03e16f6c_0-e_f_c.0} (100%)
 rename tests/cluecode/data/{copyrights/copyright_3a3b02ce_0-a_b_ce.0 => copyright_lines/3a3b02ce_0-a_b_ce.0} (100%)
 rename tests/cluecode/data/{copyrights/copyright_ABC_cpp-Case_cpp.cpp => copyright_lines/ABC_cpp-Case_cpp.cpp} (100%)
 rename tests/cluecode/data/{copyrights/copyright_ABC_file_cpp-File_cpp.cpp => copyright_lines/ABC_file_cpp-File_cpp.cpp} (100%)
 rename tests/cluecode/data/{copyrights/copyright_abc => copyright_lines/abc} (100%)
 rename tests/cluecode/data/{copyrights/copyright_abc_loss_of_holder_c-c.c => copyright_lines/abc_loss_of_holder_c-c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_abiword_common_copyright-abiword_common_copyright.copyright => copyright_lines/abiword_common.copyright} (100%)
 rename tests/cluecode/data/{copyrights/copyright_acme_c-c.c => copyright_lines/acme_c-c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_activefieldattribute_cs-ActiveFieldAttribute_cs.cs => copyright_lines/activefieldattribute_cs-ActiveFieldAttribute_cs.cs} (100%)
 rename tests/cluecode/data/{copyrights/copyright_addr_c-addr_c.c => copyright_lines/addr_c-addr_c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_adler_inflate_c-inflate_c.c => copyright_lines/adler_inflate_c-inflate_c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_aleal-c.c => copyright_lines/aleal-c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_andre_darcy-c.c => copyright_lines/andre_darcy-c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_android_c-c.c => copyright_lines/android_c-c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_apache_notice-NOTICE => copyright_lines/apache_notice-NOTICE} (100%)
 rename tests/cluecode/data/{copyrights/copyright_aptitude_copyright_label-aptitude_copyright_label.label => copyright_lines/aptitude-aptitude.label} (100%)
 rename tests/cluecode/data/{copyrights/copyright_atheros_spanning_lines-py.py => copyright_lines/atheros_spanning_lines-py.py} (100%)
 rename tests/cluecode/data/{copyrights/copyright_att_in_c-9_c.c => copyright_lines/att_in_c-9_c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_audio_c-c.c => copyright_lines/audio_c-c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_babkin_txt.txt => copyright_lines/babkin_txt.txt} (100%)
 rename tests/cluecode/data/{copyrights/copyright_blender_debian-blender_copyright.copyright => copyright_lines/blender_debian-blender.copyright} (100%)
 create mode 100644 tests/cluecode/data/copyright_lines/company_name_in_java-9_java.java
 rename tests/cluecode/data/{copyrights/copyright_essential_smoke-ibm_c.c => copyright_lines/essential_smoke-ibm_c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_heunrich_c-c.c => copyright_lines/heunrich_c-c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_isc-c.c => copyright_lines/isc-c.c} (100%)
 rename tests/cluecode/data/{copyrights/copyright_sample_py-py.py => copyright_lines/sample_py-py.py} (100%)
 create mode 100644 tests/cluecode/data/copyright_lines/vector50.hpp
 create mode 100644 tests/cluecode/data/copyrights/03e16f6c_0-e_f_c.0
 create mode 100644 tests/cluecode/data/copyrights/3a3b02ce_0-a_b_ce.0
 create mode 100644 tests/cluecode/data/copyrights/ABC_cpp-Case_cpp.cpp
 create mode 100644 tests/cluecode/data/copyrights/ABC_file_cpp-File_cpp.cpp
 rename tests/cluecode/data/copyrights/{copyright_in_COPYING_gpl-COPYING_gpl.gpl => COPYING_gpl-COPYING_gpl.gpl} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi => COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_README-README => README-README} (100%)
 rename tests/cluecode/data/copyrights/{copyright_Yocto-SPDX.pdf => Yocto-SPDX.pdf} (100%)
 create mode 100644 tests/cluecode/data/copyrights/abc
 create mode 100644 tests/cluecode/data/copyrights/abc_loss_of_holder_c-c.c
 create mode 100644 tests/cluecode/data/copyrights/abiword_common.copyright
 create mode 100644 tests/cluecode/data/copyrights/acme_c-c.c
 create mode 100644 tests/cluecode/data/copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs
 rename tests/cluecode/data/copyrights/{copyright_license_text_adaptive_v1_0-Adaptive v.0 => adaptive_v1_0-Adaptive v.0} (100%)
 create mode 100644 tests/cluecode/data/copyrights/addr_c-addr_c.c
 create mode 100644 tests/cluecode/data/copyrights/adler_inflate_c-inflate_c.c
 rename tests/cluecode/data/copyrights/{copyright_license_text_adobe-Adobe => adobe-Adobe} (100%)
 rename tests/cluecode/data/copyrights/{copyright_adobe_flashplugin_copyright_label-adobe_flashplugin_copyright_label.label => adobe_flashplugin-adobe_flashplugin.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_adobeflex2sdk-Adobeflex_sdk => adobeflex2sdk-Adobeflex_sdk} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_afferogplv1-AfferoGPLv => afferogplv1-AfferoGPLv} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_afferogplv2-AfferoGPLv => afferogplv2-AfferoGPLv} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_afferogplv3-AfferoGPLv => afferogplv3-AfferoGPLv} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_afl_v3_0-AFL_v.0 => afl_v3_0-AFL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_aladdin_free_public_license-Aladdin Free Public License => aladdin_free_public_license-Aladdin Free Public License} (100%)
 create mode 100644 tests/cluecode/data/copyrights/aleal-c.c
 rename tests/cluecode/data/copyrights/{copyright_license_text_amazondsb-AmazonDSb => amazondsb-AmazonDSb} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ampasbsd-AMPASBSD => ampasbsd-AMPASBSD} (100%)
 create mode 100644 tests/cluecode/data/copyrights/andre_darcy-c.c
 rename tests/cluecode/data/copyrights/{copyright_colin_android-bsdiff_c.c => android_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_apache2_debian_trailing_name_missed-apache_copyright_label.label => apache2_debian_trailing_name_missed-apache.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_apache_in_html.html => apache_in_html.html} (100%)
 create mode 100644 tests/cluecode/data/copyrights/apache_notice-NOTICE
 rename tests/cluecode/data/copyrights/{copyright_license_text_apachev1_0-Apachev.0 => apachev1_0-Apachev.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_apachev1_1-Apachev.1 => apachev1_1-Apachev.1} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_apachev2_0b-Apachev_b.0b => apachev2_0b-Apachev_b.0b} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_apple_common_documentation_license_v1_0-Apple Common Documentation License v.0 => apple_common_documentation_license_v1_0-Apple Common Documentation License v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_apple_public_source_license_v1_0-Apple Public Source License v.0 => apple_public_source_license_v1_0-Apple Public Source License v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_apple_public_source_license_v1_1-Apple Public Source License v.1 => apple_public_source_license_v1_1-Apple Public Source License v.1} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_apple_public_source_license_v1_2-Apple Public Source License v.2 => apple_public_source_license_v1_2-Apple Public Source License v.2} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_apslv2_0-APSLv.0 => apslv2_0-APSLv.0} (100%)
 create mode 100644 tests/cluecode/data/copyrights/aptitude-aptitude.label
 rename tests/cluecode/data/copyrights/{copyright_license_text_artistic_v1_0-Artistic v.0 => artistic_v1_0-Artistic v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_artistic_v1_0_short-Artistic v_ short.0 short => artistic_v1_0_short-Artistic v_ short.0 short} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_artistic_v2_0beta4-Artistic v_beta.0beta4 => artistic_v2_0beta4-Artistic v_beta.0beta4} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_artisticv2_0-Artisticv.0 => artisticv2_0-Artisticv.0} (100%)
 create mode 100644 tests/cluecode/data/copyrights/atheros_spanning_lines-py.py
 create mode 100644 tests/cluecode/data/copyrights/att_in_c-9_c.c
 rename tests/cluecode/data/copyrights/{copyright_license_text_attributionassurancelicense-AttributionAssuranceLicense => attributionassurancelicense-AttributionAssuranceLicense} (100%)
 create mode 100644 tests/cluecode/data/copyrights/audio_c-c.c
 create mode 100644 tests/cluecode/data/copyrights/babkin_txt.txt
 rename tests/cluecode/data/copyrights/{copyright_in_bash-shell_sh.sh => bash-shell_sh.sh} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_bigelow_holmes-Bigelow&Holmes => bigelow_holmes-Bigelow&Holmes} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_binary_lib-php_embed_lib.lib => binary_lib-php_embed_lib.lib} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_bitstream-Bi_ream => bitstream-Bi_ream} (100%)
 create mode 100644 tests/cluecode/data/copyrights/blender_debian-blender.copyright
 rename tests/cluecode/data/copyrights/{copyright_blue_sky_dash_in_name-c.c => blue_sky_dash_in_name-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_bouncy_license-LICENSE => bouncy_license-LICENSE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_bouncy_notice-9_NOTICE => bouncy_notice-9_NOTICE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_bsdnrl-BSDNRL => bsdnrl-BSDNRL} (100%)
 rename tests/cluecode/data/copyrights/{copyright_btt_plot1_py-btt_plot_py.py => btt_plot1_py-btt_plot_py.py} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_c-c.c => c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_c_include-h.h => c_include-h.h} (100%)
 rename tests/cluecode/data/copyrights/{copyright_copyright_camelcase_br_diagnostics_h-br_diagnostics_h.h => camelcase_br_diagnostics_h-br_diagnostics_h.h} (100%)
 rename tests/cluecode/data/copyrights/{copyright_camelcase_bug_br_fcc_thread_psipstack_c-br_fcc_thread_psipstack_c.c => camelcase_bug_br_fcc_thread_psipstack_c-br_fcc_thread_psipstack_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_ccube_txt.txt => ccube_txt.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_cedrik_java-java.java => cedrik_java-java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_cern-TestMatrix_D_java.java => cern-TestMatrix_D_java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_cern_matrix2d_java-TestMatrix_D_java.java => cern_matrix2d_java-TestMatrix_D_java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_chameleon_assembly-9_9_setjmp_S.S => chameleon_assembly-9_9_setjmp_S.S} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_cnri-CNRI => cnri-CNRI} (100%)
 rename tests/cluecode/data/copyrights/{copyright_co_cust-copyright_java.java => co_cust-java.java} (100%)
 create mode 100644 tests/cluecode/data/copyrights/colin_android-bsdiff_c.c
 rename tests/cluecode/data/copyrights/{copyright_company_in_txt-9.txt => company_in_txt-9.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_complex_4_line_statement_in_text-9.txt => complex_4_line_statement_in_text-9.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_complex_notice-NOTICE => complex_notice-NOTICE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_complex_notice_sun_microsystems_on_multiple_lines-NOTICE => complex_notice_sun_microsystems_on_multiple_lines-NOTICE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_condor_extra_For-Condor => condor_extra_For-Condor} (100%)
 rename tests/cluecode/data/copyrights/{copyright_config-config_guess.guess => config-config_guess.guess} (100%)
 rename tests/cluecode/data/copyrights/{copyright_config1_guess-config_guess.guess => config1_guess-config_guess.guess} (100%)
 delete mode 100644 tests/cluecode/data/copyrights/copyright_license_text_gsoap-gSOAP
 rename tests/cluecode/data/copyrights/{copyright_coreutils_debian-coreutils_copyright.copyright => coreutils_debian-coreutils.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_dag_c-s_fabsl_c.c => dag_c-s_fabsl_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_dag_elring_notice-NOTICE => dag_elring_notice-NOTICE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_dash_in_name-Makefile => dash_in_name-Makefile} (100%)
 rename tests/cluecode/data/copyrights/{copyright_dasher_copyright_label-dasher_copyright_label.label => dasher-dasher.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_date_range_dahua_in_c-c.c => date_range_dahua_in_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_date_range_in_c-c.c => date_range_in_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_date_range_in_c_2-c.c => date_range_in_c_2-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_debian_archive_keyring_copyright-debian_archive_keyring_copyright.copyright => debian_archive_keyring-debian_archive_keyring.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_debian_lib_1-libmono_cairo_cil_copyright_label.label => debian_lib_1-libmono_cairo_cil.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_debian_lib_2-libmono_cairo_cil_copyright.copyright => debian_lib_2-libmono_cairo_cil.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_debian_lib_3-libmono_security_cil_copyright.copyright => debian_lib_3-libmono_security_cil.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_debian_multi_names_on_one_line-libgdata__copyright.copyright => debian_multi_names_on_one_line-libgdata.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_dionysos_c-c.c => dionysos_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_disclaimed-c.c => disclaimed-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_djvulibre_desktop_copyright-djvulibre_desktop_copyright.copyright => djvulibre_desktop-djvulibre_desktop.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_dll-9_msvci_dll.dll => dll-9_msvci_dll.dll} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_doc-DOC => doc-DOC} (100%)
 rename tests/cluecode/data/copyrights/{copyright_docbook_xsl_doc_html_copyright-docbook_xsl_doc_html_copyright.copyright => docbook_xsl_doc_html-docbook_xsl_doc_html.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_drand48_c-drand_c.c => drand48_c-drand_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_dual_mpl_gpl-Dual MPL GPL => dual_mpl_gpl-Dual MPL GPL} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_dualmpl_mit-DualMPL_MIT => dualmpl_mit-DualMPL_MIT} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_eclv1_0-ECLv.0 => eclv1_0-ECLv.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ecosv2_0-eCosv.0 => ecosv2_0-eCosv.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_ed_copyright-ed_copyright.copyright => ed-ed.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_entessa-Entessa => entessa-Entessa} (100%)
 rename tests/cluecode/data/copyrights/{copyright_epiphany_browser_data_copyright_label-epiphany_browser_data_copyright_label.label => epiphany_browser_data-epiphany_browser_data.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_eplv1_0b-EPLv_b.0b => eplv1_0b-EPLv_b.0b} (100%)
 rename tests/cluecode/data/copyrights/{copyright_eric_young_c-c.c => eric_young_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_errno_atheros-c.c => errno_atheros-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_errno_atheros_ah_h-ah_h.h => errno_atheros_ah_h-ah_h.h} (100%)
 rename tests/cluecode/data/copyrights/{copyright_errno_c-c.c => errno_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_esmertec_java-java.java => esmertec_java-java.java} (100%)
 create mode 100644 tests/cluecode/data/copyrights/essential_smoke-ibm_c.c
 rename tests/cluecode/data/copyrights/{copyright_license_text_eudatagrid-EUDatagrid => eudatagrid-EUDatagrid} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_eurosym_v2-Eurosym_v.v2 => eurosym_v2-Eurosym_v.v2} (100%)
 rename tests/cluecode/data/copyrights/{copyright_expat_h-expat_h.h => expat_h-expat_h.h} (100%)
 rename tests/cluecode/data/copyrights/{copyright_ext_all_js-ext_all_js.js => ext_all_js-ext_all_js.js} (100%)
 rename tests/cluecode/data/copyrights/{copyright_extjs_c-c.c => extjs_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_false_positive_in_c-false_positives_c.c => false_positive_in_c-false_positives_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_false_positive_in_js-editor_beta_de_js.js => false_positive_in_js-editor_beta_de_js.js} (100%)
 rename tests/cluecode/data/copyrights/{copyright_false_positive_in_license-LICENSE => false_positive_in_license-LICENSE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_frameworxv1_0-Frameworxv.0 => frameworxv1_0-Frameworxv.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_freebsd-FreeBSD => freebsd-FreeBSD} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_freetype-FreeType => freetype-FreeType} (100%)
 rename tests/cluecode/data/copyrights/{copyright_fsf_py-999_py.py => fsf_py-999_py.py} (100%)
 rename tests/cluecode/data/copyrights/{copyright_gailly-c.c => gailly-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_geoff_js-js.js => geoff_js-js.js} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_gfdlv1_2-GFDLv.2 => gfdlv1_2-GFDLv.2} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_gfdlv1_3-GFDLv.3 => gfdlv1_3-GFDLv.3} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_glide-Glide => glide-Glide} (100%)
 rename tests/cluecode/data/copyrights/{copyright_gnome_session_copyright-gnome_session_copyright.copyright => gnome_session-gnome_session.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_gnome_system_monitor_copyright-gnome_system_monitor_copyright.copyright => gnome_system_monitor-gnome_system_monitor.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_gnome_system_monitor_copyright_label-gnome_system_monitor_copyright_label.label => gnome_system_monitor-gnome_system_monitor.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_gnuplot-gnuplot => gnuplot-gnuplot} (100%)
 rename tests/cluecode/data/copyrights/{copyright_gobjc_4_3_copyright-gobjc__copyright.copyright => gobjc_4_3-gobjc.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_google_closure_templates_java_html-html.html => google_closure_templates_java_html-html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_google_view_layout1_xml-view_layout_xml.xml => google_view_layout1_xml-view_layout_xml.xml} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_gpl_v1-GPL_v => gpl_v1-GPL_v} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_gpl_v2-GPL_v => gpl_v2-GPL_v} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_gpl_v3-GPL_v => gpl_v3-GPL_v} (100%)
 rename tests/cluecode/data/copyrights/{copyright_group-c.c => group-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_gsoap-gSOAP => gsoap-gSOAP} (100%)
 rename tests/cluecode/data/copyrights/{copyright_gstreamer0_fluendo_mp3_copyright-gstreamer__fluendo_mp_copyright.copyright => gstreamer0_fluendo_mp3-gstreamer_fluendo_mp.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_h-h.h => h-h.h} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hall-copyright.txt => hall-copyright.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hans_jurgen_htm-9_html.html => hans_jurgen_htm-9_html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hansen_cs-cs.cs => hansen_cs-cs.cs} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hciattach_qualcomm1_c-hciattach_qualcomm_c.c => hciattach_qualcomm1_c-hciattach_qualcomm_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_helix-Helix => helix-Helix} (100%)
 create mode 100644 tests/cluecode/data/copyrights/heunrich_c-c.c
 rename tests/cluecode/data/copyrights/{copyright_license_text_hewlett_packard-Hewlett_Packard => hewlett_packard-Hewlett_Packard} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hibernate_copyright_label-hibernate_copyright_label.label => hibernate-hibernate.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_holtmann-hciattach_qualcomm_c.c => holtmann-hciattach_qualcomm_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hostapd_cli_c-hostapd_cli_c.c => hostapd_cli_c-hostapd_cli_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hostapd_trailing_available.c => hostapd_trailing_available.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hp_notice-NOTICE => hp_notice-NOTICE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_hpijs_ppds_copyright_label-hpijs_ppds_copyright_label.label => hpijs_ppds-hpijs_ppds.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_html.html => html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_html_comments-html.html => html_comments-html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_html_incorrect-detail_9_html.html => html_incorrect-detail_9_html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_ibm_c-ibm_c.c => ibm_c-ibm_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ibmpl_v1_0-IBMPL_v.0 => ibmpl_v1_0-IBMPL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_icedax_copyright_label-icedax_copyright_label.label => icedax-icedax.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ietf-IETF => ietf-IETF} (100%)
 rename tests/cluecode/data/copyrights/{copyright_ifrename_c-ifrename_c.c => ifrename_c-ifrename_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ijg-IJG => ijg-IJG} (100%)
 rename tests/cluecode/data/copyrights/{copyright_illinois_html-9_html.html => illinois_html-9_html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_imatix-iMatix => imatix-iMatix} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_imlib2-Imlib => imlib2-Imlib} (100%)
 rename tests/cluecode/data/copyrights/{copyright_inria_loss_of_holder_c-c.c => inria_loss_of_holder_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_intel-Intel => intel-Intel} (100%)
 create mode 100644 tests/cluecode/data/copyrights/isc-c.c
 rename tests/cluecode/data/copyrights/{copyright_license_text_jabber-Jabber => jabber-Jabber} (100%)
 rename tests/cluecode/data/copyrights/{copyright_java-java.java => java-java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_jdoe-copyright_c.c => jdoe-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_jpython-JPython => jpython-JPython} (100%)
 rename tests/cluecode/data/copyrights/{copyright_json_in_phps-JSON_phps.phps => json_in_phps-JSON_phps.phps} (100%)
 rename tests/cluecode/data/copyrights/{copyright_json_in_phps_incorrect-JSON_phps.phps => json_in_phps_incorrect-JSON_phps.phps} (100%)
 rename tests/cluecode/data/copyrights/{copyright_json_phps_html-JSON_phps_html.html => json_phps_html-JSON_phps_html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_json_phps_html_incorrect-JSON_phps_html.html => json_phps_html_incorrect-JSON_phps_html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_jsp_all_CAPS-jsp.jsp => jsp_all_CAPS-jsp.jsp} (100%)
 rename tests/cluecode/data/copyrights/{copyright_kaboom_copyright-kaboom_copyright.copyright => kaboom-kaboom.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_kbuild_copyright-kbuild_copyright.copyright => kbuild-kbuild.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_kde_l10n_zhcn_copyright-kde_l_n_zhcn_copyright.copyright => kde_l10n_zhcn-kde_l_n_zhcn.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_larryrosen-LarryRosen => larryrosen-LarryRosen} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_latex_v1_0-LaTeX_v.0 => latex_v1_0-LaTeX_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_latex_v1_1-LaTeX_v.1 => latex_v1_1-LaTeX_v.1} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_latex_v1_2-LaTeX_v.2 => latex_v1_2-LaTeX_v.2} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_latex_v1_3a-LaTeX_v_a.3a => latex_v1_3a-LaTeX_v_a.3a} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref => latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_latex_v1_3c-LaTeX_v_c.3c => latex_v1_3c-LaTeX_v_c.3c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_leonardo_c-c.c => leonardo_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_lgpl_v2_0-LGPL_v.0 => lgpl_v2_0-LGPL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_lgpl_v2_1-LGPL_v.1 => lgpl_v2_1-LGPL_v.1} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_lgpl_v3-LGPL_v => lgpl_v3-LGPL_v} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libadns1_copyright-libadns_copyright.copyright => libadns1-libadns.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libc6_i686_copyright-libc_i_copyright.copyright => libc6_i686-libc_i.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libcdio10_copyright_label-libcdio_copyright_label.label => libcdio10-libcdio.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libcelt0_copyright-libcelt_copyright.copyright => libcelt0-libcelt.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libcompress_raw_zlib_perl_copyright-libcompress_raw_zlib_perl_copyright.copyright => libcompress_raw_zlib_perl-libcompress_raw_zlib_perl.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libcpufreq0_copyright-libcpufreq_copyright.copyright => libcpufreq0-libcpufreq.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libcrypt_ssleay_perl_copyright-libcrypt_ssleay_perl_copyright.copyright => libcrypt_ssleay_perl-libcrypt_ssleay_perl.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libepc_ui_1_0_1_copyright-libepc_ui__copyright.copyright => libepc_ui_1_0_1-libepc_ui.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libepc_ui_1_0_2_copyright_label-libepc_ui__copyright_label.label => libepc_ui_1_0_2-libepc_ui.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libfltk1_1_copyright-libfltk_copyright.copyright => libfltk1_1-libfltk.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libgail18_copyright_label-libgail_copyright_label.label => libgail18-libgail.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libggiwmh0_target_x_copyright-libggiwmh_target_x_copyright.copyright => libggiwmh0_target_x-libggiwmh_target_x.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libgnome_desktop_2_copyright-libgnome_desktop__copyright.copyright => libgnome_desktop_2-libgnome_desktop.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libgnome_media0_copyright-libgnome_media_copyright.copyright => libgnome_media0-libgnome_media.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libgoffice_0_8_copyright_label-libgoffice__copyright_label.label => libgoffice_0_8-libgoffice.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libgtkhtml2_0_copyright-libgtkhtml_copyright.copyright => libgtkhtml2_0-libgtkhtml.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libisc44_copyright-libisc_copyright.copyright => libisc44-libisc.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libisccfg30_copyright-libisccfg_copyright.copyright => libisccfg30-libisccfg.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libisccfg40_copyright-libisccfg_copyright.copyright => libisccfg40-libisccfg.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libjpeg62_copyright-libjpeg_copyright.copyright => libjpeg62-libjpeg.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libkeyutils1_copyright_label-libkeyutils_copyright_label.label => libkeyutils1-libkeyutils.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_liblocale_gettext_perl_copyright_label-liblocale_get_perl_copyright_label.label => liblocale_gettext_perl-liblocale_get_perl.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libopenraw1_copyright_label-libopenraw_copyright_label.label => libopenraw1-libopenraw.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libopenthreads12_copyright-libopenthreads_copyright.copyright => libopenthreads12-libopenthreads.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libpam_ck_connector_copyright-libpam_ck_connector_copyright.copyright => libpam_ck_connector-libpam_ck_connector.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libpoppler3_copyright-libpoppler_copyright.copyright => libpoppler3-libpoppler.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libqt4_scripttools_copyright-libqt_scripttools_copyright.copyright => libqt4_scripttools-libqt_scripttools.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libqtscript4_gui_copyright-libqtscript_gui_copyright.copyright => libqtscript4_gui-libqtscript_gui.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libsocks4_copyright-libsocks_copyright.copyright => libsocks4-libsocks.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libsox_fmt_alsa_copyright-libsox_fmt_alsa_copyright.copyright => libsox_fmt_alsa-libsox_fmt_alsa.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libspeex1_copyright-libspeex_copyright.copyright => libspeex1-libspeex.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libstlport4_6ldbl_copyright_label-libstlport_ldbl_copyright_label.label => libstlport4_6ldbl-libstlport_ldbl.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libtdb1_copyright-libtdb_copyright.copyright => libtdb1-libtdb.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libuim6_copyright-libuim_copyright.copyright => libuim6-libuim.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libxext6_copyright-libxext_copyright.copyright => libxext6-libxext.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libxmlrpc_c3_copyright-libxmlrpc_c_copyright.copyright => libxmlrpc_c3-libxmlrpc_c.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_libxt6_copyright_label-libxt_copyright_label.label => libxt6-libxt.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_qpl_v1_0_perfect-QPL_v.0 => license_qpl_v1_0_perfect-QPL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_linux_source_2_6_copyright-linux_source__copyright.copyright => linux_source_2_6-linux_source.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_logica_v1_0-Logica_v.0 => logica_v1_0-Logica_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_loss_of_holder_c-c.c => loss_of_holder_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_luxi_fonts-Luxi_fonts => luxi_fonts-Luxi_fonts} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_maia-Maia => maia-Maia} (100%)
 rename tests/cluecode/data/copyrights/{copyright_matroska_demux1_c-matroska_demux_c.c => matroska_demux1_c-matroska_demux_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_matroska_demux_c-matroska_demux_c.c => matroska_demux_c-matroska_demux_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_matroska_demux_muller_c-matroska_demux_c.c => matroska_demux_muller_c-matroska_demux_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_maven_pom_xstream-pom_xml.xml => maven_pom_xstream-pom_xml.xml} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_media-a_png.png => media-a_png.png} (100%)
 rename tests/cluecode/data/copyrights/{copyright_memcmp_assembly-9_9_memcmp_S.S => memcmp_assembly-9_9_memcmp_S.S} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mergesort_java-MergeSort_java.java => mergesort_java-MergeSort_java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_phps-phps.phps => michal_txt.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu => mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu} (100%)
 rename tests/cluecode/data/copyrights/{copyright_missing_statement_file_txt-file.txt => missing_statement_file_txt-file.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mit.txt => mit.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_adobeglyph-MIT_AdobeGlyph => mit_adobeglyph-MIT_AdobeGlyph} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_cmu-MIT_CMU => mit_cmu-MIT_CMU} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mit_danse-MIT_Danse => mit_danse-MIT_Danse} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_danse-MIT_danse => mit_danse-MIT_danse} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_enna-MIT_enna => mit_enna-MIT_enna} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_hylafax-MIT_hylafax => mit_hylafax-MIT_hylafax} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_icu-MIT_ICU => mit_icu-MIT_ICU} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_lucent-MIT_Lucent => mit_lucent-MIT_Lucent} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_mlton-MIT_MLton => mit_mlton-MIT_MLton} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer => mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_unicode-MIT_unicode => mit_unicode-MIT_unicode} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mit_wordnet-MIT_WordNet => mit_wordnet-MIT_WordNet} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mitre-MITRE => mitre-MITRE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mixedcaps_c-mixedcaps_c.c => mixedcaps_c-mixedcaps_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mixedcase_company_name_in_c-lowercase_company_c.c => mixedcase_company_name_in_c-lowercase_company_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mkisofs_copyright-mkisofs_copyright.copyright => mkisofs-mkisofs.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_moto_broad-c.c => moto_broad-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_motorola_c-c.c => motorola_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_motorola_mobility_c-c.c => motorola_mobility_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mplayer_skin_blue_copyright-mplayer_skin_blue_copyright.copyright => mplayer_skin_blue-mplayer_skin_blue.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ms_pl-Ms_PL => ms_pl-Ms_PL} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ms_rl-Ms_RL => ms_rl-Ms_RL} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ms_rsl-Ms_RSL => ms_rsl-Ms_RSL} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_msntp-MSNTP => msntp-MSNTP} (100%)
 rename tests/cluecode/data/copyrights/{copyright_muller-c.c => muller-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_multiline-Historical.txt => multiline-Historical.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_multiline_george-Historical.txt => multiline_george-Historical.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_mycorp_c-c.c => mycorp_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_mysql_gplexception-MySQL_gplexception => mysql_gplexception-MySQL_gplexception} (100%)
 rename tests/cluecode/data/copyrights/{copyright_name_before_copyright_c-c.c => name_before_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_name_sign_year_correct-c.c => name_sign_year_correct-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_naumen-Naumen => naumen-Naumen} (100%)
 rename tests/cluecode/data/copyrights/{copyright_naumen_txt.txt => naumen_txt.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_ncurses_bin_copyright-ncurses_bin_copyright.copyright => ncurses_bin-ncurses_bin.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_nederlof.txt => nederlof.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_netcomponents-NetComponents => netcomponents-NetComponents} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_nethack-Nethack => nethack-Nethack} (100%)
 rename tests/cluecode/data/copyrights/{copyright_nnp_and_co.txt => nnp_and_co.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_no_copyright_in_c-c.c => no_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_no_copyright_in_class_file_1-PersistentArrayHolder_class.class => no_class_file_1-PersistentArrayHolder_class.class} (100%)
 rename tests/cluecode/data/copyrights/{copyright_no_copyright_in_class_file_2-PersistentElementHolder_class.class => no_class_file_2-PersistentElementHolder_class.class} (100%)
 rename tests/cluecode/data/copyrights/{copyright_no_copyright_in_class_file_3-PersistentIndexedElementHolder_class.class => no_class_file_3-PersistentIndexedElementHolder_class.class} (100%)
 rename tests/cluecode/data/copyrights/{copyright_no_copyright_in_class_file_4-PersistentListElementHolder_class.class => no_class_file_4-PersistentListElementHolder_class.class} (100%)
 rename tests/cluecode/data/copyrights/{copyright_no_holder_java-java.java => no_holder_java-java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_nokia-Nokia => nokia-Nokia} (100%)
 rename tests/cluecode/data/copyrights/{copyright_nokia_cpp-cpp.cpp => nokia_cpp-cpp.cpp} (100%)
 rename tests/cluecode/data/copyrights/{copyright_north_c-99_c.c => north_c-99_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_notice2-9_NOTICE => notice2-9_NOTICE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_notice2_txt-NOTICE.txt => notice2_txt-NOTICE.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_notice_name_before_statement-NOTICE => notice_name_before_statement-NOTICE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_notice_txt-NOTICE.txt => notice_txt-NOTICE.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_npl_v1_0-NPL_v.0 => npl_v1_0-NPL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_nvidia_source-Nvidia_source => nvidia_source-Nvidia_source} (100%)
 rename tests/cluecode/data/copyrights/{copyright_o_brien_style_name.txt => o_brien_style_name.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_oberhummer_c_code-c.c => oberhummer_c_code-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_oberhummer_text.txt => oberhummer_text.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_objectivec-objectiveC_m.m => objectivec-objectiveC_m.m} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_oclc_v1_0-OCLC_v.0 => oclc_v1_0-OCLC_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_oclc_v2_0-OCLC_v.0 => oclc_v2_0-OCLC_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_openhackware_copyright_label-openhackware_copyright_label.label => openhackware-openhackware.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_openldap-OpenLDAP => openldap-OpenLDAP} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_openmotif-OpenMotif => openmotif-OpenMotif} (100%)
 rename tests/cluecode/data/copyrights/{openoffice_org_report_builder_bin_copyright.copyright => openoffice_org_report_builder_bin.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_openoffice_org_report_builder_bin_copyright2-openoffice_org_report_builder_bin_copyright.copyright2 => openoffice_org_report_builder_bin_2-openoffice_org_report_builder_bin.copyright2} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_openpbs-OpenPBS => openpbs-OpenPBS} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_openpublicationref-OpenPublicationref => openpublicationref-OpenPublicationref} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_openssl-OpenSSL => openssl-OpenSSL} (100%)
 rename tests/cluecode/data/copyrights/{copyright_openssl-c.c => openssl-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_osl_v3_0-OSL_v.0 => osl_v3_0-OSL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_partial_detection.txt => partial_detection.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_partial_detection_mit.txt => partial_detection_mit.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_perl_base_copyright-perl_base_copyright.copyright => perl_base-perl_base.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_perl_module-pm.pm => perl_module-pm.pm} (100%)
 rename tests/cluecode/data/copyrights/{copyright_peter_c-c.c => peter_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_phorum-Phorum => phorum-Phorum} (100%)
 rename tests/cluecode/data/copyrights/{copyright_michal_txt.txt => phps-phps.phps} (100%)
 rename tests/cluecode/data/copyrights/{copyright_piersol-TestMatrix_D_java.java => piersol-TestMatrix_D_java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_pine-Pine => pine-Pine} (100%)
 rename tests/cluecode/data/copyrights/{copyright_pixelstream.rgb => pixelstream.rgb} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_postcript-9__ps.ps => postcript-9_ps.ps} (100%)
 rename tests/cluecode/data/copyrights/{copyright_postgresql_8_3_copyright_label-postgresql__copyright_label.label => postgresql_8_3-postgresql.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_prof_informatics.txt => prof_informatics.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_professional_txt-copyright.txt => professional_txt-copyright.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_properties-properties.properties => properties-properties.properties} (100%)
 rename tests/cluecode/data/copyrights/{copyright_psf_in_python-BitVector_py.py => psf_in_python-BitVector_py.py} (100%)
 rename tests/cluecode/data/copyrights/{copyright_python_dateutil_copyright-python_dateutil_copyright.copyright => python_dateutil-python_dateutil.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_python_psyco_copyright-python_psyco_copyright.copyright => python_psyco-python_psyco.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_python_reportbug_copyright_label-python_report_copyright_label.label => python_reportbug-python_report.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_python_software_properties_copyright-python_software_properties_copyright.copyright => python_software_properties-python_software_properties.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_python_v1_6-Python_v.6 => python_v1_6-Python_v.6} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_python_v1_6_1-Python_v.1 => python_v1_6_1-Python_v.1} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_python_v2-Python_v => python_v2-Python_v} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_qpl_v1_0-QPL_v.0 => qpl_v1_0-QPL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_realcsl_v2_0-RealCSL_v.0 => realcsl_v2_0-RealCSL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_realpsl_v1_0-RealPSL_v.0 => realpsl_v1_0-RealPSL_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_realpsl_v1_0ref-RealPSL_v_ref.0ref => realpsl_v1_0ref-RealPSL_v_ref.0ref} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_reciprocal_v1_5-Reciprocal_v.5 => reciprocal_v1_5-Reciprocal_v.5} (100%)
 rename tests/cluecode/data/copyrights/{copyright_red_hat_openoffice_org_report_builder_bin_copyright-openoffice_org_report_builder_bin_copyright.copyright => red_hat_openoffice_org_report_builder_bin-openoffice_org_report_builder_bin.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_redhateula-RedHatEULA => redhateula-RedHatEULA} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_redhatref-RedHatref => redhatref-RedHatref} (100%)
 rename tests/cluecode/data/copyrights/{copyright_regents_complex-strtol_c.c => regents_complex-strtol_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_regents_license-LICENSE => regents_license-LICENSE} (100%)
 rename tests/cluecode/data/copyrights/{copyright_resig_js-js.js => resig_js-js.js} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_ricoh_v1_0-Ricoh_v.0 => ricoh_v1_0-Ricoh_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_rusty.txt => rusty.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_rusty_c-c.c => rusty_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_s_fabsl_c-s_fabsl_c.c => s_fabsl_c-s_fabsl_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_sample_java-java.java => sample_java-java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_sample_no_copyright-c.c => sample_no-c.c} (100%)
 create mode 100644 tests/cluecode/data/copyrights/sample_py-py.py
 rename tests/cluecode/data/copyrights/{copyright_license_text_scilab-Scilab => scilab-Scilab} (100%)
 rename tests/cluecode/data/copyrights/{copyright_seahorse_plugins-seahorse_plugins_copyright.copyright => seahorse_plugins-seahorse_plugins.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_sgi_cid_v1_0-SGI_CID_v.0 => sgi_cid_v1_0-SGI_CID_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_sgi_glx_v1_0-SGI_GLX_v.0 => sgi_glx_v1_0-SGI_GLX_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_simgear1_0_0_copyright-simgear__copyright.copyright => simgear1_0_0-simgear.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_sissl_v1_1refa-SISSL_v_refa.1refa => sissl_v1_1refa-SISSL_v_refa.1refa} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_sleepycat-Sleepycat => sleepycat-Sleepycat} (100%)
 rename tests/cluecode/data/copyrights/{copyright_snippet_no_copyright => snippet_no} (100%)
 rename tests/cluecode/data/copyrights/{copyright_snmptrapd_c-snmptrapd_c.c => snmptrapd_c-snmptrapd_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_some_co-9_h.h => some_co-9_h.h} (100%)
 rename tests/cluecode/data/copyrights/{copyright_somefile_cpp-somefile_cpp.cpp => somefile_cpp-somefile_cpp.cpp} (100%)
 rename tests/cluecode/data/copyrights/{copyright_source_auditor_projectinfo_java-ProjectInfo_java.java => source_auditor_projectinfo_java-ProjectInfo_java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_stacktrace_cpp-stacktrace_cpp.cpp => stacktrace_cpp-stacktrace_cpp.cpp} (100%)
 rename tests/cluecode/data/copyrights/{copyright_stmicro_in_h-h.h => stmicro_in_h-h.h} (100%)
 rename tests/cluecode/data/copyrights/{copyright_stmicro_in_txt.txt => stmicro_in_txt.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_strchr_assembly-9_9_strchr_S.S => strchr_assembly-9_9_strchr_S.S} (100%)
 rename tests/cluecode/data/copyrights/{copyright_super_tech_c-c.c => super_tech_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0 => sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_tcl_copyright-tcl_copyright.copyright => tcl-tcl.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_tech_sys.txt => tech_sys.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_texinfo_tex-texinfo_tex.tex => texinfo_tex-texinfo_tex.tex} (100%)
 rename tests/cluecode/data/copyrights/{copyright_texlive_lang_greek_copyright-texlive_lang_greek_copyright.copyright => texlive_lang_greek-texlive_lang_greek.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_texlive_lang_spanish_copyright-texlive_lang_spanish_copyright.copyright => texlive_lang_spanish-texlive_lang_spanish.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_texlive_lang_vietnamese_copyright_label-texlive_lang_vietnamese_copyright_label.label => texlive_lang_vietnamese-texlive_lang_vietnamese.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_tfc_c-c.c => tfc_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_thirdpartyproject_prop-ThirdPartyProject_prop.prop => thirdpartyproject_prop-ThirdPartyProject_prop.prop} (100%)
 rename tests/cluecode/data/copyrights/{copyright_trailing_For-copyright_c.c => trailing_For-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_trailing_copyleft.txt => trailing_copyleft.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_trailing_name-copyright.txt => trailing_name-copyright.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_trailing_redistribution-bspatch_c.c => trailing_redistribution-bspatch_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_transcode_doc_copyright-transcode_doc_copyright.copyright => transcode_doc-transcode_doc.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_transfig_copyright_with_parts-transfig_copyright.copyright => transfig_with_parts-transfig.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_treetablemodeladapter_java-TreeTableModelAdapter_java.java => treetablemodeladapter_java-TreeTableModelAdapter_java.java} (100%)
 rename tests/cluecode/data/copyrights/{copyright_truncated_dmv_c-9_c.c => truncated_dmv_c-9_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_truncated_doe-c.c => truncated_doe-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_truncated_inria.txt => truncated_inria.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_truncated_rusty-c.c => truncated_rusty-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_truncated_swfobject_js-swfobject_js.js => truncated_swfobject_js-swfobject_js.js} (100%)
 rename tests/cluecode/data/copyrights/{copyright_ttf_malayalam_fonts_copyright-ttf_malayalam_fonts_copyright.copyright => ttf_malayalam_fonts-ttf_malayalam_fonts.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_tunnel_h-tunnel_h.h => tunnel_h-tunnel_h.h} (100%)
 rename tests/cluecode/data/copyrights/{copyright_two_digits_years-digits_c.c => two_digits_years-digits_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_txt.txt => txt.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_uofu_rfpl-UofU_RFPL => uofu_rfpl-UofU_RFPL} (100%)
 rename tests/cluecode/data/copyrights/{copyright_url_in_html-detail_9_html.html => url_in_html-detail_9_html.html} (100%)
 rename tests/cluecode/data/copyrights/{copyright_utilities_js-utilities_js.js => utilities_js-utilities_js.js} (100%)
 rename tests/cluecode/data/copyrights/{copyright_var_route_c-var_route_c.c => var_route_c-var_route_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_view_layout2_xml-view_layout_xml.xml => view_layout2_xml-view_layout_xml.xml} (100%)
 rename tests/cluecode/data/copyrights/{copyright_in_visio_doc-Glitch_ERD_vsd.vsd => visio_doc-Glitch_ERD_vsd.vsd} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_vovida_v1_0-Vovida_v.0 => vovida_v1_0-Vovida_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_warning_parsing_empty_text-controlpanel_anjuta.anjuta => warning_parsing_empty_text-controlpanel_anjuta.anjuta} (100%)
 rename tests/cluecode/data/copyrights/{copyright_web_app_dtd_b_sun-web_app__dtd.dtd => web_app_dtd_b_sun-web_app_dtd.dtd} (100%)
 rename tests/cluecode/data/copyrights/{copyright_web_app_dtd_sun_twice-web_app__b_dtd.dtd => web_app_dtd_sun_twice-web_app_b_dtd.dtd} (100%)
 rename tests/cluecode/data/copyrights/{copyright_wide_c-c.c => wide_c-c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_wide_txt.txt => wide_txt.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_with_apos.txt => with_apos.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_with_ascii_art.txt => with_ascii_art.txt} (100%)
 rename tests/cluecode/data/copyrights/{copyright_with_colon => with_colon} (100%)
 rename tests/cluecode/data/copyrights/{copyright_with_trailing_words.js => with_trailing_words.js} (100%)
 rename tests/cluecode/data/copyrights/{copyright_with_verbatim_lf-verbatim_lf_c.c => with_verbatim_lf-verbatim_lf_c.c} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_wtfpl-WTFPL => wtfpl-WTFPL} (100%)
 rename tests/cluecode/data/copyrights/{copyright_wxWindows Library .0 variant => wxWindows Library .0 variant} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_x_net-X_Net.Net => x_net-X_Net.Net} (100%)
 rename tests/cluecode/data/copyrights/{copyright_xconsortium_sh-9_sh.sh => xconsortium_sh-9_sh.sh} (100%)
 rename tests/cluecode/data/copyrights/{copyright_xfonts_utils_copyright-xfonts_utils_copyright.copyright => xfonts_utils-xfonts_utils.copyright} (100%)
 rename tests/cluecode/data/copyrights/{copyright_xresprobe_copyright_label-xresprobe_copyright_label.label => xresprobe-xresprobe.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_xsane_copyright_label-xsane_copyright_label.label => xsane-xsane.label} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_zend-Zend => zend-Zend} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_zliback-zLibAck => zliback-zLibAck} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_zope_v1_0-Zope_v.0 => zope_v1_0-Zope_v.0} (100%)
 rename tests/cluecode/data/copyrights/{copyright_license_text_zope_v2_0-Zope_v.0 => zope_v2_0-Zope_v.0} (100%)

diff --git a/tests/cluecode/cluecode_assert_utils.py b/tests/cluecode/cluecode_assert_utils.py
index 2030a185cf7..a85955dc3ba 100644
--- a/tests/cluecode/cluecode_assert_utils.py
+++ b/tests/cluecode/cluecode_assert_utils.py
@@ -22,27 +22,32 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import unicode_literals
 
 import cluecode.copyrights
 
 
-def check_detection(expected, test_file,
+def check_detection(expected, test_file_or_iterable,
                     expected_in_results=True,
                     results_in_expected=True,
                     what='copyrights'):
     """
-    Run detection of copyright on the test_file, checking the results
-    match the expected list of values.
+    Run detection of copyright on the `test_file_or_iterable`, checking the
+    results match the expected list of values.
 
-    If expected_in_results and results_in_expected are True (the default),
-    then expected and test results are tested for equality. To accommodate
-    for some level of approximate testing, the check can test only if an
-    expected result in a test result, or the opposite. If
-    expected_in_results and results_in_expected are both False an
+    `test_file_or_iterable` is either a path string or an iterable of text lines.
+
+    If `expected_in_results` and `results_in_expected` are True (the default),
+    then expected and test results are tested for equality. To accommodate for
+    some level of approximate testing, the check can test only if an expected
+    result in a test result, or the opposite.
+
+    If `expected_in_results` and `results_in_expected` are both False an
     exception is raised as this is not a case that make sense.
     """
-    copyrights, authors, years, holders = cluecode.copyrights.detect(test_file)
+    copyrights, authors, years, holders = cluecode.copyrights.detect(test_file_or_iterable)
     results = {
         'copyrights': copyrights,
         'authors': authors,
@@ -60,10 +65,10 @@ def check_detection(expected, test_file,
 
     elif expected_in_results:
         for i, expect in enumerate(expected):
-            msg = repr(expect) + ' not in ' + repr(result[i]) + ' for test file:' + test_file
+            msg = repr(expect) + ' not in ' + repr(result[i]) + ' for test file:' + test_file_or_iterable
             assert expect in result[i], msg
 
     elif results_in_expected:
         for i, res in enumerate(result):
-            msg = repr(expected[i]) + ' does not contain ' + repr(res) + ' for test file:' + test_file
+            msg = repr(expected[i]) + ' does not contain ' + repr(res) + ' for test file:' + test_file_or_iterable
             assert res in expected[i], msg
diff --git a/tests/cluecode/data/copyrights/copyright_03e16f6c_0-e_f_c.0 b/tests/cluecode/data/copyright_lines/03e16f6c_0-e_f_c.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_03e16f6c_0-e_f_c.0
rename to tests/cluecode/data/copyright_lines/03e16f6c_0-e_f_c.0
diff --git a/tests/cluecode/data/copyrights/copyright_3a3b02ce_0-a_b_ce.0 b/tests/cluecode/data/copyright_lines/3a3b02ce_0-a_b_ce.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_3a3b02ce_0-a_b_ce.0
rename to tests/cluecode/data/copyright_lines/3a3b02ce_0-a_b_ce.0
diff --git a/tests/cluecode/data/copyrights/copyright_ABC_cpp-Case_cpp.cpp b/tests/cluecode/data/copyright_lines/ABC_cpp-Case_cpp.cpp
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ABC_cpp-Case_cpp.cpp
rename to tests/cluecode/data/copyright_lines/ABC_cpp-Case_cpp.cpp
diff --git a/tests/cluecode/data/copyrights/copyright_ABC_file_cpp-File_cpp.cpp b/tests/cluecode/data/copyright_lines/ABC_file_cpp-File_cpp.cpp
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ABC_file_cpp-File_cpp.cpp
rename to tests/cluecode/data/copyright_lines/ABC_file_cpp-File_cpp.cpp
diff --git a/tests/cluecode/data/copyrights/copyright_abc b/tests/cluecode/data/copyright_lines/abc
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_abc
rename to tests/cluecode/data/copyright_lines/abc
diff --git a/tests/cluecode/data/copyrights/copyright_abc_loss_of_holder_c-c.c b/tests/cluecode/data/copyright_lines/abc_loss_of_holder_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_abc_loss_of_holder_c-c.c
rename to tests/cluecode/data/copyright_lines/abc_loss_of_holder_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_abiword_common_copyright-abiword_common_copyright.copyright b/tests/cluecode/data/copyright_lines/abiword_common.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_abiword_common_copyright-abiword_common_copyright.copyright
rename to tests/cluecode/data/copyright_lines/abiword_common.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_acme_c-c.c b/tests/cluecode/data/copyright_lines/acme_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_acme_c-c.c
rename to tests/cluecode/data/copyright_lines/acme_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_activefieldattribute_cs-ActiveFieldAttribute_cs.cs b/tests/cluecode/data/copyright_lines/activefieldattribute_cs-ActiveFieldAttribute_cs.cs
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_activefieldattribute_cs-ActiveFieldAttribute_cs.cs
rename to tests/cluecode/data/copyright_lines/activefieldattribute_cs-ActiveFieldAttribute_cs.cs
diff --git a/tests/cluecode/data/copyrights/copyright_addr_c-addr_c.c b/tests/cluecode/data/copyright_lines/addr_c-addr_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_addr_c-addr_c.c
rename to tests/cluecode/data/copyright_lines/addr_c-addr_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_adler_inflate_c-inflate_c.c b/tests/cluecode/data/copyright_lines/adler_inflate_c-inflate_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_adler_inflate_c-inflate_c.c
rename to tests/cluecode/data/copyright_lines/adler_inflate_c-inflate_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_aleal-c.c b/tests/cluecode/data/copyright_lines/aleal-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_aleal-c.c
rename to tests/cluecode/data/copyright_lines/aleal-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_andre_darcy-c.c b/tests/cluecode/data/copyright_lines/andre_darcy-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_andre_darcy-c.c
rename to tests/cluecode/data/copyright_lines/andre_darcy-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_android_c-c.c b/tests/cluecode/data/copyright_lines/android_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_android_c-c.c
rename to tests/cluecode/data/copyright_lines/android_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_apache_notice-NOTICE b/tests/cluecode/data/copyright_lines/apache_notice-NOTICE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_apache_notice-NOTICE
rename to tests/cluecode/data/copyright_lines/apache_notice-NOTICE
diff --git a/tests/cluecode/data/copyrights/copyright_aptitude_copyright_label-aptitude_copyright_label.label b/tests/cluecode/data/copyright_lines/aptitude-aptitude.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_aptitude_copyright_label-aptitude_copyright_label.label
rename to tests/cluecode/data/copyright_lines/aptitude-aptitude.label
diff --git a/tests/cluecode/data/copyrights/copyright_atheros_spanning_lines-py.py b/tests/cluecode/data/copyright_lines/atheros_spanning_lines-py.py
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_atheros_spanning_lines-py.py
rename to tests/cluecode/data/copyright_lines/atheros_spanning_lines-py.py
diff --git a/tests/cluecode/data/copyrights/copyright_att_in_c-9_c.c b/tests/cluecode/data/copyright_lines/att_in_c-9_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_att_in_c-9_c.c
rename to tests/cluecode/data/copyright_lines/att_in_c-9_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_audio_c-c.c b/tests/cluecode/data/copyright_lines/audio_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_audio_c-c.c
rename to tests/cluecode/data/copyright_lines/audio_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_babkin_txt.txt b/tests/cluecode/data/copyright_lines/babkin_txt.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_babkin_txt.txt
rename to tests/cluecode/data/copyright_lines/babkin_txt.txt
diff --git a/tests/cluecode/data/copyrights/copyright_blender_debian-blender_copyright.copyright b/tests/cluecode/data/copyright_lines/blender_debian-blender.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_blender_debian-blender_copyright.copyright
rename to tests/cluecode/data/copyright_lines/blender_debian-blender.copyright
diff --git a/tests/cluecode/data/copyright_lines/company_name_in_java-9_java.java b/tests/cluecode/data/copyright_lines/company_name_in_java-9_java.java
new file mode 100644
index 00000000000..778a496994f
--- /dev/null
+++ b/tests/cluecode/data/copyright_lines/company_name_in_java-9_java.java
@@ -0,0 +1,20 @@
+/*
+Copyright (c) 2008-2011 Company Name Incorporated
+All rights Reserved. 
+Company Name Proprietary 
+ */
+import some.java.package;
+import some.java.package2;
+import some.java.package3;
+import some.java.package4;
+import some.java.package4;
+import some.java.package5;
+
+import some.proprietary.pkg;
+import some.proprietary.pkg2;
+import some.proprietary.pkg3;
+import some.proprietary.pkg4;
+
+public class SomeClass extends SomeOtherClass implements WhateverListener {
+       private static final String JB = "JB"; // John Blah? Japan Beach? : -)
+     
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copyright_essential_smoke-ibm_c.c b/tests/cluecode/data/copyright_lines/essential_smoke-ibm_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_essential_smoke-ibm_c.c
rename to tests/cluecode/data/copyright_lines/essential_smoke-ibm_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_heunrich_c-c.c b/tests/cluecode/data/copyright_lines/heunrich_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_heunrich_c-c.c
rename to tests/cluecode/data/copyright_lines/heunrich_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_isc-c.c b/tests/cluecode/data/copyright_lines/isc-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_isc-c.c
rename to tests/cluecode/data/copyright_lines/isc-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_sample_py-py.py b/tests/cluecode/data/copyright_lines/sample_py-py.py
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_sample_py-py.py
rename to tests/cluecode/data/copyright_lines/sample_py-py.py
diff --git a/tests/cluecode/data/copyright_lines/vector50.hpp b/tests/cluecode/data/copyright_lines/vector50.hpp
new file mode 100644
index 00000000000..fe53f22bf6b
--- /dev/null
+++ b/tests/cluecode/data/copyright_lines/vector50.hpp
@@ -0,0 +1,174 @@
+
+// Copyright (C) 2005 Arkadiy Vertleyb
+// Copyright (C) 2005 Peder Holt
+//
+// Use modification and distribution are subject to the boost Software License,
+// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).
+
+// Preprocessed code, do not edit manually !
+
+
+namespace boost { namespace type_of {
+    template<class V, class Increase_BOOST_TYPEOF_LIMIT_SIZE> struct v_iter;
+        template<class V> struct v_iter<V, mpl::int_<0> > { typedef typename V::item0 type; typedef v_iter<V, mpl::int_<0 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<1> > { typedef typename V::item1 type; typedef v_iter<V, mpl::int_<1 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<2> > { typedef typename V::item2 type; typedef v_iter<V, mpl::int_<2 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<3> > { typedef typename V::item3 type; typedef v_iter<V, mpl::int_<3 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<4> > { typedef typename V::item4 type; typedef v_iter<V, mpl::int_<4 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<5> > { typedef typename V::item5 type; typedef v_iter<V, mpl::int_<5 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<6> > { typedef typename V::item6 type; typedef v_iter<V, mpl::int_<6 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<7> > { typedef typename V::item7 type; typedef v_iter<V, mpl::int_<7 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<8> > { typedef typename V::item8 type; typedef v_iter<V, mpl::int_<8 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<9> > { typedef typename V::item9 type; typedef v_iter<V, mpl::int_<9 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<10> > { typedef typename V::item10 type; typedef v_iter<V, mpl::int_<10 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<11> > { typedef typename V::item11 type; typedef v_iter<V, mpl::int_<11 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<12> > { typedef typename V::item12 type; typedef v_iter<V, mpl::int_<12 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<13> > { typedef typename V::item13 type; typedef v_iter<V, mpl::int_<13 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<14> > { typedef typename V::item14 type; typedef v_iter<V, mpl::int_<14 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<15> > { typedef typename V::item15 type; typedef v_iter<V, mpl::int_<15 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<16> > { typedef typename V::item16 type; typedef v_iter<V, mpl::int_<16 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<17> > { typedef typename V::item17 type; typedef v_iter<V, mpl::int_<17 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<18> > { typedef typename V::item18 type; typedef v_iter<V, mpl::int_<18 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<19> > { typedef typename V::item19 type; typedef v_iter<V, mpl::int_<19 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<20> > { typedef typename V::item20 type; typedef v_iter<V, mpl::int_<20 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<21> > { typedef typename V::item21 type; typedef v_iter<V, mpl::int_<21 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<69> > { typedef typename V::item69 type; typedef v_iter<V, mpl::int_<69 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<22> > { typedef typename V::item22 type; typedef v_iter<V, mpl::int_<22 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<23> > { typedef typename V::item23 type; typedef v_iter<V, mpl::int_<23 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<24> > { typedef typename V::item24 type; typedef v_iter<V, mpl::int_<24 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<25> > { typedef typename V::item25 type; typedef v_iter<V, mpl::int_<25 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<26> > { typedef typename V::item26 type; typedef v_iter<V, mpl::int_<26 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<27> > { typedef typename V::item27 type; typedef v_iter<V, mpl::int_<27 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<28> > { typedef typename V::item28 type; typedef v_iter<V, mpl::int_<28 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<29> > { typedef typename V::item29 type; typedef v_iter<V, mpl::int_<29 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<30> > { typedef typename V::item30 type; typedef v_iter<V, mpl::int_<30 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<31> > { typedef typename V::item31 type; typedef v_iter<V, mpl::int_<31 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<32> > { typedef typename V::item32 type; typedef v_iter<V, mpl::int_<32 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<33> > { typedef typename V::item33 type; typedef v_iter<V, mpl::int_<33 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<34> > { typedef typename V::item34 type; typedef v_iter<V, mpl::int_<34 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<35> > { typedef typename V::item35 type; typedef v_iter<V, mpl::int_<35 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<36> > { typedef typename V::item36 type; typedef v_iter<V, mpl::int_<36 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<37> > { typedef typename V::item37 type; typedef v_iter<V, mpl::int_<37 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<38> > { typedef typename V::item38 type; typedef v_iter<V, mpl::int_<38 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<39> > { typedef typename V::item39 type; typedef v_iter<V, mpl::int_<39 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<40> > { typedef typename V::item40 type; typedef v_iter<V, mpl::int_<40 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<41> > { typedef typename V::item41 type; typedef v_iter<V, mpl::int_<41 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<42> > { typedef typename V::item42 type; typedef v_iter<V, mpl::int_<42 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<43> > { typedef typename V::item43 type; typedef v_iter<V, mpl::int_<43 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<44> > { typedef typename V::item44 type; typedef v_iter<V, mpl::int_<44 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<45> > { typedef typename V::item45 type; typedef v_iter<V, mpl::int_<45 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<46> > { typedef typename V::item46 type; typedef v_iter<V, mpl::int_<46 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<47> > { typedef typename V::item47 type; typedef v_iter<V, mpl::int_<47 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<48> > { typedef typename V::item48 type; typedef v_iter<V, mpl::int_<48 + 1> > next; };
+        template<class V> struct v_iter<V, mpl::int_<49> > { typedef typename V::item49 type; typedef v_iter<V, mpl::int_<49 + 1> > next; };
+}}
+namespace boost { namespace type_of {
+        template< class T = void> struct vector0 { typedef v_iter<vector0<>, boost::mpl::int_<0> > begin; typedef mpl::int_<1> item0; typedef mpl::int_<1> item1; typedef mpl::int_<1> item2; typedef mpl::int_<1> item3; typedef mpl::int_<1> item4; typedef mpl::int_<1> item5; typedef mpl::int_<1> item6; typedef mpl::int_<1> item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 > struct vector1 { typedef v_iter<vector1< P0>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef mpl::int_<1> item1; typedef mpl::int_<1> item2; typedef mpl::int_<1> item3; typedef mpl::int_<1> item4; typedef mpl::int_<1> item5; typedef mpl::int_<1> item6; typedef mpl::int_<1> item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 > struct vector2 { typedef v_iter<vector2< P0 , P1>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef mpl::int_<1> item2; typedef mpl::int_<1> item3; typedef mpl::int_<1> item4; typedef mpl::int_<1> item5; typedef mpl::int_<1> item6; typedef mpl::int_<1> item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 > struct vector3 { typedef v_iter<vector3< P0 , P1 , P2>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef mpl::int_<1> item3; typedef mpl::int_<1> item4; typedef mpl::int_<1> item5; typedef mpl::int_<1> item6; typedef mpl::int_<1> item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 > struct vector4 { typedef v_iter<vector4< P0 , P1 , P2 , P3>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef mpl::int_<1> item4; typedef mpl::int_<1> item5; typedef mpl::int_<1> item6; typedef mpl::int_<1> item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 > struct vector5 { typedef v_iter<vector5< P0 , P1 , P2 , P3 , P4>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef mpl::int_<1> item5; typedef mpl::int_<1> item6; typedef mpl::int_<1> item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 > struct vector6 { typedef v_iter<vector6< P0 , P1 , P2 , P3 , P4 , P5>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef mpl::int_<1> item6; typedef mpl::int_<1> item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 > struct vector7 { typedef v_iter<vector7< P0 , P1 , P2 , P3 , P4 , P5 , P6>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef mpl::int_<1> item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 > struct vector8 { typedef v_iter<vector8< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef mpl::int_<1> item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 > struct vector9 { typedef v_iter<vector9< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef mpl::int_<1> item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 > struct vector10 { typedef v_iter<vector10< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef mpl::int_<1> item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 > struct vector11 { typedef v_iter<vector11< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef mpl::int_<1> item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 > struct vector12 { typedef v_iter<vector12< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef mpl::int_<1> item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 > struct vector13 { typedef v_iter<vector13< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef mpl::int_<1> item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 > struct vector14 { typedef v_iter<vector14< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef mpl::int_<1> item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 > struct vector15 { typedef v_iter<vector15< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef mpl::int_<1> item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 > struct vector16 { typedef v_iter<vector16< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef mpl::int_<1> item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 > struct vector17 { typedef v_iter<vector17< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef mpl::int_<1> item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 > struct vector18 { typedef v_iter<vector18< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef mpl::int_<1> item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 > struct vector19 { typedef v_iter<vector19< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef mpl::int_<1> item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 > struct vector20 { typedef v_iter<vector20< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef mpl::int_<1> item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 > struct vector21 { typedef v_iter<vector21< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef mpl::int_<1> item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 > struct vector22 { typedef v_iter<vector22< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef mpl::int_<1> item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 > struct vector23 { typedef v_iter<vector23< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef mpl::int_<1> item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 > struct vector24 { typedef v_iter<vector24< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef mpl::int_<1> item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 > struct vector25 { typedef v_iter<vector25< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef mpl::int_<1> item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 > struct vector26 { typedef v_iter<vector26< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef mpl::int_<1> item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 > struct vector27 { typedef v_iter<vector27< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef mpl::int_<1> item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 > struct vector28 { typedef v_iter<vector28< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef mpl::int_<1> item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 > struct vector29 { typedef v_iter<vector29< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef mpl::int_<1> item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 > struct vector30 { typedef v_iter<vector30< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef mpl::int_<1> item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 > struct vector31 { typedef v_iter<vector31< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef mpl::int_<1> item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 > struct vector32 { typedef v_iter<vector32< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef mpl::int_<1> item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 > struct vector33 { typedef v_iter<vector33< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef mpl::int_<1> item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 > struct vector34 { typedef v_iter<vector34< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef mpl::int_<1> item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 > struct vector35 { typedef v_iter<vector35< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef mpl::int_<1> item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 > struct vector36 { typedef v_iter<vector36< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef mpl::int_<1> item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 > struct vector37 { typedef v_iter<vector37< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef mpl::int_<1> item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 > struct vector38 { typedef v_iter<vector38< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef mpl::int_<1> item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 > struct vector39 { typedef v_iter<vector39< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef mpl::int_<1> item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 > struct vector40 { typedef v_iter<vector40< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef mpl::int_<1> item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 > struct vector41 { typedef v_iter<vector41< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef mpl::int_<1> item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 > struct vector42 { typedef v_iter<vector42< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef mpl::int_<1> item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 > struct vector43 { typedef v_iter<vector43< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef P42 item42; typedef mpl::int_<1> item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 > struct vector44 { typedef v_iter<vector44< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef P42 item42; typedef P43 item43; typedef mpl::int_<1> item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 > struct vector45 { typedef v_iter<vector45< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef P42 item42; typedef P43 item43; typedef P44 item44; typedef mpl::int_<1> item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 > struct vector46 { typedef v_iter<vector46< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef P42 item42; typedef P43 item43; typedef P44 item44; typedef P45 item45; typedef mpl::int_<1> item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 , class P46 > struct vector47 { typedef v_iter<vector47< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef P42 item42; typedef P43 item43; typedef P44 item44; typedef P45 item45; typedef P46 item46; typedef mpl::int_<1> item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 , class P46 , class P47 > struct vector48 { typedef v_iter<vector48< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46 , P47>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef P42 item42; typedef P43 item43; typedef P44 item44; typedef P45 item45; typedef P46 item46; typedef P47 item47; typedef mpl::int_<1> item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 , class P46 , class P47 , class P48 > struct vector49 { typedef v_iter<vector49< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46 , P47 , P48>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef P42 item42; typedef P43 item43; typedef P44 item44; typedef P45 item45; typedef P46 item46; typedef P47 item47; typedef P48 item48; typedef mpl::int_<1> item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 , class P46 , class P47 , class P48 , class P49 > struct vector50 { typedef v_iter<vector50< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46 , P47 , P48 , P49>, boost::mpl::int_<0> > begin; typedef P0 item0; typedef P1 item1; typedef P2 item2; typedef P3 item3; typedef P4 item4; typedef P5 item5; typedef P6 item6; typedef P7 item7; typedef P8 item8; typedef P9 item9; typedef P10 item10; typedef P11 item11; typedef P12 item12; typedef P13 item13; typedef P14 item14; typedef P15 item15; typedef P16 item16; typedef P17 item17; typedef P18 item18; typedef P19 item19; typedef P20 item20; typedef P21 item21; typedef P22 item22; typedef P23 item23; typedef P24 item24; typedef P25 item25; typedef P26 item26; typedef P27 item27; typedef P28 item28; typedef P29 item29; typedef P30 item30; typedef P31 item31; typedef P32 item32; typedef P33 item33; typedef P34 item34; typedef P35 item35; typedef P36 item36; typedef P37 item37; typedef P38 item38; typedef P39 item39; typedef P40 item40; typedef P41 item41; typedef P42 item42; typedef P43 item43; typedef P44 item44; typedef P45 item45; typedef P46 item46; typedef P47 item47; typedef P48 item48; typedef P49 item49; typedef mpl::int_<1> item50; typedef mpl::int_<1> item51; typedef mpl::int_<1> item52; typedef mpl::int_<1> item53; typedef mpl::int_<1> item54; typedef mpl::int_<1> item55; typedef mpl::int_<1> item56; typedef mpl::int_<1> item57; typedef mpl::int_<1> item58; typedef mpl::int_<1> item59; typedef mpl::int_<1> item60; typedef mpl::int_<1> item61; typedef mpl::int_<1> item62; typedef mpl::int_<1> item63; typedef mpl::int_<1> item64; typedef mpl::int_<1> item65; typedef mpl::int_<1> item66; typedef mpl::int_<1> item67; typedef mpl::int_<1> item68; typedef mpl::int_<1> item69; typedef mpl::int_<1> item70; typedef mpl::int_<1> item71; typedef mpl::int_<1> item72; typedef mpl::int_<1> item73; typedef mpl::int_<1> item74; typedef mpl::int_<1> item75; typedef mpl::int_<1> item76; typedef mpl::int_<1> item77; typedef mpl::int_<1> item78; typedef mpl::int_<1> item79; typedef mpl::int_<1> item80; typedef mpl::int_<1> item81; typedef mpl::int_<1> item82; typedef mpl::int_<1> item83; typedef mpl::int_<1> item84; typedef mpl::int_<1> item85; typedef mpl::int_<1> item86; typedef mpl::int_<1> item87; typedef mpl::int_<1> item88; typedef mpl::int_<1> item89; typedef mpl::int_<1> item90; typedef mpl::int_<1> item91; typedef mpl::int_<1> item92; typedef mpl::int_<1> item93; typedef mpl::int_<1> item94; typedef mpl::int_<1> item95; typedef mpl::int_<1> item96; typedef mpl::int_<1> item97; typedef mpl::int_<1> item98; typedef mpl::int_<1> item99; };
+}}
+namespace boost { namespace type_of {
+    template<class V, class T> struct push_back {
+        typedef V type;
+    };
+        template< class T> struct push_back<boost::type_of::vector0<>, T> { typedef boost::type_of::vector1< T > type; };
+        template< class P0 , class T> struct push_back<boost::type_of::vector1< P0>, T> { typedef boost::type_of::vector2< P0 , T > type; };
+        template< class P0 , class P1 , class T> struct push_back<boost::type_of::vector2< P0 , P1>, T> { typedef boost::type_of::vector3< P0 , P1 , T > type; };
+        template< class P0 , class P1 , class P2 , class T> struct push_back<boost::type_of::vector3< P0 , P1 , P2>, T> { typedef boost::type_of::vector4< P0 , P1 , P2 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class T> struct push_back<boost::type_of::vector4< P0 , P1 , P2 , P3>, T> { typedef boost::type_of::vector5< P0 , P1 , P2 , P3 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class T> struct push_back<boost::type_of::vector5< P0 , P1 , P2 , P3 , P4>, T> { typedef boost::type_of::vector6< P0 , P1 , P2 , P3 , P4 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class T> struct push_back<boost::type_of::vector6< P0 , P1 , P2 , P3 , P4 , P5>, T> { typedef boost::type_of::vector7< P0 , P1 , P2 , P3 , P4 , P5 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class T> struct push_back<boost::type_of::vector7< P0 , P1 , P2 , P3 , P4 , P5 , P6>, T> { typedef boost::type_of::vector8< P0 , P1 , P2 , P3 , P4 , P5 , P6 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class T> struct push_back<boost::type_of::vector8< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7>, T> { typedef boost::type_of::vector9< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class T> struct push_back<boost::type_of::vector9< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8>, T> { typedef boost::type_of::vector10< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class T> struct push_back<boost::type_of::vector10< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9>, T> { typedef boost::type_of::vector11< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class T> struct push_back<boost::type_of::vector11< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10>, T> { typedef boost::type_of::vector12< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class T> struct push_back<boost::type_of::vector12< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11>, T> { typedef boost::type_of::vector13< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class T> struct push_back<boost::type_of::vector13< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12>, T> { typedef boost::type_of::vector14< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class T> struct push_back<boost::type_of::vector14< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13>, T> { typedef boost::type_of::vector15< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class T> struct push_back<boost::type_of::vector15< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14>, T> { typedef boost::type_of::vector16< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class T> struct push_back<boost::type_of::vector16< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15>, T> { typedef boost::type_of::vector17< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class T> struct push_back<boost::type_of::vector17< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16>, T> { typedef boost::type_of::vector18< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class T> struct push_back<boost::type_of::vector18< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17>, T> { typedef boost::type_of::vector19< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class T> struct push_back<boost::type_of::vector19< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18>, T> { typedef boost::type_of::vector20< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class T> struct push_back<boost::type_of::vector20< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19>, T> { typedef boost::type_of::vector21< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class T> struct push_back<boost::type_of::vector21< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20>, T> { typedef boost::type_of::vector22< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class T> struct push_back<boost::type_of::vector22< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21>, T> { typedef boost::type_of::vector23< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class T> struct push_back<boost::type_of::vector23< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22>, T> { typedef boost::type_of::vector24< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class T> struct push_back<boost::type_of::vector24< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23>, T> { typedef boost::type_of::vector25< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class T> struct push_back<boost::type_of::vector25< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24>, T> { typedef boost::type_of::vector26< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class T> struct push_back<boost::type_of::vector26< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25>, T> { typedef boost::type_of::vector27< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class T> struct push_back<boost::type_of::vector27< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26>, T> { typedef boost::type_of::vector28< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class T> struct push_back<boost::type_of::vector28< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27>, T> { typedef boost::type_of::vector29< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class T> struct push_back<boost::type_of::vector29< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28>, T> { typedef boost::type_of::vector30< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class T> struct push_back<boost::type_of::vector30< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29>, T> { typedef boost::type_of::vector31< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class T> struct push_back<boost::type_of::vector31< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30>, T> { typedef boost::type_of::vector32< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class T> struct push_back<boost::type_of::vector32< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31>, T> { typedef boost::type_of::vector33< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class T> struct push_back<boost::type_of::vector33< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32>, T> { typedef boost::type_of::vector34< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class T> struct push_back<boost::type_of::vector34< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33>, T> { typedef boost::type_of::vector35< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class T> struct push_back<boost::type_of::vector35< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34>, T> { typedef boost::type_of::vector36< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class T> struct push_back<boost::type_of::vector36< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35>, T> { typedef boost::type_of::vector37< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class T> struct push_back<boost::type_of::vector37< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36>, T> { typedef boost::type_of::vector38< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class T> struct push_back<boost::type_of::vector38< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37>, T> { typedef boost::type_of::vector39< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class T> struct push_back<boost::type_of::vector39< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38>, T> { typedef boost::type_of::vector40< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class T> struct push_back<boost::type_of::vector40< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39>, T> { typedef boost::type_of::vector41< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class T> struct push_back<boost::type_of::vector41< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40>, T> { typedef boost::type_of::vector42< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class T> struct push_back<boost::type_of::vector42< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41>, T> { typedef boost::type_of::vector43< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class T> struct push_back<boost::type_of::vector43< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42>, T> { typedef boost::type_of::vector44< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class T> struct push_back<boost::type_of::vector44< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43>, T> { typedef boost::type_of::vector45< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class T> struct push_back<boost::type_of::vector45< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44>, T> { typedef boost::type_of::vector46< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 , class T> struct push_back<boost::type_of::vector46< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45>, T> { typedef boost::type_of::vector47< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 , class P46 , class T> struct push_back<boost::type_of::vector47< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46>, T> { typedef boost::type_of::vector48< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 , class P46 , class P47 , class T> struct push_back<boost::type_of::vector48< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46 , P47>, T> { typedef boost::type_of::vector49< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46 , P47 , T > type; };
+        template< class P0 , class P1 , class P2 , class P3 , class P4 , class P5 , class P6 , class P7 , class P8 , class P9 , class P10 , class P11 , class P12 , class P13 , class P14 , class P15 , class P16 , class P17 , class P18 , class P19 , class P20 , class P21 , class P22 , class P23 , class P24 , class P25 , class P26 , class P27 , class P28 , class P29 , class P30 , class P31 , class P32 , class P33 , class P34 , class P35 , class P36 , class P37 , class P38 , class P39 , class P40 , class P41 , class P42 , class P43 , class P44 , class P45 , class P46 , class P47 , class P48 , class T> struct push_back<boost::type_of::vector49< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46 , P47 , P48>, T> { typedef boost::type_of::vector50< P0 , P1 , P2 , P3 , P4 , P5 , P6 , P7 , P8 , P9 , P10 , P11 , P12 , P13 , P14 , P15 , P16 , P17 , P18 , P19 , P20 , P21 , P22 , P23 , P24 , P25 , P26 , P27 , P28 , P29 , P30 , P31 , P32 , P33 , P34 , P35 , P36 , P37 , P38 , P39 , P40 , P41 , P42 , P43 , P44 , P45 , P46 , P47 , P48 , T > type; };
+        template<class V> struct v_iter<V, mpl::int_<69> > { typedef typename V::item69 type; typedef v_iter<V, mpl::int_<69 + 1> > next; };
+
+}}
diff --git a/tests/cluecode/data/copyrights/03e16f6c_0-e_f_c.0 b/tests/cluecode/data/copyrights/03e16f6c_0-e_f_c.0
new file mode 100644
index 00000000000..4cdf2749e0f
--- /dev/null
+++ b/tests/cluecode/data/copyrights/03e16f6c_0-e_f_c.0
@@ -0,0 +1,78 @@
+-----BEGIN CERTIFICATE-----
+MIIEEjCCAvqgAwIBAgIPAMEAizw8iBHRPvZj7N9AMA0GCSqGSIb3DQEBBAUAMHAx
+KzApBgNVBAsTIkNvcHlyaWdodCAoYykgMTk5NyBNaWNyb3NvZnQgQ29ycC4xHjAc
+BgNVBAsTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEhMB8GA1UEAxMYTWljcm9zb2Z0
+IFJvb3QgQXV0aG9yaXR5MB4XDTk3MDExMDA3MDAwMFoXDTIwMTIzMTA3MDAwMFow
+cDErMCkGA1UECxMiQ29weXJpZ2h0IChjKSAxOTk3IE1pY3Jvc29mdCBDb3JwLjEe
+MBwGA1UECxMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSEwHwYDVQQDExhNaWNyb3Nv
+ZnQgUm9vdCBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCpAr3BcOY78k4bKJ+XeF4w6qKpjSVf+P6VTKO3/p2iID58UaKboo9gMmvRQmR5
+7qx2yVTa8uuchhyPn4Rms8VremIj1h083g8BkuiWxL8tZpqaaCaZ0Dosvwy1WCbB
+RucKPjiWLKkoOajsSYNC44QPu5psVWGsgnyhYC13TOmZtGQ7mlAcMQgkFJ+p55Er
+GOY9mGMUYFgFZZ8dN1KH96fvlALGG9O/VUWziYC/OuxUlE6u/ad6bXROrxjMlgko
+IQBXkGBpN7tLEgc8Vv9b+6RmCgim0oFWV++2O14WgXcE2va+roCV/rDNf9anGnJc
+PMq88AijIjCzBoXJsyB3E4XfAgMBAAGjgagwgaUwgaIGA1UdAQSBmjCBl4AQW9Bw
+72lyniNRfhSyTY7/y6FyMHAxKzApBgNVBAsTIkNvcHlyaWdodCAoYykgMTk5NyBN
+aWNyb3NvZnQgQ29ycC4xHjAcBgNVBAsTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEh
+MB8GA1UEAxMYTWljcm9zb2Z0IFJvb3QgQXV0aG9yaXR5gg8AwQCLPDyIEdE+9mPs
+30AwDQYJKoZIhvcNAQEEBQADggEBAJXoC8CN85cYNe24ASTYdxHzXGAyn54Lyz4F
+kYiPyTrmIfLwV5MstaBHyGLv/NfMOztaqTZUaf4kbT/JzKreBXzdMY09nxBwarv+
+Ek8YacD80EPjEVogT+pie6+qGcgrNyUtvmWhEoolD2Oj91Qc+SHJ1hXzUqxuQzIH
+/YIX+OVnbA1R9r3xUse958Qw/CAxCYgdlSkaTdUdAqXxgOADtFv0sd3IV+5lScdS
+VLa0AygS/5DW8AiPfriXxas3LOR65Kh343agANBqP8HSNorgQRKoNWobats14dQc
+BOSoRQTIWjM4bk0cDWK3CqKM09VUP0bNHFWmcNsSOoeTdZ+n0qA=
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            c1:00:8b:3c:3c:88:11:d1:3e:f6:63:ec:df:40
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: OU=Copyright (c) 1997 Microsoft Corp., OU=Microsoft Corporation, CN=Microsoft Root Authority
+        Validity
+            Not Before: Jan 10 07:00:00 1997 GMT
+            Not After : Dec 31 07:00:00 2020 GMT
+        Subject: OU=Copyright (c) 1997 Microsoft Corp., OU=Microsoft Corporation, CN=Microsoft Root Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:a9:02:bd:c1:70:e6:3b:f2:4e:1b:28:9f:97:78:
+                    5e:30:ea:a2:a9:8d:25:5f:f8:fe:95:4c:a3:b7:fe:
+                    9d:a2:20:3e:7c:51:a2:9b:a2:8f:60:32:6b:d1:42:
+                    64:79:ee:ac:76:c9:54:da:f2:eb:9c:86:1c:8f:9f:
+                    84:66:b3:c5:6b:7a:62:23:d6:1d:3c:de:0f:01:92:
+                    e8:96:c4:bf:2d:66:9a:9a:68:26:99:d0:3a:2c:bf:
+                    0c:b5:58:26:c1:46:e7:0a:3e:38:96:2c:a9:28:39:
+                    a8:ec:49:83:42:e3:84:0f:bb:9a:6c:55:61:ac:82:
+                    7c:a1:60:2d:77:4c:e9:99:b4:64:3b:9a:50:1c:31:
+                    08:24:14:9f:a9:e7:91:2b:18:e6:3d:98:63:14:60:
+                    58:05:65:9f:1d:37:52:87:f7:a7:ef:94:02:c6:1b:
+                    d3:bf:55:45:b3:89:80:bf:3a:ec:54:94:4e:ae:fd:
+                    a7:7a:6d:74:4e:af:18:cc:96:09:28:21:00:57:90:
+                    60:69:37:bb:4b:12:07:3c:56:ff:5b:fb:a4:66:0a:
+                    08:a6:d2:81:56:57:ef:b6:3b:5e:16:81:77:04:da:
+                    f6:be:ae:80:95:fe:b0:cd:7f:d6:a7:1a:72:5c:3c:
+                    ca:bc:f0:08:a3:22:30:b3:06:85:c9:b3:20:77:13:
+                    85:df
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            2.5.29.1: 
+                0....[.p.ir.#Q~..M....r0p1+0)..U..."Copyright (c) 1997 Microsoft Corp.1.0...U....Microsoft Corporation1!0...U....Microsoft Root Authority......<<...>.c..@
+    Signature Algorithm: md5WithRSAEncryption
+        95:e8:0b:c0:8d:f3:97:18:35:ed:b8:01:24:d8:77:11:f3:5c:
+        60:32:9f:9e:0b:cb:3e:05:91:88:8f:c9:3a:e6:21:f2:f0:57:
+        93:2c:b5:a0:47:c8:62:ef:fc:d7:cc:3b:3b:5a:a9:36:54:69:
+        fe:24:6d:3f:c9:cc:aa:de:05:7c:dd:31:8d:3d:9f:10:70:6a:
+        bb:fe:12:4f:18:69:c0:fc:d0:43:e3:11:5a:20:4f:ea:62:7b:
+        af:aa:19:c8:2b:37:25:2d:be:65:a1:12:8a:25:0f:63:a3:f7:
+        54:1c:f9:21:c9:d6:15:f3:52:ac:6e:43:32:07:fd:82:17:f8:
+        e5:67:6c:0d:51:f6:bd:f1:52:c7:bd:e7:c4:30:fc:20:31:09:
+        88:1d:95:29:1a:4d:d5:1d:02:a5:f1:80:e0:03:b4:5b:f4:b1:
+        dd:c8:57:ee:65:49:c7:52:54:b6:b4:03:28:12:ff:90:d6:f0:
+        08:8f:7e:b8:97:c5:ab:37:2c:e4:7a:e4:a8:77:e3:76:a0:00:
+        d0:6a:3f:c1:d2:36:8a:e0:41:12:a8:35:6a:1b:6a:db:35:e1:
+        d4:1c:04:e4:a8:45:04:c8:5a:33:38:6e:4d:1c:0d:62:b7:0a:
+        a2:8c:d3:d5:54:3f:46:cd:1c:55:a6:70:db:12:3a:87:93:75:
+        9f:a7:d2:a0
+SHA1 Fingerprint=A4:34:89:15:9A:52:0F:0D:93:D0:32:CC:AF:37:E7:FE:20:A8:B4:19
diff --git a/tests/cluecode/data/copyrights/3a3b02ce_0-a_b_ce.0 b/tests/cluecode/data/copyrights/3a3b02ce_0-a_b_ce.0
new file mode 100644
index 00000000000..8b744f6c64d
--- /dev/null
+++ b/tests/cluecode/data/copyrights/3a3b02ce_0-a_b_ce.0
@@ -0,0 +1,84 @@
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
+ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
+aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
+NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
+A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
+SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
+VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
+w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
+mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
+4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
+4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
+EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
+SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
+ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
+vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
+Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
+/L7fCg0=
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=CH, O=WISeKey, OU=Copyright (c) 2005, OU=OISTE Foundation Endorsed, CN=OISTE WISeKey Global Root GA CA
+        Validity
+            Not Before: Dec 11 16:03:44 2005 GMT
+            Not After : Dec 11 16:09:51 2037 GMT
+        Subject: C=CH, O=WISeKey, OU=Copyright (c) 2005, OU=OISTE Foundation Endorsed, CN=OISTE WISeKey Global Root GA CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:cb:4f:b3:00:9b:3d:36:dd:f9:d1:49:6a:6b:10:
+                    49:1f:ec:d8:2b:b2:c6:f8:32:81:29:43:95:4c:9a:
+                    19:23:21:15:45:de:e3:c8:1c:51:55:5b:ae:93:e8:
+                    37:ff:2b:6b:e9:d4:ea:be:2a:dd:a8:51:2b:d7:66:
+                    c3:61:5c:60:02:c8:f5:ce:72:7b:3b:b8:f2:4e:65:
+                    08:9a:cd:a4:6a:19:c1:01:bb:73:a6:d7:f6:c3:dd:
+                    cd:bc:a4:8b:b5:99:61:b8:01:a2:a3:d4:4d:d4:05:
+                    3d:91:ad:f8:b4:08:71:64:af:70:f1:1c:6b:7e:f6:
+                    c3:77:9d:24:73:7b:e4:0c:8c:e1:d9:36:e1:99:8b:
+                    05:99:0b:ed:45:31:09:ca:c2:00:db:f7:72:a0:96:
+                    aa:95:87:d0:8e:c7:b6:61:73:0d:76:66:8c:dc:1b:
+                    b4:63:a2:9f:7f:93:13:30:f1:a1:27:db:d9:ff:2c:
+                    55:88:91:a0:e0:4f:07:b0:28:56:8c:18:1b:97:44:
+                    8e:89:dd:e0:17:6e:e7:2a:ef:8f:39:0a:31:84:82:
+                    d8:40:14:49:2e:7a:41:e4:a7:fe:e3:64:cc:c1:59:
+                    71:4b:2c:21:a7:5b:7d:e0:1d:d1:2e:81:9b:c3:d8:
+                    68:f7:bd:96:1b:ac:70:b1:16:14:0b:db:60:b9:26:
+                    01:05
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: 
+                Digital Signature, Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                B3:03:7E:AE:36:BC:B0:79:D1:DC:94:26:B6:11:BE:21:B2:69:86:94
+            1.3.6.1.4.1.311.21.1: 
+                ...
+    Signature Algorithm: sha1WithRSAEncryption
+        4b:a1:ff:0b:87:6e:b3:f9:c1:43:b1:48:f3:28:c0:1d:2e:c9:
+        09:41:fa:94:00:1c:a4:a4:ab:49:4f:8f:3d:1e:ef:4d:6f:bd:
+        bc:a4:f6:f2:26:30:c9:10:ca:1d:88:fb:74:19:1f:85:45:bd:
+        b0:6c:51:f9:36:7e:db:f5:4c:32:3a:41:4f:5b:47:cf:e8:0b:
+        2d:b6:c4:19:9d:74:c5:47:c6:3b:6a:0f:ac:14:db:3c:f4:73:
+        9c:a9:05:df:00:dc:74:78:fa:f8:35:60:59:02:13:18:7c:bc:
+        fb:4d:b0:20:6d:43:bb:60:30:7a:67:33:5c:c5:99:d1:f8:2d:
+        39:52:73:fb:8c:aa:97:25:5c:72:d9:08:1e:ab:4e:3c:e3:81:
+        31:9f:03:a6:fb:c0:fe:29:88:55:da:84:d5:50:03:b6:e2:84:
+        a3:a6:36:aa:11:3a:01:e1:18:4b:d6:44:68:b3:3d:f9:53:74:
+        84:b3:46:91:46:96:00:b7:80:2c:b6:e1:e3:10:e2:db:a2:e7:
+        28:8f:01:96:62:16:3e:00:e3:1c:a5:36:81:18:a2:4c:52:76:
+        c0:11:a3:6e:e6:1d:ba:e3:5a:be:36:53:c5:3e:75:8f:86:69:
+        29:58:53:b5:9c:bb:6f:9f:5c:c5:18:ec:dd:2f:e1:98:c9:fc:
+        be:df:0a:0d
+SHA1 Fingerprint=59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9
diff --git a/tests/cluecode/data/copyrights/ABC_cpp-Case_cpp.cpp b/tests/cluecode/data/copyrights/ABC_cpp-Case_cpp.cpp
new file mode 100644
index 00000000000..ce313fa7155
--- /dev/null
+++ b/tests/cluecode/data/copyrights/ABC_cpp-Case_cpp.cpp
@@ -0,0 +1,14 @@
+/******************************
+ ABC DEF
+ 
+ ABC Company
+ 
+ www.abcCompany.com
+ 
+ -----------------------
+ File:	testCase.cpp
+ Project:	testProject
+ -----------------------
+ Copyright (C) ABC Company
+ 
+ **********************************/	
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/ABC_file_cpp-File_cpp.cpp b/tests/cluecode/data/copyrights/ABC_file_cpp-File_cpp.cpp
new file mode 100644
index 00000000000..f3046f0ea99
--- /dev/null
+++ b/tests/cluecode/data/copyrights/ABC_file_cpp-File_cpp.cpp
@@ -0,0 +1,14 @@
+/******************************
+	ABC DEF
+
+	ABC Company
+	
+	www.abcCompany.com
+
+	-----------------------
+	File:	testCase.cpp
+	Project:	testProject
+	-----------------------
+	Copyright (C) ABC Company
+
+**********************************/
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copyright_in_COPYING_gpl-COPYING_gpl.gpl b/tests/cluecode/data/copyrights/COPYING_gpl-COPYING_gpl.gpl
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_COPYING_gpl-COPYING_gpl.gpl
rename to tests/cluecode/data/copyrights/COPYING_gpl-COPYING_gpl.gpl
diff --git a/tests/cluecode/data/copyrights/copyright_in_COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi b/tests/cluecode/data/copyrights/COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi
rename to tests/cluecode/data/copyrights/COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi
diff --git a/tests/cluecode/data/copyrights/copyright_in_README-README b/tests/cluecode/data/copyrights/README-README
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_README-README
rename to tests/cluecode/data/copyrights/README-README
diff --git a/tests/cluecode/data/copyrights/copyright_Yocto-SPDX.pdf b/tests/cluecode/data/copyrights/Yocto-SPDX.pdf
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_Yocto-SPDX.pdf
rename to tests/cluecode/data/copyrights/Yocto-SPDX.pdf
diff --git a/tests/cluecode/data/copyrights/abc b/tests/cluecode/data/copyrights/abc
new file mode 100644
index 00000000000..e31f8194906
--- /dev/null
+++ b/tests/cluecode/data/copyrights/abc
@@ -0,0 +1,2 @@
+#!/bin/sh
+# Copyright (C) 2006 abc.org
diff --git a/tests/cluecode/data/copyrights/abc_loss_of_holder_c-c.c b/tests/cluecode/data/copyrights/abc_loss_of_holder_c-c.c
new file mode 100644
index 00000000000..949051f3f20
--- /dev/null
+++ b/tests/cluecode/data/copyrights/abc_loss_of_holder_c-c.c
@@ -0,0 +1,2 @@
+//copyright abc 2001
+//all rights reserved
diff --git a/tests/cluecode/data/copyrights/abiword_common.copyright b/tests/cluecode/data/copyrights/abiword_common.copyright
new file mode 100644
index 00000000000..69c723fb618
--- /dev/null
+++ b/tests/cluecode/data/copyrights/abiword_common.copyright
@@ -0,0 +1,152 @@
+This package was debianized by:
+
+    Masayuki Hatta (mhatta) <mhatta@debian.org> on Sun, 22 Mar 2009 18:42:01 +0900
+
+It was downloaded from:
+
+    http://www.abisource.com/download/
+
+Upstream Authors:
+
+    <s>AbiSource, Inc, along with many volunteers</s>
+
+    See AUTHORS for (almost) complete list of contributors.
+
+Copyright:
+
+    Copyright (C) 1998- <s>AbiSource, Inc. & Co.</s>
+
+License:
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.  the
+complete text of the GNU General Public License version 3 can be found
+in `/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2009 <s>Masayuki Hatta (mhatta) <mhatta@debian.org></s>
+    Copyright (C) 2009 <s>Patrik Fimml <patrik@fimml.at></s>
+
+and is licensed under the GPL version 3, see above.
+
+
+o About Trademark
+
+(See also http://www.abisource.com/information/license/tm_guide.phtml)
+
+Trademark Usage Guidelines
+
+AbiSource Trademarks
+
+AbiSource, AbiWord, AbiCalc, AbiFile, AbiSuite, AbiShow and other
+AbiSource graphics, logos and service names are trademarks of Dom
+Lachowicz. These trademarks may not be used in connection with any
+product or service that is not AbiSource's, in any manner that is
+likely to cause confusion among customers, or in any manner that
+disparages or discredits AbiSource.
+
+Trademarks and the GPL
+
+AbiSource software products, such as AbiWord, are copyrighted works
+released under the terms of the GNU General Public License
+(GPL). Verbatim copies of such works may be made and distributed, by
+anyone, in accordance with the terms of the GPL without violating the
+AbiSource trademarks. The GPL also grants you certain rights to make
+and distribute derivative works based on the source code to AbiSource
+products.
+
+The GPL does not grant you any right to use AbiSource trademarks in
+connection with these derivative works. AbiSource trademarks may not
+be used in connection with any such derivative works unless that usage
+is explicitly and specifically licensed, in writing, from Dom
+Lachowicz.
+
+Personal exemption
+
+As a specific exception, AbiSource freely licenses the use of certain
+of its trademarks solely in combination with the suffix "Personal"
+when applied to derivative works based on an AbiSource GPL
+product. Thus, for example, you are free to use the mark "AbiWord
+Personal" in connection with derivative works that are based on
+"AbiWord". To help maintain this distinction, AbiSource releases the
+sources to its GPL products with Personal-based trademarks.
+
+We are not lawyers
+
+Trademark and copyright issues are, at heart, legal matters. We've
+tried to keep this explanation as simple and common-sense as possible,
+but if you have any questions about when and how to use AbiSource
+trademarks, your best bet is to ask a lawyer. We are not lawyers.
+
+We are not evil
+
+Our goal is very simple. We want to make sure our software stays Open
+Source, no matter what. That's why we chose the GPL. We also want
+everyone to know which products are ours. That's why we are so picky
+about our trademarks.
+
+o "AbiWord" vs. "AbiWord Personal" for Debian?
+
+Maybe this is informative for now.
+
+> From: Dom Lachowicz
+> Date: 20 July 2004 22:08:34 BST
+> To: Andy Korvemaker, abiword-dev@abisource.com
+> Subject: Re: Abiword being removed from Debian/unstable?
+>
+>
+> I'm not sure if this is the reason or not, but please
+> see:
+>
+> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=258918
+>
+> For the record, I've recently acquired the AbiWord
+> trademarks and whatnot. I haven't had a chance to
+> update the TM information on the website.
+>
+> To be expressly clear here for any Debian guys that
+> read this message:
+>
+> Within reason, I don't care if you use "AbiWord" vs.
+> "AbiWord Personal." In fact, I'd prefer it if you used
+> "AbiWord."
+>
+> Within reason, I don't care if you use the "official"
+> artwork or the "personal" artwork. In fact, I'd prefer
+> it if you used the "official" artwork.
+>
+> I do begin to care if you use my trademarks to promote
+> other products, or in ways that disparage my
+> trademarks or products. If you "forked" AbiWord, you
+> couldn't use the trademarks. But you're clearly not
+> going to do that. The USPTO has more info and case law
+> on this sort of thing.
+>
+> Debian and the other distros are clearly distributing
+> AbiWord, and providing a beneficial service to the
+> community. Even though Debian's version might have a
+> few patches against our "mainline" branch, I don't
+> believe it constitutes a "fork." As such, I think that
+> it is fine (if not preferable) for you guys to use the
+> official name and artwork in your distribution.
+>
+> So, you have my blessing to call your AbiWord +
+> patches "AbiWord". You can use the official artwork
+> too.
+>
+> Dom
+>
diff --git a/tests/cluecode/data/copyrights/acme_c-c.c b/tests/cluecode/data/copyrights/acme_c-c.c
new file mode 100644
index 00000000000..23dbd722d5d
--- /dev/null
+++ b/tests/cluecode/data/copyrights/acme_c-c.c
@@ -0,0 +1 @@
+/* Copyright © 2000 ACME, Inc., All Rights Reserved */
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs b/tests/cluecode/data/copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs
new file mode 100644
index 00000000000..bcad9a64c59
--- /dev/null
+++ b/tests/cluecode/data/copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs
@@ -0,0 +1,40 @@
+/*
+ * Ra-Brix - A Modular-based Framework for building 
+ * Web Applications Copyright 2009 - Thomas Hansen 
+ * thomas@ra-ajax.org. Unless permission is 
+ * explicitly given this code is licensed under the 
+ * GNU Affero GPL version 3 which can be found in the 
+ * license.txt file on disc.
+ * 
+ */
+
+using System;
+
+namespace Ra.Brix.Data
+{
+    /**
+     * Used to mark entity objects as serializable. If a property is
+     * marked with this attribute then it will be possible to serialise
+     * that property. Notice that you still need to mark you classes with the
+     * ActiveRecordAttribute. Also only properties, and not fields and such
+     * can be marked as serializable with this attribute.
+     */
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple=false)]
+    public class ActiveFieldAttribute : Attribute
+    {
+        /**
+         * If true then this is a one-to-x relationship which
+         * means that the type owns this instance and will also delete
+         * the instance if the object itself is deleted. If it is false
+         * then this indicate a many-to-x relationship 
+         * and means that the object does NOT own this property and the 
+         * property will NOT be deleted when the object is deleted.
+         * If it is false then the property will also NOT be saved whenever
+         * the not owning object is being saved.
+         * Default value is true - which means that the object will
+         * be saved when parent object is saved, and also deleted when
+         * the parent object is being deleted.
+         */
+        public bool IsOwner = true;
+    }
+}
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_adaptive_v1_0-Adaptive v.0 b/tests/cluecode/data/copyrights/adaptive_v1_0-Adaptive v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_adaptive_v1_0-Adaptive v.0
rename to tests/cluecode/data/copyrights/adaptive_v1_0-Adaptive v.0
diff --git a/tests/cluecode/data/copyrights/addr_c-addr_c.c b/tests/cluecode/data/copyrights/addr_c-addr_c.c
new file mode 100644
index 00000000000..d3bb4b93fb9
--- /dev/null
+++ b/tests/cluecode/data/copyrights/addr_c-addr_c.c
@@ -0,0 +1,23 @@
+/**************************************************************/
+/* ADDR.C */
+/* Author: John Doe, 7/2000 */
+/* Copyright 1999 Cornell University.  All rights reserved. */
+/* Copyright 2000 Jon Doe.  All rights reserved. */
+/* See license.txt for further information. */
+/**************************************************************/
+
+#include "string.h"
+#include "sys.h"
+
+tst_id tst_put(tst_id *id) {
+    tst_id id ;
+    memcpy(&id, *tst_id,sizeof(id));
+    return id ;
+}
+
+tst_id tst_get() {
+    tst_id id ;
+    memset(&id, 0, sizeof(id)) ;
+    return id ;
+}
+
diff --git a/tests/cluecode/data/copyrights/adler_inflate_c-inflate_c.c b/tests/cluecode/data/copyrights/adler_inflate_c-inflate_c.c
new file mode 100644
index 00000000000..a12a78b33e0
--- /dev/null
+++ b/tests/cluecode/data/copyrights/adler_inflate_c-inflate_c.c
@@ -0,0 +1,952 @@
+/* inflate.c -- Not copyrighted 1992 by Mark Adler
+   version c10p1, 10 January 1993 */
+
+/* You can do whatever you like with this source file, though I would
+   prefer that if you modify it and redistribute it that you include
+   comments to that effect with your name and the date.  Thank you.
+   [The history has been moved to the file ChangeLog.]
+ */
+
+/*
+   Inflate deflated (PKZIP's method 8 compressed) data.  The compression
+   method searches for as much of the current string of bytes (up to a
+   length of 258) in the previous 32K bytes.  If it doesn't find any
+   matches (of at least length 3), it codes the next byte.  Otherwise, it
+   codes the length of the matched string and its distance backwards from
+   the current position.  There is a single Huffman code that codes both
+   single bytes (called "literals") and match lengths.  A second Huffman
+   code codes the distance information, which follows a length code.  Each
+   length or distance code actually represents a base value and a number
+   of "extra" (sometimes zero) bits to get to add to the base value.  At
+   the end of each deflated block is a special end-of-block (EOB) literal/
+   length code.  The decoding process is basically: get a literal/length
+   code; if EOB then done; if a literal, emit the decoded byte; if a
+   length then get the distance and emit the referred-to bytes from the
+   sliding window of previously emitted data.
+
+   There are (currently) three kinds of inflate blocks: stored, fixed, and
+   dynamic.  The compressor deals with some chunk of data at a time, and
+   decides which method to use on a chunk-by-chunk basis.  A chunk might
+   typically be 32K or 64K.  If the chunk is uncompressible, then the
+   "stored" method is used.  In this case, the bytes are simply stored as
+   is, eight bits per byte, with none of the above coding.  The bytes are
+   preceded by a count, since there is no longer an EOB code.
+
+   If the data is compressible, then either the fixed or dynamic methods
+   are used.  In the dynamic method, the compressed data is preceded by
+   an encoding of the literal/length and distance Huffman codes that are
+   to be used to decode this block.  The representation is itself Huffman
+   coded, and so is preceded by a description of that code.  These code
+   descriptions take up a little space, and so for small blocks, there is
+   a predefined set of codes, called the fixed codes.  The fixed method is
+   used if the block codes up smaller that way (usually for quite small
+   chunks), otherwise the dynamic method is used.  In the latter case, the
+   codes are customized to the probabilities in the current block, and so
+   can code it much better than the pre-determined fixed codes.
+ 
+   The Huffman codes themselves are decoded using a mutli-level table
+   lookup, in order to maximize the speed of decoding plus the speed of
+   building the decoding tables.  See the comments below that precede the
+   lbits and dbits tuning parameters.
+ */
+
+
+/*
+   Notes beyond the 1.93a appnote.txt:
+
+   1. Distance pointers never point before the beginning of the output
+      stream.
+   2. Distance pointers can point back across blocks, up to 32k away.
+   3. There is an implied maximum of 7 bits for the bit length table and
+      15 bits for the actual data.
+   4. If only one code exists, then it is encoded using one bit.  (Zero
+      would be more efficient, but perhaps a little confusing.)  If two
+      codes exist, they are coded using one bit each (0 and 1).
+   5. There is no way of sending zero distance codes--a dummy must be
+      sent if there are none.  (History: a pre 2.0 version of PKZIP would
+      store blocks with no distance codes, but this was discovered to be
+      too harsh a criterion.)  Valid only for 1.93a.  2.04c does allow
+      zero distance codes, which is sent as one code of zero bits in
+      length.
+   6. There are up to 286 literal/length codes.  Code 256 represents the
+      end-of-block.  Note however that the static length tree defines
+      288 codes just to fill out the Huffman codes.  Codes 286 and 287
+      cannot be used though, since there is no length base or extra bits
+      defined for them.  Similarily, there are up to 30 distance codes.
+      However, static trees define 32 codes (all 5 bits) to fill out the
+      Huffman codes, but the last two had better not show up in the data.
+   7. Unzip can check dynamic Huffman blocks for complete code sets.
+      The exception is that a single code would not be complete (see #4).
+   8. The five bits following the block type is really the number of
+      literal codes sent minus 257.
+   9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
+      (1+6+6).  Therefore, to output three times the length, you output
+      three codes (1+1+1), whereas to output four times the same length,
+      you only need two codes (1+3).  Hmm.
+  10. In the tree reconstruction algorithm, Code = Code + Increment
+      only if BitLength(i) is not zero.  (Pretty obvious.)
+  11. Correction: 4 Bits: # of Bit Length codes - 4     (4 - 19)
+  12. Note: length code 284 can represent 227-258, but length code 285
+      really is 258.  The last length deserves its own, short code
+      since it gets used a lot in very redundant files.  The length
+      258 is special since 258 - 3 (the min match length) is 255.
+  13. The literal/length and distance code bit lengths are read as a
+      single stream of lengths.  It is possible (and advantageous) for
+      a repeat code (16, 17, or 18) to go across the boundary between
+      the two sets of lengths.
+ */
+
+#ifndef lint
+static char rcsid[] = "$Id: inflate.c,v 0.10 1993/02/04 13:21:06 jloup Exp $";
+#endif
+
+#include "tailor.h"
+#include "gzip.h"
+#define slide window
+
+#include <stdio.h>
+
+#if defined(STDC_HEADERS) || defined(HAVE_STDLIB_H)
+#  include <sys/types.h>
+#  include <stdlib.h>
+#endif
+
+/* Huffman code lookup table entry--this entry is four bytes for machines
+   that have 16-bit pointers (e.g. PC's in the small or medium model).
+   Valid extra bits are 0..13.  e == 15 is EOB (end of block), e == 16
+   means that v is a literal, 16 < e < 32 means that v is a pointer to
+   the next table, which codes e - 16 bits, and lastly e == 99 indicates
+   an unused code.  If a code with e == 99 is looked up, this implies an
+   error in the data. */
+struct huft {
+  uch e;                /* number of extra bits or operation */
+  uch b;                /* number of bits in this code or subcode */
+  union {
+    ush n;              /* literal, length base, or distance base */
+    struct huft *t;     /* pointer to next level of table */
+  } v;
+};
+
+
+/* Function prototypes */
+int huft_build OF((unsigned *, unsigned, unsigned, ush *, ush *,
+                   struct huft **, int *));
+int huft_free OF((struct huft *));
+int inflate_codes OF((struct huft *, struct huft *, int, int));
+int inflate_stored OF((void));
+int inflate_fixed OF((void));
+int inflate_dynamic OF((void));
+int inflate_block OF((int *));
+int inflate OF((void));
+
+
+/* The inflate algorithm uses a sliding 32K byte window on the uncompressed
+   stream to find repeated byte strings.  This is implemented here as a
+   circular buffer.  The index is updated simply by incrementing and then
+   and'ing with 0x7fff (32K-1). */
+/* It is left to other modules to supply the 32K area.  It is assumed
+   to be usable as if it were declared "uch slide[32768];" or as just
+   "uch *slide;" and then malloc'ed in the latter case.  The definition
+   must be in unzip.h, included above. */
+/* unsigned wp;             current position in slide */
+#define wp outcnt
+#define flush_output(w) (wp=(w),flush_window())
+
+/* Tables for deflate from PKZIP's appnote.txt. */
+static unsigned border[] = {    /* Order of the bit length code lengths */
+        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+static ush cplens[] = {         /* Copy lengths for literal codes 257..285 */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+        /* note: see note #13 above about the 258 in this list. */
+static ush cplext[] = {         /* Extra bits for literal codes 257..285 */
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99}; /* 99==invalid */
+static ush cpdist[] = {         /* Copy offsets for distance codes 0..29 */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577};
+static ush cpdext[] = {         /* Extra bits for distance codes */
+        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+        12, 12, 13, 13};
+
+
+
+/* Macros for inflate() bit peeking and grabbing.
+   The usage is:
+   
+        NEEDBITS(j)
+        x = b & mask_bits[j];
+        DUMPBITS(j)
+
+   where NEEDBITS makes sure that b has at least j bits in it, and
+   DUMPBITS removes the bits from b.  The macros use the variable k
+   for the number of bits in b.  Normally, b and k are register
+   variables for speed, and are initialized at the begining of a
+   routine that uses these macros from a global bit buffer and count.
+
+   If we assume that EOB will be the longest code, then we will never
+   ask for bits with NEEDBITS that are beyond the end of the stream.
+   So, NEEDBITS should not read any more bytes than are needed to
+   meet the request.  Then no bytes need to be "returned" to the buffer
+   at the end of the last block.
+
+   However, this assumption is not true for fixed blocks--the EOB code
+   is 7 bits, but the other literal/length codes can be 8 or 9 bits.
+   (The EOB code is shorter than other codes becuase fixed blocks are
+   generally short.  So, while a block always has an EOB, many other
+   literal/length codes have a significantly lower probability of
+   showing up at all.)  However, by making the first table have a
+   lookup of seven bits, the EOB code will be found in that first
+   lookup, and so will not require that too many bits be pulled from
+   the stream.
+ */
+
+ulg bb;                         /* bit buffer */
+unsigned bk;                    /* bits in bit buffer */
+
+ush mask_bits[] = {
+    0x0000,
+    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
+    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
+};
+
+#ifdef CRYPT
+  uch cc;
+#  define NEXTBYTE() \
+     (decrypt ? (cc = get_byte(), zdecode(cc), cc) : get_byte())
+#else
+#  define NEXTBYTE()  (uch)get_byte()
+#endif
+#define NEEDBITS(n) {while(k<(n)){b|=((ulg)NEXTBYTE())<<k;k+=8;}}
+#define DUMPBITS(n) {b>>=(n);k-=(n);}
+
+
+/*
+   Huffman code decoding is performed using a multi-level table lookup.
+   The fastest way to decode is to simply build a lookup table whose
+   size is determined by the longest code.  However, the time it takes
+   to build this table can also be a factor if the data being decoded
+   is not very long.  The most common codes are necessarily the
+   shortest codes, so those codes dominate the decoding time, and hence
+   the speed.  The idea is you can have a shorter table that decodes the
+   shorter, more probable codes, and then point to subsidiary tables for
+   the longer codes.  The time it costs to decode the longer codes is
+   then traded against the time it takes to make longer tables.
+
+   This results of this trade are in the variables lbits and dbits
+   below.  lbits is the number of bits the first level table for literal/
+   length codes can decode in one step, and dbits is the same thing for
+   the distance codes.  Subsequent tables are also less than or equal to
+   those sizes.  These values may be adjusted either when all of the
+   codes are shorter than that, in which case the longest code length in
+   bits is used, or when the shortest code is *longer* than the requested
+   table size, in which case the length of the shortest code in bits is
+   used.
+
+   There are two different values for the two tables, since they code a
+   different number of possibilities each.  The literal/length table
+   codes 286 possible values, or in a flat code, a little over eight
+   bits.  The distance table codes 30 possible values, or a little less
+   than five bits, flat.  The optimum values for speed end up being
+   about one bit more than those, so lbits is 8+1 and dbits is 5+1.
+   The optimum values may differ though from machine to machine, and
+   possibly even between compilers.  Your mileage may vary.
+ */
+
+
+int lbits = 9;          /* bits in base literal/length lookup table */
+int dbits = 6;          /* bits in base distance lookup table */
+
+
+/* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
+#define BMAX 16         /* maximum bit length of any code (16 for explode) */
+#define N_MAX 288       /* maximum number of codes in any set */
+
+
+unsigned hufts;         /* track memory usage */
+
+
+int huft_build(b, n, s, d, e, t, m)
+unsigned *b;            /* code lengths in bits (all assumed <= BMAX) */
+unsigned n;             /* number of codes (assumed <= N_MAX) */
+unsigned s;             /* number of simple-valued codes (0..s-1) */
+ush *d;                 /* list of base values for non-simple codes */
+ush *e;                 /* list of extra bits for non-simple codes */
+struct huft **t;        /* result: starting table */
+int *m;                 /* maximum lookup bits, returns actual */
+/* Given a list of code lengths and a maximum table size, make a set of
+   tables to decode that set of codes.  Return zero on success, one if
+   the given code set is incomplete (the tables are still built in this
+   case), two if the input is invalid (all zero length codes or an
+   oversubscribed set of lengths), and three if not enough memory. */
+{
+  unsigned a;                   /* counter for codes of length k */
+  unsigned c[BMAX+1];           /* bit length count table */
+  unsigned f;                   /* i repeats in table every f entries */
+  int g;                        /* maximum code length */
+  int h;                        /* table level */
+  register unsigned i;          /* counter, current code */
+  register unsigned j;          /* counter */
+  register int k;               /* number of bits in current code */
+  int l;                        /* bits per table (returned in m) */
+  register unsigned *p;         /* pointer into c[], b[], or v[] */
+  register struct huft *q;      /* points to current table */
+  struct huft r;                /* table entry for structure assignment */
+  struct huft *u[BMAX];         /* table stack */
+  unsigned v[N_MAX];            /* values in order of bit length */
+  register int w;               /* bits before this table == (l * h) */
+  unsigned x[BMAX+1];           /* bit offsets, then code stack */
+  unsigned *xp;                 /* pointer into x */
+  int y;                        /* number of dummy codes added */
+  unsigned z;                   /* number of entries in current table */
+
+
+  /* Generate counts for each bit length */
+  memzero(c, sizeof(c));
+  p = b;  i = n;
+  do {
+    Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), 
+	    n-i, *p));
+    c[*p++]++;                  /* assume all entries <= BMAX */
+  } while (--i);
+  if (c[0] == n)                /* null input--all zero length codes */
+  {
+    *t = (struct huft *)NULL;
+    *m = 0;
+    return 0;
+  }
+
+
+  /* Find minimum and maximum length, bound *m by those */
+  l = *m;
+  for (j = 1; j <= BMAX; j++)
+    if (c[j])
+      break;
+  k = j;                        /* minimum code length */
+  if ((unsigned)l < j)
+    l = j;
+  for (i = BMAX; i; i--)
+    if (c[i])
+      break;
+  g = i;                        /* maximum code length */
+  if ((unsigned)l > i)
+    l = i;
+  *m = l;
+
+
+  /* Adjust last length count to fill out codes, if needed */
+  for (y = 1 << j; j < i; j++, y <<= 1)
+    if ((y -= c[j]) < 0)
+      return 2;                 /* bad input: more codes than bits */
+  if ((y -= c[i]) < 0)
+    return 2;
+  c[i] += y;
+
+
+  /* Generate starting offsets into the value table for each length */
+  x[1] = j = 0;
+  p = c + 1;  xp = x + 2;
+  while (--i) {                 /* note that i == g from above */
+    *xp++ = (j += *p++);
+  }
+
+
+  /* Make a table of values in order of bit lengths */
+  p = b;  i = 0;
+  do {
+    if ((j = *p++) != 0)
+      v[x[j]++] = i;
+  } while (++i < n);
+
+
+  /* Generate the Huffman codes and for each, make the table entries */
+  x[0] = i = 0;                 /* first Huffman code is zero */
+  p = v;                        /* grab values in bit order */
+  h = -1;                       /* no tables yet--level -1 */
+  w = -l;                       /* bits decoded == (l * h) */
+  u[0] = (struct huft *)NULL;   /* just to keep compilers happy */
+  q = (struct huft *)NULL;      /* ditto */
+  z = 0;                        /* ditto */
+
+  /* go through the bit lengths (k already is bits in shortest code) */
+  for (; k <= g; k++)
+  {
+    a = c[k];
+    while (a--)
+    {
+      /* here i is the Huffman code of length k bits for value *p */
+      /* make tables up to required level */
+      while (k > w + l)
+      {
+        h++;
+        w += l;                 /* previous table always l bits */
+
+        /* compute minimum size table less than or equal to l bits */
+        z = (z = g - w) > (unsigned)l ? l : z;  /* upper limit on table size */
+        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
+        {                       /* too few codes for k-w bit table */
+          f -= a + 1;           /* deduct codes from patterns left */
+          xp = c + k;
+          while (++j < z)       /* try smaller tables up to z bits */
+          {
+            if ((f <<= 1) <= *++xp)
+              break;            /* enough codes to use up j bits */
+            f -= *xp;           /* else deduct codes from patterns */
+          }
+        }
+        z = 1 << j;             /* table entries for j-bit table */
+
+        /* allocate and link in new table */
+        if ((q = (struct huft *)malloc((z + 1)*sizeof(struct huft))) ==
+            (struct huft *)NULL)
+        {
+          if (h)
+            huft_free(u[0]);
+          return 3;             /* not enough memory */
+        }
+        hufts += z + 1;         /* track memory usage */
+        *t = q + 1;             /* link to list for huft_free() */
+        *(t = &(q->v.t)) = (struct huft *)NULL;
+        u[h] = ++q;             /* table starts after link */
+
+        /* connect to last table, if there is one */
+        if (h)
+        {
+          x[h] = i;             /* save pattern for backing up */
+          r.b = (uch)l;         /* bits to dump before this table */
+          r.e = (uch)(16 + j);  /* bits in this table */
+          r.v.t = q;            /* pointer to this table */
+          j = i >> (w - l);     /* (get around Turbo C bug) */
+          u[h-1][j] = r;        /* connect to last table */
+        }
+      }
+
+      /* set up table entry in r */
+      r.b = (uch)(k - w);
+      if (p >= v + n)
+        r.e = 99;               /* out of values--invalid code */
+      else if (*p < s)
+      {
+        r.e = (uch)(*p < 256 ? 16 : 15);    /* 256 is end-of-block code */
+        r.v.n = *p++;           /* simple code is just the value */
+      }
+      else
+      {
+        r.e = (uch)e[*p - s];   /* non-simple--look up in lists */
+        r.v.n = d[*p++ - s];
+      }
+
+      /* fill code-like entries with r */
+      f = 1 << (k - w);
+      for (j = i >> w; j < z; j += f)
+        q[j] = r;
+
+      /* backwards increment the k-bit code i */
+      for (j = 1 << (k - 1); i & j; j >>= 1)
+        i ^= j;
+      i ^= j;
+
+      /* backup over finished tables */
+      while ((i & ((1 << w) - 1)) != x[h])
+      {
+        h--;                    /* don't need to update q */
+        w -= l;
+      }
+    }
+  }
+
+
+  /* Return true (1) if we were given an incomplete table */
+  return y != 0 && g != 1;
+}
+
+
+
+int huft_free(t)
+struct huft *t;         /* table to free */
+/* Free the malloc'ed tables built by huft_build(), which makes a linked
+   list of the tables it made, with the links in a dummy first entry of
+   each table. */
+{
+  register struct huft *p, *q;
+
+
+  /* Go through linked list, freeing from the malloced (t[-1]) address. */
+  p = t;
+  while (p != (struct huft *)NULL)
+  {
+    q = (--p)->v.t;
+    free(p);
+    p = q;
+  } 
+  return 0;
+}
+
+
+int inflate_codes(tl, td, bl, bd)
+struct huft *tl, *td;   /* literal/length and distance decoder tables */
+int bl, bd;             /* number of bits decoded by tl[] and td[] */
+/* inflate (decompress) the codes in a deflated (compressed) block.
+   Return an error code or zero if it all goes ok. */
+{
+  register unsigned e;  /* table entry flag/number of extra bits */
+  unsigned n, d;        /* length and index for copy */
+  unsigned w;           /* current window position */
+  struct huft *t;       /* pointer to table entry */
+  unsigned ml, md;      /* masks for bl and bd bits */
+  register ulg b;       /* bit buffer */
+  register unsigned k;  /* number of bits in bit buffer */
+
+
+  /* make local copies of globals */
+  b = bb;                       /* initialize bit buffer */
+  k = bk;
+  w = wp;                       /* initialize window position */
+
+  /* inflate the coded data */
+  ml = mask_bits[bl];           /* precompute masks for speed */
+  md = mask_bits[bd];
+  for (;;)                      /* do until end of block */
+  {
+    NEEDBITS((unsigned)bl)
+    if ((e = (t = tl + ((unsigned)b & ml))->e) > 16)
+      do {
+        if (e == 99)
+          return 1;
+        DUMPBITS(t->b)
+        e -= 16;
+        NEEDBITS(e)
+      } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16);
+    DUMPBITS(t->b)
+    if (e == 16)                /* then it's a literal */
+    {
+      slide[w++] = (uch)t->v.n;
+      Tracevv((stderr, "%c", slide[w-1]));
+      if (w == WSIZE)
+      {
+        flush_output(w);
+        w = 0;
+      }
+    }
+    else                        /* it's an EOB or a length */
+    {
+      /* exit if end of block */
+      if (e == 15)
+        break;
+
+      /* get length of block to copy */
+      NEEDBITS(e)
+      n = t->v.n + ((unsigned)b & mask_bits[e]);
+      DUMPBITS(e);
+
+      /* decode distance of block to copy */
+      NEEDBITS((unsigned)bd)
+      if ((e = (t = td + ((unsigned)b & md))->e) > 16)
+        do {
+          if (e == 99)
+            return 1;
+          DUMPBITS(t->b)
+          e -= 16;
+          NEEDBITS(e)
+        } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16);
+      DUMPBITS(t->b)
+      NEEDBITS(e)
+      d = w - t->v.n - ((unsigned)b & mask_bits[e]);
+      DUMPBITS(e)
+      Tracevv((stderr,"\\[%d,%d]", w-d, n));
+
+      /* do the copy */
+      do {
+        n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e);
+#if !defined(NOMEMCPY) && !defined(DEBUG)
+        if (w - d >= e)         /* (this test assumes unsigned comparison) */
+        {
+          memcpy(slide + w, slide + d, e);
+          w += e;
+          d += e;
+        }
+        else                      /* do it slow to avoid memcpy() overlap */
+#endif /* !NOMEMCPY */
+          do {
+            slide[w++] = slide[d++];
+	    Tracevv((stderr, "%c", slide[w-1]));
+          } while (--e);
+        if (w == WSIZE)
+        {
+          flush_output(w);
+          w = 0;
+        }
+      } while (n);
+    }
+  }
+
+
+  /* restore the globals from the locals */
+  wp = w;                       /* restore global window pointer */
+  bb = b;                       /* restore global bit buffer */
+  bk = k;
+
+  /* done */
+  return 0;
+}
+
+
+
+int inflate_stored()
+/* "decompress" an inflated type 0 (stored) block. */
+{
+  unsigned n;           /* number of bytes in block */
+  unsigned w;           /* current window position */
+  register ulg b;       /* bit buffer */
+  register unsigned k;  /* number of bits in bit buffer */
+
+
+  /* make local copies of globals */
+  b = bb;                       /* initialize bit buffer */
+  k = bk;
+  w = wp;                       /* initialize window position */
+
+
+  /* go to byte boundary */
+  n = k & 7;
+  DUMPBITS(n);
+
+
+  /* get the length and its complement */
+  NEEDBITS(16)
+  n = ((unsigned)b & 0xffff);
+  DUMPBITS(16)
+  NEEDBITS(16)
+  if (n != (unsigned)((~b) & 0xffff))
+    return 1;                   /* error in compressed data */
+  DUMPBITS(16)
+
+
+  /* read and output the compressed data */
+  while (n--)
+  {
+    NEEDBITS(8)
+    slide[w++] = (uch)b;
+    if (w == WSIZE)
+    {
+      flush_output(w);
+      w = 0;
+    }
+    DUMPBITS(8)
+  }
+
+
+  /* restore the globals from the locals */
+  wp = w;                       /* restore global window pointer */
+  bb = b;                       /* restore global bit buffer */
+  bk = k;
+  return 0;
+}
+
+
+
+int inflate_fixed()
+/* decompress an inflated type 1 (fixed Huffman codes) block.  We should
+   either replace this with a custom decoder, or at least precompute the
+   Huffman tables. */
+{
+  int i;                /* temporary variable */
+  struct huft *tl;      /* literal/length code table */
+  struct huft *td;      /* distance code table */
+  int bl;               /* lookup bits for tl */
+  int bd;               /* lookup bits for td */
+  unsigned l[288];      /* length list for huft_build */
+
+
+  /* set up literal table */
+  for (i = 0; i < 144; i++)
+    l[i] = 8;
+  for (; i < 256; i++)
+    l[i] = 9;
+  for (; i < 280; i++)
+    l[i] = 7;
+  for (; i < 288; i++)          /* make a complete, but wrong code set */
+    l[i] = 8;
+  bl = 7;
+  if ((i = huft_build(l, 288, 257, cplens, cplext, &tl, &bl)) != 0)
+    return i;
+
+
+  /* set up distance table */
+  for (i = 0; i < 30; i++)      /* make an incomplete code set */
+    l[i] = 5;
+  bd = 5;
+  if ((i = huft_build(l, 30, 0, cpdist, cpdext, &td, &bd)) > 1)
+  {
+    huft_free(tl);
+    return i;
+  }
+
+
+  /* decompress until an end-of-block code */
+  if (inflate_codes(tl, td, bl, bd))
+    return 1;
+
+
+  /* free the decoding tables, return */
+  huft_free(tl);
+  huft_free(td);
+  return 0;
+}
+
+
+
+int inflate_dynamic()
+/* decompress an inflated type 2 (dynamic Huffman codes) block. */
+{
+  int i;                /* temporary variables */
+  unsigned j;
+  unsigned l;           /* last length */
+  unsigned m;           /* mask for bit lengths table */
+  unsigned n;           /* number of lengths to get */
+  struct huft *tl;      /* literal/length code table */
+  struct huft *td;      /* distance code table */
+  int bl;               /* lookup bits for tl */
+  int bd;               /* lookup bits for td */
+  unsigned nb;          /* number of bit length codes */
+  unsigned nl;          /* number of literal/length codes */
+  unsigned nd;          /* number of distance codes */
+#ifdef PKZIP_BUG_WORKAROUND
+  unsigned ll[288+32];  /* literal/length and distance code lengths */
+#else
+  unsigned ll[286+30];  /* literal/length and distance code lengths */
+#endif
+  register ulg b;       /* bit buffer */
+  register unsigned k;  /* number of bits in bit buffer */
+
+
+  /* make local bit buffer */
+  b = bb;
+  k = bk;
+
+
+  /* read in table lengths */
+  NEEDBITS(5)
+  nl = 257 + ((unsigned)b & 0x1f);      /* number of literal/length codes */
+  DUMPBITS(5)
+  NEEDBITS(5)
+  nd = 1 + ((unsigned)b & 0x1f);        /* number of distance codes */
+  DUMPBITS(5)
+  NEEDBITS(4)
+  nb = 4 + ((unsigned)b & 0xf);         /* number of bit length codes */
+  DUMPBITS(4)
+#ifdef PKZIP_BUG_WORKAROUND
+  if (nl > 288 || nd > 32)
+#else
+  if (nl > 286 || nd > 30)
+#endif
+    return 1;                   /* bad lengths */
+
+
+  /* read in bit-length-code lengths */
+  for (j = 0; j < nb; j++)
+  {
+    NEEDBITS(3)
+    ll[border[j]] = (unsigned)b & 7;
+    DUMPBITS(3)
+  }
+  for (; j < 19; j++)
+    ll[border[j]] = 0;
+
+
+  /* build decoding table for trees--single level, 7 bit lookup */
+  bl = 7;
+  if ((i = huft_build(ll, 19, 19, NULL, NULL, &tl, &bl)) != 0)
+  {
+    if (i == 1)
+      huft_free(tl);
+    return i;                   /* incomplete code set */
+  }
+
+
+  /* read in literal and distance code lengths */
+  n = nl + nd;
+  m = mask_bits[bl];
+  i = l = 0;
+  while ((unsigned)i < n)
+  {
+    NEEDBITS((unsigned)bl)
+    j = (td = tl + ((unsigned)b & m))->b;
+    DUMPBITS(j)
+    j = td->v.n;
+    if (j < 16)                 /* length of code in bits (0..15) */
+      ll[i++] = l = j;          /* save last length in l */
+    else if (j == 16)           /* repeat last length 3 to 6 times */
+    {
+      NEEDBITS(2)
+      j = 3 + ((unsigned)b & 3);
+      DUMPBITS(2)
+      if ((unsigned)i + j > n)
+        return 1;
+      while (j--)
+        ll[i++] = l;
+    }
+    else if (j == 17)           /* 3 to 10 zero length codes */
+    {
+      NEEDBITS(3)
+      j = 3 + ((unsigned)b & 7);
+      DUMPBITS(3)
+      if ((unsigned)i + j > n)
+        return 1;
+      while (j--)
+        ll[i++] = 0;
+      l = 0;
+    }
+    else                        /* j == 18: 11 to 138 zero length codes */
+    {
+      NEEDBITS(7)
+      j = 11 + ((unsigned)b & 0x7f);
+      DUMPBITS(7)
+      if ((unsigned)i + j > n)
+        return 1;
+      while (j--)
+        ll[i++] = 0;
+      l = 0;
+    }
+  }
+
+
+  /* free decoding table for trees */
+  huft_free(tl);
+
+
+  /* restore the global bit buffer */
+  bb = b;
+  bk = k;
+
+
+  /* build the decoding tables for literal/length and distance codes */
+  bl = lbits;
+  if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0)
+  {
+    if (i == 1) {
+      fprintf(stderr, " incomplete literal tree\n");
+      huft_free(tl);
+    }
+    return i;                   /* incomplete code set */
+  }
+  bd = dbits;
+  if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0)
+  {
+    if (i == 1) {
+      fprintf(stderr, " incomplete distance tree\n");
+#ifdef PKZIP_BUG_WORKAROUND
+      i = 0;
+    }
+#else
+      huft_free(td);
+    }
+    huft_free(tl);
+    return i;                   /* incomplete code set */
+#endif
+  }
+
+
+  /* decompress until an end-of-block code */
+  if (inflate_codes(tl, td, bl, bd))
+    return 1;
+
+
+  /* free the decoding tables, return */
+  huft_free(tl);
+  huft_free(td);
+  return 0;
+}
+
+
+
+int inflate_block(e)
+int *e;                 /* last block flag */
+/* decompress an inflated block */
+{
+  unsigned t;           /* block type */
+  register ulg b;       /* bit buffer */
+  register unsigned k;  /* number of bits in bit buffer */
+
+
+  /* make local bit buffer */
+  b = bb;
+  k = bk;
+
+
+  /* read in last block bit */
+  NEEDBITS(1)
+  *e = (int)b & 1;
+  DUMPBITS(1)
+
+
+  /* read in block type */
+  NEEDBITS(2)
+  t = (unsigned)b & 3;
+  DUMPBITS(2)
+
+
+  /* restore the global bit buffer */
+  bb = b;
+  bk = k;
+
+
+  /* inflate that block type */
+  if (t == 2)
+    return inflate_dynamic();
+  if (t == 0)
+    return inflate_stored();
+  if (t == 1)
+    return inflate_fixed();
+
+
+  /* bad block type */
+  return 2;
+}
+
+
+
+int inflate()
+/* decompress an inflated entry */
+{
+  int e;                /* last block flag */
+  int r;                /* result code */
+  unsigned h;           /* maximum struct huft's malloc'ed */
+
+
+  /* initialize window, bit buffer */
+  wp = 0;
+  bk = 0;
+  bb = 0;
+
+
+  /* decompress until the last block */
+  h = 0;
+  do {
+    hufts = 0;
+    if ((r = inflate_block(&e)) != 0)
+      return r;
+    if (hufts > h)
+      h = hufts;
+  } while (!e);
+
+  /* Undo too much lookahead. The next read will be byte aligned so we
+   * can discard unused bits in the last meaningful byte.
+   */
+  while (bk >= 8) {
+    bk -= 8;
+    inptr--;
+  }
+
+  /* flush out slide */
+  flush_output(wp);
+
+
+  /* return success */
+#ifdef DEBUG
+  fprintf(stderr, "<%u> ", h);
+#endif /* DEBUG */
+  return 0;
+}
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_adobe-Adobe b/tests/cluecode/data/copyrights/adobe-Adobe
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_adobe-Adobe
rename to tests/cluecode/data/copyrights/adobe-Adobe
diff --git a/tests/cluecode/data/copyrights/copyright_adobe_flashplugin_copyright_label-adobe_flashplugin_copyright_label.label b/tests/cluecode/data/copyrights/adobe_flashplugin-adobe_flashplugin.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_adobe_flashplugin_copyright_label-adobe_flashplugin_copyright_label.label
rename to tests/cluecode/data/copyrights/adobe_flashplugin-adobe_flashplugin.label
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_adobeflex2sdk-Adobeflex_sdk b/tests/cluecode/data/copyrights/adobeflex2sdk-Adobeflex_sdk
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_adobeflex2sdk-Adobeflex_sdk
rename to tests/cluecode/data/copyrights/adobeflex2sdk-Adobeflex_sdk
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_afferogplv1-AfferoGPLv b/tests/cluecode/data/copyrights/afferogplv1-AfferoGPLv
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_afferogplv1-AfferoGPLv
rename to tests/cluecode/data/copyrights/afferogplv1-AfferoGPLv
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_afferogplv2-AfferoGPLv b/tests/cluecode/data/copyrights/afferogplv2-AfferoGPLv
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_afferogplv2-AfferoGPLv
rename to tests/cluecode/data/copyrights/afferogplv2-AfferoGPLv
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_afferogplv3-AfferoGPLv b/tests/cluecode/data/copyrights/afferogplv3-AfferoGPLv
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_afferogplv3-AfferoGPLv
rename to tests/cluecode/data/copyrights/afferogplv3-AfferoGPLv
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_afl_v3_0-AFL_v.0 b/tests/cluecode/data/copyrights/afl_v3_0-AFL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_afl_v3_0-AFL_v.0
rename to tests/cluecode/data/copyrights/afl_v3_0-AFL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_aladdin_free_public_license-Aladdin Free Public License b/tests/cluecode/data/copyrights/aladdin_free_public_license-Aladdin Free Public License
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_aladdin_free_public_license-Aladdin Free Public License
rename to tests/cluecode/data/copyrights/aladdin_free_public_license-Aladdin Free Public License
diff --git a/tests/cluecode/data/copyrights/aleal-c.c b/tests/cluecode/data/copyrights/aleal-c.c
new file mode 100644
index 00000000000..75d73228561
--- /dev/null
+++ b/tests/cluecode/data/copyrights/aleal-c.c
@@ -0,0 +1,3 @@
+/**
+* copyright : (C) 2006 by aleal
+*/
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_amazondsb-AmazonDSb b/tests/cluecode/data/copyrights/amazondsb-AmazonDSb
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_amazondsb-AmazonDSb
rename to tests/cluecode/data/copyrights/amazondsb-AmazonDSb
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ampasbsd-AMPASBSD b/tests/cluecode/data/copyrights/ampasbsd-AMPASBSD
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ampasbsd-AMPASBSD
rename to tests/cluecode/data/copyrights/ampasbsd-AMPASBSD
diff --git a/tests/cluecode/data/copyrights/andre_darcy-c.c b/tests/cluecode/data/copyrights/andre_darcy-c.c
new file mode 100644
index 00000000000..383e586c5dd
--- /dev/null
+++ b/tests/cluecode/data/copyrights/andre_darcy-c.c
@@ -0,0 +1,28 @@
+/*
+ * $Id: vtmodule.c 33125 2009-07-16 20:58:26Z dbochkov $
+ * PyGres, version 2.2 A Python interface for PostgreSQL database. Written by
+ * D'Arcy J.M. Cain, (darcy@druid.net).  Based heavily on code written by
+ * Pascal Andre, andre@chimay.via.ecp.fr. Copyright (c) 1995, Pascal Andre
+ * (andre@via.ecp.fr).
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without a written
+ * agreement is hereby granted, provided that the above copyright notice and
+ * this paragraph and the following two paragraphs appear in all copies or in
+ * any new file that contains a substantial portion of this file.
+ *
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+ * SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE
+ * AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE
+ * AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Further modifications copyright 1997, 1998, 1999 by D'Arcy J.M. Cain
+ * (darcy@druid.net) subject to the same terms and conditions as above.
+ *
+ */
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copyright_colin_android-bsdiff_c.c b/tests/cluecode/data/copyrights/android_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_colin_android-bsdiff_c.c
rename to tests/cluecode/data/copyrights/android_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_apache2_debian_trailing_name_missed-apache_copyright_label.label b/tests/cluecode/data/copyrights/apache2_debian_trailing_name_missed-apache.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_apache2_debian_trailing_name_missed-apache_copyright_label.label
rename to tests/cluecode/data/copyrights/apache2_debian_trailing_name_missed-apache.label
diff --git a/tests/cluecode/data/copyrights/copyright_apache_in_html.html b/tests/cluecode/data/copyrights/apache_in_html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_apache_in_html.html
rename to tests/cluecode/data/copyrights/apache_in_html.html
diff --git a/tests/cluecode/data/copyrights/apache_notice-NOTICE b/tests/cluecode/data/copyrights/apache_notice-NOTICE
new file mode 100644
index 00000000000..e820f3230fe
--- /dev/null
+++ b/tests/cluecode/data/copyrights/apache_notice-NOTICE
@@ -0,0 +1,35 @@
+   =========================================================================
+   ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+   ==  Version 2.0, in this case for the Apache Xalan Java distribution.  ==
+   =========================================================================
+
+   Apache Xalan (Xalan serializer)
+   Copyright 1999-2006 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   =========================================================================
+
+
+   =========================================================================       
+   Apache Xerces Java
+   Copyright 1999-2006 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of Apache Xerces Java in xercesImpl.jar and xml-apis.jar
+
+   =========================================================================   
+   Apache xml-commons xml-apis (redistribution of xml-apis.jar)
+
+   Apache XML Commons
+   Copyright 2001-2003,2006 The Apache Software Foundation.
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of this software were originally based on the following:
+     - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_apachev1_0-Apachev.0 b/tests/cluecode/data/copyrights/apachev1_0-Apachev.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_apachev1_0-Apachev.0
rename to tests/cluecode/data/copyrights/apachev1_0-Apachev.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_apachev1_1-Apachev.1 b/tests/cluecode/data/copyrights/apachev1_1-Apachev.1
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_apachev1_1-Apachev.1
rename to tests/cluecode/data/copyrights/apachev1_1-Apachev.1
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_apachev2_0b-Apachev_b.0b b/tests/cluecode/data/copyrights/apachev2_0b-Apachev_b.0b
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_apachev2_0b-Apachev_b.0b
rename to tests/cluecode/data/copyrights/apachev2_0b-Apachev_b.0b
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_apple_common_documentation_license_v1_0-Apple Common Documentation License v.0 b/tests/cluecode/data/copyrights/apple_common_documentation_license_v1_0-Apple Common Documentation License v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_apple_common_documentation_license_v1_0-Apple Common Documentation License v.0
rename to tests/cluecode/data/copyrights/apple_common_documentation_license_v1_0-Apple Common Documentation License v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_apple_public_source_license_v1_0-Apple Public Source License v.0 b/tests/cluecode/data/copyrights/apple_public_source_license_v1_0-Apple Public Source License v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_apple_public_source_license_v1_0-Apple Public Source License v.0
rename to tests/cluecode/data/copyrights/apple_public_source_license_v1_0-Apple Public Source License v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_apple_public_source_license_v1_1-Apple Public Source License v.1 b/tests/cluecode/data/copyrights/apple_public_source_license_v1_1-Apple Public Source License v.1
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_apple_public_source_license_v1_1-Apple Public Source License v.1
rename to tests/cluecode/data/copyrights/apple_public_source_license_v1_1-Apple Public Source License v.1
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_apple_public_source_license_v1_2-Apple Public Source License v.2 b/tests/cluecode/data/copyrights/apple_public_source_license_v1_2-Apple Public Source License v.2
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_apple_public_source_license_v1_2-Apple Public Source License v.2
rename to tests/cluecode/data/copyrights/apple_public_source_license_v1_2-Apple Public Source License v.2
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_apslv2_0-APSLv.0 b/tests/cluecode/data/copyrights/apslv2_0-APSLv.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_apslv2_0-APSLv.0
rename to tests/cluecode/data/copyrights/apslv2_0-APSLv.0
diff --git a/tests/cluecode/data/copyrights/aptitude-aptitude.label b/tests/cluecode/data/copyrights/aptitude-aptitude.label
new file mode 100644
index 00000000000..228714bc833
--- /dev/null
+++ b/tests/cluecode/data/copyrights/aptitude-aptitude.label
@@ -0,0 +1,6 @@
+Copyright 1999-2005 <s>Daniel Burrows <dburrows@debian.org></s>
+
+The upstream web site for aptitude is
+http://people.debian.org/~dburrows/aptitude .
+
+License: GPL (/usr/share/common-licenses/GPL)
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_artistic_v1_0-Artistic v.0 b/tests/cluecode/data/copyrights/artistic_v1_0-Artistic v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_artistic_v1_0-Artistic v.0
rename to tests/cluecode/data/copyrights/artistic_v1_0-Artistic v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_artistic_v1_0_short-Artistic v_ short.0 short b/tests/cluecode/data/copyrights/artistic_v1_0_short-Artistic v_ short.0 short
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_artistic_v1_0_short-Artistic v_ short.0 short
rename to tests/cluecode/data/copyrights/artistic_v1_0_short-Artistic v_ short.0 short
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_artistic_v2_0beta4-Artistic v_beta.0beta4 b/tests/cluecode/data/copyrights/artistic_v2_0beta4-Artistic v_beta.0beta4
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_artistic_v2_0beta4-Artistic v_beta.0beta4
rename to tests/cluecode/data/copyrights/artistic_v2_0beta4-Artistic v_beta.0beta4
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_artisticv2_0-Artisticv.0 b/tests/cluecode/data/copyrights/artisticv2_0-Artisticv.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_artisticv2_0-Artisticv.0
rename to tests/cluecode/data/copyrights/artisticv2_0-Artisticv.0
diff --git a/tests/cluecode/data/copyrights/atheros_spanning_lines-py.py b/tests/cluecode/data/copyrights/atheros_spanning_lines-py.py
new file mode 100644
index 00000000000..1298b24d32b
--- /dev/null
+++ b/tests/cluecode/data/copyrights/atheros_spanning_lines-py.py
@@ -0,0 +1,16 @@
+# /***************************************************************************\
+# ** Copyright © 2000 Atheros Communications, Inc., All Rights Reserved **
+# ** Copyright © 2001 Atheros Communications, Inc., All Rights Reserved **
+# ** **
+# ** Atheros and the Atheros logo and design are trademarks of Atheros **
+# ** Communications, Inc. **
+# ** **
+# ** Sample Code from Microsoft Windows 2000 Driver Development Kit is **
+# ** used under license from Microsoft Corporation and was developed for **
+# ** Microsoft by Intel Corp., Hillsboro, Oregon: Copyright (c) 1994-1997 **
+# ** by Intel Corporation. **
+# ** **
+# ** $Id$ **
+# \**************************************************************************/
+#
+# #ifndef _PCI_H
diff --git a/tests/cluecode/data/copyrights/att_in_c-9_c.c b/tests/cluecode/data/copyrights/att_in_c-9_c.c
new file mode 100644
index 00000000000..f475109bc3d
--- /dev/null
+++ b/tests/cluecode/data/copyrights/att_in_c-9_c.c
@@ -0,0 +1,18 @@
+/****************************************************************
+ *
+ * The author of this software is David M. Gay.
+ *
+ * Copyright (c) 1991 by AT&T.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose without fee is hereby granted, provided that this entire notice
+ * is included in all copies of any software which is or includes a copy
+ * or modification of this software and in all copies of the supporting
+ * documentation for such software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR AT&T MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+ *
+ ***************************************************************/
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_attributionassurancelicense-AttributionAssuranceLicense b/tests/cluecode/data/copyrights/attributionassurancelicense-AttributionAssuranceLicense
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_attributionassurancelicense-AttributionAssuranceLicense
rename to tests/cluecode/data/copyrights/attributionassurancelicense-AttributionAssuranceLicense
diff --git a/tests/cluecode/data/copyrights/audio_c-c.c b/tests/cluecode/data/copyrights/audio_c-c.c
new file mode 100644
index 00000000000..014fbcd080d
--- /dev/null
+++ b/tests/cluecode/data/copyrights/audio_c-c.c
@@ -0,0 +1,5 @@
+/*
+    ITU-T G.723 Speech Coder   ANSI-C Source Code     Version 5.00
+    copyright (c) 1995, AudioCodes, DSP Group, France Telecom,
+    Universite de Sherbrooke.  All rights reserved.
+*/
diff --git a/tests/cluecode/data/copyrights/babkin_txt.txt b/tests/cluecode/data/copyrights/babkin_txt.txt
new file mode 100644
index 00000000000..b75b9d7dcd2
--- /dev/null
+++ b/tests/cluecode/data/copyrights/babkin_txt.txt
@@ -0,0 +1,5 @@
+Copyright (c)  North
+Copyright (c)  South
+Copyright (c) 2134 abc
+Copyright (c) 2001 by the TTF2PT1 project
+Copyright (c) 2001 by Sergey Babkin
diff --git a/tests/cluecode/data/copyrights/copyright_in_bash-shell_sh.sh b/tests/cluecode/data/copyrights/bash-shell_sh.sh
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_bash-shell_sh.sh
rename to tests/cluecode/data/copyrights/bash-shell_sh.sh
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_bigelow_holmes-Bigelow&Holmes b/tests/cluecode/data/copyrights/bigelow_holmes-Bigelow&Holmes
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_bigelow_holmes-Bigelow&Holmes
rename to tests/cluecode/data/copyrights/bigelow_holmes-Bigelow&Holmes
diff --git a/tests/cluecode/data/copyrights/copyright_in_binary_lib-php_embed_lib.lib b/tests/cluecode/data/copyrights/binary_lib-php_embed_lib.lib
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_binary_lib-php_embed_lib.lib
rename to tests/cluecode/data/copyrights/binary_lib-php_embed_lib.lib
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_bitstream-Bi_ream b/tests/cluecode/data/copyrights/bitstream-Bi_ream
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_bitstream-Bi_ream
rename to tests/cluecode/data/copyrights/bitstream-Bi_ream
diff --git a/tests/cluecode/data/copyrights/blender_debian-blender.copyright b/tests/cluecode/data/copyrights/blender_debian-blender.copyright
new file mode 100644
index 00000000000..9a3f99b71df
--- /dev/null
+++ b/tests/cluecode/data/copyrights/blender_debian-blender.copyright
@@ -0,0 +1,57 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Blender Foundation
+Debianized-By: Masayuki Hatta (mhatta) <mhatta@debian.org>
+Debianized-Date: Mon,  3 May 2004 15:16:26 +0900
+Original-Source-Location: http://download.blender.org/source/
+
+
+Files: *
+Copyright: © 2002-2008 <s>Blender Foundation</s>
+License: GPL-2+
+ | This program is free software; you can redistribute it and/or
+ | modify it under the terms of the GNU General Public License
+ | as published by the Free Software Foundation; either version 2
+ | of the License, or (at your option) any later version.
+ |
+ | This program is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ | GNU General Public License for more details.
+ |
+ | You should have received a copy of the GNU General Public License along
+ | with this program; if not, write to the Free Software Foundation, Inc.,
+ | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ |
+ |
+ | On Debian systems, the complete text of the GNU General Public License
+ | version 2 can be found in “/usr/share/common-licenses/GPL-2”.
+
+
+Files: debian/*
+Copyright: © 2004-2005 <s>Masayuki Hatta <mhatta@debian.org></s>
+           © 2005-2007 <s>Florian Ernst <florian@debian.org></s>
+           © 2007-2008 <s>Cyril Brulebois <kibi@debian.org></s>
+License: GPL-2+
+ | This program is free software; you can redistribute it and/or
+ | modify it under the terms of the GNU General Public License
+ | as published by the Free Software Foundation; either version 2
+ | of the License, or (at your option) any later version.
+ |
+ | This program is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ | GNU General Public License for more details.
+ |
+ | You should have received a copy of the GNU General Public License along
+ | with this program; if not, write to the Free Software Foundation, Inc.,
+ | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ |
+ |
+ | On Debian systems, the complete text of the GNU General Public License
+ | version 2 can be found in “/usr/share/common-licenses/GPL-2”.
+
+
+
+Files: extern/{bFTGL,ffmpeg,libmp3lame,libopenjpeg,xvidcore,x264}
+Removed since they are embedded code copies of software available in
+main or software not acceptable in main.
diff --git a/tests/cluecode/data/copyrights/copyright_blue_sky_dash_in_name-c.c b/tests/cluecode/data/copyrights/blue_sky_dash_in_name-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_blue_sky_dash_in_name-c.c
rename to tests/cluecode/data/copyrights/blue_sky_dash_in_name-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_bouncy_license-LICENSE b/tests/cluecode/data/copyrights/bouncy_license-LICENSE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_bouncy_license-LICENSE
rename to tests/cluecode/data/copyrights/bouncy_license-LICENSE
diff --git a/tests/cluecode/data/copyrights/copyright_bouncy_notice-9_NOTICE b/tests/cluecode/data/copyrights/bouncy_notice-9_NOTICE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_bouncy_notice-9_NOTICE
rename to tests/cluecode/data/copyrights/bouncy_notice-9_NOTICE
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_bsdnrl-BSDNRL b/tests/cluecode/data/copyrights/bsdnrl-BSDNRL
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_bsdnrl-BSDNRL
rename to tests/cluecode/data/copyrights/bsdnrl-BSDNRL
diff --git a/tests/cluecode/data/copyrights/copyright_btt_plot1_py-btt_plot_py.py b/tests/cluecode/data/copyrights/btt_plot1_py-btt_plot_py.py
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_btt_plot1_py-btt_plot_py.py
rename to tests/cluecode/data/copyrights/btt_plot1_py-btt_plot_py.py
diff --git a/tests/cluecode/data/copyrights/copyright_in_c-c.c b/tests/cluecode/data/copyrights/c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_c-c.c
rename to tests/cluecode/data/copyrights/c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_in_c_include-h.h b/tests/cluecode/data/copyrights/c_include-h.h
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_c_include-h.h
rename to tests/cluecode/data/copyrights/c_include-h.h
diff --git a/tests/cluecode/data/copyrights/copyright_copyright_camelcase_br_diagnostics_h-br_diagnostics_h.h b/tests/cluecode/data/copyrights/camelcase_br_diagnostics_h-br_diagnostics_h.h
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_copyright_camelcase_br_diagnostics_h-br_diagnostics_h.h
rename to tests/cluecode/data/copyrights/camelcase_br_diagnostics_h-br_diagnostics_h.h
diff --git a/tests/cluecode/data/copyrights/copyright_camelcase_bug_br_fcc_thread_psipstack_c-br_fcc_thread_psipstack_c.c b/tests/cluecode/data/copyrights/camelcase_bug_br_fcc_thread_psipstack_c-br_fcc_thread_psipstack_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_camelcase_bug_br_fcc_thread_psipstack_c-br_fcc_thread_psipstack_c.c
rename to tests/cluecode/data/copyrights/camelcase_bug_br_fcc_thread_psipstack_c-br_fcc_thread_psipstack_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_ccube_txt.txt b/tests/cluecode/data/copyrights/ccube_txt.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ccube_txt.txt
rename to tests/cluecode/data/copyrights/ccube_txt.txt
diff --git a/tests/cluecode/data/copyrights/copyright_cedrik_java-java.java b/tests/cluecode/data/copyrights/cedrik_java-java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_cedrik_java-java.java
rename to tests/cluecode/data/copyrights/cedrik_java-java.java
diff --git a/tests/cluecode/data/copyrights/copyright_cern-TestMatrix_D_java.java b/tests/cluecode/data/copyrights/cern-TestMatrix_D_java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_cern-TestMatrix_D_java.java
rename to tests/cluecode/data/copyrights/cern-TestMatrix_D_java.java
diff --git a/tests/cluecode/data/copyrights/copyright_cern_matrix2d_java-TestMatrix_D_java.java b/tests/cluecode/data/copyrights/cern_matrix2d_java-TestMatrix_D_java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_cern_matrix2d_java-TestMatrix_D_java.java
rename to tests/cluecode/data/copyrights/cern_matrix2d_java-TestMatrix_D_java.java
diff --git a/tests/cluecode/data/copyrights/copyright_chameleon_assembly-9_9_setjmp_S.S b/tests/cluecode/data/copyrights/chameleon_assembly-9_9_setjmp_S.S
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_chameleon_assembly-9_9_setjmp_S.S
rename to tests/cluecode/data/copyrights/chameleon_assembly-9_9_setjmp_S.S
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_cnri-CNRI b/tests/cluecode/data/copyrights/cnri-CNRI
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_cnri-CNRI
rename to tests/cluecode/data/copyrights/cnri-CNRI
diff --git a/tests/cluecode/data/copyrights/copyright_co_cust-copyright_java.java b/tests/cluecode/data/copyrights/co_cust-java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_co_cust-copyright_java.java
rename to tests/cluecode/data/copyrights/co_cust-java.java
diff --git a/tests/cluecode/data/copyrights/colin_android-bsdiff_c.c b/tests/cluecode/data/copyrights/colin_android-bsdiff_c.c
new file mode 100644
index 00000000000..b6d342b7a8e
--- /dev/null
+++ b/tests/cluecode/data/copyrights/colin_android-bsdiff_c.c
@@ -0,0 +1,410 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Most of this code comes from bsdiff.c from the bsdiff-4.3
+ * distribution, which is:
+ */
+
+/*-
+ * Copyright 2003-2005 Colin Percival
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted providing that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+
+#include <bzlib.h>
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define MIN(x,y) (((x)<(y)) ? (x) : (y))
+
+static void split(off_t *I,off_t *V,off_t start,off_t len,off_t h)
+{
+	off_t i,j,k,x,tmp,jj,kk;
+
+	if(len<16) {
+		for(k=start;k<start+len;k+=j) {
+			j=1;x=V[I[k]+h];
+			for(i=1;k+i<start+len;i++) {
+				if(V[I[k+i]+h]<x) {
+					x=V[I[k+i]+h];
+					j=0;
+				};
+				if(V[I[k+i]+h]==x) {
+					tmp=I[k+j];I[k+j]=I[k+i];I[k+i]=tmp;
+					j++;
+				};
+			};
+			for(i=0;i<j;i++) V[I[k+i]]=k+j-1;
+			if(j==1) I[k]=-1;
+		};
+		return;
+	};
+
+	x=V[I[start+len/2]+h];
+	jj=0;kk=0;
+	for(i=start;i<start+len;i++) {
+		if(V[I[i]+h]<x) jj++;
+		if(V[I[i]+h]==x) kk++;
+	};
+	jj+=start;kk+=jj;
+
+	i=start;j=0;k=0;
+	while(i<jj) {
+		if(V[I[i]+h]<x) {
+			i++;
+		} else if(V[I[i]+h]==x) {
+			tmp=I[i];I[i]=I[jj+j];I[jj+j]=tmp;
+			j++;
+		} else {
+			tmp=I[i];I[i]=I[kk+k];I[kk+k]=tmp;
+			k++;
+		};
+	};
+
+	while(jj+j<kk) {
+		if(V[I[jj+j]+h]==x) {
+			j++;
+		} else {
+			tmp=I[jj+j];I[jj+j]=I[kk+k];I[kk+k]=tmp;
+			k++;
+		};
+	};
+
+	if(jj>start) split(I,V,start,jj-start,h);
+
+	for(i=0;i<kk-jj;i++) V[I[jj+i]]=kk-1;
+	if(jj==kk-1) I[jj]=-1;
+
+	if(start+len>kk) split(I,V,kk,start+len-kk,h);
+}
+
+static void qsufsort(off_t *I,off_t *V,u_char *old,off_t oldsize)
+{
+	off_t buckets[256];
+	off_t i,h,len;
+
+	for(i=0;i<256;i++) buckets[i]=0;
+	for(i=0;i<oldsize;i++) buckets[old[i]]++;
+	for(i=1;i<256;i++) buckets[i]+=buckets[i-1];
+	for(i=255;i>0;i--) buckets[i]=buckets[i-1];
+	buckets[0]=0;
+
+	for(i=0;i<oldsize;i++) I[++buckets[old[i]]]=i;
+	I[0]=oldsize;
+	for(i=0;i<oldsize;i++) V[i]=buckets[old[i]];
+	V[oldsize]=0;
+	for(i=1;i<256;i++) if(buckets[i]==buckets[i-1]+1) I[buckets[i]]=-1;
+	I[0]=-1;
+
+	for(h=1;I[0]!=-(oldsize+1);h+=h) {
+		len=0;
+		for(i=0;i<oldsize+1;) {
+			if(I[i]<0) {
+				len-=I[i];
+				i-=I[i];
+			} else {
+				if(len) I[i-len]=-len;
+				len=V[I[i]]+1-i;
+				split(I,V,i,len,h);
+				i+=len;
+				len=0;
+			};
+		};
+		if(len) I[i-len]=-len;
+	};
+
+	for(i=0;i<oldsize+1;i++) I[V[i]]=i;
+}
+
+static off_t matchlen(u_char *old,off_t oldsize,u_char *new,off_t newsize)
+{
+	off_t i;
+
+	for(i=0;(i<oldsize)&&(i<newsize);i++)
+		if(old[i]!=new[i]) break;
+
+	return i;
+}
+
+static off_t search(off_t *I,u_char *old,off_t oldsize,
+		u_char *new,off_t newsize,off_t st,off_t en,off_t *pos)
+{
+	off_t x,y;
+
+	if(en-st<2) {
+		x=matchlen(old+I[st],oldsize-I[st],new,newsize);
+		y=matchlen(old+I[en],oldsize-I[en],new,newsize);
+
+		if(x>y) {
+			*pos=I[st];
+			return x;
+		} else {
+			*pos=I[en];
+			return y;
+		}
+	};
+
+	x=st+(en-st)/2;
+	if(memcmp(old+I[x],new,MIN(oldsize-I[x],newsize))<0) {
+		return search(I,old,oldsize,new,newsize,x,en,pos);
+	} else {
+		return search(I,old,oldsize,new,newsize,st,x,pos);
+	};
+}
+
+static void offtout(off_t x,u_char *buf)
+{
+	off_t y;
+
+	if(x<0) y=-x; else y=x;
+
+		buf[0]=y%256;y-=buf[0];
+	y=y/256;buf[1]=y%256;y-=buf[1];
+	y=y/256;buf[2]=y%256;y-=buf[2];
+	y=y/256;buf[3]=y%256;y-=buf[3];
+	y=y/256;buf[4]=y%256;y-=buf[4];
+	y=y/256;buf[5]=y%256;y-=buf[5];
+	y=y/256;buf[6]=y%256;y-=buf[6];
+	y=y/256;buf[7]=y%256;
+
+	if(x<0) buf[7]|=0x80;
+}
+
+// This is main() from bsdiff.c, with the following changes:
+//
+//    - old, oldsize, new, newsize are arguments; we don't load this
+//      data from files.  old and new are owned by the caller; we
+//      don't free them at the end.
+//
+//    - the "I" block of memory is owned by the caller, who passes a
+//      pointer to *I, which can be NULL.  This way if we call
+//      bsdiff() multiple times with the same 'old' data, we only do
+//      the qsufsort() step the first time.
+//
+int bsdiff(u_char* old, off_t oldsize, off_t** IP, u_char* new, off_t newsize,
+           const char* patch_filename)
+{
+	int fd;
+	off_t *I;
+	off_t scan,pos,len;
+	off_t lastscan,lastpos,lastoffset;
+	off_t oldscore,scsc;
+	off_t s,Sf,lenf,Sb,lenb;
+	off_t overlap,Ss,lens;
+	off_t i;
+	off_t dblen,eblen;
+	u_char *db,*eb;
+	u_char buf[8];
+	u_char header[32];
+	FILE * pf;
+	BZFILE * pfbz2;
+	int bz2err;
+
+        if (*IP == NULL) {
+            off_t* V;
+            *IP = malloc((oldsize+1) * sizeof(off_t));
+            V = malloc((oldsize+1) * sizeof(off_t));
+            qsufsort(*IP, V, old, oldsize);
+            free(V);
+        }
+        I = *IP;
+
+	if(((db=malloc(newsize+1))==NULL) ||
+		((eb=malloc(newsize+1))==NULL)) err(1,NULL);
+	dblen=0;
+	eblen=0;
+
+	/* Create the patch file */
+	if ((pf = fopen(patch_filename, "w")) == NULL)
+              err(1, "%s", patch_filename);
+
+	/* Header is
+		0	8	 "BSDIFF40"
+		8	8	length of bzip2ed ctrl block
+		16	8	length of bzip2ed diff block
+		24	8	length of new file */
+	/* File is
+		0	32	Header
+		32	??	Bzip2ed ctrl block
+		??	??	Bzip2ed diff block
+		??	??	Bzip2ed extra block */
+	memcpy(header,"BSDIFF40",8);
+	offtout(0, header + 8);
+	offtout(0, header + 16);
+	offtout(newsize, header + 24);
+	if (fwrite(header, 32, 1, pf) != 1)
+		err(1, "fwrite(%s)", patch_filename);
+
+	/* Compute the differences, writing ctrl as we go */
+	if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL)
+		errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err);
+	scan=0;len=0;
+	lastscan=0;lastpos=0;lastoffset=0;
+	while(scan<newsize) {
+		oldscore=0;
+
+		for(scsc=scan+=len;scan<newsize;scan++) {
+			len=search(I,old,oldsize,new+scan,newsize-scan,
+					0,oldsize,&pos);
+
+			for(;scsc<scan+len;scsc++)
+			if((scsc+lastoffset<oldsize) &&
+				(old[scsc+lastoffset] == new[scsc]))
+				oldscore++;
+
+			if(((len==oldscore) && (len!=0)) ||
+				(len>oldscore+8)) break;
+
+			if((scan+lastoffset<oldsize) &&
+				(old[scan+lastoffset] == new[scan]))
+				oldscore--;
+		};
+
+		if((len!=oldscore) || (scan==newsize)) {
+			s=0;Sf=0;lenf=0;
+			for(i=0;(lastscan+i<scan)&&(lastpos+i<oldsize);) {
+				if(old[lastpos+i]==new[lastscan+i]) s++;
+				i++;
+				if(s*2-i>Sf*2-lenf) { Sf=s; lenf=i; };
+			};
+
+			lenb=0;
+			if(scan<newsize) {
+				s=0;Sb=0;
+				for(i=1;(scan>=lastscan+i)&&(pos>=i);i++) {
+					if(old[pos-i]==new[scan-i]) s++;
+					if(s*2-i>Sb*2-lenb) { Sb=s; lenb=i; };
+				};
+			};
+
+			if(lastscan+lenf>scan-lenb) {
+				overlap=(lastscan+lenf)-(scan-lenb);
+				s=0;Ss=0;lens=0;
+				for(i=0;i<overlap;i++) {
+					if(new[lastscan+lenf-overlap+i]==
+					   old[lastpos+lenf-overlap+i]) s++;
+					if(new[scan-lenb+i]==
+					   old[pos-lenb+i]) s--;
+					if(s>Ss) { Ss=s; lens=i+1; };
+				};
+
+				lenf+=lens-overlap;
+				lenb-=lens;
+			};
+
+			for(i=0;i<lenf;i++)
+				db[dblen+i]=new[lastscan+i]-old[lastpos+i];
+			for(i=0;i<(scan-lenb)-(lastscan+lenf);i++)
+				eb[eblen+i]=new[lastscan+lenf+i];
+
+			dblen+=lenf;
+			eblen+=(scan-lenb)-(lastscan+lenf);
+
+			offtout(lenf,buf);
+			BZ2_bzWrite(&bz2err, pfbz2, buf, 8);
+			if (bz2err != BZ_OK)
+				errx(1, "BZ2_bzWrite, bz2err = %d", bz2err);
+
+			offtout((scan-lenb)-(lastscan+lenf),buf);
+			BZ2_bzWrite(&bz2err, pfbz2, buf, 8);
+			if (bz2err != BZ_OK)
+				errx(1, "BZ2_bzWrite, bz2err = %d", bz2err);
+
+			offtout((pos-lenb)-(lastpos+lenf),buf);
+			BZ2_bzWrite(&bz2err, pfbz2, buf, 8);
+			if (bz2err != BZ_OK)
+				errx(1, "BZ2_bzWrite, bz2err = %d", bz2err);
+
+			lastscan=scan-lenb;
+			lastpos=pos-lenb;
+			lastoffset=pos-scan;
+		};
+	};
+	BZ2_bzWriteClose(&bz2err, pfbz2, 0, NULL, NULL);
+	if (bz2err != BZ_OK)
+		errx(1, "BZ2_bzWriteClose, bz2err = %d", bz2err);
+
+	/* Compute size of compressed ctrl data */
+	if ((len = ftello(pf)) == -1)
+		err(1, "ftello");
+	offtout(len-32, header + 8);
+
+	/* Write compressed diff data */
+	if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL)
+		errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err);
+	BZ2_bzWrite(&bz2err, pfbz2, db, dblen);
+	if (bz2err != BZ_OK)
+		errx(1, "BZ2_bzWrite, bz2err = %d", bz2err);
+	BZ2_bzWriteClose(&bz2err, pfbz2, 0, NULL, NULL);
+	if (bz2err != BZ_OK)
+		errx(1, "BZ2_bzWriteClose, bz2err = %d", bz2err);
+
+	/* Compute size of compressed diff data */
+	if ((newsize = ftello(pf)) == -1)
+		err(1, "ftello");
+	offtout(newsize - len, header + 16);
+
+	/* Write compressed extra data */
+	if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL)
+		errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err);
+	BZ2_bzWrite(&bz2err, pfbz2, eb, eblen);
+	if (bz2err != BZ_OK)
+		errx(1, "BZ2_bzWrite, bz2err = %d", bz2err);
+	BZ2_bzWriteClose(&bz2err, pfbz2, 0, NULL, NULL);
+	if (bz2err != BZ_OK)
+		errx(1, "BZ2_bzWriteClose, bz2err = %d", bz2err);
+
+	/* Seek to the beginning, write the header, and close the file */
+	if (fseeko(pf, 0, SEEK_SET))
+		err(1, "fseeko");
+	if (fwrite(header, 32, 1, pf) != 1)
+		err(1, "fwrite(%s)", patch_filename);
+	if (fclose(pf))
+		err(1, "fclose");
+
+	/* Free the memory we used */
+	free(db);
+	free(eb);
+
+	return 0;
+}
diff --git a/tests/cluecode/data/copyrights/copyright_company_in_txt-9.txt b/tests/cluecode/data/copyrights/company_in_txt-9.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_company_in_txt-9.txt
rename to tests/cluecode/data/copyrights/company_in_txt-9.txt
diff --git a/tests/cluecode/data/copyrights/copyright_complex_4_line_statement_in_text-9.txt b/tests/cluecode/data/copyrights/complex_4_line_statement_in_text-9.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_complex_4_line_statement_in_text-9.txt
rename to tests/cluecode/data/copyrights/complex_4_line_statement_in_text-9.txt
diff --git a/tests/cluecode/data/copyrights/copyright_complex_notice-NOTICE b/tests/cluecode/data/copyrights/complex_notice-NOTICE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_complex_notice-NOTICE
rename to tests/cluecode/data/copyrights/complex_notice-NOTICE
diff --git a/tests/cluecode/data/copyrights/copyright_complex_notice_sun_microsystems_on_multiple_lines-NOTICE b/tests/cluecode/data/copyrights/complex_notice_sun_microsystems_on_multiple_lines-NOTICE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_complex_notice_sun_microsystems_on_multiple_lines-NOTICE
rename to tests/cluecode/data/copyrights/complex_notice_sun_microsystems_on_multiple_lines-NOTICE
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_condor_extra_For-Condor b/tests/cluecode/data/copyrights/condor_extra_For-Condor
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_condor_extra_For-Condor
rename to tests/cluecode/data/copyrights/condor_extra_For-Condor
diff --git a/tests/cluecode/data/copyrights/copyright_config-config_guess.guess b/tests/cluecode/data/copyrights/config-config_guess.guess
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_config-config_guess.guess
rename to tests/cluecode/data/copyrights/config-config_guess.guess
diff --git a/tests/cluecode/data/copyrights/copyright_config1_guess-config_guess.guess b/tests/cluecode/data/copyrights/config1_guess-config_guess.guess
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_config1_guess-config_guess.guess
rename to tests/cluecode/data/copyrights/config1_guess-config_guess.guess
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_gsoap-gSOAP b/tests/cluecode/data/copyrights/copyright_license_text_gsoap-gSOAP
deleted file mode 100644
index 18b7d15d21c..00000000000
--- a/tests/cluecode/data/copyrights/copyright_license_text_gsoap-gSOAP
+++ /dev/null
@@ -1,158 +0,0 @@
-gSOAP Public License
-Version 1.3a
-The gSOAP public license is derived from the Mozilla Public License (MPL1.1). The sections that were deleted from the original MPL1.1 text are 1.0.1, 2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was added. The modified sections are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 (deleted the last sentence), and 3.6 (simplified).
-1  DEFINITIONS.
-
-    sep 0mm
-1.0.1.
-1.1. "Contributor"
-    means each entity that creates or contributes to the creation of Modifications.
-1.2. "Contributor Version"
-    means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-1.3. "Covered Code"
-    means the Original Code, or Modifications or the combination of the Original Code, and Modifications, in each case including portions thereof.
-1.4. "Electronic Distribution Mechanism"
-    means a mechanism generally accepted in the software development community for the electronic transfer of data.
-1.5. "Executable"
-    means Covered Code in any form other than Source Code.
-1.6. "Initial Developer"
-    means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-1.7. "Larger Work"
-    means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-1.8. "License"
-    means this document.
-1.8.1. "Licensable"
-    means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-1.9. "Modifications"
-    means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-        sep 0mm
-    A.
-        Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-    B.
-        Any new file that contains any part of the Original Code, or previous Modifications. 
-
-1.10. "Original Code"
-    means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-1.10.1. "Patent Claims"
-    means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-1.11. "Source Code"
-    means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-1.12. "You" (or "Your")
-    means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2  SOURCE CODE LICENSE.
-
-    sep 0mm
-2.1. The Initial Developer Grant.
-
-    The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-        sep 0mm
-    (a)
-        under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
-    (b)
-        under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell ("offer to sell and import") the Original Code, Modifications, or portions thereof, but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Original Code, Modifications, or any combination or portions thereof.
-    (c)
-    (d)
-
-2.2. Contributor Grant.
-
-    Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
-
-        sep 0mm
-    (a)
-        under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
-    (b)
-        under patents now or hereafter owned or controlled by Contributor, to make, have made, use and sell ("offer to sell and import") the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Contributor Version (or portions thereof).
-    (c)
-    (d)
-
-3  DISTRIBUTION OBLIGATIONS.
-
-    sep 0mm
-3.1. Application of License.
-
-    The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-3.2. Availability of Source Code.
-
-    Any Modification created by You will be provided to the Initial Developer in Source Code form and are subject to the terms of the License.
-3.3. Description of Modifications.
-
-    You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-3.4. Intellectual Property Matters.
-
-        sep 0mm
-    (a) Third Party Claims.
-        If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-    (b) Contributor APIs.
-        If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file.
-    (c) Representations.
-        Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. 
-
-3.5. Required Notices.
-
-    You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor.
-3.6. Distribution of Executable Versions.
-
-    You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. If you distribute executable versions containing Covered Code as part of a product, you must reproduce the notice in Exhibit B in the documentation and/or other materials provided with the product.
-3.7. Larger Works.
-
-    You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
-3.8. Restrictions.
-
-    You may not remove any product identification, copyright, proprietary notices or labels from gSOAP.
-
-4  INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-5  APPLICATION OF THIS LICENSE.
-This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
-6  VERSIONS OF THE LICENSE.
-
-    sep 0mm
-6.1. New Versions.
-
-    Grantor may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-6.2. Effect of New Versions.
-
-    Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License.
-6.3. Derivative Works.
-
-    If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrase "gSOAP" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the gSOAP Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
-
-7  DISCLAIMER OF WARRANTY.
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND ANY WARRANTY THAT MAY ARISE BY REASON OF TRADE USAGE, CUSTOM, OR COURSE OF DEALING. WITHOUT LIMITING THE FOREGOING, YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" AND THAT THE AUTHORS DO NOT WARRANT THE SOFTWARE WILL RUN UNINTERRUPTED OR ERROR FREE. LIMITED LIABILITY THE ENTIRE RISK AS TO RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. UNDER NO CIRCUMSTANCES WILL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES OF ANY KIND OR NATURE WHATSOEVER, WHETHER BASED ON CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, ARISING OUT OF OR IN ANY WAY RELATED TO THE SOFTWARE, EVEN IF THE AUTHORS HAVE BEEN ADVISED ON THE POSSIBILITY OF SUCH DAMAGE OR IF SUCH DAMAGE COULD HAVE BEEN REASONABLY FORESEEN, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY EXCLUSIVE REMEDY PROVIDED. SUCH LIMITATION ON DAMAGES INCLUDES, BUT IS NOT LIMITED TO, DAMAGES FOR LOSS OF GOODWILL, LOST PROFITS, LOSS OF DATA OR SOFTWARE, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION OR IMPAIRMENT OF OTHER GOODS. IN NO EVENT WILL THE AUTHORS BE LIABLE FOR THE COSTS OF PROCUREMENT OF SUBSTITUTE SOFTWARE OR SERVICES. YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED FOR USE IN ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS SUCH AS OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR CONTROL, OR LIFE-CRITICAL APPLICATIONS. THE AUTHORS EXPRESSLY DISCLAIM ANY LIABILITY RESULTING FROM USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS AND ACCEPTS NO LIABILITY IN RESPECT OF ANY ACTIONS OR CLAIMS BASED ON THE USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS BY YOU. FOR PURPOSES OF THIS PARAGRAPH, THE TERM "LIFE-CRITICAL APPLICATION" MEANS AN APPLICATION IN WHICH THE FUNCTIONING OR MALFUNCTIONING OF THE SOFTWARE MAY RESULT DIRECTLY OR INDIRECTLY IN PHYSICAL INJURY OR LOSS OF HUMAN LIFE. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-8  TERMINATION.
-
-    sep 0mm
-8.1.
-    This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-8.2.
-8.3.
-    If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
-8.4.
-    In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
-
-9  LIMITATION OF LIABILITY.
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-10  U.S. GOVERNMENT END USERS.
-11  MISCELLANEOUS.
-12  RESPONSIBILITY FOR CLAIMS.
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-EXHIBIT A.
-"The contents of this file are subject to the gSOAP Public License Version 1.3 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-    http://www.cs.fsu.edu/~engelen/soaplicense.html 
-
-Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-The Original Code of the gSOAP Software is: stdsoap.h, stdsoap2.h, stdsoap.c, stdsoap2.c, stdsoap.cpp, stdsoap2.cpp, soapcpp2.h, soapcpp2.c, soapcpp2_lex.l, soapcpp2_yacc.y, error2.h, error2.c, symbol2.c, init2.c, soapdoc2.html, and soapdoc2.pdf, httpget.h, httpget.c, stl.h, stldeque.h, stllist.h, stlvector.h, stlset.h.
-The Initial Developer of the Original Code is Robert A. van Engelen. Portions created by Robert A. van Engelen are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
-Contributor(s):
-
-"________________________."
-
-[Note: The text of this Exhibit A may differ slightly form the text of the notices in the Source Code files of the Original code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.]
-EXHIBIT B.
-"Part of the software embedded in this product is gSOAP software.
-Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
-THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." 
diff --git a/tests/cluecode/data/copyrights/copyright_coreutils_debian-coreutils_copyright.copyright b/tests/cluecode/data/copyrights/coreutils_debian-coreutils.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_coreutils_debian-coreutils_copyright.copyright
rename to tests/cluecode/data/copyrights/coreutils_debian-coreutils.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_dag_c-s_fabsl_c.c b/tests/cluecode/data/copyrights/dag_c-s_fabsl_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_dag_c-s_fabsl_c.c
rename to tests/cluecode/data/copyrights/dag_c-s_fabsl_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_dag_elring_notice-NOTICE b/tests/cluecode/data/copyrights/dag_elring_notice-NOTICE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_dag_elring_notice-NOTICE
rename to tests/cluecode/data/copyrights/dag_elring_notice-NOTICE
diff --git a/tests/cluecode/data/copyrights/copyright_dash_in_name-Makefile b/tests/cluecode/data/copyrights/dash_in_name-Makefile
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_dash_in_name-Makefile
rename to tests/cluecode/data/copyrights/dash_in_name-Makefile
diff --git a/tests/cluecode/data/copyrights/copyright_dasher_copyright_label-dasher_copyright_label.label b/tests/cluecode/data/copyrights/dasher-dasher.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_dasher_copyright_label-dasher_copyright_label.label
rename to tests/cluecode/data/copyrights/dasher-dasher.label
diff --git a/tests/cluecode/data/copyrights/copyright_date_range_dahua_in_c-c.c b/tests/cluecode/data/copyrights/date_range_dahua_in_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_date_range_dahua_in_c-c.c
rename to tests/cluecode/data/copyrights/date_range_dahua_in_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_date_range_in_c-c.c b/tests/cluecode/data/copyrights/date_range_in_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_date_range_in_c-c.c
rename to tests/cluecode/data/copyrights/date_range_in_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_date_range_in_c_2-c.c b/tests/cluecode/data/copyrights/date_range_in_c_2-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_date_range_in_c_2-c.c
rename to tests/cluecode/data/copyrights/date_range_in_c_2-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_debian_archive_keyring_copyright-debian_archive_keyring_copyright.copyright b/tests/cluecode/data/copyrights/debian_archive_keyring-debian_archive_keyring.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_debian_archive_keyring_copyright-debian_archive_keyring_copyright.copyright
rename to tests/cluecode/data/copyrights/debian_archive_keyring-debian_archive_keyring.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_debian_lib_1-libmono_cairo_cil_copyright_label.label b/tests/cluecode/data/copyrights/debian_lib_1-libmono_cairo_cil.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_debian_lib_1-libmono_cairo_cil_copyright_label.label
rename to tests/cluecode/data/copyrights/debian_lib_1-libmono_cairo_cil.label
diff --git a/tests/cluecode/data/copyrights/copyright_debian_lib_2-libmono_cairo_cil_copyright.copyright b/tests/cluecode/data/copyrights/debian_lib_2-libmono_cairo_cil.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_debian_lib_2-libmono_cairo_cil_copyright.copyright
rename to tests/cluecode/data/copyrights/debian_lib_2-libmono_cairo_cil.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_debian_lib_3-libmono_security_cil_copyright.copyright b/tests/cluecode/data/copyrights/debian_lib_3-libmono_security_cil.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_debian_lib_3-libmono_security_cil_copyright.copyright
rename to tests/cluecode/data/copyrights/debian_lib_3-libmono_security_cil.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_debian_multi_names_on_one_line-libgdata__copyright.copyright b/tests/cluecode/data/copyrights/debian_multi_names_on_one_line-libgdata.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_debian_multi_names_on_one_line-libgdata__copyright.copyright
rename to tests/cluecode/data/copyrights/debian_multi_names_on_one_line-libgdata.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_dionysos_c-c.c b/tests/cluecode/data/copyrights/dionysos_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_dionysos_c-c.c
rename to tests/cluecode/data/copyrights/dionysos_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_disclaimed-c.c b/tests/cluecode/data/copyrights/disclaimed-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_disclaimed-c.c
rename to tests/cluecode/data/copyrights/disclaimed-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_djvulibre_desktop_copyright-djvulibre_desktop_copyright.copyright b/tests/cluecode/data/copyrights/djvulibre_desktop-djvulibre_desktop.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_djvulibre_desktop_copyright-djvulibre_desktop_copyright.copyright
rename to tests/cluecode/data/copyrights/djvulibre_desktop-djvulibre_desktop.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_in_dll-9_msvci_dll.dll b/tests/cluecode/data/copyrights/dll-9_msvci_dll.dll
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_dll-9_msvci_dll.dll
rename to tests/cluecode/data/copyrights/dll-9_msvci_dll.dll
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_doc-DOC b/tests/cluecode/data/copyrights/doc-DOC
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_doc-DOC
rename to tests/cluecode/data/copyrights/doc-DOC
diff --git a/tests/cluecode/data/copyrights/copyright_docbook_xsl_doc_html_copyright-docbook_xsl_doc_html_copyright.copyright b/tests/cluecode/data/copyrights/docbook_xsl_doc_html-docbook_xsl_doc_html.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_docbook_xsl_doc_html_copyright-docbook_xsl_doc_html_copyright.copyright
rename to tests/cluecode/data/copyrights/docbook_xsl_doc_html-docbook_xsl_doc_html.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_drand48_c-drand_c.c b/tests/cluecode/data/copyrights/drand48_c-drand_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_drand48_c-drand_c.c
rename to tests/cluecode/data/copyrights/drand48_c-drand_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_dual_mpl_gpl-Dual MPL GPL b/tests/cluecode/data/copyrights/dual_mpl_gpl-Dual MPL GPL
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_dual_mpl_gpl-Dual MPL GPL
rename to tests/cluecode/data/copyrights/dual_mpl_gpl-Dual MPL GPL
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_dualmpl_mit-DualMPL_MIT b/tests/cluecode/data/copyrights/dualmpl_mit-DualMPL_MIT
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_dualmpl_mit-DualMPL_MIT
rename to tests/cluecode/data/copyrights/dualmpl_mit-DualMPL_MIT
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_eclv1_0-ECLv.0 b/tests/cluecode/data/copyrights/eclv1_0-ECLv.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_eclv1_0-ECLv.0
rename to tests/cluecode/data/copyrights/eclv1_0-ECLv.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ecosv2_0-eCosv.0 b/tests/cluecode/data/copyrights/ecosv2_0-eCosv.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ecosv2_0-eCosv.0
rename to tests/cluecode/data/copyrights/ecosv2_0-eCosv.0
diff --git a/tests/cluecode/data/copyrights/copyright_ed_copyright-ed_copyright.copyright b/tests/cluecode/data/copyrights/ed-ed.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ed_copyright-ed_copyright.copyright
rename to tests/cluecode/data/copyrights/ed-ed.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_entessa-Entessa b/tests/cluecode/data/copyrights/entessa-Entessa
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_entessa-Entessa
rename to tests/cluecode/data/copyrights/entessa-Entessa
diff --git a/tests/cluecode/data/copyrights/copyright_epiphany_browser_data_copyright_label-epiphany_browser_data_copyright_label.label b/tests/cluecode/data/copyrights/epiphany_browser_data-epiphany_browser_data.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_epiphany_browser_data_copyright_label-epiphany_browser_data_copyright_label.label
rename to tests/cluecode/data/copyrights/epiphany_browser_data-epiphany_browser_data.label
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_eplv1_0b-EPLv_b.0b b/tests/cluecode/data/copyrights/eplv1_0b-EPLv_b.0b
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_eplv1_0b-EPLv_b.0b
rename to tests/cluecode/data/copyrights/eplv1_0b-EPLv_b.0b
diff --git a/tests/cluecode/data/copyrights/copyright_eric_young_c-c.c b/tests/cluecode/data/copyrights/eric_young_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_eric_young_c-c.c
rename to tests/cluecode/data/copyrights/eric_young_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_errno_atheros-c.c b/tests/cluecode/data/copyrights/errno_atheros-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_errno_atheros-c.c
rename to tests/cluecode/data/copyrights/errno_atheros-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_errno_atheros_ah_h-ah_h.h b/tests/cluecode/data/copyrights/errno_atheros_ah_h-ah_h.h
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_errno_atheros_ah_h-ah_h.h
rename to tests/cluecode/data/copyrights/errno_atheros_ah_h-ah_h.h
diff --git a/tests/cluecode/data/copyrights/copyright_errno_c-c.c b/tests/cluecode/data/copyrights/errno_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_errno_c-c.c
rename to tests/cluecode/data/copyrights/errno_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_esmertec_java-java.java b/tests/cluecode/data/copyrights/esmertec_java-java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_esmertec_java-java.java
rename to tests/cluecode/data/copyrights/esmertec_java-java.java
diff --git a/tests/cluecode/data/copyrights/essential_smoke-ibm_c.c b/tests/cluecode/data/copyrights/essential_smoke-ibm_c.c
new file mode 100644
index 00000000000..453963d4788
--- /dev/null
+++ b/tests/cluecode/data/copyrights/essential_smoke-ibm_c.c
@@ -0,0 +1,24 @@
+/**************************************************************
+from ticket 141
+Something like
+
+
+Copyright IBM and others (c) 2008
+
+Copyright Eclipse, IBM and others (c) 2008
+
+might still need to be reported on an IBM project as it would not be exclusively an IBM copyright.
+When there are several copyright statements in the code, only the one that is about the company should be excluded.
+Some other issues include the variety of things: For instance we can find copyrights such as:
+
+
+**************************************************************/
+
+#include "string.h"
+#include "sys.h"
+
+tst_id tst_put(tst_id *id) {
+    tst_id id ;
+    memcpy(&id, *tst_id,sizeof(id));
+    return id ;
+}
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_eudatagrid-EUDatagrid b/tests/cluecode/data/copyrights/eudatagrid-EUDatagrid
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_eudatagrid-EUDatagrid
rename to tests/cluecode/data/copyrights/eudatagrid-EUDatagrid
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_eurosym_v2-Eurosym_v.v2 b/tests/cluecode/data/copyrights/eurosym_v2-Eurosym_v.v2
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_eurosym_v2-Eurosym_v.v2
rename to tests/cluecode/data/copyrights/eurosym_v2-Eurosym_v.v2
diff --git a/tests/cluecode/data/copyrights/copyright_expat_h-expat_h.h b/tests/cluecode/data/copyrights/expat_h-expat_h.h
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_expat_h-expat_h.h
rename to tests/cluecode/data/copyrights/expat_h-expat_h.h
diff --git a/tests/cluecode/data/copyrights/copyright_ext_all_js-ext_all_js.js b/tests/cluecode/data/copyrights/ext_all_js-ext_all_js.js
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ext_all_js-ext_all_js.js
rename to tests/cluecode/data/copyrights/ext_all_js-ext_all_js.js
diff --git a/tests/cluecode/data/copyrights/copyright_extjs_c-c.c b/tests/cluecode/data/copyrights/extjs_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_extjs_c-c.c
rename to tests/cluecode/data/copyrights/extjs_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_false_positive_in_c-false_positives_c.c b/tests/cluecode/data/copyrights/false_positive_in_c-false_positives_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_false_positive_in_c-false_positives_c.c
rename to tests/cluecode/data/copyrights/false_positive_in_c-false_positives_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_false_positive_in_js-editor_beta_de_js.js b/tests/cluecode/data/copyrights/false_positive_in_js-editor_beta_de_js.js
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_false_positive_in_js-editor_beta_de_js.js
rename to tests/cluecode/data/copyrights/false_positive_in_js-editor_beta_de_js.js
diff --git a/tests/cluecode/data/copyrights/copyright_false_positive_in_license-LICENSE b/tests/cluecode/data/copyrights/false_positive_in_license-LICENSE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_false_positive_in_license-LICENSE
rename to tests/cluecode/data/copyrights/false_positive_in_license-LICENSE
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_frameworxv1_0-Frameworxv.0 b/tests/cluecode/data/copyrights/frameworxv1_0-Frameworxv.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_frameworxv1_0-Frameworxv.0
rename to tests/cluecode/data/copyrights/frameworxv1_0-Frameworxv.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_freebsd-FreeBSD b/tests/cluecode/data/copyrights/freebsd-FreeBSD
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_freebsd-FreeBSD
rename to tests/cluecode/data/copyrights/freebsd-FreeBSD
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_freetype-FreeType b/tests/cluecode/data/copyrights/freetype-FreeType
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_freetype-FreeType
rename to tests/cluecode/data/copyrights/freetype-FreeType
diff --git a/tests/cluecode/data/copyrights/copyright_fsf_py-999_py.py b/tests/cluecode/data/copyrights/fsf_py-999_py.py
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_fsf_py-999_py.py
rename to tests/cluecode/data/copyrights/fsf_py-999_py.py
diff --git a/tests/cluecode/data/copyrights/copyright_gailly-c.c b/tests/cluecode/data/copyrights/gailly-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_gailly-c.c
rename to tests/cluecode/data/copyrights/gailly-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_geoff_js-js.js b/tests/cluecode/data/copyrights/geoff_js-js.js
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_geoff_js-js.js
rename to tests/cluecode/data/copyrights/geoff_js-js.js
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_gfdlv1_2-GFDLv.2 b/tests/cluecode/data/copyrights/gfdlv1_2-GFDLv.2
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_gfdlv1_2-GFDLv.2
rename to tests/cluecode/data/copyrights/gfdlv1_2-GFDLv.2
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_gfdlv1_3-GFDLv.3 b/tests/cluecode/data/copyrights/gfdlv1_3-GFDLv.3
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_gfdlv1_3-GFDLv.3
rename to tests/cluecode/data/copyrights/gfdlv1_3-GFDLv.3
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_glide-Glide b/tests/cluecode/data/copyrights/glide-Glide
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_glide-Glide
rename to tests/cluecode/data/copyrights/glide-Glide
diff --git a/tests/cluecode/data/copyrights/copyright_gnome_session_copyright-gnome_session_copyright.copyright b/tests/cluecode/data/copyrights/gnome_session-gnome_session.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_gnome_session_copyright-gnome_session_copyright.copyright
rename to tests/cluecode/data/copyrights/gnome_session-gnome_session.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_gnome_system_monitor_copyright-gnome_system_monitor_copyright.copyright b/tests/cluecode/data/copyrights/gnome_system_monitor-gnome_system_monitor.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_gnome_system_monitor_copyright-gnome_system_monitor_copyright.copyright
rename to tests/cluecode/data/copyrights/gnome_system_monitor-gnome_system_monitor.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_gnome_system_monitor_copyright_label-gnome_system_monitor_copyright_label.label b/tests/cluecode/data/copyrights/gnome_system_monitor-gnome_system_monitor.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_gnome_system_monitor_copyright_label-gnome_system_monitor_copyright_label.label
rename to tests/cluecode/data/copyrights/gnome_system_monitor-gnome_system_monitor.label
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_gnuplot-gnuplot b/tests/cluecode/data/copyrights/gnuplot-gnuplot
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_gnuplot-gnuplot
rename to tests/cluecode/data/copyrights/gnuplot-gnuplot
diff --git a/tests/cluecode/data/copyrights/copyright_gobjc_4_3_copyright-gobjc__copyright.copyright b/tests/cluecode/data/copyrights/gobjc_4_3-gobjc.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_gobjc_4_3_copyright-gobjc__copyright.copyright
rename to tests/cluecode/data/copyrights/gobjc_4_3-gobjc.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_google_closure_templates_java_html-html.html b/tests/cluecode/data/copyrights/google_closure_templates_java_html-html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_google_closure_templates_java_html-html.html
rename to tests/cluecode/data/copyrights/google_closure_templates_java_html-html.html
diff --git a/tests/cluecode/data/copyrights/copyright_google_view_layout1_xml-view_layout_xml.xml b/tests/cluecode/data/copyrights/google_view_layout1_xml-view_layout_xml.xml
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_google_view_layout1_xml-view_layout_xml.xml
rename to tests/cluecode/data/copyrights/google_view_layout1_xml-view_layout_xml.xml
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_gpl_v1-GPL_v b/tests/cluecode/data/copyrights/gpl_v1-GPL_v
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_gpl_v1-GPL_v
rename to tests/cluecode/data/copyrights/gpl_v1-GPL_v
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_gpl_v2-GPL_v b/tests/cluecode/data/copyrights/gpl_v2-GPL_v
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_gpl_v2-GPL_v
rename to tests/cluecode/data/copyrights/gpl_v2-GPL_v
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_gpl_v3-GPL_v b/tests/cluecode/data/copyrights/gpl_v3-GPL_v
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_gpl_v3-GPL_v
rename to tests/cluecode/data/copyrights/gpl_v3-GPL_v
diff --git a/tests/cluecode/data/copyrights/copyright_group-c.c b/tests/cluecode/data/copyrights/group-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_group-c.c
rename to tests/cluecode/data/copyrights/group-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_gsoap-gSOAP b/tests/cluecode/data/copyrights/gsoap-gSOAP
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_gsoap-gSOAP
rename to tests/cluecode/data/copyrights/gsoap-gSOAP
diff --git a/tests/cluecode/data/copyrights/copyright_gstreamer0_fluendo_mp3_copyright-gstreamer__fluendo_mp_copyright.copyright b/tests/cluecode/data/copyrights/gstreamer0_fluendo_mp3-gstreamer_fluendo_mp.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_gstreamer0_fluendo_mp3_copyright-gstreamer__fluendo_mp_copyright.copyright
rename to tests/cluecode/data/copyrights/gstreamer0_fluendo_mp3-gstreamer_fluendo_mp.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_in_h-h.h b/tests/cluecode/data/copyrights/h-h.h
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_h-h.h
rename to tests/cluecode/data/copyrights/h-h.h
diff --git a/tests/cluecode/data/copyrights/copyright_hall-copyright.txt b/tests/cluecode/data/copyrights/hall-copyright.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hall-copyright.txt
rename to tests/cluecode/data/copyrights/hall-copyright.txt
diff --git a/tests/cluecode/data/copyrights/copyright_hans_jurgen_htm-9_html.html b/tests/cluecode/data/copyrights/hans_jurgen_htm-9_html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hans_jurgen_htm-9_html.html
rename to tests/cluecode/data/copyrights/hans_jurgen_htm-9_html.html
diff --git a/tests/cluecode/data/copyrights/copyright_hansen_cs-cs.cs b/tests/cluecode/data/copyrights/hansen_cs-cs.cs
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hansen_cs-cs.cs
rename to tests/cluecode/data/copyrights/hansen_cs-cs.cs
diff --git a/tests/cluecode/data/copyrights/copyright_hciattach_qualcomm1_c-hciattach_qualcomm_c.c b/tests/cluecode/data/copyrights/hciattach_qualcomm1_c-hciattach_qualcomm_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hciattach_qualcomm1_c-hciattach_qualcomm_c.c
rename to tests/cluecode/data/copyrights/hciattach_qualcomm1_c-hciattach_qualcomm_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_helix-Helix b/tests/cluecode/data/copyrights/helix-Helix
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_helix-Helix
rename to tests/cluecode/data/copyrights/helix-Helix
diff --git a/tests/cluecode/data/copyrights/heunrich_c-c.c b/tests/cluecode/data/copyrights/heunrich_c-c.c
new file mode 100644
index 00000000000..964b6039c6c
--- /dev/null
+++ b/tests/cluecode/data/copyrights/heunrich_c-c.c
@@ -0,0 +1,6 @@
+
+/*
+
+
+Copyright (C) 2000 HEUNRICH HERTZ INSTITUTE All Rights Reserved.
+*/
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_hewlett_packard-Hewlett_Packard b/tests/cluecode/data/copyrights/hewlett_packard-Hewlett_Packard
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_hewlett_packard-Hewlett_Packard
rename to tests/cluecode/data/copyrights/hewlett_packard-Hewlett_Packard
diff --git a/tests/cluecode/data/copyrights/copyright_hibernate_copyright_label-hibernate_copyright_label.label b/tests/cluecode/data/copyrights/hibernate-hibernate.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hibernate_copyright_label-hibernate_copyright_label.label
rename to tests/cluecode/data/copyrights/hibernate-hibernate.label
diff --git a/tests/cluecode/data/copyrights/copyright_holtmann-hciattach_qualcomm_c.c b/tests/cluecode/data/copyrights/holtmann-hciattach_qualcomm_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_holtmann-hciattach_qualcomm_c.c
rename to tests/cluecode/data/copyrights/holtmann-hciattach_qualcomm_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_hostapd_cli_c-hostapd_cli_c.c b/tests/cluecode/data/copyrights/hostapd_cli_c-hostapd_cli_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hostapd_cli_c-hostapd_cli_c.c
rename to tests/cluecode/data/copyrights/hostapd_cli_c-hostapd_cli_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_hostapd_trailing_available.c b/tests/cluecode/data/copyrights/hostapd_trailing_available.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hostapd_trailing_available.c
rename to tests/cluecode/data/copyrights/hostapd_trailing_available.c
diff --git a/tests/cluecode/data/copyrights/copyright_hp_notice-NOTICE b/tests/cluecode/data/copyrights/hp_notice-NOTICE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hp_notice-NOTICE
rename to tests/cluecode/data/copyrights/hp_notice-NOTICE
diff --git a/tests/cluecode/data/copyrights/copyright_hpijs_ppds_copyright_label-hpijs_ppds_copyright_label.label b/tests/cluecode/data/copyrights/hpijs_ppds-hpijs_ppds.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_hpijs_ppds_copyright_label-hpijs_ppds_copyright_label.label
rename to tests/cluecode/data/copyrights/hpijs_ppds-hpijs_ppds.label
diff --git a/tests/cluecode/data/copyrights/copyright_in_html.html b/tests/cluecode/data/copyrights/html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_html.html
rename to tests/cluecode/data/copyrights/html.html
diff --git a/tests/cluecode/data/copyrights/copyright_in_html_comments-html.html b/tests/cluecode/data/copyrights/html_comments-html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_html_comments-html.html
rename to tests/cluecode/data/copyrights/html_comments-html.html
diff --git a/tests/cluecode/data/copyrights/copyright_in_html_incorrect-detail_9_html.html b/tests/cluecode/data/copyrights/html_incorrect-detail_9_html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_html_incorrect-detail_9_html.html
rename to tests/cluecode/data/copyrights/html_incorrect-detail_9_html.html
diff --git a/tests/cluecode/data/copyrights/copyright_ibm_c-ibm_c.c b/tests/cluecode/data/copyrights/ibm_c-ibm_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ibm_c-ibm_c.c
rename to tests/cluecode/data/copyrights/ibm_c-ibm_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ibmpl_v1_0-IBMPL_v.0 b/tests/cluecode/data/copyrights/ibmpl_v1_0-IBMPL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ibmpl_v1_0-IBMPL_v.0
rename to tests/cluecode/data/copyrights/ibmpl_v1_0-IBMPL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_icedax_copyright_label-icedax_copyright_label.label b/tests/cluecode/data/copyrights/icedax-icedax.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_icedax_copyright_label-icedax_copyright_label.label
rename to tests/cluecode/data/copyrights/icedax-icedax.label
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ietf-IETF b/tests/cluecode/data/copyrights/ietf-IETF
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ietf-IETF
rename to tests/cluecode/data/copyrights/ietf-IETF
diff --git a/tests/cluecode/data/copyrights/copyright_ifrename_c-ifrename_c.c b/tests/cluecode/data/copyrights/ifrename_c-ifrename_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ifrename_c-ifrename_c.c
rename to tests/cluecode/data/copyrights/ifrename_c-ifrename_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ijg-IJG b/tests/cluecode/data/copyrights/ijg-IJG
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ijg-IJG
rename to tests/cluecode/data/copyrights/ijg-IJG
diff --git a/tests/cluecode/data/copyrights/copyright_illinois_html-9_html.html b/tests/cluecode/data/copyrights/illinois_html-9_html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_illinois_html-9_html.html
rename to tests/cluecode/data/copyrights/illinois_html-9_html.html
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_imatix-iMatix b/tests/cluecode/data/copyrights/imatix-iMatix
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_imatix-iMatix
rename to tests/cluecode/data/copyrights/imatix-iMatix
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_imlib2-Imlib b/tests/cluecode/data/copyrights/imlib2-Imlib
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_imlib2-Imlib
rename to tests/cluecode/data/copyrights/imlib2-Imlib
diff --git a/tests/cluecode/data/copyrights/copyright_inria_loss_of_holder_c-c.c b/tests/cluecode/data/copyrights/inria_loss_of_holder_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_inria_loss_of_holder_c-c.c
rename to tests/cluecode/data/copyrights/inria_loss_of_holder_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_intel-Intel b/tests/cluecode/data/copyrights/intel-Intel
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_intel-Intel
rename to tests/cluecode/data/copyrights/intel-Intel
diff --git a/tests/cluecode/data/copyrights/isc-c.c b/tests/cluecode/data/copyrights/isc-c.c
new file mode 100644
index 00000000000..97244fcbb17
--- /dev/null
+++ b/tests/cluecode/data/copyrights/isc-c.c
@@ -0,0 +1,4 @@
+#ifndef lint
+static char copyright[] =
+"$Id$ Copyright (c) 1998-2000 The Internet Software Consortium.  All rights reserved.\n";
+#endif /* not lint */
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_jabber-Jabber b/tests/cluecode/data/copyrights/jabber-Jabber
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_jabber-Jabber
rename to tests/cluecode/data/copyrights/jabber-Jabber
diff --git a/tests/cluecode/data/copyrights/copyright_java-java.java b/tests/cluecode/data/copyrights/java-java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_java-java.java
rename to tests/cluecode/data/copyrights/java-java.java
diff --git a/tests/cluecode/data/copyrights/copyright_jdoe-copyright_c.c b/tests/cluecode/data/copyrights/jdoe-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_jdoe-copyright_c.c
rename to tests/cluecode/data/copyrights/jdoe-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_jpython-JPython b/tests/cluecode/data/copyrights/jpython-JPython
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_jpython-JPython
rename to tests/cluecode/data/copyrights/jpython-JPython
diff --git a/tests/cluecode/data/copyrights/copyright_json_in_phps-JSON_phps.phps b/tests/cluecode/data/copyrights/json_in_phps-JSON_phps.phps
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_json_in_phps-JSON_phps.phps
rename to tests/cluecode/data/copyrights/json_in_phps-JSON_phps.phps
diff --git a/tests/cluecode/data/copyrights/copyright_json_in_phps_incorrect-JSON_phps.phps b/tests/cluecode/data/copyrights/json_in_phps_incorrect-JSON_phps.phps
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_json_in_phps_incorrect-JSON_phps.phps
rename to tests/cluecode/data/copyrights/json_in_phps_incorrect-JSON_phps.phps
diff --git a/tests/cluecode/data/copyrights/copyright_json_phps_html-JSON_phps_html.html b/tests/cluecode/data/copyrights/json_phps_html-JSON_phps_html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_json_phps_html-JSON_phps_html.html
rename to tests/cluecode/data/copyrights/json_phps_html-JSON_phps_html.html
diff --git a/tests/cluecode/data/copyrights/copyright_json_phps_html_incorrect-JSON_phps_html.html b/tests/cluecode/data/copyrights/json_phps_html_incorrect-JSON_phps_html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_json_phps_html_incorrect-JSON_phps_html.html
rename to tests/cluecode/data/copyrights/json_phps_html_incorrect-JSON_phps_html.html
diff --git a/tests/cluecode/data/copyrights/copyright_jsp_all_CAPS-jsp.jsp b/tests/cluecode/data/copyrights/jsp_all_CAPS-jsp.jsp
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_jsp_all_CAPS-jsp.jsp
rename to tests/cluecode/data/copyrights/jsp_all_CAPS-jsp.jsp
diff --git a/tests/cluecode/data/copyrights/copyright_kaboom_copyright-kaboom_copyright.copyright b/tests/cluecode/data/copyrights/kaboom-kaboom.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_kaboom_copyright-kaboom_copyright.copyright
rename to tests/cluecode/data/copyrights/kaboom-kaboom.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_kbuild_copyright-kbuild_copyright.copyright b/tests/cluecode/data/copyrights/kbuild-kbuild.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_kbuild_copyright-kbuild_copyright.copyright
rename to tests/cluecode/data/copyrights/kbuild-kbuild.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_kde_l10n_zhcn_copyright-kde_l_n_zhcn_copyright.copyright b/tests/cluecode/data/copyrights/kde_l10n_zhcn-kde_l_n_zhcn.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_kde_l10n_zhcn_copyright-kde_l_n_zhcn_copyright.copyright
rename to tests/cluecode/data/copyrights/kde_l10n_zhcn-kde_l_n_zhcn.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_larryrosen-LarryRosen b/tests/cluecode/data/copyrights/larryrosen-LarryRosen
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_larryrosen-LarryRosen
rename to tests/cluecode/data/copyrights/larryrosen-LarryRosen
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_latex_v1_0-LaTeX_v.0 b/tests/cluecode/data/copyrights/latex_v1_0-LaTeX_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_latex_v1_0-LaTeX_v.0
rename to tests/cluecode/data/copyrights/latex_v1_0-LaTeX_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_latex_v1_1-LaTeX_v.1 b/tests/cluecode/data/copyrights/latex_v1_1-LaTeX_v.1
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_latex_v1_1-LaTeX_v.1
rename to tests/cluecode/data/copyrights/latex_v1_1-LaTeX_v.1
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_latex_v1_2-LaTeX_v.2 b/tests/cluecode/data/copyrights/latex_v1_2-LaTeX_v.2
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_latex_v1_2-LaTeX_v.2
rename to tests/cluecode/data/copyrights/latex_v1_2-LaTeX_v.2
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_latex_v1_3a-LaTeX_v_a.3a b/tests/cluecode/data/copyrights/latex_v1_3a-LaTeX_v_a.3a
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_latex_v1_3a-LaTeX_v_a.3a
rename to tests/cluecode/data/copyrights/latex_v1_3a-LaTeX_v_a.3a
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref b/tests/cluecode/data/copyrights/latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref
rename to tests/cluecode/data/copyrights/latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_latex_v1_3c-LaTeX_v_c.3c b/tests/cluecode/data/copyrights/latex_v1_3c-LaTeX_v_c.3c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_latex_v1_3c-LaTeX_v_c.3c
rename to tests/cluecode/data/copyrights/latex_v1_3c-LaTeX_v_c.3c
diff --git a/tests/cluecode/data/copyrights/copyright_leonardo_c-c.c b/tests/cluecode/data/copyrights/leonardo_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_leonardo_c-c.c
rename to tests/cluecode/data/copyrights/leonardo_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_lgpl_v2_0-LGPL_v.0 b/tests/cluecode/data/copyrights/lgpl_v2_0-LGPL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_lgpl_v2_0-LGPL_v.0
rename to tests/cluecode/data/copyrights/lgpl_v2_0-LGPL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_lgpl_v2_1-LGPL_v.1 b/tests/cluecode/data/copyrights/lgpl_v2_1-LGPL_v.1
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_lgpl_v2_1-LGPL_v.1
rename to tests/cluecode/data/copyrights/lgpl_v2_1-LGPL_v.1
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_lgpl_v3-LGPL_v b/tests/cluecode/data/copyrights/lgpl_v3-LGPL_v
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_lgpl_v3-LGPL_v
rename to tests/cluecode/data/copyrights/lgpl_v3-LGPL_v
diff --git a/tests/cluecode/data/copyrights/copyright_libadns1_copyright-libadns_copyright.copyright b/tests/cluecode/data/copyrights/libadns1-libadns.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libadns1_copyright-libadns_copyright.copyright
rename to tests/cluecode/data/copyrights/libadns1-libadns.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libc6_i686_copyright-libc_i_copyright.copyright b/tests/cluecode/data/copyrights/libc6_i686-libc_i.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libc6_i686_copyright-libc_i_copyright.copyright
rename to tests/cluecode/data/copyrights/libc6_i686-libc_i.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libcdio10_copyright_label-libcdio_copyright_label.label b/tests/cluecode/data/copyrights/libcdio10-libcdio.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libcdio10_copyright_label-libcdio_copyright_label.label
rename to tests/cluecode/data/copyrights/libcdio10-libcdio.label
diff --git a/tests/cluecode/data/copyrights/copyright_libcelt0_copyright-libcelt_copyright.copyright b/tests/cluecode/data/copyrights/libcelt0-libcelt.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libcelt0_copyright-libcelt_copyright.copyright
rename to tests/cluecode/data/copyrights/libcelt0-libcelt.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libcompress_raw_zlib_perl_copyright-libcompress_raw_zlib_perl_copyright.copyright b/tests/cluecode/data/copyrights/libcompress_raw_zlib_perl-libcompress_raw_zlib_perl.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libcompress_raw_zlib_perl_copyright-libcompress_raw_zlib_perl_copyright.copyright
rename to tests/cluecode/data/copyrights/libcompress_raw_zlib_perl-libcompress_raw_zlib_perl.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libcpufreq0_copyright-libcpufreq_copyright.copyright b/tests/cluecode/data/copyrights/libcpufreq0-libcpufreq.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libcpufreq0_copyright-libcpufreq_copyright.copyright
rename to tests/cluecode/data/copyrights/libcpufreq0-libcpufreq.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libcrypt_ssleay_perl_copyright-libcrypt_ssleay_perl_copyright.copyright b/tests/cluecode/data/copyrights/libcrypt_ssleay_perl-libcrypt_ssleay_perl.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libcrypt_ssleay_perl_copyright-libcrypt_ssleay_perl_copyright.copyright
rename to tests/cluecode/data/copyrights/libcrypt_ssleay_perl-libcrypt_ssleay_perl.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libepc_ui_1_0_1_copyright-libepc_ui__copyright.copyright b/tests/cluecode/data/copyrights/libepc_ui_1_0_1-libepc_ui.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libepc_ui_1_0_1_copyright-libepc_ui__copyright.copyright
rename to tests/cluecode/data/copyrights/libepc_ui_1_0_1-libepc_ui.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libepc_ui_1_0_2_copyright_label-libepc_ui__copyright_label.label b/tests/cluecode/data/copyrights/libepc_ui_1_0_2-libepc_ui.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libepc_ui_1_0_2_copyright_label-libepc_ui__copyright_label.label
rename to tests/cluecode/data/copyrights/libepc_ui_1_0_2-libepc_ui.label
diff --git a/tests/cluecode/data/copyrights/copyright_libfltk1_1_copyright-libfltk_copyright.copyright b/tests/cluecode/data/copyrights/libfltk1_1-libfltk.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libfltk1_1_copyright-libfltk_copyright.copyright
rename to tests/cluecode/data/copyrights/libfltk1_1-libfltk.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libgail18_copyright_label-libgail_copyright_label.label b/tests/cluecode/data/copyrights/libgail18-libgail.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libgail18_copyright_label-libgail_copyright_label.label
rename to tests/cluecode/data/copyrights/libgail18-libgail.label
diff --git a/tests/cluecode/data/copyrights/copyright_libggiwmh0_target_x_copyright-libggiwmh_target_x_copyright.copyright b/tests/cluecode/data/copyrights/libggiwmh0_target_x-libggiwmh_target_x.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libggiwmh0_target_x_copyright-libggiwmh_target_x_copyright.copyright
rename to tests/cluecode/data/copyrights/libggiwmh0_target_x-libggiwmh_target_x.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libgnome_desktop_2_copyright-libgnome_desktop__copyright.copyright b/tests/cluecode/data/copyrights/libgnome_desktop_2-libgnome_desktop.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libgnome_desktop_2_copyright-libgnome_desktop__copyright.copyright
rename to tests/cluecode/data/copyrights/libgnome_desktop_2-libgnome_desktop.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libgnome_media0_copyright-libgnome_media_copyright.copyright b/tests/cluecode/data/copyrights/libgnome_media0-libgnome_media.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libgnome_media0_copyright-libgnome_media_copyright.copyright
rename to tests/cluecode/data/copyrights/libgnome_media0-libgnome_media.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libgoffice_0_8_copyright_label-libgoffice__copyright_label.label b/tests/cluecode/data/copyrights/libgoffice_0_8-libgoffice.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libgoffice_0_8_copyright_label-libgoffice__copyright_label.label
rename to tests/cluecode/data/copyrights/libgoffice_0_8-libgoffice.label
diff --git a/tests/cluecode/data/copyrights/copyright_libgtkhtml2_0_copyright-libgtkhtml_copyright.copyright b/tests/cluecode/data/copyrights/libgtkhtml2_0-libgtkhtml.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libgtkhtml2_0_copyright-libgtkhtml_copyright.copyright
rename to tests/cluecode/data/copyrights/libgtkhtml2_0-libgtkhtml.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libisc44_copyright-libisc_copyright.copyright b/tests/cluecode/data/copyrights/libisc44-libisc.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libisc44_copyright-libisc_copyright.copyright
rename to tests/cluecode/data/copyrights/libisc44-libisc.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libisccfg30_copyright-libisccfg_copyright.copyright b/tests/cluecode/data/copyrights/libisccfg30-libisccfg.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libisccfg30_copyright-libisccfg_copyright.copyright
rename to tests/cluecode/data/copyrights/libisccfg30-libisccfg.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libisccfg40_copyright-libisccfg_copyright.copyright b/tests/cluecode/data/copyrights/libisccfg40-libisccfg.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libisccfg40_copyright-libisccfg_copyright.copyright
rename to tests/cluecode/data/copyrights/libisccfg40-libisccfg.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libjpeg62_copyright-libjpeg_copyright.copyright b/tests/cluecode/data/copyrights/libjpeg62-libjpeg.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libjpeg62_copyright-libjpeg_copyright.copyright
rename to tests/cluecode/data/copyrights/libjpeg62-libjpeg.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libkeyutils1_copyright_label-libkeyutils_copyright_label.label b/tests/cluecode/data/copyrights/libkeyutils1-libkeyutils.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libkeyutils1_copyright_label-libkeyutils_copyright_label.label
rename to tests/cluecode/data/copyrights/libkeyutils1-libkeyutils.label
diff --git a/tests/cluecode/data/copyrights/copyright_liblocale_gettext_perl_copyright_label-liblocale_get_perl_copyright_label.label b/tests/cluecode/data/copyrights/liblocale_gettext_perl-liblocale_get_perl.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_liblocale_gettext_perl_copyright_label-liblocale_get_perl_copyright_label.label
rename to tests/cluecode/data/copyrights/liblocale_gettext_perl-liblocale_get_perl.label
diff --git a/tests/cluecode/data/copyrights/copyright_libopenraw1_copyright_label-libopenraw_copyright_label.label b/tests/cluecode/data/copyrights/libopenraw1-libopenraw.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libopenraw1_copyright_label-libopenraw_copyright_label.label
rename to tests/cluecode/data/copyrights/libopenraw1-libopenraw.label
diff --git a/tests/cluecode/data/copyrights/copyright_libopenthreads12_copyright-libopenthreads_copyright.copyright b/tests/cluecode/data/copyrights/libopenthreads12-libopenthreads.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libopenthreads12_copyright-libopenthreads_copyright.copyright
rename to tests/cluecode/data/copyrights/libopenthreads12-libopenthreads.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libpam_ck_connector_copyright-libpam_ck_connector_copyright.copyright b/tests/cluecode/data/copyrights/libpam_ck_connector-libpam_ck_connector.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libpam_ck_connector_copyright-libpam_ck_connector_copyright.copyright
rename to tests/cluecode/data/copyrights/libpam_ck_connector-libpam_ck_connector.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libpoppler3_copyright-libpoppler_copyright.copyright b/tests/cluecode/data/copyrights/libpoppler3-libpoppler.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libpoppler3_copyright-libpoppler_copyright.copyright
rename to tests/cluecode/data/copyrights/libpoppler3-libpoppler.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libqt4_scripttools_copyright-libqt_scripttools_copyright.copyright b/tests/cluecode/data/copyrights/libqt4_scripttools-libqt_scripttools.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libqt4_scripttools_copyright-libqt_scripttools_copyright.copyright
rename to tests/cluecode/data/copyrights/libqt4_scripttools-libqt_scripttools.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libqtscript4_gui_copyright-libqtscript_gui_copyright.copyright b/tests/cluecode/data/copyrights/libqtscript4_gui-libqtscript_gui.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libqtscript4_gui_copyright-libqtscript_gui_copyright.copyright
rename to tests/cluecode/data/copyrights/libqtscript4_gui-libqtscript_gui.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libsocks4_copyright-libsocks_copyright.copyright b/tests/cluecode/data/copyrights/libsocks4-libsocks.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libsocks4_copyright-libsocks_copyright.copyright
rename to tests/cluecode/data/copyrights/libsocks4-libsocks.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libsox_fmt_alsa_copyright-libsox_fmt_alsa_copyright.copyright b/tests/cluecode/data/copyrights/libsox_fmt_alsa-libsox_fmt_alsa.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libsox_fmt_alsa_copyright-libsox_fmt_alsa_copyright.copyright
rename to tests/cluecode/data/copyrights/libsox_fmt_alsa-libsox_fmt_alsa.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libspeex1_copyright-libspeex_copyright.copyright b/tests/cluecode/data/copyrights/libspeex1-libspeex.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libspeex1_copyright-libspeex_copyright.copyright
rename to tests/cluecode/data/copyrights/libspeex1-libspeex.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libstlport4_6ldbl_copyright_label-libstlport_ldbl_copyright_label.label b/tests/cluecode/data/copyrights/libstlport4_6ldbl-libstlport_ldbl.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libstlport4_6ldbl_copyright_label-libstlport_ldbl_copyright_label.label
rename to tests/cluecode/data/copyrights/libstlport4_6ldbl-libstlport_ldbl.label
diff --git a/tests/cluecode/data/copyrights/copyright_libtdb1_copyright-libtdb_copyright.copyright b/tests/cluecode/data/copyrights/libtdb1-libtdb.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libtdb1_copyright-libtdb_copyright.copyright
rename to tests/cluecode/data/copyrights/libtdb1-libtdb.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libuim6_copyright-libuim_copyright.copyright b/tests/cluecode/data/copyrights/libuim6-libuim.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libuim6_copyright-libuim_copyright.copyright
rename to tests/cluecode/data/copyrights/libuim6-libuim.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libxext6_copyright-libxext_copyright.copyright b/tests/cluecode/data/copyrights/libxext6-libxext.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libxext6_copyright-libxext_copyright.copyright
rename to tests/cluecode/data/copyrights/libxext6-libxext.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libxmlrpc_c3_copyright-libxmlrpc_c_copyright.copyright b/tests/cluecode/data/copyrights/libxmlrpc_c3-libxmlrpc_c.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libxmlrpc_c3_copyright-libxmlrpc_c_copyright.copyright
rename to tests/cluecode/data/copyrights/libxmlrpc_c3-libxmlrpc_c.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_libxt6_copyright_label-libxt_copyright_label.label b/tests/cluecode/data/copyrights/libxt6-libxt.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_libxt6_copyright_label-libxt_copyright_label.label
rename to tests/cluecode/data/copyrights/libxt6-libxt.label
diff --git a/tests/cluecode/data/copyrights/copyright_license_qpl_v1_0_perfect-QPL_v.0 b/tests/cluecode/data/copyrights/license_qpl_v1_0_perfect-QPL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_qpl_v1_0_perfect-QPL_v.0
rename to tests/cluecode/data/copyrights/license_qpl_v1_0_perfect-QPL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_linux_source_2_6_copyright-linux_source__copyright.copyright b/tests/cluecode/data/copyrights/linux_source_2_6-linux_source.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_linux_source_2_6_copyright-linux_source__copyright.copyright
rename to tests/cluecode/data/copyrights/linux_source_2_6-linux_source.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_logica_v1_0-Logica_v.0 b/tests/cluecode/data/copyrights/logica_v1_0-Logica_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_logica_v1_0-Logica_v.0
rename to tests/cluecode/data/copyrights/logica_v1_0-Logica_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_loss_of_holder_c-c.c b/tests/cluecode/data/copyrights/loss_of_holder_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_loss_of_holder_c-c.c
rename to tests/cluecode/data/copyrights/loss_of_holder_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_luxi_fonts-Luxi_fonts b/tests/cluecode/data/copyrights/luxi_fonts-Luxi_fonts
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_luxi_fonts-Luxi_fonts
rename to tests/cluecode/data/copyrights/luxi_fonts-Luxi_fonts
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_maia-Maia b/tests/cluecode/data/copyrights/maia-Maia
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_maia-Maia
rename to tests/cluecode/data/copyrights/maia-Maia
diff --git a/tests/cluecode/data/copyrights/copyright_matroska_demux1_c-matroska_demux_c.c b/tests/cluecode/data/copyrights/matroska_demux1_c-matroska_demux_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_matroska_demux1_c-matroska_demux_c.c
rename to tests/cluecode/data/copyrights/matroska_demux1_c-matroska_demux_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_matroska_demux_c-matroska_demux_c.c b/tests/cluecode/data/copyrights/matroska_demux_c-matroska_demux_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_matroska_demux_c-matroska_demux_c.c
rename to tests/cluecode/data/copyrights/matroska_demux_c-matroska_demux_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_matroska_demux_muller_c-matroska_demux_c.c b/tests/cluecode/data/copyrights/matroska_demux_muller_c-matroska_demux_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_matroska_demux_muller_c-matroska_demux_c.c
rename to tests/cluecode/data/copyrights/matroska_demux_muller_c-matroska_demux_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_in_maven_pom_xstream-pom_xml.xml b/tests/cluecode/data/copyrights/maven_pom_xstream-pom_xml.xml
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_maven_pom_xstream-pom_xml.xml
rename to tests/cluecode/data/copyrights/maven_pom_xstream-pom_xml.xml
diff --git a/tests/cluecode/data/copyrights/copyright_in_media-a_png.png b/tests/cluecode/data/copyrights/media-a_png.png
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_media-a_png.png
rename to tests/cluecode/data/copyrights/media-a_png.png
diff --git a/tests/cluecode/data/copyrights/copyright_memcmp_assembly-9_9_memcmp_S.S b/tests/cluecode/data/copyrights/memcmp_assembly-9_9_memcmp_S.S
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_memcmp_assembly-9_9_memcmp_S.S
rename to tests/cluecode/data/copyrights/memcmp_assembly-9_9_memcmp_S.S
diff --git a/tests/cluecode/data/copyrights/copyright_mergesort_java-MergeSort_java.java b/tests/cluecode/data/copyrights/mergesort_java-MergeSort_java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mergesort_java-MergeSort_java.java
rename to tests/cluecode/data/copyrights/mergesort_java-MergeSort_java.java
diff --git a/tests/cluecode/data/copyrights/copyright_in_phps-phps.phps b/tests/cluecode/data/copyrights/michal_txt.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_phps-phps.phps
rename to tests/cluecode/data/copyrights/michal_txt.txt
diff --git a/tests/cluecode/data/copyrights/copyright_mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu b/tests/cluecode/data/copyrights/mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu
rename to tests/cluecode/data/copyrights/mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu
diff --git a/tests/cluecode/data/copyrights/copyright_missing_statement_file_txt-file.txt b/tests/cluecode/data/copyrights/missing_statement_file_txt-file.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_missing_statement_file_txt-file.txt
rename to tests/cluecode/data/copyrights/missing_statement_file_txt-file.txt
diff --git a/tests/cluecode/data/copyrights/copyright_mit.txt b/tests/cluecode/data/copyrights/mit.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mit.txt
rename to tests/cluecode/data/copyrights/mit.txt
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_adobeglyph-MIT_AdobeGlyph b/tests/cluecode/data/copyrights/mit_adobeglyph-MIT_AdobeGlyph
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_adobeglyph-MIT_AdobeGlyph
rename to tests/cluecode/data/copyrights/mit_adobeglyph-MIT_AdobeGlyph
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_cmu-MIT_CMU b/tests/cluecode/data/copyrights/mit_cmu-MIT_CMU
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_cmu-MIT_CMU
rename to tests/cluecode/data/copyrights/mit_cmu-MIT_CMU
diff --git a/tests/cluecode/data/copyrights/copyright_mit_danse-MIT_Danse b/tests/cluecode/data/copyrights/mit_danse-MIT_Danse
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mit_danse-MIT_Danse
rename to tests/cluecode/data/copyrights/mit_danse-MIT_Danse
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_danse-MIT_danse b/tests/cluecode/data/copyrights/mit_danse-MIT_danse
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_danse-MIT_danse
rename to tests/cluecode/data/copyrights/mit_danse-MIT_danse
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_enna-MIT_enna b/tests/cluecode/data/copyrights/mit_enna-MIT_enna
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_enna-MIT_enna
rename to tests/cluecode/data/copyrights/mit_enna-MIT_enna
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_hylafax-MIT_hylafax b/tests/cluecode/data/copyrights/mit_hylafax-MIT_hylafax
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_hylafax-MIT_hylafax
rename to tests/cluecode/data/copyrights/mit_hylafax-MIT_hylafax
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_icu-MIT_ICU b/tests/cluecode/data/copyrights/mit_icu-MIT_ICU
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_icu-MIT_ICU
rename to tests/cluecode/data/copyrights/mit_icu-MIT_ICU
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_lucent-MIT_Lucent b/tests/cluecode/data/copyrights/mit_lucent-MIT_Lucent
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_lucent-MIT_Lucent
rename to tests/cluecode/data/copyrights/mit_lucent-MIT_Lucent
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_mlton-MIT_MLton b/tests/cluecode/data/copyrights/mit_mlton-MIT_MLton
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_mlton-MIT_MLton
rename to tests/cluecode/data/copyrights/mit_mlton-MIT_MLton
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer b/tests/cluecode/data/copyrights/mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer
rename to tests/cluecode/data/copyrights/mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_unicode-MIT_unicode b/tests/cluecode/data/copyrights/mit_unicode-MIT_unicode
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_unicode-MIT_unicode
rename to tests/cluecode/data/copyrights/mit_unicode-MIT_unicode
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mit_wordnet-MIT_WordNet b/tests/cluecode/data/copyrights/mit_wordnet-MIT_WordNet
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mit_wordnet-MIT_WordNet
rename to tests/cluecode/data/copyrights/mit_wordnet-MIT_WordNet
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mitre-MITRE b/tests/cluecode/data/copyrights/mitre-MITRE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mitre-MITRE
rename to tests/cluecode/data/copyrights/mitre-MITRE
diff --git a/tests/cluecode/data/copyrights/copyright_mixedcaps_c-mixedcaps_c.c b/tests/cluecode/data/copyrights/mixedcaps_c-mixedcaps_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mixedcaps_c-mixedcaps_c.c
rename to tests/cluecode/data/copyrights/mixedcaps_c-mixedcaps_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_mixedcase_company_name_in_c-lowercase_company_c.c b/tests/cluecode/data/copyrights/mixedcase_company_name_in_c-lowercase_company_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mixedcase_company_name_in_c-lowercase_company_c.c
rename to tests/cluecode/data/copyrights/mixedcase_company_name_in_c-lowercase_company_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_mkisofs_copyright-mkisofs_copyright.copyright b/tests/cluecode/data/copyrights/mkisofs-mkisofs.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mkisofs_copyright-mkisofs_copyright.copyright
rename to tests/cluecode/data/copyrights/mkisofs-mkisofs.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_moto_broad-c.c b/tests/cluecode/data/copyrights/moto_broad-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_moto_broad-c.c
rename to tests/cluecode/data/copyrights/moto_broad-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_motorola_c-c.c b/tests/cluecode/data/copyrights/motorola_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_motorola_c-c.c
rename to tests/cluecode/data/copyrights/motorola_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_motorola_mobility_c-c.c b/tests/cluecode/data/copyrights/motorola_mobility_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_motorola_mobility_c-c.c
rename to tests/cluecode/data/copyrights/motorola_mobility_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_mplayer_skin_blue_copyright-mplayer_skin_blue_copyright.copyright b/tests/cluecode/data/copyrights/mplayer_skin_blue-mplayer_skin_blue.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mplayer_skin_blue_copyright-mplayer_skin_blue_copyright.copyright
rename to tests/cluecode/data/copyrights/mplayer_skin_blue-mplayer_skin_blue.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ms_pl-Ms_PL b/tests/cluecode/data/copyrights/ms_pl-Ms_PL
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ms_pl-Ms_PL
rename to tests/cluecode/data/copyrights/ms_pl-Ms_PL
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ms_rl-Ms_RL b/tests/cluecode/data/copyrights/ms_rl-Ms_RL
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ms_rl-Ms_RL
rename to tests/cluecode/data/copyrights/ms_rl-Ms_RL
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ms_rsl-Ms_RSL b/tests/cluecode/data/copyrights/ms_rsl-Ms_RSL
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ms_rsl-Ms_RSL
rename to tests/cluecode/data/copyrights/ms_rsl-Ms_RSL
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_msntp-MSNTP b/tests/cluecode/data/copyrights/msntp-MSNTP
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_msntp-MSNTP
rename to tests/cluecode/data/copyrights/msntp-MSNTP
diff --git a/tests/cluecode/data/copyrights/copyright_muller-c.c b/tests/cluecode/data/copyrights/muller-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_muller-c.c
rename to tests/cluecode/data/copyrights/muller-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_multiline-Historical.txt b/tests/cluecode/data/copyrights/multiline-Historical.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_multiline-Historical.txt
rename to tests/cluecode/data/copyrights/multiline-Historical.txt
diff --git a/tests/cluecode/data/copyrights/copyright_multiline_george-Historical.txt b/tests/cluecode/data/copyrights/multiline_george-Historical.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_multiline_george-Historical.txt
rename to tests/cluecode/data/copyrights/multiline_george-Historical.txt
diff --git a/tests/cluecode/data/copyrights/copyright_mycorp_c-c.c b/tests/cluecode/data/copyrights/mycorp_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_mycorp_c-c.c
rename to tests/cluecode/data/copyrights/mycorp_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_mysql_gplexception-MySQL_gplexception b/tests/cluecode/data/copyrights/mysql_gplexception-MySQL_gplexception
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_mysql_gplexception-MySQL_gplexception
rename to tests/cluecode/data/copyrights/mysql_gplexception-MySQL_gplexception
diff --git a/tests/cluecode/data/copyrights/copyright_name_before_copyright_c-c.c b/tests/cluecode/data/copyrights/name_before_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_name_before_copyright_c-c.c
rename to tests/cluecode/data/copyrights/name_before_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_name_sign_year_correct-c.c b/tests/cluecode/data/copyrights/name_sign_year_correct-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_name_sign_year_correct-c.c
rename to tests/cluecode/data/copyrights/name_sign_year_correct-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_naumen-Naumen b/tests/cluecode/data/copyrights/naumen-Naumen
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_naumen-Naumen
rename to tests/cluecode/data/copyrights/naumen-Naumen
diff --git a/tests/cluecode/data/copyrights/copyright_naumen_txt.txt b/tests/cluecode/data/copyrights/naumen_txt.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_naumen_txt.txt
rename to tests/cluecode/data/copyrights/naumen_txt.txt
diff --git a/tests/cluecode/data/copyrights/copyright_ncurses_bin_copyright-ncurses_bin_copyright.copyright b/tests/cluecode/data/copyrights/ncurses_bin-ncurses_bin.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ncurses_bin_copyright-ncurses_bin_copyright.copyright
rename to tests/cluecode/data/copyrights/ncurses_bin-ncurses_bin.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_nederlof.txt b/tests/cluecode/data/copyrights/nederlof.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_nederlof.txt
rename to tests/cluecode/data/copyrights/nederlof.txt
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_netcomponents-NetComponents b/tests/cluecode/data/copyrights/netcomponents-NetComponents
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_netcomponents-NetComponents
rename to tests/cluecode/data/copyrights/netcomponents-NetComponents
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_nethack-Nethack b/tests/cluecode/data/copyrights/nethack-Nethack
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_nethack-Nethack
rename to tests/cluecode/data/copyrights/nethack-Nethack
diff --git a/tests/cluecode/data/copyrights/copyright_nnp_and_co.txt b/tests/cluecode/data/copyrights/nnp_and_co.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_nnp_and_co.txt
rename to tests/cluecode/data/copyrights/nnp_and_co.txt
diff --git a/tests/cluecode/data/copyrights/copyright_no_copyright_in_c-c.c b/tests/cluecode/data/copyrights/no_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_no_copyright_in_c-c.c
rename to tests/cluecode/data/copyrights/no_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_no_copyright_in_class_file_1-PersistentArrayHolder_class.class b/tests/cluecode/data/copyrights/no_class_file_1-PersistentArrayHolder_class.class
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_no_copyright_in_class_file_1-PersistentArrayHolder_class.class
rename to tests/cluecode/data/copyrights/no_class_file_1-PersistentArrayHolder_class.class
diff --git a/tests/cluecode/data/copyrights/copyright_no_copyright_in_class_file_2-PersistentElementHolder_class.class b/tests/cluecode/data/copyrights/no_class_file_2-PersistentElementHolder_class.class
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_no_copyright_in_class_file_2-PersistentElementHolder_class.class
rename to tests/cluecode/data/copyrights/no_class_file_2-PersistentElementHolder_class.class
diff --git a/tests/cluecode/data/copyrights/copyright_no_copyright_in_class_file_3-PersistentIndexedElementHolder_class.class b/tests/cluecode/data/copyrights/no_class_file_3-PersistentIndexedElementHolder_class.class
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_no_copyright_in_class_file_3-PersistentIndexedElementHolder_class.class
rename to tests/cluecode/data/copyrights/no_class_file_3-PersistentIndexedElementHolder_class.class
diff --git a/tests/cluecode/data/copyrights/copyright_no_copyright_in_class_file_4-PersistentListElementHolder_class.class b/tests/cluecode/data/copyrights/no_class_file_4-PersistentListElementHolder_class.class
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_no_copyright_in_class_file_4-PersistentListElementHolder_class.class
rename to tests/cluecode/data/copyrights/no_class_file_4-PersistentListElementHolder_class.class
diff --git a/tests/cluecode/data/copyrights/copyright_no_holder_java-java.java b/tests/cluecode/data/copyrights/no_holder_java-java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_no_holder_java-java.java
rename to tests/cluecode/data/copyrights/no_holder_java-java.java
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_nokia-Nokia b/tests/cluecode/data/copyrights/nokia-Nokia
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_nokia-Nokia
rename to tests/cluecode/data/copyrights/nokia-Nokia
diff --git a/tests/cluecode/data/copyrights/copyright_nokia_cpp-cpp.cpp b/tests/cluecode/data/copyrights/nokia_cpp-cpp.cpp
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_nokia_cpp-cpp.cpp
rename to tests/cluecode/data/copyrights/nokia_cpp-cpp.cpp
diff --git a/tests/cluecode/data/copyrights/copyright_north_c-99_c.c b/tests/cluecode/data/copyrights/north_c-99_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_north_c-99_c.c
rename to tests/cluecode/data/copyrights/north_c-99_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_notice2-9_NOTICE b/tests/cluecode/data/copyrights/notice2-9_NOTICE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_notice2-9_NOTICE
rename to tests/cluecode/data/copyrights/notice2-9_NOTICE
diff --git a/tests/cluecode/data/copyrights/copyright_notice2_txt-NOTICE.txt b/tests/cluecode/data/copyrights/notice2_txt-NOTICE.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_notice2_txt-NOTICE.txt
rename to tests/cluecode/data/copyrights/notice2_txt-NOTICE.txt
diff --git a/tests/cluecode/data/copyrights/copyright_notice_name_before_statement-NOTICE b/tests/cluecode/data/copyrights/notice_name_before_statement-NOTICE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_notice_name_before_statement-NOTICE
rename to tests/cluecode/data/copyrights/notice_name_before_statement-NOTICE
diff --git a/tests/cluecode/data/copyrights/copyright_notice_txt-NOTICE.txt b/tests/cluecode/data/copyrights/notice_txt-NOTICE.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_notice_txt-NOTICE.txt
rename to tests/cluecode/data/copyrights/notice_txt-NOTICE.txt
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_npl_v1_0-NPL_v.0 b/tests/cluecode/data/copyrights/npl_v1_0-NPL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_npl_v1_0-NPL_v.0
rename to tests/cluecode/data/copyrights/npl_v1_0-NPL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_nvidia_source-Nvidia_source b/tests/cluecode/data/copyrights/nvidia_source-Nvidia_source
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_nvidia_source-Nvidia_source
rename to tests/cluecode/data/copyrights/nvidia_source-Nvidia_source
diff --git a/tests/cluecode/data/copyrights/copyright_o_brien_style_name.txt b/tests/cluecode/data/copyrights/o_brien_style_name.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_o_brien_style_name.txt
rename to tests/cluecode/data/copyrights/o_brien_style_name.txt
diff --git a/tests/cluecode/data/copyrights/copyright_oberhummer_c_code-c.c b/tests/cluecode/data/copyrights/oberhummer_c_code-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_oberhummer_c_code-c.c
rename to tests/cluecode/data/copyrights/oberhummer_c_code-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_oberhummer_text.txt b/tests/cluecode/data/copyrights/oberhummer_text.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_oberhummer_text.txt
rename to tests/cluecode/data/copyrights/oberhummer_text.txt
diff --git a/tests/cluecode/data/copyrights/copyright_objectivec-objectiveC_m.m b/tests/cluecode/data/copyrights/objectivec-objectiveC_m.m
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_objectivec-objectiveC_m.m
rename to tests/cluecode/data/copyrights/objectivec-objectiveC_m.m
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_oclc_v1_0-OCLC_v.0 b/tests/cluecode/data/copyrights/oclc_v1_0-OCLC_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_oclc_v1_0-OCLC_v.0
rename to tests/cluecode/data/copyrights/oclc_v1_0-OCLC_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_oclc_v2_0-OCLC_v.0 b/tests/cluecode/data/copyrights/oclc_v2_0-OCLC_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_oclc_v2_0-OCLC_v.0
rename to tests/cluecode/data/copyrights/oclc_v2_0-OCLC_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_openhackware_copyright_label-openhackware_copyright_label.label b/tests/cluecode/data/copyrights/openhackware-openhackware.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_openhackware_copyright_label-openhackware_copyright_label.label
rename to tests/cluecode/data/copyrights/openhackware-openhackware.label
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_openldap-OpenLDAP b/tests/cluecode/data/copyrights/openldap-OpenLDAP
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_openldap-OpenLDAP
rename to tests/cluecode/data/copyrights/openldap-OpenLDAP
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_openmotif-OpenMotif b/tests/cluecode/data/copyrights/openmotif-OpenMotif
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_openmotif-OpenMotif
rename to tests/cluecode/data/copyrights/openmotif-OpenMotif
diff --git a/tests/cluecode/data/copyrights/openoffice_org_report_builder_bin_copyright.copyright b/tests/cluecode/data/copyrights/openoffice_org_report_builder_bin.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/openoffice_org_report_builder_bin_copyright.copyright
rename to tests/cluecode/data/copyrights/openoffice_org_report_builder_bin.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_openoffice_org_report_builder_bin_copyright2-openoffice_org_report_builder_bin_copyright.copyright2 b/tests/cluecode/data/copyrights/openoffice_org_report_builder_bin_2-openoffice_org_report_builder_bin.copyright2
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_openoffice_org_report_builder_bin_copyright2-openoffice_org_report_builder_bin_copyright.copyright2
rename to tests/cluecode/data/copyrights/openoffice_org_report_builder_bin_2-openoffice_org_report_builder_bin.copyright2
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_openpbs-OpenPBS b/tests/cluecode/data/copyrights/openpbs-OpenPBS
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_openpbs-OpenPBS
rename to tests/cluecode/data/copyrights/openpbs-OpenPBS
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_openpublicationref-OpenPublicationref b/tests/cluecode/data/copyrights/openpublicationref-OpenPublicationref
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_openpublicationref-OpenPublicationref
rename to tests/cluecode/data/copyrights/openpublicationref-OpenPublicationref
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_openssl-OpenSSL b/tests/cluecode/data/copyrights/openssl-OpenSSL
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_openssl-OpenSSL
rename to tests/cluecode/data/copyrights/openssl-OpenSSL
diff --git a/tests/cluecode/data/copyrights/copyright_openssl-c.c b/tests/cluecode/data/copyrights/openssl-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_openssl-c.c
rename to tests/cluecode/data/copyrights/openssl-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_osl_v3_0-OSL_v.0 b/tests/cluecode/data/copyrights/osl_v3_0-OSL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_osl_v3_0-OSL_v.0
rename to tests/cluecode/data/copyrights/osl_v3_0-OSL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_partial_detection.txt b/tests/cluecode/data/copyrights/partial_detection.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_partial_detection.txt
rename to tests/cluecode/data/copyrights/partial_detection.txt
diff --git a/tests/cluecode/data/copyrights/copyright_partial_detection_mit.txt b/tests/cluecode/data/copyrights/partial_detection_mit.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_partial_detection_mit.txt
rename to tests/cluecode/data/copyrights/partial_detection_mit.txt
diff --git a/tests/cluecode/data/copyrights/copyright_perl_base_copyright-perl_base_copyright.copyright b/tests/cluecode/data/copyrights/perl_base-perl_base.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_perl_base_copyright-perl_base_copyright.copyright
rename to tests/cluecode/data/copyrights/perl_base-perl_base.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_perl_module-pm.pm b/tests/cluecode/data/copyrights/perl_module-pm.pm
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_perl_module-pm.pm
rename to tests/cluecode/data/copyrights/perl_module-pm.pm
diff --git a/tests/cluecode/data/copyrights/copyright_peter_c-c.c b/tests/cluecode/data/copyrights/peter_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_peter_c-c.c
rename to tests/cluecode/data/copyrights/peter_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_phorum-Phorum b/tests/cluecode/data/copyrights/phorum-Phorum
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_phorum-Phorum
rename to tests/cluecode/data/copyrights/phorum-Phorum
diff --git a/tests/cluecode/data/copyrights/copyright_michal_txt.txt b/tests/cluecode/data/copyrights/phps-phps.phps
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_michal_txt.txt
rename to tests/cluecode/data/copyrights/phps-phps.phps
diff --git a/tests/cluecode/data/copyrights/copyright_piersol-TestMatrix_D_java.java b/tests/cluecode/data/copyrights/piersol-TestMatrix_D_java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_piersol-TestMatrix_D_java.java
rename to tests/cluecode/data/copyrights/piersol-TestMatrix_D_java.java
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_pine-Pine b/tests/cluecode/data/copyrights/pine-Pine
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_pine-Pine
rename to tests/cluecode/data/copyrights/pine-Pine
diff --git a/tests/cluecode/data/copyrights/copyright_pixelstream.rgb b/tests/cluecode/data/copyrights/pixelstream.rgb
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_pixelstream.rgb
rename to tests/cluecode/data/copyrights/pixelstream.rgb
diff --git a/tests/cluecode/data/copyrights/copyright_in_postcript-9__ps.ps b/tests/cluecode/data/copyrights/postcript-9_ps.ps
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_postcript-9__ps.ps
rename to tests/cluecode/data/copyrights/postcript-9_ps.ps
diff --git a/tests/cluecode/data/copyrights/copyright_postgresql_8_3_copyright_label-postgresql__copyright_label.label b/tests/cluecode/data/copyrights/postgresql_8_3-postgresql.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_postgresql_8_3_copyright_label-postgresql__copyright_label.label
rename to tests/cluecode/data/copyrights/postgresql_8_3-postgresql.label
diff --git a/tests/cluecode/data/copyrights/copyright_prof_informatics.txt b/tests/cluecode/data/copyrights/prof_informatics.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_prof_informatics.txt
rename to tests/cluecode/data/copyrights/prof_informatics.txt
diff --git a/tests/cluecode/data/copyrights/copyright_professional_txt-copyright.txt b/tests/cluecode/data/copyrights/professional_txt-copyright.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_professional_txt-copyright.txt
rename to tests/cluecode/data/copyrights/professional_txt-copyright.txt
diff --git a/tests/cluecode/data/copyrights/copyright_properties-properties.properties b/tests/cluecode/data/copyrights/properties-properties.properties
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_properties-properties.properties
rename to tests/cluecode/data/copyrights/properties-properties.properties
diff --git a/tests/cluecode/data/copyrights/copyright_psf_in_python-BitVector_py.py b/tests/cluecode/data/copyrights/psf_in_python-BitVector_py.py
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_psf_in_python-BitVector_py.py
rename to tests/cluecode/data/copyrights/psf_in_python-BitVector_py.py
diff --git a/tests/cluecode/data/copyrights/copyright_python_dateutil_copyright-python_dateutil_copyright.copyright b/tests/cluecode/data/copyrights/python_dateutil-python_dateutil.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_python_dateutil_copyright-python_dateutil_copyright.copyright
rename to tests/cluecode/data/copyrights/python_dateutil-python_dateutil.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_python_psyco_copyright-python_psyco_copyright.copyright b/tests/cluecode/data/copyrights/python_psyco-python_psyco.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_python_psyco_copyright-python_psyco_copyright.copyright
rename to tests/cluecode/data/copyrights/python_psyco-python_psyco.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_python_reportbug_copyright_label-python_report_copyright_label.label b/tests/cluecode/data/copyrights/python_reportbug-python_report.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_python_reportbug_copyright_label-python_report_copyright_label.label
rename to tests/cluecode/data/copyrights/python_reportbug-python_report.label
diff --git a/tests/cluecode/data/copyrights/copyright_python_software_properties_copyright-python_software_properties_copyright.copyright b/tests/cluecode/data/copyrights/python_software_properties-python_software_properties.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_python_software_properties_copyright-python_software_properties_copyright.copyright
rename to tests/cluecode/data/copyrights/python_software_properties-python_software_properties.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_python_v1_6-Python_v.6 b/tests/cluecode/data/copyrights/python_v1_6-Python_v.6
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_python_v1_6-Python_v.6
rename to tests/cluecode/data/copyrights/python_v1_6-Python_v.6
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_python_v1_6_1-Python_v.1 b/tests/cluecode/data/copyrights/python_v1_6_1-Python_v.1
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_python_v1_6_1-Python_v.1
rename to tests/cluecode/data/copyrights/python_v1_6_1-Python_v.1
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_python_v2-Python_v b/tests/cluecode/data/copyrights/python_v2-Python_v
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_python_v2-Python_v
rename to tests/cluecode/data/copyrights/python_v2-Python_v
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_qpl_v1_0-QPL_v.0 b/tests/cluecode/data/copyrights/qpl_v1_0-QPL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_qpl_v1_0-QPL_v.0
rename to tests/cluecode/data/copyrights/qpl_v1_0-QPL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_realcsl_v2_0-RealCSL_v.0 b/tests/cluecode/data/copyrights/realcsl_v2_0-RealCSL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_realcsl_v2_0-RealCSL_v.0
rename to tests/cluecode/data/copyrights/realcsl_v2_0-RealCSL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_realpsl_v1_0-RealPSL_v.0 b/tests/cluecode/data/copyrights/realpsl_v1_0-RealPSL_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_realpsl_v1_0-RealPSL_v.0
rename to tests/cluecode/data/copyrights/realpsl_v1_0-RealPSL_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_realpsl_v1_0ref-RealPSL_v_ref.0ref b/tests/cluecode/data/copyrights/realpsl_v1_0ref-RealPSL_v_ref.0ref
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_realpsl_v1_0ref-RealPSL_v_ref.0ref
rename to tests/cluecode/data/copyrights/realpsl_v1_0ref-RealPSL_v_ref.0ref
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_reciprocal_v1_5-Reciprocal_v.5 b/tests/cluecode/data/copyrights/reciprocal_v1_5-Reciprocal_v.5
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_reciprocal_v1_5-Reciprocal_v.5
rename to tests/cluecode/data/copyrights/reciprocal_v1_5-Reciprocal_v.5
diff --git a/tests/cluecode/data/copyrights/copyright_red_hat_openoffice_org_report_builder_bin_copyright-openoffice_org_report_builder_bin_copyright.copyright b/tests/cluecode/data/copyrights/red_hat_openoffice_org_report_builder_bin-openoffice_org_report_builder_bin.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_red_hat_openoffice_org_report_builder_bin_copyright-openoffice_org_report_builder_bin_copyright.copyright
rename to tests/cluecode/data/copyrights/red_hat_openoffice_org_report_builder_bin-openoffice_org_report_builder_bin.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_redhateula-RedHatEULA b/tests/cluecode/data/copyrights/redhateula-RedHatEULA
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_redhateula-RedHatEULA
rename to tests/cluecode/data/copyrights/redhateula-RedHatEULA
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_redhatref-RedHatref b/tests/cluecode/data/copyrights/redhatref-RedHatref
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_redhatref-RedHatref
rename to tests/cluecode/data/copyrights/redhatref-RedHatref
diff --git a/tests/cluecode/data/copyrights/copyright_regents_complex-strtol_c.c b/tests/cluecode/data/copyrights/regents_complex-strtol_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_regents_complex-strtol_c.c
rename to tests/cluecode/data/copyrights/regents_complex-strtol_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_regents_license-LICENSE b/tests/cluecode/data/copyrights/regents_license-LICENSE
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_regents_license-LICENSE
rename to tests/cluecode/data/copyrights/regents_license-LICENSE
diff --git a/tests/cluecode/data/copyrights/copyright_resig_js-js.js b/tests/cluecode/data/copyrights/resig_js-js.js
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_resig_js-js.js
rename to tests/cluecode/data/copyrights/resig_js-js.js
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_ricoh_v1_0-Ricoh_v.0 b/tests/cluecode/data/copyrights/ricoh_v1_0-Ricoh_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_ricoh_v1_0-Ricoh_v.0
rename to tests/cluecode/data/copyrights/ricoh_v1_0-Ricoh_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_rusty.txt b/tests/cluecode/data/copyrights/rusty.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_rusty.txt
rename to tests/cluecode/data/copyrights/rusty.txt
diff --git a/tests/cluecode/data/copyrights/copyright_rusty_c-c.c b/tests/cluecode/data/copyrights/rusty_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_rusty_c-c.c
rename to tests/cluecode/data/copyrights/rusty_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_s_fabsl_c-s_fabsl_c.c b/tests/cluecode/data/copyrights/s_fabsl_c-s_fabsl_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_s_fabsl_c-s_fabsl_c.c
rename to tests/cluecode/data/copyrights/s_fabsl_c-s_fabsl_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_sample_java-java.java b/tests/cluecode/data/copyrights/sample_java-java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_sample_java-java.java
rename to tests/cluecode/data/copyrights/sample_java-java.java
diff --git a/tests/cluecode/data/copyrights/copyright_sample_no_copyright-c.c b/tests/cluecode/data/copyrights/sample_no-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_sample_no_copyright-c.c
rename to tests/cluecode/data/copyrights/sample_no-c.c
diff --git a/tests/cluecode/data/copyrights/sample_py-py.py b/tests/cluecode/data/copyrights/sample_py-py.py
new file mode 100644
index 00000000000..3f93b934791
--- /dev/null
+++ b/tests/cluecode/data/copyrights/sample_py-py.py
@@ -0,0 +1,9 @@
+# /*
+# ********************************************************************************
+# *
+# * C M O D U L E C L U S T E R F I L E
+# *
+# * COPYRIGHT 2006 ABC
+# * ABC CONFIDENTIAL PROPRIETARY
+# *
+# ********************************************************************************
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_scilab-Scilab b/tests/cluecode/data/copyrights/scilab-Scilab
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_scilab-Scilab
rename to tests/cluecode/data/copyrights/scilab-Scilab
diff --git a/tests/cluecode/data/copyrights/copyright_seahorse_plugins-seahorse_plugins_copyright.copyright b/tests/cluecode/data/copyrights/seahorse_plugins-seahorse_plugins.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_seahorse_plugins-seahorse_plugins_copyright.copyright
rename to tests/cluecode/data/copyrights/seahorse_plugins-seahorse_plugins.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_sgi_cid_v1_0-SGI_CID_v.0 b/tests/cluecode/data/copyrights/sgi_cid_v1_0-SGI_CID_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_sgi_cid_v1_0-SGI_CID_v.0
rename to tests/cluecode/data/copyrights/sgi_cid_v1_0-SGI_CID_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_sgi_glx_v1_0-SGI_GLX_v.0 b/tests/cluecode/data/copyrights/sgi_glx_v1_0-SGI_GLX_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_sgi_glx_v1_0-SGI_GLX_v.0
rename to tests/cluecode/data/copyrights/sgi_glx_v1_0-SGI_GLX_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_simgear1_0_0_copyright-simgear__copyright.copyright b/tests/cluecode/data/copyrights/simgear1_0_0-simgear.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_simgear1_0_0_copyright-simgear__copyright.copyright
rename to tests/cluecode/data/copyrights/simgear1_0_0-simgear.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_sissl_v1_1refa-SISSL_v_refa.1refa b/tests/cluecode/data/copyrights/sissl_v1_1refa-SISSL_v_refa.1refa
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_sissl_v1_1refa-SISSL_v_refa.1refa
rename to tests/cluecode/data/copyrights/sissl_v1_1refa-SISSL_v_refa.1refa
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_sleepycat-Sleepycat b/tests/cluecode/data/copyrights/sleepycat-Sleepycat
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_sleepycat-Sleepycat
rename to tests/cluecode/data/copyrights/sleepycat-Sleepycat
diff --git a/tests/cluecode/data/copyrights/copyright_snippet_no_copyright b/tests/cluecode/data/copyrights/snippet_no
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_snippet_no_copyright
rename to tests/cluecode/data/copyrights/snippet_no
diff --git a/tests/cluecode/data/copyrights/copyright_snmptrapd_c-snmptrapd_c.c b/tests/cluecode/data/copyrights/snmptrapd_c-snmptrapd_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_snmptrapd_c-snmptrapd_c.c
rename to tests/cluecode/data/copyrights/snmptrapd_c-snmptrapd_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_some_co-9_h.h b/tests/cluecode/data/copyrights/some_co-9_h.h
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_some_co-9_h.h
rename to tests/cluecode/data/copyrights/some_co-9_h.h
diff --git a/tests/cluecode/data/copyrights/copyright_somefile_cpp-somefile_cpp.cpp b/tests/cluecode/data/copyrights/somefile_cpp-somefile_cpp.cpp
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_somefile_cpp-somefile_cpp.cpp
rename to tests/cluecode/data/copyrights/somefile_cpp-somefile_cpp.cpp
diff --git a/tests/cluecode/data/copyrights/copyright_source_auditor_projectinfo_java-ProjectInfo_java.java b/tests/cluecode/data/copyrights/source_auditor_projectinfo_java-ProjectInfo_java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_source_auditor_projectinfo_java-ProjectInfo_java.java
rename to tests/cluecode/data/copyrights/source_auditor_projectinfo_java-ProjectInfo_java.java
diff --git a/tests/cluecode/data/copyrights/copyright_stacktrace_cpp-stacktrace_cpp.cpp b/tests/cluecode/data/copyrights/stacktrace_cpp-stacktrace_cpp.cpp
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_stacktrace_cpp-stacktrace_cpp.cpp
rename to tests/cluecode/data/copyrights/stacktrace_cpp-stacktrace_cpp.cpp
diff --git a/tests/cluecode/data/copyrights/copyright_stmicro_in_h-h.h b/tests/cluecode/data/copyrights/stmicro_in_h-h.h
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_stmicro_in_h-h.h
rename to tests/cluecode/data/copyrights/stmicro_in_h-h.h
diff --git a/tests/cluecode/data/copyrights/copyright_stmicro_in_txt.txt b/tests/cluecode/data/copyrights/stmicro_in_txt.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_stmicro_in_txt.txt
rename to tests/cluecode/data/copyrights/stmicro_in_txt.txt
diff --git a/tests/cluecode/data/copyrights/copyright_strchr_assembly-9_9_strchr_S.S b/tests/cluecode/data/copyrights/strchr_assembly-9_9_strchr_S.S
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_strchr_assembly-9_9_strchr_S.S
rename to tests/cluecode/data/copyrights/strchr_assembly-9_9_strchr_S.S
diff --git a/tests/cluecode/data/copyrights/copyright_super_tech_c-c.c b/tests/cluecode/data/copyrights/super_tech_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_super_tech_c-c.c
rename to tests/cluecode/data/copyrights/super_tech_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0 b/tests/cluecode/data/copyrights/sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0
rename to tests/cluecode/data/copyrights/sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_tcl_copyright-tcl_copyright.copyright b/tests/cluecode/data/copyrights/tcl-tcl.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_tcl_copyright-tcl_copyright.copyright
rename to tests/cluecode/data/copyrights/tcl-tcl.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_tech_sys.txt b/tests/cluecode/data/copyrights/tech_sys.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_tech_sys.txt
rename to tests/cluecode/data/copyrights/tech_sys.txt
diff --git a/tests/cluecode/data/copyrights/copyright_texinfo_tex-texinfo_tex.tex b/tests/cluecode/data/copyrights/texinfo_tex-texinfo_tex.tex
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_texinfo_tex-texinfo_tex.tex
rename to tests/cluecode/data/copyrights/texinfo_tex-texinfo_tex.tex
diff --git a/tests/cluecode/data/copyrights/copyright_texlive_lang_greek_copyright-texlive_lang_greek_copyright.copyright b/tests/cluecode/data/copyrights/texlive_lang_greek-texlive_lang_greek.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_texlive_lang_greek_copyright-texlive_lang_greek_copyright.copyright
rename to tests/cluecode/data/copyrights/texlive_lang_greek-texlive_lang_greek.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_texlive_lang_spanish_copyright-texlive_lang_spanish_copyright.copyright b/tests/cluecode/data/copyrights/texlive_lang_spanish-texlive_lang_spanish.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_texlive_lang_spanish_copyright-texlive_lang_spanish_copyright.copyright
rename to tests/cluecode/data/copyrights/texlive_lang_spanish-texlive_lang_spanish.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_texlive_lang_vietnamese_copyright_label-texlive_lang_vietnamese_copyright_label.label b/tests/cluecode/data/copyrights/texlive_lang_vietnamese-texlive_lang_vietnamese.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_texlive_lang_vietnamese_copyright_label-texlive_lang_vietnamese_copyright_label.label
rename to tests/cluecode/data/copyrights/texlive_lang_vietnamese-texlive_lang_vietnamese.label
diff --git a/tests/cluecode/data/copyrights/copyright_tfc_c-c.c b/tests/cluecode/data/copyrights/tfc_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_tfc_c-c.c
rename to tests/cluecode/data/copyrights/tfc_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_thirdpartyproject_prop-ThirdPartyProject_prop.prop b/tests/cluecode/data/copyrights/thirdpartyproject_prop-ThirdPartyProject_prop.prop
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_thirdpartyproject_prop-ThirdPartyProject_prop.prop
rename to tests/cluecode/data/copyrights/thirdpartyproject_prop-ThirdPartyProject_prop.prop
diff --git a/tests/cluecode/data/copyrights/copyright_trailing_For-copyright_c.c b/tests/cluecode/data/copyrights/trailing_For-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_trailing_For-copyright_c.c
rename to tests/cluecode/data/copyrights/trailing_For-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_trailing_copyleft.txt b/tests/cluecode/data/copyrights/trailing_copyleft.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_trailing_copyleft.txt
rename to tests/cluecode/data/copyrights/trailing_copyleft.txt
diff --git a/tests/cluecode/data/copyrights/copyright_trailing_name-copyright.txt b/tests/cluecode/data/copyrights/trailing_name-copyright.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_trailing_name-copyright.txt
rename to tests/cluecode/data/copyrights/trailing_name-copyright.txt
diff --git a/tests/cluecode/data/copyrights/copyright_trailing_redistribution-bspatch_c.c b/tests/cluecode/data/copyrights/trailing_redistribution-bspatch_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_trailing_redistribution-bspatch_c.c
rename to tests/cluecode/data/copyrights/trailing_redistribution-bspatch_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_transcode_doc_copyright-transcode_doc_copyright.copyright b/tests/cluecode/data/copyrights/transcode_doc-transcode_doc.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_transcode_doc_copyright-transcode_doc_copyright.copyright
rename to tests/cluecode/data/copyrights/transcode_doc-transcode_doc.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_transfig_copyright_with_parts-transfig_copyright.copyright b/tests/cluecode/data/copyrights/transfig_with_parts-transfig.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_transfig_copyright_with_parts-transfig_copyright.copyright
rename to tests/cluecode/data/copyrights/transfig_with_parts-transfig.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_treetablemodeladapter_java-TreeTableModelAdapter_java.java b/tests/cluecode/data/copyrights/treetablemodeladapter_java-TreeTableModelAdapter_java.java
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_treetablemodeladapter_java-TreeTableModelAdapter_java.java
rename to tests/cluecode/data/copyrights/treetablemodeladapter_java-TreeTableModelAdapter_java.java
diff --git a/tests/cluecode/data/copyrights/copyright_truncated_dmv_c-9_c.c b/tests/cluecode/data/copyrights/truncated_dmv_c-9_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_truncated_dmv_c-9_c.c
rename to tests/cluecode/data/copyrights/truncated_dmv_c-9_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_truncated_doe-c.c b/tests/cluecode/data/copyrights/truncated_doe-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_truncated_doe-c.c
rename to tests/cluecode/data/copyrights/truncated_doe-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_truncated_inria.txt b/tests/cluecode/data/copyrights/truncated_inria.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_truncated_inria.txt
rename to tests/cluecode/data/copyrights/truncated_inria.txt
diff --git a/tests/cluecode/data/copyrights/copyright_truncated_rusty-c.c b/tests/cluecode/data/copyrights/truncated_rusty-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_truncated_rusty-c.c
rename to tests/cluecode/data/copyrights/truncated_rusty-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_truncated_swfobject_js-swfobject_js.js b/tests/cluecode/data/copyrights/truncated_swfobject_js-swfobject_js.js
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_truncated_swfobject_js-swfobject_js.js
rename to tests/cluecode/data/copyrights/truncated_swfobject_js-swfobject_js.js
diff --git a/tests/cluecode/data/copyrights/copyright_ttf_malayalam_fonts_copyright-ttf_malayalam_fonts_copyright.copyright b/tests/cluecode/data/copyrights/ttf_malayalam_fonts-ttf_malayalam_fonts.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_ttf_malayalam_fonts_copyright-ttf_malayalam_fonts_copyright.copyright
rename to tests/cluecode/data/copyrights/ttf_malayalam_fonts-ttf_malayalam_fonts.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_tunnel_h-tunnel_h.h b/tests/cluecode/data/copyrights/tunnel_h-tunnel_h.h
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_tunnel_h-tunnel_h.h
rename to tests/cluecode/data/copyrights/tunnel_h-tunnel_h.h
diff --git a/tests/cluecode/data/copyrights/copyright_two_digits_years-digits_c.c b/tests/cluecode/data/copyrights/two_digits_years-digits_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_two_digits_years-digits_c.c
rename to tests/cluecode/data/copyrights/two_digits_years-digits_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_in_txt.txt b/tests/cluecode/data/copyrights/txt.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_txt.txt
rename to tests/cluecode/data/copyrights/txt.txt
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_uofu_rfpl-UofU_RFPL b/tests/cluecode/data/copyrights/uofu_rfpl-UofU_RFPL
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_uofu_rfpl-UofU_RFPL
rename to tests/cluecode/data/copyrights/uofu_rfpl-UofU_RFPL
diff --git a/tests/cluecode/data/copyrights/copyright_url_in_html-detail_9_html.html b/tests/cluecode/data/copyrights/url_in_html-detail_9_html.html
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_url_in_html-detail_9_html.html
rename to tests/cluecode/data/copyrights/url_in_html-detail_9_html.html
diff --git a/tests/cluecode/data/copyrights/copyright_utilities_js-utilities_js.js b/tests/cluecode/data/copyrights/utilities_js-utilities_js.js
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_utilities_js-utilities_js.js
rename to tests/cluecode/data/copyrights/utilities_js-utilities_js.js
diff --git a/tests/cluecode/data/copyrights/copyright_var_route_c-var_route_c.c b/tests/cluecode/data/copyrights/var_route_c-var_route_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_var_route_c-var_route_c.c
rename to tests/cluecode/data/copyrights/var_route_c-var_route_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_view_layout2_xml-view_layout_xml.xml b/tests/cluecode/data/copyrights/view_layout2_xml-view_layout_xml.xml
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_view_layout2_xml-view_layout_xml.xml
rename to tests/cluecode/data/copyrights/view_layout2_xml-view_layout_xml.xml
diff --git a/tests/cluecode/data/copyrights/copyright_in_visio_doc-Glitch_ERD_vsd.vsd b/tests/cluecode/data/copyrights/visio_doc-Glitch_ERD_vsd.vsd
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_in_visio_doc-Glitch_ERD_vsd.vsd
rename to tests/cluecode/data/copyrights/visio_doc-Glitch_ERD_vsd.vsd
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_vovida_v1_0-Vovida_v.0 b/tests/cluecode/data/copyrights/vovida_v1_0-Vovida_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_vovida_v1_0-Vovida_v.0
rename to tests/cluecode/data/copyrights/vovida_v1_0-Vovida_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_warning_parsing_empty_text-controlpanel_anjuta.anjuta b/tests/cluecode/data/copyrights/warning_parsing_empty_text-controlpanel_anjuta.anjuta
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_warning_parsing_empty_text-controlpanel_anjuta.anjuta
rename to tests/cluecode/data/copyrights/warning_parsing_empty_text-controlpanel_anjuta.anjuta
diff --git a/tests/cluecode/data/copyrights/copyright_web_app_dtd_b_sun-web_app__dtd.dtd b/tests/cluecode/data/copyrights/web_app_dtd_b_sun-web_app_dtd.dtd
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_web_app_dtd_b_sun-web_app__dtd.dtd
rename to tests/cluecode/data/copyrights/web_app_dtd_b_sun-web_app_dtd.dtd
diff --git a/tests/cluecode/data/copyrights/copyright_web_app_dtd_sun_twice-web_app__b_dtd.dtd b/tests/cluecode/data/copyrights/web_app_dtd_sun_twice-web_app_b_dtd.dtd
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_web_app_dtd_sun_twice-web_app__b_dtd.dtd
rename to tests/cluecode/data/copyrights/web_app_dtd_sun_twice-web_app_b_dtd.dtd
diff --git a/tests/cluecode/data/copyrights/copyright_wide_c-c.c b/tests/cluecode/data/copyrights/wide_c-c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_wide_c-c.c
rename to tests/cluecode/data/copyrights/wide_c-c.c
diff --git a/tests/cluecode/data/copyrights/copyright_wide_txt.txt b/tests/cluecode/data/copyrights/wide_txt.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_wide_txt.txt
rename to tests/cluecode/data/copyrights/wide_txt.txt
diff --git a/tests/cluecode/data/copyrights/copyright_with_apos.txt b/tests/cluecode/data/copyrights/with_apos.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_with_apos.txt
rename to tests/cluecode/data/copyrights/with_apos.txt
diff --git a/tests/cluecode/data/copyrights/copyright_with_ascii_art.txt b/tests/cluecode/data/copyrights/with_ascii_art.txt
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_with_ascii_art.txt
rename to tests/cluecode/data/copyrights/with_ascii_art.txt
diff --git a/tests/cluecode/data/copyrights/copyright_with_colon b/tests/cluecode/data/copyrights/with_colon
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_with_colon
rename to tests/cluecode/data/copyrights/with_colon
diff --git a/tests/cluecode/data/copyrights/copyright_with_trailing_words.js b/tests/cluecode/data/copyrights/with_trailing_words.js
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_with_trailing_words.js
rename to tests/cluecode/data/copyrights/with_trailing_words.js
diff --git a/tests/cluecode/data/copyrights/copyright_with_verbatim_lf-verbatim_lf_c.c b/tests/cluecode/data/copyrights/with_verbatim_lf-verbatim_lf_c.c
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_with_verbatim_lf-verbatim_lf_c.c
rename to tests/cluecode/data/copyrights/with_verbatim_lf-verbatim_lf_c.c
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_wtfpl-WTFPL b/tests/cluecode/data/copyrights/wtfpl-WTFPL
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_wtfpl-WTFPL
rename to tests/cluecode/data/copyrights/wtfpl-WTFPL
diff --git a/tests/cluecode/data/copyrights/copyright_wxWindows Library .0 variant b/tests/cluecode/data/copyrights/wxWindows Library .0 variant
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_wxWindows Library .0 variant
rename to tests/cluecode/data/copyrights/wxWindows Library .0 variant
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_x_net-X_Net.Net b/tests/cluecode/data/copyrights/x_net-X_Net.Net
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_x_net-X_Net.Net
rename to tests/cluecode/data/copyrights/x_net-X_Net.Net
diff --git a/tests/cluecode/data/copyrights/copyright_xconsortium_sh-9_sh.sh b/tests/cluecode/data/copyrights/xconsortium_sh-9_sh.sh
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_xconsortium_sh-9_sh.sh
rename to tests/cluecode/data/copyrights/xconsortium_sh-9_sh.sh
diff --git a/tests/cluecode/data/copyrights/copyright_xfonts_utils_copyright-xfonts_utils_copyright.copyright b/tests/cluecode/data/copyrights/xfonts_utils-xfonts_utils.copyright
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_xfonts_utils_copyright-xfonts_utils_copyright.copyright
rename to tests/cluecode/data/copyrights/xfonts_utils-xfonts_utils.copyright
diff --git a/tests/cluecode/data/copyrights/copyright_xresprobe_copyright_label-xresprobe_copyright_label.label b/tests/cluecode/data/copyrights/xresprobe-xresprobe.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_xresprobe_copyright_label-xresprobe_copyright_label.label
rename to tests/cluecode/data/copyrights/xresprobe-xresprobe.label
diff --git a/tests/cluecode/data/copyrights/copyright_xsane_copyright_label-xsane_copyright_label.label b/tests/cluecode/data/copyrights/xsane-xsane.label
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_xsane_copyright_label-xsane_copyright_label.label
rename to tests/cluecode/data/copyrights/xsane-xsane.label
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_zend-Zend b/tests/cluecode/data/copyrights/zend-Zend
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_zend-Zend
rename to tests/cluecode/data/copyrights/zend-Zend
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_zliback-zLibAck b/tests/cluecode/data/copyrights/zliback-zLibAck
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_zliback-zLibAck
rename to tests/cluecode/data/copyrights/zliback-zLibAck
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_zope_v1_0-Zope_v.0 b/tests/cluecode/data/copyrights/zope_v1_0-Zope_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_zope_v1_0-Zope_v.0
rename to tests/cluecode/data/copyrights/zope_v1_0-Zope_v.0
diff --git a/tests/cluecode/data/copyrights/copyright_license_text_zope_v2_0-Zope_v.0 b/tests/cluecode/data/copyrights/zope_v2_0-Zope_v.0
similarity index 100%
rename from tests/cluecode/data/copyrights/copyright_license_text_zope_v2_0-Zope_v.0
rename to tests/cluecode/data/copyrights/zope_v2_0-Zope_v.0
diff --git a/tests/cluecode/test_copyrights.py b/tests/cluecode/test_copyrights.py
index a1fb550ae1d..ae43fd3e8b3 100644
--- a/tests/cluecode/test_copyrights.py
+++ b/tests/cluecode/test_copyrights.py
@@ -118,7 +118,7 @@ def test_is_candidate_should_not_select_line_with_only_two_digit_numbers(self):
         line = 'template<class V> struct v_iter<V, mpl::int_<10> > { typedef typename V::item10 type; typedef v_iter<V, mpl::int_<10 + 1> > next; };'
         assert not cluecode.copyrights.is_candidate(line)
 
-    def test_is_candidate_should_select_line_with_copyright_sign(self):
+    def test_is_candidate_should_select_line_with_sign(self):
         line = 'template<class V> struct v_iter<V, mpl::int_<10> (c) { typedef typename V::item10 type; typedef v_iter<V, mpl::int_<10 + 1> > next; };'
         assert cluecode.copyrights.is_candidate(line)
 
@@ -149,8 +149,8 @@ def test_is_candidate_should_select_line_with_iso_date_year(self):
 class TestCopyrightDetector(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
-    def test_copyright_detect(self):
-        location = self.get_test_loc('copyrights/copyright_essential_smoke-ibm_c.c')
+    def test_detect(self):
+        location = self.get_test_loc('copyrights/essential_smoke-ibm_c.c')
         expected = [
             'Copyright IBM and others (c) 2008',
             'Copyright Eclipse, IBM and others (c) 2008'
@@ -169,8 +169,8 @@ def test_company_name_in_java(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_03e16f6c_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_03e16f6c_0-e_f_c.0')
+    def test_03e16f6c_0(self):
+        test_file = self.get_test_loc('copyrights/03e16f6c_0-e_f_c.0')
         expected = [
             'Copyright (c) 1997 Microsoft Corp.',
             'Copyright (c) 1997 Microsoft Corp.',
@@ -180,87 +180,87 @@ def test_copyright_03e16f6c_0(self):
                         expected_in_results=True,
                         results_in_expected=False)
 
-    def test_copyright_3a3b02ce_0(self):
+    def test_3a3b02ce_0(self):
         # this is a certificate and the actual copyright holder is not clear:
         # could be either Wisekey or OISTE Foundation.
-        test_file = self.get_test_loc('copyrights/copyright_3a3b02ce_0-a_b_ce.0')
+        test_file = self.get_test_loc('copyrights/3a3b02ce_0-a_b_ce.0')
         expected = [
             'Copyright (c) 2005, OU OISTE Foundation Endorsed, CN OISTE WISeKey Global Root',
             'Copyright (c) 2005, OU OISTE Foundation Endorsed, CN OISTE WISeKey Global Root',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ABC_cpp(self):
-        test_file = self.get_test_loc('copyrights/copyright_ABC_cpp-Case_cpp.cpp')
+    def test_ABC_cpp(self):
+        test_file = self.get_test_loc('copyrights/ABC_cpp-Case_cpp.cpp')
         expected = [
             'Copyright (c) ABC Company',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ABC_file_cpp(self):
-        test_file = self.get_test_loc('copyrights/copyright_ABC_file_cpp-File_cpp.cpp')
+    def test_ABC_file_cpp(self):
+        test_file = self.get_test_loc('copyrights/ABC_file_cpp-File_cpp.cpp')
         expected = [
             'Copyright (c) ABC Company',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_false_positive_in_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_false_positive_in_c-false_positives_c.c')
+    def test_false_positive_in_c(self):
+        test_file = self.get_test_loc('copyrights/false_positive_in_c-false_positives_c.c')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_false_positive_in_js(self):
-        test_file = self.get_test_loc('copyrights/copyright_false_positive_in_js-editor_beta_de_js.js')
+    def test_false_positive_in_js(self):
+        test_file = self.get_test_loc('copyrights/false_positive_in_js-editor_beta_de_js.js')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_false_positive_in_license(self):
-        test_file = self.get_test_loc('copyrights/copyright_false_positive_in_license-LICENSE')
+    def test_false_positive_in_license(self):
+        test_file = self.get_test_loc('copyrights/false_positive_in_license-LICENSE')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_heunrich_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_heunrich_c-c.c')
+    def test_heunrich_c(self):
+        test_file = self.get_test_loc('copyrights/heunrich_c-c.c')
         expected = [
             'Copyright (c) 2000 HEUNRICH HERTZ INSTITUTE',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_isc(self):
-        test_file = self.get_test_loc('copyrights/copyright_isc-c.c')
+    def test_isc(self):
+        test_file = self.get_test_loc('copyrights/isc-c.c')
         expected = [
             'Copyright (c) 1998-2000 The Internet Software Consortium.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_no_copyright_in_class_file_1(self):
-        test_file = self.get_test_loc('copyrights/copyright_no_copyright_in_class_file_1-PersistentArrayHolder_class.class')
+    def test_no_class_file_1(self):
+        test_file = self.get_test_loc('copyrights/no_class_file_1-PersistentArrayHolder_class.class')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_sample_py(self):
-        test_file = self.get_test_loc('copyrights/copyright_sample_py-py.py')
+    def test_sample_py(self):
+        test_file = self.get_test_loc('copyrights/sample_py-py.py')
         expected = [
             'COPYRIGHT 2006 ABC ABC',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_abc(self):
-        test_file = self.get_test_loc('copyrights/copyright_abc')
+    def test_abc(self):
+        test_file = self.get_test_loc('copyrights/abc')
         expected = [
             'Copyright (c) 2006 abc.org',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_abc_loss_of_holder_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_abc_loss_of_holder_c-c.c')
+    def test_abc_loss_of_holder_c(self):
+        test_file = self.get_test_loc('copyrights/abc_loss_of_holder_c-c.c')
         expected = [
             'copyright abc 2001',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_abiword_common_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_abiword_common_copyright-abiword_common_copyright.copyright')
+    def test_abiword_common(self):
+        test_file = self.get_test_loc('copyrights/abiword_common.copyright')
         expected = [
             'Copyright (c) 1998- AbiSource, Inc. & Co.',
             'Copyright (c) 2009 Masayuki Hatta',
@@ -268,45 +268,45 @@ def test_copyright_abiword_common_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_acme_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_acme_c-c.c')
+    def test_acme_c(self):
+        test_file = self.get_test_loc('copyrights/acme_c-c.c')
         expected = [
             'Copyright (c) 2000 ACME, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_activefieldattribute_cs(self):
-        test_file = self.get_test_loc('copyrights/copyright_activefieldattribute_cs-ActiveFieldAttribute_cs.cs')
+    def test_activefieldattribute_cs(self):
+        test_file = self.get_test_loc('copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs')
         expected = [
             'Web Applications Copyright 2009 - Thomas Hansen thomas@ra-ajax.org.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_addr_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_addr_c-addr_c.c')
+    def test_addr_c(self):
+        test_file = self.get_test_loc('copyrights/addr_c-addr_c.c')
         expected = [
             'Copyright 1999 Cornell University.',
             'Copyright 2000 Jon Doe.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_apostrophe_in_name(self):
-        test_file = self.get_test_loc('copyrights/copyright_with_apos.txt')
+    def test_apostrophe_in_name(self):
+        test_file = self.get_test_loc('copyrights/with_apos.txt')
         expected = [
             "Copyright Marco d'Itri <md@Linux.IT>",
             "Copyright Marco d'Itri",
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_adler_inflate_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_adler_inflate_c-inflate_c.c')
+    def test_adler_inflate_c(self):
+        test_file = self.get_test_loc('copyrights/adler_inflate_c-inflate_c.c')
         expected = [
             'Not copyrighted 1992 by Mark Adler',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_adobe_flashplugin_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_adobe_flashplugin_copyright_label-adobe_flashplugin_copyright_label.label')
+    def test_adobe_flashplugin(self):
+        test_file = self.get_test_loc('copyrights/adobe_flashplugin-adobe_flashplugin.label')
         expected = [
             'Copyright (c) 1996 - 2008. Adobe Systems Incorporated',
             '(c) 2001-2009, Takuo KITAME, Bart Martens, and Canonical, LTD',
@@ -315,31 +315,31 @@ def test_copyright_adobe_flashplugin_copyright_label(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_aleal(self):
-        test_file = self.get_test_loc('copyrights/copyright_aleal-c.c')
+    def test_aleal(self):
+        test_file = self.get_test_loc('copyrights/aleal-c.c')
         expected = [
             'copyright (c) 2006 by aleal',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_andre_darcy(self):
-        test_file = self.get_test_loc('copyrights/copyright_andre_darcy-c.c')
+    def test_andre_darcy(self):
+        test_file = self.get_test_loc('copyrights/andre_darcy-c.c')
         expected = [
             'Copyright (c) 1995, Pascal Andre (andre@via.ecp.fr).',
             "copyright 1997, 1998, 1999 by D'Arcy J.M. Cain (darcy@druid.net)",
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_android_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_android_c-c.c')
+    def test_android_c(self):
+        test_file = self.get_test_loc('copyrights/android_c-c.c')
         expected = [
             'Copyright (c) 2009 The Android Open Source Project',
             'Copyright 2003-2005 Colin Percival',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_apache2_debian_trailing_name_missed(self):
-        test_file = self.get_test_loc('copyrights/copyright_apache2_debian_trailing_name_missed-apache_copyright_label.label')
+    def test_apache2_debian_trailing_name_missed(self):
+        test_file = self.get_test_loc('copyrights/apache2_debian_trailing_name_missed-apache.label')
         expected = [
             'copyright Steinar H. Gunderson <sgunderson@bigfoot.com> and Knut Auvor Grythe <knut@auvor.no>',
             'Copyright (c) 1996-1997 Cisco Systems, Inc.',
@@ -373,8 +373,8 @@ def test_copyright_apache2_debian_trailing_name_missed(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_apache_notice(self):
-        test_file = self.get_test_loc('copyrights/copyright_apache_notice-NOTICE')
+    def test_apache_notice(self):
+        test_file = self.get_test_loc('copyrights/apache_notice-NOTICE')
         expected = [
             'Copyright 1999-2006 The Apache Software Foundation',
             'Copyright 1999-2006 The Apache Software Foundation',
@@ -383,15 +383,15 @@ def test_copyright_apache_notice(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_aptitude_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_aptitude_copyright_label-aptitude_copyright_label.label')
+    def test_aptitude(self):
+        test_file = self.get_test_loc('copyrights/aptitude-aptitude.label')
         expected = [
             'Copyright 1999-2005 Daniel Burrows <dburrows@debian.org>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_atheros_spanning_lines(self):
-        test_file = self.get_test_loc('copyrights/copyright_atheros_spanning_lines-py.py')
+    def test_atheros_spanning_lines(self):
+        test_file = self.get_test_loc('copyrights/atheros_spanning_lines-py.py')
         expected = [
             'Copyright (c) 2000 Atheros Communications, Inc.',
             'Copyright (c) 2001 Atheros Communications, Inc.',
@@ -399,22 +399,22 @@ def test_copyright_atheros_spanning_lines(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_att_in_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_att_in_c-9_c.c')
+    def test_att_in_c(self):
+        test_file = self.get_test_loc('copyrights/att_in_c-9_c.c')
         expected = [
             'Copyright (c) 1991 by AT&T.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_audio_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_audio_c-c.c')
+    def test_audio_c(self):
+        test_file = self.get_test_loc('copyrights/audio_c-c.c')
         expected = [
             'copyright (c) 1995, AudioCodes, DSP Group, France Telecom, Universite de Sherbrooke.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_babkin_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_babkin_txt.txt')
+    def test_babkin_txt(self):
+        test_file = self.get_test_loc('copyrights/babkin_txt.txt')
         expected = [
             'Copyright (c) North',
             'Copyright (c) South',
@@ -423,8 +423,8 @@ def test_copyright_babkin_txt(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_blender_debian(self):
-        test_file = self.get_test_loc('copyrights/copyright_blender_debian-blender_copyright.copyright')
+    def test_blender_debian(self):
+        test_file = self.get_test_loc('copyrights/blender_debian-blender.copyright')
         expected = [
             'Copyright (c) 2002-2008 Blender Foundation',
             'Copyright (c) 2004-2005 Masayuki Hatta <mhatta@debian.org>',
@@ -433,8 +433,8 @@ def test_copyright_blender_debian(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_blue_sky_dash_in_name(self):
-        test_file = self.get_test_loc('copyrights/copyright_blue_sky_dash_in_name-c.c')
+    def test_blue_sky_dash_in_name(self):
+        test_file = self.get_test_loc('copyrights/blue_sky_dash_in_name-c.c')
         expected = [
             'Copyright (c) 1995, 1996 - Blue Sky Software Corp. -',
         ]
@@ -442,43 +442,43 @@ def test_copyright_blue_sky_dash_in_name(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_bouncy_license(self):
-        test_file = self.get_test_loc('copyrights/copyright_bouncy_license-LICENSE')
+    def test_bouncy_license(self):
+        test_file = self.get_test_loc('copyrights/bouncy_license-LICENSE')
         expected = [
             'Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_bouncy_notice(self):
-        test_file = self.get_test_loc('copyrights/copyright_bouncy_notice-9_NOTICE')
+    def test_bouncy_notice(self):
+        test_file = self.get_test_loc('copyrights/bouncy_notice-9_NOTICE')
         expected = [
             'Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_btt_plot1_py(self):
-        test_file = self.get_test_loc('copyrights/copyright_btt_plot1_py-btt_plot_py.py')
+    def test_btt_plot1_py(self):
+        test_file = self.get_test_loc('copyrights/btt_plot1_py-btt_plot_py.py')
         expected = [
             '(c) Copyright 2009 Hewlett-Packard Development Company, L.P.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_camelcase_bug_br_fcc_thread_psipstack_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_camelcase_bug_br_fcc_thread_psipstack_c-br_fcc_thread_psipstack_c.c')
+    def test_camelcase_bug_br_fcc_thread_psipstack_c(self):
+        test_file = self.get_test_loc('copyrights/camelcase_bug_br_fcc_thread_psipstack_c-br_fcc_thread_psipstack_c.c')
         expected = [
             'Copyright 2010-2011 by BitRouter',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ccube_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_ccube_txt.txt')
+    def test_ccube_txt(self):
+        test_file = self.get_test_loc('copyrights/ccube_txt.txt')
         expected = [
             'Copyright (c) 2001 C-Cube Microsystems.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_cedrik_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_cedrik_java-java.java')
+    def test_cedrik_java(self):
+        test_file = self.get_test_loc('copyrights/cedrik_java-java.java')
         expected = [
             'copyright (c) 2005-2006 Cedrik LIME',
         ]
@@ -486,15 +486,15 @@ def test_copyright_cedrik_java(self):
                         expected_in_results=True,
                         results_in_expected=False)
 
-    def test_copyright_cern(self):
-        test_file = self.get_test_loc('copyrights/copyright_cern-TestMatrix_D_java.java')
+    def test_cern(self):
+        test_file = self.get_test_loc('copyrights/cern-TestMatrix_D_java.java')
         expected = [
             'Copyright 1999 CERN - European Organization for Nuclear Research.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_cern_matrix2d_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_cern_matrix2d_java-TestMatrix_D_java.java')
+    def test_cern_matrix2d_java(self):
+        test_file = self.get_test_loc('copyrights/cern_matrix2d_java-TestMatrix_D_java.java')
         expected = [
             'Copyright 1999 CERN - European Organization for Nuclear Research.',
             'Copyright (c) 1998 <p> Company PIERSOL Engineering Inc.',
@@ -502,45 +502,45 @@ def test_copyright_cern_matrix2d_java(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_chameleon_assembly(self):
-        test_file = self.get_test_loc('copyrights/copyright_chameleon_assembly-9_9_setjmp_S.S')
+    def test_chameleon_assembly(self):
+        test_file = self.get_test_loc('copyrights/chameleon_assembly-9_9_setjmp_S.S')
         expected = [
             'Copyright Chameleon Systems, 1999',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_co_cust(self):
-        test_file = self.get_test_loc('copyrights/copyright_co_cust-copyright_java.java')
+    def test_co_cust(self):
+        test_file = self.get_test_loc('copyrights/co_cust-java.java')
         expected = [
             'Copyright (c) 2009 <p> Company Customer Identity Hidden',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_colin_android(self):
-        test_file = self.get_test_loc('copyrights/copyright_colin_android-bsdiff_c.c')
+    def test_colin_android(self):
+        test_file = self.get_test_loc('copyrights/colin_android-bsdiff_c.c')
         expected = [
             'Copyright (c) 2009 The Android Open Source Project',
             'Copyright 2003-2005 Colin Percival',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_company_in_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_company_in_txt-9.txt')
+    def test_company_in_txt(self):
+        test_file = self.get_test_loc('copyrights/company_in_txt-9.txt')
         expected = [
             'Copyright (c) 2008-2011 Company Name Incorporated',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_complex_4_line_statement_in_text(self):
-        test_file = self.get_test_loc('copyrights/copyright_complex_4_line_statement_in_text-9.txt')
+    def test_complex_4_line_statement_in_text(self):
+        test_file = self.get_test_loc('copyrights/complex_4_line_statement_in_text-9.txt')
         expected = [
             'Copyright 2002 Jonas Borgstrom <jonas@codefactory.se> 2002 Daniel Lundin <daniel@codefactory.se> 2002 CodeFactory AB',
             'Copyright (c) 1994 The Regents of the University of California',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_complex_notice(self):
-        test_file = self.get_test_loc('copyrights/copyright_complex_notice-NOTICE')
+    def test_complex_notice(self):
+        test_file = self.get_test_loc('copyrights/complex_notice-NOTICE')
         expected = [
             'Copyright (c) 2003, Steven G. Kargl',
             'Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>',
@@ -572,8 +572,8 @@ def test_copyright_complex_notice(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_complex_notice_sun_microsystems_on_multiple_lines(self):
-        test_file = self.get_test_loc('copyrights/copyright_complex_notice_sun_microsystems_on_multiple_lines-NOTICE')
+    def test_complex_notice_sun_microsystems_on_multiple_lines(self):
+        test_file = self.get_test_loc('copyrights/complex_notice_sun_microsystems_on_multiple_lines-NOTICE')
         expected = [
             'Copyright 1999-2006 The Apache Software Foundation',
             'copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.',
@@ -586,29 +586,29 @@ def test_copyright_complex_notice_sun_microsystems_on_multiple_lines(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_config(self):
-        test_file = self.get_test_loc('copyrights/copyright_config-config_guess.guess')
+    def test_config(self):
+        test_file = self.get_test_loc('copyrights/config-config_guess.guess')
         expected = [
             'Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_config1_guess(self):
-        test_file = self.get_test_loc('copyrights/copyright_config1_guess-config_guess.guess')
+    def test_config1_guess(self):
+        test_file = self.get_test_loc('copyrights/config1_guess-config_guess.guess')
         expected = [
             'Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_copyright_camelcase_br_diagnostics_h(self):
-        test_file = self.get_test_loc('copyrights/copyright_copyright_camelcase_br_diagnostics_h-br_diagnostics_h.h')
+    def test_camelcase_br_diagnostics_h(self):
+        test_file = self.get_test_loc('copyrights/camelcase_br_diagnostics_h-br_diagnostics_h.h')
         expected = [
             'Copyright 2011 by BitRouter',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_coreutils_debian(self):
-        test_file = self.get_test_loc('copyrights/copyright_coreutils_debian-coreutils_copyright.copyright')
+    def test_coreutils_debian(self):
+        test_file = self.get_test_loc('copyrights/coreutils_debian-coreutils.copyright')
         expected = [
             'Copyright (c) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.',
             'Copyright (c) 1990, 1993, 1994 The Regents of the University of California',
@@ -632,22 +632,22 @@ def test_copyright_coreutils_debian(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_dag_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_dag_c-s_fabsl_c.c')
+    def test_dag_c(self):
+        test_file = self.get_test_loc('copyrights/dag_c-s_fabsl_c.c')
         expected = [
             'Copyright (c) 2003 Dag-Erling Coidan Smrgrav',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_dag_elring_notice(self):
-        test_file = self.get_test_loc('copyrights/copyright_dag_elring_notice-NOTICE')
+    def test_dag_elring_notice(self):
+        test_file = self.get_test_loc('copyrights/dag_elring_notice-NOTICE')
         expected = [
             'Copyright (c) 2003 Dag-Erling Codan Smrgrav',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_dash_in_name(self):
-        test_file = self.get_test_loc('copyrights/copyright_dash_in_name-Makefile')
+    def test_dash_in_name(self):
+        test_file = self.get_test_loc('copyrights/dash_in_name-Makefile')
         expected = [
             '(c) 2011 - Anycompany, LLC',
         ]
@@ -655,43 +655,43 @@ def test_copyright_dash_in_name(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_dasher_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_dasher_copyright_label-dasher_copyright_label.label')
+    def test_dasher(self):
+        test_file = self.get_test_loc('copyrights/dasher-dasher.label')
         expected = [
             'Copyright (c) 1998-2008 The Dasher Project',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_date_range_dahua_in_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_date_range_dahua_in_c-c.c')
+    def test_date_range_dahua_in_c(self):
+        test_file = self.get_test_loc('copyrights/date_range_dahua_in_c-c.c')
         expected = [
             '(c) Copyright 2006 to 2007 Dahua Digital.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_date_range_in_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_date_range_in_c-c.c')
+    def test_date_range_in_c(self):
+        test_file = self.get_test_loc('copyrights/date_range_in_c-c.c')
         expected = [
             'Copyright (c) ImageSilicon Tech. (2006 - 2007)',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_date_range_in_c_2(self):
-        test_file = self.get_test_loc('copyrights/copyright_date_range_in_c_2-c.c')
+    def test_date_range_in_c_2(self):
+        test_file = self.get_test_loc('copyrights/date_range_in_c_2-c.c')
         expected = [
             '(c) Copyright 2005 to 2007 ImageSilicon? Tech.,ltd',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_debian_archive_keyring_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_debian_archive_keyring_copyright-debian_archive_keyring_copyright.copyright')
+    def test_debian_archive_keyring(self):
+        test_file = self.get_test_loc('copyrights/debian_archive_keyring-debian_archive_keyring.copyright')
         expected = [
             'Copyright (c) 2006 Michael Vogt <mvo@debian.org>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_debian_lib_1(self):
-        test_file = self.get_test_loc('copyrights/copyright_debian_lib_1-libmono_cairo_cil_copyright_label.label')
+    def test_debian_lib_1(self):
+        test_file = self.get_test_loc('copyrights/debian_lib_1-libmono_cairo_cil.label')
         expected = [
             'Copyright 2004 The Apache Software Foundation',
             'Copyright (c) 2001-2005 Novell',
@@ -711,8 +711,8 @@ def test_copyright_debian_lib_1(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_debian_lib_2(self):
-        test_file = self.get_test_loc('copyrights/copyright_debian_lib_2-libmono_cairo_cil_copyright.copyright')
+    def test_debian_lib_2(self):
+        test_file = self.get_test_loc('copyrights/debian_lib_2-libmono_cairo_cil.copyright')
         expected = [
             'Copyright 2004 The Apache Software Foundation',
             'Copyright (c) 2001-2005 Novell',
@@ -732,8 +732,8 @@ def test_copyright_debian_lib_2(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_debian_lib_3(self):
-        test_file = self.get_test_loc('copyrights/copyright_debian_lib_3-libmono_security_cil_copyright.copyright')
+    def test_debian_lib_3(self):
+        test_file = self.get_test_loc('copyrights/debian_lib_3-libmono_security_cil.copyright')
         expected = [
             'Copyright 2004 The Apache Software Foundation',
             'Copyright (c) 2001-2005 Novell',
@@ -753,8 +753,8 @@ def test_copyright_debian_lib_3(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_debian_multi_names_on_one_line(self):
-        test_file = self.get_test_loc('copyrights/copyright_debian_multi_names_on_one_line-libgdata__copyright.copyright')
+    def test_debian_multi_names_on_one_line(self):
+        test_file = self.get_test_loc('copyrights/debian_multi_names_on_one_line-libgdata.copyright')
         expected = [
             'Copyright 1999-2004 Ximian, Inc. 1999-2005 Novell, Inc.',
             'copyright 2000-2003 Ximian, Inc. , 2003 Gergo Erdi',
@@ -780,8 +780,8 @@ def test_copyright_debian_multi_names_on_one_line(self):
 #                         expected_in_results=False,
 #                         results_in_expected=True)
 
-    def test_copyright_dionysos_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_dionysos_c-c.c')
+    def test_dionysos_c(self):
+        test_file = self.get_test_loc('copyrights/dionysos_c-c.c')
         expected = [
             'COPYRIGHT (c) 2006 - 2009 DIONYSOS',
             'COPYRIGHT (c) ADIONYSOS 2006 - 2009',
@@ -796,15 +796,15 @@ def test_copyright_dionysos_c(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_disclaimed(self):
-        test_file = self.get_test_loc('copyrights/copyright_disclaimed-c.c')
+    def test_disclaimed(self):
+        test_file = self.get_test_loc('copyrights/disclaimed-c.c')
         expected = [
             'Copyright disclaimed 2003 by Andrew Clarke',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_djvulibre_desktop_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_djvulibre_desktop_copyright-djvulibre_desktop_copyright.copyright')
+    def test_djvulibre_desktop(self):
+        test_file = self.get_test_loc('copyrights/djvulibre_desktop-djvulibre_desktop.copyright')
         expected = [
             'Copyright (c) 2002 Leon Bottou and Yann Le Cun',
             'Copyright (c) 2001 AT&T',
@@ -812,8 +812,8 @@ def test_copyright_djvulibre_desktop_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_docbook_xsl_doc_html_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_docbook_xsl_doc_html_copyright-docbook_xsl_doc_html_copyright.copyright')
+    def test_docbook_xsl_doc_html(self):
+        test_file = self.get_test_loc('copyrights/docbook_xsl_doc_html-docbook_xsl_doc_html.copyright')
         expected = [
             'Copyright (c) 1999-2007 Norman Walsh',
             'Copyright (c) 2003 Jiri Kosek',
@@ -822,15 +822,15 @@ def test_copyright_docbook_xsl_doc_html_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_drand48_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_drand48_c-drand_c.c')
+    def test_drand48_c(self):
+        test_file = self.get_test_loc('copyrights/drand48_c-drand_c.c')
         expected = [
             'Copyright (c) 1993 Martin Birgmeier',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ed_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_ed_copyright-ed_copyright.copyright')
+    def test_ed(self):
+        test_file = self.get_test_loc('copyrights/ed-ed.copyright')
         expected = [
             'Copyright (c) 1993, 1994 Andrew Moore , Talke Studio',
             'Copyright (c) 2006, 2007 Antonio Diaz Diaz',
@@ -839,88 +839,88 @@ def test_copyright_ed_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_epiphany_browser_data_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_epiphany_browser_data_copyright_label-epiphany_browser_data_copyright_label.label')
+    def test_epiphany_browser_data(self):
+        test_file = self.get_test_loc('copyrights/epiphany_browser_data-epiphany_browser_data.label')
         expected = [
             'Copyright (c) 2004 the Initial Developer.',
             '(c) 2003-2007, the Debian GNOME team <pkg-gnome-maintainers@lists.alioth.debian.org>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_eric_young_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_eric_young_c-c.c')
+    def test_eric_young_c(self):
+        test_file = self.get_test_loc('copyrights/eric_young_c-c.c')
         expected = [
             'Copyright (c) 1995-1997 Eric Young (eay@mincom.oz.au)',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_errno_atheros(self):
-        test_file = self.get_test_loc('copyrights/copyright_errno_atheros-c.c')
+    def test_errno_atheros(self):
+        test_file = self.get_test_loc('copyrights/errno_atheros-c.c')
         expected = [
             'Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_errno_atheros_ah_h(self):
-        test_file = self.get_test_loc('copyrights/copyright_errno_atheros_ah_h-ah_h.h')
+    def test_errno_atheros_ah_h(self):
+        test_file = self.get_test_loc('copyrights/errno_atheros_ah_h-ah_h.h')
         expected = [
             'Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_errno_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_errno_c-c.c')
+    def test_errno_c(self):
+        test_file = self.get_test_loc('copyrights/errno_c-c.c')
         expected = [
             'Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_esmertec_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_esmertec_java-java.java')
+    def test_esmertec_java(self):
+        test_file = self.get_test_loc('copyrights/esmertec_java-java.java')
         expected = [
             'Copyright (c) 2008 Esmertec AG',
             'Copyright (c) 2008 The Android Open Source Project',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_essential_smoke(self):
-        test_file = self.get_test_loc('copyrights/copyright_essential_smoke-ibm_c.c')
+    def test_essential_smoke(self):
+        test_file = self.get_test_loc('copyrights/essential_smoke-ibm_c.c')
         expected = [
             'Copyright IBM and others (c) 2008',
             'Copyright Eclipse, IBM and others (c) 2008',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_expat_h(self):
-        test_file = self.get_test_loc('copyrights/copyright_expat_h-expat_h.h')
+    def test_expat_h(self):
+        test_file = self.get_test_loc('copyrights/expat_h-expat_h.h')
         expected = [
             'Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ext_all_js(self):
-        test_file = self.get_test_loc('copyrights/copyright_ext_all_js-ext_all_js.js')
+    def test_ext_all_js(self):
+        test_file = self.get_test_loc('copyrights/ext_all_js-ext_all_js.js')
         expected = [
             'Copyright (c) 2006-2009 Ext JS, LLC',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_extjs_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_extjs_c-c.c')
+    def test_extjs_c(self):
+        test_file = self.get_test_loc('copyrights/extjs_c-c.c')
         expected = [
             'Copyright (c) 2006-2007, Ext JS, LLC.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_fsf_py(self):
-        test_file = self.get_test_loc('copyrights/copyright_fsf_py-999_py.py')
+    def test_fsf_py(self):
+        test_file = self.get_test_loc('copyrights/fsf_py-999_py.py')
         expected = [
             'Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_gailly(self):
-        test_file = self.get_test_loc('copyrights/copyright_gailly-c.c')
+    def test_gailly(self):
+        test_file = self.get_test_loc('copyrights/gailly-c.c')
         expected = [
             'Copyright (c) 1992-1993 Jean-loup Gailly.',
             'Copyright (c) 1992-1993 Jean-loup Gailly',
@@ -928,15 +928,15 @@ def test_copyright_gailly(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_geoff_js(self):
-        test_file = self.get_test_loc('copyrights/copyright_geoff_js-js.js')
+    def test_geoff_js(self):
+        test_file = self.get_test_loc('copyrights/geoff_js-js.js')
         expected = [
             'Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_gnome_session_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_gnome_session_copyright-gnome_session_copyright.copyright')
+    def test_gnome_session(self):
+        test_file = self.get_test_loc('copyrights/gnome_session-gnome_session.copyright')
         expected = [
             'Copyright (c) 1999-2009 Red Hat, Inc.',
             'Copyright (c) 1999-2007 Novell, Inc.',
@@ -953,8 +953,8 @@ def test_copyright_gnome_session_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_gnome_system_monitor_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_gnome_system_monitor_copyright-gnome_system_monitor_copyright.copyright')
+    def test_gnome_system_monitor(self):
+        test_file = self.get_test_loc('copyrights/gnome_system_monitor-gnome_system_monitor.copyright')
         expected = [
             'Copyright Holders: Kevin Vandersloot <kfv101@psu.edu> Erik Johnsson <zaphod@linux.nu>',
         ]
@@ -962,8 +962,8 @@ def test_copyright_gnome_system_monitor_copyright(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_gnome_system_monitor_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_gnome_system_monitor_copyright_label-gnome_system_monitor_copyright_label.label')
+    def test_gnome_system_monitor_label(self):
+        test_file = self.get_test_loc('copyrights/gnome_system_monitor-gnome_system_monitor.label')
         expected = [
             'Copyright Holders: Kevin Vandersloot <kfv101@psu.edu> Erik Johnsson <zaphod@linux.nu>',
         ]
@@ -971,8 +971,8 @@ def test_copyright_gnome_system_monitor_copyright_label(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_gobjc_4_3_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_gobjc_4_3_copyright-gobjc__copyright.copyright')
+    def test_gobjc_4_3(self):
+        test_file = self.get_test_loc('copyrights/gobjc_4_3-gobjc.copyright')
         expected = [
             'Copyright (c) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.',
             'copyright Free Software Foundation',
@@ -981,46 +981,46 @@ def test_copyright_gobjc_4_3_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_google_closure_templates_java_html(self):
-        test_file = self.get_test_loc('copyrights/copyright_google_closure_templates_java_html-html.html')
+    def test_google_closure_templates_java_html(self):
+        test_file = self.get_test_loc('copyrights/google_closure_templates_java_html-html.html')
         expected = [
             '(c) 2009 Google',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_google_view_layout1_xml(self):
-        test_file = self.get_test_loc('copyrights/copyright_google_view_layout1_xml-view_layout_xml.xml')
+    def test_google_view_layout1_xml(self):
+        test_file = self.get_test_loc('copyrights/google_view_layout1_xml-view_layout_xml.xml')
         expected = [
             'Copyright (c) 2008 Google Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_group(self):
-        test_file = self.get_test_loc('copyrights/copyright_group-c.c')
+    def test_group(self):
+        test_file = self.get_test_loc('copyrights/group-c.c')
         expected = [
             'Copyright (c) 2014 ARRis Group, Inc.',
             'Copyright (c) 2013 ARRIS Group, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_gsoap(self):
-        test_file = self.get_test_loc('copyrights/copyright_gsoap-gSOAP')
+    def test_gsoap(self):
+        test_file = self.get_test_loc('copyrights/gsoap-gSOAP')
         expected = [
             'Copyright (c) 2001-2004 Robert A. van Engelen, Genivia inc.',
             'Copyright (c) 2001-2004 Robert A. van Engelen, Genivia inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_gstreamer0_fluendo_mp3_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_gstreamer0_fluendo_mp3_copyright-gstreamer__fluendo_mp_copyright.copyright')
+    def test_gstreamer0_fluendo_mp3(self):
+        test_file = self.get_test_loc('copyrights/gstreamer0_fluendo_mp3-gstreamer_fluendo_mp.copyright')
         expected = [
             'Copyright (c) 2005,2006 Fluendo',
             'Copyright 2005 Fluendo',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_hall(self):
-        test_file = self.get_test_loc('copyrights/copyright_hall-copyright.txt')
+    def test_hall(self):
+        test_file = self.get_test_loc('copyrights/hall-copyright.txt')
         expected = [
             'Copyright (c) 2004, Richard S. Hall',
             'Copyright (c) 2004, Didier Donsez',
@@ -1028,8 +1028,8 @@ def test_copyright_hall(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_hans_jurgen_htm(self):
-        test_file = self.get_test_loc('copyrights/copyright_hans_jurgen_htm-9_html.html')
+    def test_hans_jurgen_htm(self):
+        test_file = self.get_test_loc('copyrights/hans_jurgen_htm-9_html.html')
         expected = [
             'Copyright (c) 2006 by Hans-Jurgen Koch.',
         ]
@@ -1037,22 +1037,22 @@ def test_copyright_hans_jurgen_htm(self):
                         expected_in_results=True,
                         results_in_expected=False)
 
-    def test_copyright_hansen_cs(self):
-        test_file = self.get_test_loc('copyrights/copyright_hansen_cs-cs.cs')
+    def test_hansen_cs(self):
+        test_file = self.get_test_loc('copyrights/hansen_cs-cs.cs')
         expected = [
             'Web Applications Copyright 2009 - Thomas Hansen thomas@ra-ajax.org.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_hciattach_qualcomm1_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_hciattach_qualcomm1_c-hciattach_qualcomm_c.c')
+    def test_hciattach_qualcomm1_c(self):
+        test_file = self.get_test_loc('copyrights/hciattach_qualcomm1_c-hciattach_qualcomm_c.c')
         expected = [
             'Copyright (c) 2005-2010 Marcel Holtmann <marcel@holtmann.org>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_hibernate_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_hibernate_copyright_label-hibernate_copyright_label.label')
+    def test_hibernate(self):
+        test_file = self.get_test_loc('copyrights/hibernate-hibernate.label')
         expected = [
             'Copyright (c) 2004-2006 Bernard Blackham <bernard@blackham.com.au>',
             'copyright (c) 2004-2006 Cameron Patrick <cameron@patrick.wattle.id.au>',
@@ -1060,24 +1060,24 @@ def test_copyright_hibernate_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_holtmann(self):
-        test_file = self.get_test_loc('copyrights/copyright_holtmann-hciattach_qualcomm_c.c')
+    def test_holtmann(self):
+        test_file = self.get_test_loc('copyrights/holtmann-hciattach_qualcomm_c.c')
         expected = [
             'Copyright (c) 2005-2010 Marcel Holtmann <marcel@holtmann.org>',
             'Copyright (c) 2010, Code Aurora Forum.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_hostapd_cli_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_hostapd_cli_c-hostapd_cli_c.c')
+    def test_hostapd_cli_c(self):
+        test_file = self.get_test_loc('copyrights/hostapd_cli_c-hostapd_cli_c.c')
         expected = [
             'Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>',
             'Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_hp_notice(self):
-        test_file = self.get_test_loc('copyrights/copyright_hp_notice-NOTICE')
+    def test_hp_notice(self):
+        test_file = self.get_test_loc('copyrights/hp_notice-NOTICE')
         expected = [
             '(c) Copyright 2007 Hewlett-Packard Development Company, L.P.',
             '(c) Copyright 2008 Hewlett-Packard Development Company, L.P.',
@@ -1090,8 +1090,8 @@ def test_copyright_hp_notice(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_hpijs_ppds_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_hpijs_ppds_copyright_label-hpijs_ppds_copyright_label.label')
+    def test_hpijs_ppds(self):
+        test_file = self.get_test_loc('copyrights/hpijs_ppds-hpijs_ppds.label')
         expected = [
             'Copyright (c) 2003-2004 by Torsten Landschoff <torsten@debian.org>',
             'Copyright (c) 2004-2006 by Henrique de Moraes Holschuh <hmh@debian.org>',
@@ -1100,8 +1100,8 @@ def test_copyright_hpijs_ppds_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ibm_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_ibm_c-ibm_c.c')
+    def test_ibm_c(self):
+        test_file = self.get_test_loc('copyrights/ibm_c-ibm_c.c')
         expected = [
             'Copyright (c) ibm technologies 2008',
             'Copyright (c) IBM Corporation 2008',
@@ -1112,8 +1112,8 @@ def test_copyright_ibm_c(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_icedax_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_icedax_copyright_label-icedax_copyright_label.label')
+    def test_icedax(self):
+        test_file = self.get_test_loc('copyrights/icedax-icedax.label')
         expected = [
             'Copyright 1998-2003 Heiko Eissfeldt',
             '(c) Peter Widow',
@@ -1130,15 +1130,15 @@ def test_copyright_icedax_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ifrename_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_ifrename_c-ifrename_c.c')
+    def test_ifrename_c(self):
+        test_file = self.get_test_loc('copyrights/ifrename_c-ifrename_c.c')
         expected = [
             'Copyright (c) 2004 Jean Tourrilhes <jt@hpl.hp.com>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_illinois_html(self):
-        test_file = self.get_test_loc('copyrights/copyright_illinois_html-9_html.html')
+    def test_illinois_html(self):
+        test_file = self.get_test_loc('copyrights/illinois_html-9_html.html')
         expected = [
             'Copyright 1999,2000,2001,2002,2003,2004 The Board of Trustees of the University of Illinois',
         ]
@@ -1146,30 +1146,30 @@ def test_copyright_illinois_html(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_in_COPYING_gpl(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_COPYING_gpl-COPYING_gpl.gpl')
+    def test_COPYING_gpl(self):
+        test_file = self.get_test_loc('copyrights/COPYING_gpl-COPYING_gpl.gpl')
         expected = [
             'Copyright (c) 1989, 1991 Free Software Foundation, Inc.',
             'copyrighted by the Free Software Foundation',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_COPYRIGHT_madwifi(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi')
+    def test_COPYRIGHT_madwifi(self):
+        test_file = self.get_test_loc('copyrights/COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi')
         expected = [
             'Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_README(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_README-README')
+    def test_README(self):
+        test_file = self.get_test_loc('copyrights/README-README')
         expected = [
             'Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_bash(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_bash-shell_sh.sh')
+    def test_bash(self):
+        test_file = self.get_test_loc('copyrights/bash-shell_sh.sh')
         expected = [
             'Copyright (c) 2008 Hewlett-Packard Development Company, L.P.',
         ]
@@ -1177,7 +1177,7 @@ def test_copyright_in_bash(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_in_binary_file_with_metadata(self):
+    def test_binary_file_with_metadata(self):
         test_file = self.get_test_loc('copyrights/mp4_with_metadata.mp4')
         expected = [
             'copyright (c) 2016 Philippe',
@@ -1186,21 +1186,21 @@ def test_copyright_in_binary_file_with_metadata(self):
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_in_windows_binary_lib(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_binary_lib-php_embed_lib.lib')
+    def test_windows_binary_lib(self):
+        test_file = self.get_test_loc('copyrights/binary_lib-php_embed_lib.lib')
         expected = [
             'Copyright nexB and others (c) 2012',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_windows_binary_dll_ignore_leading_junk(self):
+    def test_windows_binary_dll_ignore_leading_junk(self):
         test_file = self.get_test_loc('copyrights/windows.dll')
         expected = [
             'Copyright nexB and others (c) 2012'
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_elf_binary_treats_new_lines_as_spaces(self):
+    def test_elf_binary_treats_new_lines_as_spaces(self):
         test_file = self.get_test_loc('copyrights/tor.bin')
         expected = [
             u'Copyright (c) 2001-2004, Roger Dingledine',
@@ -1209,15 +1209,15 @@ def test_copyright_in_elf_binary_treats_new_lines_as_spaces(self):
         ]
         check_detection(expected, test_file, what='copyrights')
 
-    def test_copyright_in_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_c-c.c')
+    def test_c(self):
+        test_file = self.get_test_loc('copyrights/c-c.c')
         expected = [
             'COPYRIGHT (c) STMicroelectronics 2005.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_c_include(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_c_include-h.h')
+    def test_c_include(self):
+        test_file = self.get_test_loc('copyrights/c_include-h.h')
         expected = [
             'COPYRIGHT (c) ST-Microelectronics 1998.',
         ]
@@ -1225,143 +1225,142 @@ def test_copyright_in_c_include(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_in_dll_approximate(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_dll-9_msvci_dll.dll')
+    def test_dll_approximate(self):
+        test_file = self.get_test_loc('copyrights/dll-9_msvci_dll.dll')
         expected = [
             'Copyright Myself and Me, Inc QjT F4P',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_in_dll_exact(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_dll-9_msvci_dll.dll')
+    def test_dll_exact(self):
+        test_file = self.get_test_loc('copyrights/dll-9_msvci_dll.dll')
         expected = [
             'Copyright Myself and Me, Inc',
         ]
         check_detection(expected, test_file)
 
-
-    def test_copyright_in_h(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_h-h.h')
+    def test_h(self):
+        test_file = self.get_test_loc('copyrights/h-h.h')
         expected = [
             'COPYRIGHT (c) ST-Microelectronics 1998.',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_in_html_comments(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_html_comments-html.html')
+    def test_html_comments(self):
+        test_file = self.get_test_loc('copyrights/html_comments-html.html')
         expected = [
             'Copyright 2008 ABCD, LLC.',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_in_html_incorrect(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_html_incorrect-detail_9_html.html')
+    def test_html_incorrect(self):
+        test_file = self.get_test_loc('copyrights/html_incorrect-detail_9_html.html')
         expected = [
             'A12 Oe (c) 2004-2009',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_maven_pom_xstream(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_maven_pom_xstream-pom_xml.xml')
+    def test_maven_pom_xstream(self):
+        test_file = self.get_test_loc('copyrights/maven_pom_xstream-pom_xml.xml')
         expected = [
             'Copyright (c) 2006 Joe Walnes.',
             'Copyright (c) 2006, 2007, 2008 XStream committers.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_media(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_media-a_png.png')
+    def test_media(self):
+        test_file = self.get_test_loc('copyrights/media-a_png.png')
         expected = [
             'Copyright nexB and others (c) 2012',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_phps(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_phps-phps.phps')
+    def test_phps(self):
+        test_file = self.get_test_loc('copyrights/phps-phps.phps')
         expected = [
             'copyright 2005 Michal Migurski',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_postcript(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_postcript-9__ps.ps')
+    def test_postcript(self):
+        test_file = self.get_test_loc('copyrights/postcript-9_ps.ps')
         expected = [
             'Copyright 1999 Radical Eye Software',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_txt.txt')
+    def test_txt(self):
+        test_file = self.get_test_loc('copyrights/txt.txt')
         expected = [
             'Copyright ?2004-2006 Company',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_in_visio_doc(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_visio_doc-Glitch_ERD_vsd.vsd')
+    def test_visio_doc(self):
+        test_file = self.get_test_loc('copyrights/visio_doc-Glitch_ERD_vsd.vsd')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_inria_loss_of_holder_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_inria_loss_of_holder_c-c.c')
+    def test_inria_loss_of_holder_c(self):
+        test_file = self.get_test_loc('copyrights/inria_loss_of_holder_c-c.c')
         expected = [
             'Copyright (c) 2000,2002,2003 INRIA, France Telecom',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_java-java.java')
+    def test_java(self):
+        test_file = self.get_test_loc('copyrights/java-java.java')
         expected = [
             'Copyright (c) 1992-2002 by P.J. Plauger.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_java_passing(self):
-        test_file = self.get_test_loc('copyrights/copyright_java-java.java')
+    def test_java_passing(self):
+        test_file = self.get_test_loc('copyrights/java-java.java')
         expected = [
             'Copyright (c) 1992-2002 by P.J.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_jdoe(self):
-        test_file = self.get_test_loc('copyrights/copyright_jdoe-copyright_c.c')
+    def test_jdoe(self):
+        test_file = self.get_test_loc('copyrights/jdoe-c.c')
         expected = [
             'Copyright 2009 J-Doe.',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_json_in_phps(self):
-        test_file = self.get_test_loc('copyrights/copyright_json_in_phps-JSON_phps.phps')
+    def test_json_in_phps(self):
+        test_file = self.get_test_loc('copyrights/json_in_phps-JSON_phps.phps')
         expected = [
             'copyright 2005 Michal Migurski',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_json_in_phps_incorrect(self):
-        test_file = self.get_test_loc('copyrights/copyright_json_in_phps_incorrect-JSON_phps.phps')
+    def test_json_in_phps_incorrect(self):
+        test_file = self.get_test_loc('copyrights/json_in_phps_incorrect-JSON_phps.phps')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_json_phps_html_incorrect(self):
-        test_file = self.get_test_loc('copyrights/copyright_json_phps_html_incorrect-JSON_phps_html.html')
+    def test_json_phps_html_incorrect(self):
+        test_file = self.get_test_loc('copyrights/json_phps_html_incorrect-JSON_phps_html.html')
         expected = []
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_json_phps_html(self):
-        test_file = self.get_test_loc('copyrights/copyright_json_phps_html-JSON_phps_html.html')
+    def test_json_phps_html(self):
+        test_file = self.get_test_loc('copyrights/json_phps_html-JSON_phps_html.html')
         expected = [
             'copyright 2005 Michal Migurski',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_jsp_all_CAPS(self):
-        test_file = self.get_test_loc('copyrights/copyright_jsp_all_CAPS-jsp.jsp')
+    def test_jsp_all_CAPS(self):
+        test_file = self.get_test_loc('copyrights/jsp_all_CAPS-jsp.jsp')
         expected = [
             'copyright 2005-2006 Cedrik LIME',
         ]
@@ -1369,8 +1368,8 @@ def test_copyright_jsp_all_CAPS(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_kaboom_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_kaboom_copyright-kaboom_copyright.copyright')
+    def test_kaboom(self):
+        test_file = self.get_test_loc('copyrights/kaboom-kaboom.copyright')
         expected = [
             'Copyright (c) 2009 Sune Vuorela <sune@vuorela.dk>',
             'Copyright (c) 2007-2009 George Kiagiadakis <gkiagiad@csd.uoc.gr>',
@@ -1379,8 +1378,8 @@ def test_copyright_kaboom_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_kbuild_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_kbuild_copyright-kbuild_copyright.copyright')
+    def test_kbuild(self):
+        test_file = self.get_test_loc('copyrights/kbuild-kbuild.copyright')
         expected = [
             'Copyright (c) 2005-2009 Knut St. Osmundsen <bird-kBuild-spam@anduin.net>',
             'Copyright (c) 1991-1993 The Regents of the University of California',
@@ -1391,16 +1390,16 @@ def test_copyright_kbuild_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_kde_l10n_zhcn_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_kde_l10n_zhcn_copyright-kde_l_n_zhcn_copyright.copyright')
+    def test_kde_l10n_zhcn(self):
+        test_file = self.get_test_loc('copyrights/kde_l10n_zhcn-kde_l_n_zhcn.copyright')
         expected = [
             'Copyright (c) 1996-2009 The KDE Translation teams <kde-i18n-doc@kde.org>',
             '(c) 2007-2009, Debian Qt/KDE Maintainers',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_leonardo_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_leonardo_c-c.c')
+    def test_leonardo_c(self):
+        test_file = self.get_test_loc('copyrights/leonardo_c-c.c')
         expected = [
             'Copyright (c) 1994 by Leonardo DaVinci Societe',
         ]
@@ -1408,8 +1407,8 @@ def test_copyright_leonardo_c(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_libadns1_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libadns1_copyright-libadns_copyright.copyright')
+    def test_libadns1(self):
+        test_file = self.get_test_loc('copyrights/libadns1-libadns.copyright')
         expected = [
             'Copyright 1997-2000 Ian Jackson',
             'Copyright 1999 Tony Finch',
@@ -1417,8 +1416,8 @@ def test_copyright_libadns1_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libc6_i686_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libc6_i686_copyright-libc_i_copyright.copyright')
+    def test_libc6_i686(self):
+        test_file = self.get_test_loc('copyrights/libc6_i686-libc_i.copyright')
         expected = [
             'Copyright (c) 1991,92,93,94,95,96,97,98,99,2000,2001,2002,2003,2004,2005, 2006,2007,2008 Free Software Foundation, Inc.',
             'Copyright (c) 1991,92,93,94,95,96,97,98,99,2000,2001,2002,2003,2004,2005, 2006,2007,2008 Free Software Foundation, Inc.',
@@ -1431,8 +1430,8 @@ def test_copyright_libc6_i686_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libcdio10_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_libcdio10_copyright_label-libcdio_copyright_label.label')
+    def test_libcdio10(self):
+        test_file = self.get_test_loc('copyrights/libcdio10-libcdio.label')
         expected = [
             'Copyright (c) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>',
             'Copyright (c) 2000, 2001, 2003, 2004, 2005, 2008 Herbert Valerio Riedel',
@@ -1456,16 +1455,16 @@ def test_copyright_libcdio10_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libcelt0_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libcelt0_copyright-libcelt_copyright.copyright')
+    def test_libcelt0(self):
+        test_file = self.get_test_loc('copyrights/libcelt0-libcelt.copyright')
         expected = [
             'Copyright 2005-2007 Christopher Montgomery , Jean-Marc Valin , Timothy Terriberry',
             '(c) 2008, Ron',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libcompress_raw_zlib_perl_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libcompress_raw_zlib_perl_copyright-libcompress_raw_zlib_perl_copyright.copyright')
+    def test_libcompress_raw_zlib_perl(self):
+        test_file = self.get_test_loc('copyrights/libcompress_raw_zlib_perl-libcompress_raw_zlib_perl.copyright')
         expected = [
             'Copyright 2005-2009, Paul Marquess <pmqs@cpan.org>',
             'Copyright 1995-2005, Jean-loup Gailly <jloup@gzip.org>',
@@ -1475,15 +1474,15 @@ def test_copyright_libcompress_raw_zlib_perl_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libcpufreq0_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libcpufreq0_copyright-libcpufreq_copyright.copyright')
+    def test_libcpufreq0(self):
+        test_file = self.get_test_loc('copyrights/libcpufreq0-libcpufreq.copyright')
         expected = [
             'Copyright 2004-2006 Dominik Brodowski',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libcrypt_ssleay_perl_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libcrypt_ssleay_perl_copyright-libcrypt_ssleay_perl_copyright.copyright')
+    def test_libcrypt_ssleay_perl(self):
+        test_file = self.get_test_loc('copyrights/libcrypt_ssleay_perl-libcrypt_ssleay_perl.copyright')
         expected = [
             'Copyright (c) 1999-2003 Joshua Chamas',
             'Copyright (c) 1998 Gisle Aas',
@@ -1491,34 +1490,34 @@ def test_copyright_libcrypt_ssleay_perl_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libepc_ui_1_0_1_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libepc_ui_1_0_1_copyright-libepc_ui__copyright.copyright')
+    def test_libepc_ui_1_0_1(self):
+        test_file = self.get_test_loc('copyrights/libepc_ui_1_0_1-libepc_ui.copyright')
         expected = [
             'Copyright (c) 2007, 2008 Openismus GmbH',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libepc_ui_1_0_2_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_libepc_ui_1_0_2_copyright_label-libepc_ui__copyright_label.label')
+    def test_libepc_ui_1_0_2(self):
+        test_file = self.get_test_loc('copyrights/libepc_ui_1_0_2-libepc_ui.label')
         expected = [
             'Copyright (c) 2007, 2008 Openismus GmbH',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libfltk1_1_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libfltk1_1_copyright-libfltk_copyright.copyright')
+    def test_libfltk1_1(self):
+        test_file = self.get_test_loc('copyrights/libfltk1_1-libfltk.copyright')
         expected = [
             'Copyright (c) 1998-2009 Bill Spitzak spitzak@users.sourceforge.net',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libgail18_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_libgail18_copyright_label-libgail_copyright_label.label')
+    def test_libgail18(self):
+        test_file = self.get_test_loc('copyrights/libgail18-libgail.label')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_libggiwmh0_target_x_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libggiwmh0_target_x_copyright-libggiwmh_target_x_copyright.copyright')
+    def test_libggiwmh0_target_x(self):
+        test_file = self.get_test_loc('copyrights/libggiwmh0_target_x-libggiwmh_target_x.copyright')
         expected = [
             'Copyright (c) 2005 Eric Faurot eric.faurot@gmail.com',
             'Copyright (c) 2004 Peter Ekberg peda@lysator.liu.se',
@@ -1529,8 +1528,8 @@ def test_copyright_libggiwmh0_target_x_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libgnome_desktop_2_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libgnome_desktop_2_copyright-libgnome_desktop__copyright.copyright')
+    def test_libgnome_desktop_2(self):
+        test_file = self.get_test_loc('copyrights/libgnome_desktop_2-libgnome_desktop.copyright')
         expected = [
             'Copyright (c) 1999, 2000 Red Hat Inc.',
             'Copyright (c) 2001 Sid Vicious',
@@ -1540,56 +1539,56 @@ def test_copyright_libgnome_desktop_2_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libgnome_media0_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libgnome_media0_copyright-libgnome_media_copyright.copyright')
+    def test_libgnome_media0(self):
+        test_file = self.get_test_loc('copyrights/libgnome_media0-libgnome_media.copyright')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_libgoffice_0_8_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_libgoffice_0_8_copyright_label-libgoffice__copyright_label.label')
+    def test_libgoffice_0_8(self):
+        test_file = self.get_test_loc('copyrights/libgoffice_0_8-libgoffice.label')
         expected = [
             'Copyright (c) 2003-2008 Jody Goldberg (jody@gnome.org) and others.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libgtkhtml2_0_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libgtkhtml2_0_copyright-libgtkhtml_copyright.copyright')
+    def test_libgtkhtml2_0(self):
+        test_file = self.get_test_loc('copyrights/libgtkhtml2_0-libgtkhtml.copyright')
         expected = [
             'Copyright 1999,2000,2001 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libisc44_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libisc44_copyright-libisc_copyright.copyright')
+    def test_libisc44(self):
+        test_file = self.get_test_loc('copyrights/libisc44-libisc.copyright')
         expected = [
             'Copyright (c) 1996-2001 Internet Software Consortium.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libisccfg30_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libisccfg30_copyright-libisccfg_copyright.copyright')
+    def test_libisccfg30(self):
+        test_file = self.get_test_loc('copyrights/libisccfg30-libisccfg.copyright')
         expected = [
             'Copyright (c) 1996-2001 Internet Software Consortium',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libisccfg40_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libisccfg40_copyright-libisccfg_copyright.copyright')
+    def test_libisccfg40(self):
+        test_file = self.get_test_loc('copyrights/libisccfg40-libisccfg.copyright')
         expected = [
             'Copyright (c) 1996-2001 Internet Software Consortium',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libjpeg62_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libjpeg62_copyright-libjpeg_copyright.copyright')
+    def test_libjpeg62(self):
+        test_file = self.get_test_loc('copyrights/libjpeg62-libjpeg.copyright')
         expected = [
             'copyright (c) 1991-1998, Thomas G. Lane',
             'copyright by the Free Software Foundation',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libkeyutils1_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_libkeyutils1_copyright_label-libkeyutils_copyright_label.label')
+    def test_libkeyutils1(self):
+        test_file = self.get_test_loc('copyrights/libkeyutils1-libkeyutils.label')
         expected = [
             'Copyright (c) 2005 Red Hat',
             'Copyright (c) 2005 Red Hat',
@@ -1597,15 +1596,15 @@ def test_copyright_libkeyutils1_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_liblocale_gettext_perl_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_liblocale_gettext_perl_copyright_label-liblocale_get_perl_copyright_label.label')
+    def test_liblocale_gettext_perl(self):
+        test_file = self.get_test_loc('copyrights/liblocale_gettext_perl-liblocale_get_perl.label')
         expected = [
             'Copyright 1996..2005 by Phillip Vandry <vandry@TZoNE.ORG>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libopenraw1_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_libopenraw1_copyright_label-libopenraw_copyright_label.label')
+    def test_libopenraw1(self):
+        test_file = self.get_test_loc('copyrights/libopenraw1-libopenraw.label')
         expected = [
             'Copyright (c) 2007, David Paleino <d.paleino@gmail.com>',
             'Copyright (c) 2005-2009, Hubert Figuiere <hub@figuiere.net>',
@@ -1620,16 +1619,16 @@ def test_copyright_libopenraw1_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libopenthreads12_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libopenthreads12_copyright-libopenthreads_copyright.copyright')
+    def test_libopenthreads12(self):
+        test_file = self.get_test_loc('copyrights/libopenthreads12-libopenthreads.copyright')
         expected = [
             'Copyright (c) 2002 Robert Osfield',
             'Copyright (c) 1998 Julian Smart , Robert Roebling',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libpam_ck_connector_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libpam_ck_connector_copyright-libpam_ck_connector_copyright.copyright')
+    def test_libpam_ck_connector(self):
+        test_file = self.get_test_loc('copyrights/libpam_ck_connector-libpam_ck_connector.copyright')
         expected = [
             'Copyright (c) 2006 William Jon McCann <mccann@jhu.edu>',
             'Copyright (c) 2007 David Zeuthen <davidz@redhat.com>',
@@ -1638,23 +1637,23 @@ def test_copyright_libpam_ck_connector_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libpoppler3_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libpoppler3_copyright-libpoppler_copyright.copyright')
+    def test_libpoppler3(self):
+        test_file = self.get_test_loc('copyrights/libpoppler3-libpoppler.copyright')
         expected = [
             'Copyright (c) 1996-2003 Glyph & Cog, LLC',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libqt4_scripttools_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libqt4_scripttools_copyright-libqt_scripttools_copyright.copyright')
+    def test_libqt4_scripttools(self):
+        test_file = self.get_test_loc('copyrights/libqt4_scripttools-libqt_scripttools.copyright')
         expected = [
             '(c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies)',
             '(c) 1994-2008 Trolltech ASA',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libqtscript4_gui_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libqtscript4_gui_copyright-libqtscript_gui_copyright.copyright')
+    def test_libqtscript4_gui(self):
+        test_file = self.get_test_loc('copyrights/libqtscript4_gui-libqtscript_gui.copyright')
         expected = [
             'Copyright (c) 2009 Modestas Vainius <modestas@vainius.eu>',
             'Copyright (c) Trolltech ASA',
@@ -1663,23 +1662,23 @@ def test_copyright_libqtscript4_gui_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libsocks4_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libsocks4_copyright-libsocks_copyright.copyright')
+    def test_libsocks4(self):
+        test_file = self.get_test_loc('copyrights/libsocks4-libsocks.copyright')
         expected = [
             'Copyright (c) 1989 Regents of the University of California.',
             'Portions Copyright (c) 1993, 1994, 1995 by NEC Systems Laboratory',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libsox_fmt_alsa_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libsox_fmt_alsa_copyright-libsox_fmt_alsa_copyright.copyright')
+    def test_libsox_fmt_alsa(self):
+        test_file = self.get_test_loc('copyrights/libsox_fmt_alsa-libsox_fmt_alsa.copyright')
         expected = [
             'Copyright 1991 Lance Norskog And Sundry Contributors',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libspeex1_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libspeex1_copyright-libspeex_copyright.copyright')
+    def test_libspeex1(self):
+        test_file = self.get_test_loc('copyrights/libspeex1-libspeex.copyright')
         expected = [
             'Copyright 2002-2007 Xiph.org Foundation',
             'Copyright 2002-2007 Jean-Marc Valin',
@@ -1691,8 +1690,8 @@ def test_copyright_libspeex1_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libstlport4_6ldbl_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_libstlport4_6ldbl_copyright_label-libstlport_ldbl_copyright_label.label')
+    def test_libstlport4_6ldbl(self):
+        test_file = self.get_test_loc('copyrights/libstlport4_6ldbl-libstlport_ldbl.label')
         expected = [
             'Copyright (c) 1994 Hewlett-Packard Company',
             'Copyright (c) 1996-1999 Silicon Graphics Computer Systems, Inc.',
@@ -1701,8 +1700,8 @@ def test_copyright_libstlport4_6ldbl_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libtdb1_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libtdb1_copyright-libtdb_copyright.copyright')
+    def test_libtdb1(self):
+        test_file = self.get_test_loc('copyrights/libtdb1-libtdb.copyright')
         expected = [
             'Copyright (c) Andrew Tridgell 1999-2004',
             'Copyright (c) Paul Rusty Russell 2000',
@@ -1710,8 +1709,8 @@ def test_copyright_libtdb1_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libuim6_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libuim6_copyright-libuim_copyright.copyright')
+    def test_libuim6(self):
+        test_file = self.get_test_loc('copyrights/libuim6-libuim.copyright')
         expected = [
             'Copyright (c) 2003-2007 uim Project http://uim.freedesktop.org/',
             'COPYRIGHT (c) 1988-1994 BY PARADIGM ASSOCIATES INCORPORATED',
@@ -1726,8 +1725,8 @@ def test_copyright_libuim6_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libxext6_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libxext6_copyright-libxext_copyright.copyright')
+    def test_libxext6(self):
+        test_file = self.get_test_loc('copyrights/libxext6-libxext.copyright')
         expected = [
             'Copyright 1986, 1987, 1988, 1989, 1994, 1998 The Open Group',
             'Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts',
@@ -1741,8 +1740,8 @@ def test_copyright_libxext6_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libxmlrpc_c3_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_libxmlrpc_c3_copyright-libxmlrpc_c_copyright.copyright')
+    def test_libxmlrpc_c3(self):
+        test_file = self.get_test_loc('copyrights/libxmlrpc_c3-libxmlrpc_c.copyright')
         expected = [
             'Copyright (c) 2001 by First Peer, Inc.',
             'Copyright (c) 2001 by Eric Kidd.',
@@ -1752,8 +1751,8 @@ def test_copyright_libxmlrpc_c3_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_libxt6_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_libxt6_copyright_label-libxt_copyright_label.label')
+    def test_libxt6(self):
+        test_file = self.get_test_loc('copyrights/libxt6-libxt.label')
         expected = [
             'Copyright 1987, 1988 by Digital Equipment Corporation , Maynard, Massachusetts',
             'Copyright 1993 by Sun Microsystems, Inc. Mountain View',
@@ -1763,38 +1762,38 @@ def test_copyright_libxt6_copyright_label(self):
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_license__qpl_v1_0_perfect(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_qpl_v1_0_perfect-QPL_v.0')
+    def test_license_qpl_v1_0_perfect(self):
+        test_file = self.get_test_loc('copyrights/license_qpl_v1_0_perfect-QPL_v.0')
         expected = [
             'Copyright (c) 1999 Trolltech AS, Norway.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_adaptive_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_adaptive_v1_0-Adaptive v.0')
+    def test_adaptive_v1_0(self):
+        test_file = self.get_test_loc('copyrights/adaptive_v1_0-Adaptive v.0')
         expected = [
             '(c) Any Recipient',
             '(c) Each Recipient',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_adobe(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_adobe-Adobe')
+    def test_adobe(self):
+        test_file = self.get_test_loc('copyrights/adobe-Adobe')
         expected = [
             'Copyright (c) 2006 Adobe Systems Incorporated.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_adobeflex2sdk(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_adobeflex2sdk-Adobeflex_sdk')
+    def test_adobeflex2sdk(self):
+        test_file = self.get_test_loc('copyrights/adobeflex2sdk-Adobeflex_sdk')
         expected = [
             '(c) Adobe AIR',
             '(c) Material Improvement',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_afferogplv1(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_afferogplv1-AfferoGPLv')
+    def test_afferogplv1(self):
+        test_file = self.get_test_loc('copyrights/afferogplv1-AfferoGPLv')
         expected = [
             'Copyright (c) 2002 Affero Inc.',
             'copyright (c) 1989, 1991 Free Software Foundation, Inc.',
@@ -1802,253 +1801,253 @@ def test_copyright_license_text_afferogplv1(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_afferogplv2(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_afferogplv2-AfferoGPLv')
+    def test_afferogplv2(self):
+        test_file = self.get_test_loc('copyrights/afferogplv2-AfferoGPLv')
         expected = [
             'Copyright (c) 2007 Affero Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_afferogplv3(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_afferogplv3-AfferoGPLv')
+    def test_afferogplv3(self):
+        test_file = self.get_test_loc('copyrights/afferogplv3-AfferoGPLv')
         expected = [
             'Copyright (c) 2007 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_afl_v3_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_afl_v3_0-AFL_v.0')
+    def test_afl_v3_0(self):
+        test_file = self.get_test_loc('copyrights/afl_v3_0-AFL_v.0')
         expected = [
             'Copyright (c) 2005 Lawrence Rosen.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_aladdin_free_public_license(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_aladdin_free_public_license-Aladdin Free Public License')
+    def test_aladdin_free_public_license(self):
+        test_file = self.get_test_loc('copyrights/aladdin_free_public_license-Aladdin Free Public License')
         expected = [
             'Copyright (c) 1994, 1995, 1997, 1998, 1999, 2000 Aladdin Enterprises, Menlo Park, California, U.S.A.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_amazondsb(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_amazondsb-AmazonDSb')
+    def test_amazondsb(self):
+        test_file = self.get_test_loc('copyrights/amazondsb-AmazonDSb')
         expected = [
             '(c) 2006 Amazon Digital Services, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ampasbsd(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ampasbsd-AMPASBSD')
+    def test_ampasbsd(self):
+        test_file = self.get_test_loc('copyrights/ampasbsd-AMPASBSD')
         expected = [
             'Copyright (c) 2006 Academy of Motion Picture Arts and Sciences',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_apachev1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_apachev1_0-Apachev.0')
+    def test_apachev1_0(self):
+        test_file = self.get_test_loc('copyrights/apachev1_0-Apachev.0')
         expected = [
             'Copyright (c) 1995-1999 The Apache Group.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_apachev1_1(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_apachev1_1-Apachev.1')
+    def test_apachev1_1(self):
+        test_file = self.get_test_loc('copyrights/apachev1_1-Apachev.1')
         expected = [
             'Copyright (c) 2000 The Apache Software Foundation.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_apachev2_0b(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_apachev2_0b-Apachev_b.0b')
+    def test_apachev2_0b(self):
+        test_file = self.get_test_loc('copyrights/apachev2_0b-Apachev_b.0b')
         expected = [
             'Copyright 2000',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_apple_common_documentation_license_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_apple_common_documentation_license_v1_0-Apple Common Documentation License v.0')
+    def test_apple_common_documentation_license_v1_0(self):
+        test_file = self.get_test_loc('copyrights/apple_common_documentation_license_v1_0-Apple Common Documentation License v.0')
         expected = [
             'Copyright (c) 2001 Apple Computer, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_apple_public_source_license_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_apple_public_source_license_v1_0-Apple Public Source License v.0')
+    def test_apple_public_source_license_v1_0(self):
+        test_file = self.get_test_loc('copyrights/apple_public_source_license_v1_0-Apple Public Source License v.0')
         expected = [
             'Portions Copyright (c) 1999 Apple Computer, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_apple_public_source_license_v1_1(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_apple_public_source_license_v1_1-Apple Public Source License v.1')
+    def test_apple_public_source_license_v1_1(self):
+        test_file = self.get_test_loc('copyrights/apple_public_source_license_v1_1-Apple Public Source License v.1')
         expected = [
             'Portions Copyright (c) 1999-2000 Apple Computer, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_apple_public_source_license_v1_2(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_apple_public_source_license_v1_2-Apple Public Source License v.2')
+    def test_apple_public_source_license_v1_2(self):
+        test_file = self.get_test_loc('copyrights/apple_public_source_license_v1_2-Apple Public Source License v.2')
         expected = [
             'Portions Copyright (c) 1999-2003 Apple Computer, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_apslv2_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_apslv2_0-APSLv.0')
+    def test_apslv2_0(self):
+        test_file = self.get_test_loc('copyrights/apslv2_0-APSLv.0')
         expected = [
             'Portions Copyright (c) 1999-2007 Apple Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_artistic_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_artistic_v1_0-Artistic v.0')
+    def test_artistic_v1_0(self):
+        test_file = self.get_test_loc('copyrights/artistic_v1_0-Artistic v.0')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_artistic_v1_0_short(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_artistic_v1_0_short-Artistic v_ short.0 short')
+    def test_artistic_v1_0_short(self):
+        test_file = self.get_test_loc('copyrights/artistic_v1_0_short-Artistic v_ short.0 short')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_artistic_v2_0beta4(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_artistic_v2_0beta4-Artistic v_beta.0beta4')
+    def test_artistic_v2_0beta4(self):
+        test_file = self.get_test_loc('copyrights/artistic_v2_0beta4-Artistic v_beta.0beta4')
         expected = [
             'Copyright (c) 2000, Larry Wall.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_artisticv2_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_artisticv2_0-Artisticv.0')
+    def test_artisticv2_0(self):
+        test_file = self.get_test_loc('copyrights/artisticv2_0-Artisticv.0')
         expected = [
             'Copyright (c) 2000-2006, The Perl Foundation.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_attributionassurancelicense(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_attributionassurancelicense-AttributionAssuranceLicense')
+    def test_attributionassurancelicense(self):
+        test_file = self.get_test_loc('copyrights/attributionassurancelicense-AttributionAssuranceLicense')
         expected = [
             'Copyright (c) 2002 by AUTHOR',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_bigelow_holmes(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_bigelow_holmes-Bigelow&Holmes')
+    def test_bigelow_holmes(self):
+        test_file = self.get_test_loc('copyrights/bigelow_holmes-Bigelow&Holmes')
         expected = [
             '(c) Copyright 1989 Sun Microsystems, Inc.',
             '(c) Copyright Bigelow & Holmes 1986, 1985.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_bitstream(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_bitstream-Bi_ream')
+    def test_bitstream(self):
+        test_file = self.get_test_loc('copyrights/bitstream-Bi_ream')
         expected = [
             'Copyright (c) 2003 by Bitstream, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_bsdnrl(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_bsdnrl-BSDNRL')
+    def test_bsdnrl(self):
+        test_file = self.get_test_loc('copyrights/bsdnrl-BSDNRL')
         expected = [
             'copyright by The Regents of the University of California.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_cnri(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_cnri-CNRI')
+    def test_cnri(self):
+        test_file = self.get_test_loc('copyrights/cnri-CNRI')
         expected = [
             'Copyright (c) 1995-2000 Corporation for National Research Initiatives',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_condor_extra_For(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_condor_extra_For-Condor')
+    def test_condor_extra_For(self):
+        test_file = self.get_test_loc('copyrights/condor_extra_For-Condor')
         expected = [
             'Copyright 1990-2006 Condor Team, Computer Sciences Department, University of Wisconsin-Madison, Madison',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_license_text_doc(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_doc-DOC')
+    def test_doc(self):
+        test_file = self.get_test_loc('copyrights/doc-DOC')
         expected = [
             'copyrighted by Douglas C. Schmidt and his research group at Washington University, University of California, Irvine, and Vanderbilt University',
             'Copyright (c) 1993-2008'
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_dual_mpl_gpl(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_dual_mpl_gpl-Dual MPL GPL')
+    def test_dual_mpl_gpl(self):
+        test_file = self.get_test_loc('copyrights/dual_mpl_gpl-Dual MPL GPL')
         expected = [
             'Copyright (c) 2002 the Initial Developer.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_dualmpl_mit(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_dualmpl_mit-DualMPL_MIT')
+    def test_dualmpl_mit(self):
+        test_file = self.get_test_loc('copyrights/dualmpl_mit-DualMPL_MIT')
         expected = [
             'Copyright (c) 1998-2001, Daniel Stenberg, <daniel@haxx.se>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_eclv1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_eclv1_0-ECLv.0')
+    def test_eclv1_0(self):
+        test_file = self.get_test_loc('copyrights/eclv1_0-ECLv.0')
         expected = [
             'Copyright (c) YeAr Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ecosv2_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ecosv2_0-eCosv.0')
+    def test_ecosv2_0(self):
+        test_file = self.get_test_loc('copyrights/ecosv2_0-eCosv.0')
         expected = [
             'Copyright (c) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_entessa(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_entessa-Entessa')
+    def test_entessa(self):
+        test_file = self.get_test_loc('copyrights/entessa-Entessa')
         expected = [
             'Copyright (c) 2003 Entessa, LLC.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_eplv1_0b(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_eplv1_0b-EPLv_b.0b')
+    def test_eplv1_0b(self):
+        test_file = self.get_test_loc('copyrights/eplv1_0b-EPLv_b.0b')
         expected = [
             'Copyright (c) 2003, 2005 IBM Corporation and others.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_eudatagrid(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_eudatagrid-EUDatagrid')
+    def test_eudatagrid(self):
+        test_file = self.get_test_loc('copyrights/eudatagrid-EUDatagrid')
         expected = [
             'Copyright (c) 2001 EU DataGrid.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_eurosym_v2(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_eurosym_v2-Eurosym_v.v2')
+    def test_eurosym_v2(self):
+        test_file = self.get_test_loc('copyrights/eurosym_v2-Eurosym_v.v2')
         expected = [
             'Copyright (c) 1999-2002 Henrik Theiling',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_frameworxv1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_frameworxv1_0-Frameworxv.0')
+    def test_frameworxv1_0(self):
+        test_file = self.get_test_loc('copyrights/frameworxv1_0-Frameworxv.0')
         expected = [
             '(c) Source Code',
             '(c) THE FRAMEWORX COMPANY 2003',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_freebsd(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_freebsd-FreeBSD')
+    def test_freebsd(self):
+        test_file = self.get_test_loc('copyrights/freebsd-FreeBSD')
         expected = [
             'Copyright 1994-2006 The FreeBSD Project.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_freetype(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_freetype-FreeType')
+    def test_freetype(self):
+        test_file = self.get_test_loc('copyrights/freetype-FreeType')
         expected = [
             'Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg',
             'copyright (c) The FreeType Project (www.freetype.org).',
@@ -2056,22 +2055,22 @@ def test_copyright_license_text_freetype(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_gfdlv1_2(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_gfdlv1_2-GFDLv.2')
+    def test_gfdlv1_2(self):
+        test_file = self.get_test_loc('copyrights/gfdlv1_2-GFDLv.2')
         expected = [
             'Copyright (c) 2000,2001,2002 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_gfdlv1_3(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_gfdlv1_3-GFDLv.3')
+    def test_gfdlv1_3(self):
+        test_file = self.get_test_loc('copyrights/gfdlv1_3-GFDLv.3')
         expected = [
             'Copyright (c) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_glide(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_glide-Glide')
+    def test_glide(self):
+        test_file = self.get_test_loc('copyrights/glide-Glide')
         expected = [
             'copyright notice (3dfx Interactive, Inc. 1999)',
             'COPYRIGHT 3DFX INTERACTIVE, INC. 1999',
@@ -2079,82 +2078,74 @@ def test_copyright_license_text_glide(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_gnuplot(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_gnuplot-gnuplot')
+    def test_gnuplot(self):
+        test_file = self.get_test_loc('copyrights/gnuplot-gnuplot')
         expected = [
             'Copyright 1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_gpl_v1(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_gpl_v1-GPL_v')
+    def test_gpl_v1(self):
+        test_file = self.get_test_loc('copyrights/gpl_v1-GPL_v')
         expected = [
             'Copyright (c) 1989 Free Software Foundation, Inc.',
             'copyrighted by the Free Software Foundation',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_gpl_v2(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_gpl_v2-GPL_v')
+    def test_gpl_v2(self):
+        test_file = self.get_test_loc('copyrights/gpl_v2-GPL_v')
         expected = [
             'Copyright (c) 1989, 1991 Free Software Foundation, Inc.',
             'copyrighted by the Free Software Foundation',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_gpl_v3(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_gpl_v3-GPL_v')
+    def test_gpl_v3(self):
+        test_file = self.get_test_loc('copyrights/gpl_v3-GPL_v')
         expected = [
             'Copyright (c) 2007 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_gsoap(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_gsoap-gSOAP')
-        expected = [
-            'Copyright (c) 2001-2004 Robert A. van Engelen, Genivia inc.',
-            'Copyright (c) 2001-2004 Robert A. van Engelen, Genivia inc.',
-        ]
-        check_detection(expected, test_file)
-
-    def test_copyright_license_text_helix(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_helix-Helix')
+    def test_helix(self):
+        test_file = self.get_test_loc('copyrights/helix-Helix')
         expected = [
             'Copyright (c) 1995-2002 RealNetworks, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_hewlett_packard(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_hewlett_packard-Hewlett_Packard')
+    def test_hewlett_packard(self):
+        test_file = self.get_test_loc('copyrights/hewlett_packard-Hewlett_Packard')
         expected = [
             '(c) HEWLETT-PACKARD COMPANY, 2004.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ibmpl_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ibmpl_v1_0-IBMPL_v.0')
+    def test_ibmpl_v1_0(self):
+        test_file = self.get_test_loc('copyrights/ibmpl_v1_0-IBMPL_v.0')
         expected = [
             'Copyright (c) 1996, 1999 International Business Machines Corporation and others.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ietf(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ietf-IETF')
+    def test_ietf(self):
+        test_file = self.get_test_loc('copyrights/ietf-IETF')
         expected = [
             'Copyright (c) The Internet Society (2003).',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ijg(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ijg-IJG')
+    def test_ijg(self):
+        test_file = self.get_test_loc('copyrights/ijg-IJG')
         expected = [
             'copyright (c) 1991-1998, Thomas G. Lane.',
             'copyright by the Free Software Foundation',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_imatix(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_imatix-iMatix')
+    def test_imatix(self):
+        test_file = self.get_test_loc('copyrights/imatix-iMatix')
         expected = [
             'Copyright 1991-2000 iMatix Corporation.',
             'Copyright 1991-2000 iMatix Corporation',
@@ -2164,311 +2155,304 @@ def test_copyright_license_text_imatix(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_imlib2(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_imlib2-Imlib')
+    def test_imlib2(self):
+        test_file = self.get_test_loc('copyrights/imlib2-Imlib')
         expected = [
             'Copyright (c) 2000 Carsten Haitzler',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_intel(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_intel-Intel')
+    def test_intel(self):
+        test_file = self.get_test_loc('copyrights/intel-Intel')
         expected = [
             'Copyright (c) 2006, Intel Corporation.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_jabber(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_jabber-Jabber')
+    def test_jabber(self):
+        test_file = self.get_test_loc('copyrights/jabber-Jabber')
         expected = [
             'Copyright (c) 1999-2000 Jabber.com, Inc.',
             'Portions Copyright (c) 1998-1999 Jeremie Miller.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_jpython(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_jpython-JPython')
+    def test_jpython(self):
+        test_file = self.get_test_loc('copyrights/jpython-JPython')
         expected = [
             'Copyright 1996-1999 Corporation for National Research Initiatives',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_larryrosen(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_larryrosen-LarryRosen')
+    def test_larryrosen(self):
+        test_file = self.get_test_loc('copyrights/larryrosen-LarryRosen')
         expected = [
             'Copyright (c) 2002 Lawrence E. Rosen.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_latex_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_latex_v1_0-LaTeX_v.0')
+    def test_latex_v1_0(self):
+        test_file = self.get_test_loc('copyrights/latex_v1_0-LaTeX_v.0')
         expected = [
             'Copyright 1999 LaTeX3 Project',
             'Copyright 2001 M. Y. Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_latex_v1_1(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_latex_v1_1-LaTeX_v.1')
+    def test_latex_v1_1(self):
+        test_file = self.get_test_loc('copyrights/latex_v1_1-LaTeX_v.1')
         expected = [
             'Copyright 1999 LaTeX3 Project',
             'Copyright 2001 M. Y. Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_latex_v1_2(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_latex_v1_2-LaTeX_v.2')
+    def test_latex_v1_2(self):
+        test_file = self.get_test_loc('copyrights/latex_v1_2-LaTeX_v.2')
         expected = [
             'Copyright 1999 LaTeX3 Project',
             'Copyright 2001 M. Y. Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_latex_v1_3a(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_latex_v1_3a-LaTeX_v_a.3a')
+    def test_latex_v1_3a(self):
+        test_file = self.get_test_loc('copyrights/latex_v1_3a-LaTeX_v_a.3a')
         expected = [
             'Copyright 1999 2002-04 LaTeX3 Project',
             'Copyright 2003 M. Y. Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_latex_v1_3a_ref(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref')
+    def test_latex_v1_3a_ref(self):
+        test_file = self.get_test_loc('copyrights/latex_v1_3a_ref-LaTeX_v_a_ref.3a_ref')
         expected = [
             'Copyright 2003 Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_latex_v1_3c(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_latex_v1_3c-LaTeX_v_c.3c')
+    def test_latex_v1_3c(self):
+        test_file = self.get_test_loc('copyrights/latex_v1_3c-LaTeX_v_c.3c')
         expected = [
             'Copyright 1999 2002-2008 LaTeX3 Project',
             'Copyright 2005 M. Y. Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_lgpl_v2_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_lgpl_v2_0-LGPL_v.0')
+    def test_lgpl_v2_0(self):
+        test_file = self.get_test_loc('copyrights/lgpl_v2_0-LGPL_v.0')
         expected = [
             'Copyright (c) 1991 Free Software Foundation, Inc.',
             'copyrighted by the Free Software Foundation',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_lgpl_v2_1(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_lgpl_v2_1-LGPL_v.1')
+    def test_lgpl_v2_1(self):
+        test_file = self.get_test_loc('copyrights/lgpl_v2_1-LGPL_v.1')
         expected = [
             'Copyright (c) 1991, 1999 Free Software Foundation, Inc.',
             'copyrighted by the Free Software Foundation',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_lgpl_v3(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_lgpl_v3-LGPL_v')
+    def test_lgpl_v3(self):
+        test_file = self.get_test_loc('copyrights/lgpl_v3-LGPL_v')
         expected = [
             'Copyright (c) 2007 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_lgpl_wxwindows_library_licence_v3_0_variant(self):
-        test_file = self.get_test_loc('copyrights/copyright_wxWindows Library .0 variant')
+    def test_lgpl_wxwindows_library_licence_v3_0_variant(self):
+        test_file = self.get_test_loc('copyrights/wxWindows Library .0 variant')
         expected = [
             'Copyright (c) 1998 Julian Smart, Robert Roebling',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_logica_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_logica_v1_0-Logica_v.0')
+    def test_logica_v1_0(self):
+        test_file = self.get_test_loc('copyrights/logica_v1_0-Logica_v.0')
         expected = [
             'Copyright (c) 1996-2001 Logica Mobile Networks Limited',
             'Copyright (c) 1996-2001 Logica Mobile Networks Limited',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_luxi_fonts(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_luxi_fonts-Luxi_fonts')
+    def test_luxi_fonts(self):
+        test_file = self.get_test_loc('copyrights/luxi_fonts-Luxi_fonts')
         expected = [
             'copyright (c) 2001 by Bigelow & Holmes Inc.',
             'copyright (c) 2001 by URW++ GmbH.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_maia(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_maia-Maia')
+    def test_maia(self):
+        test_file = self.get_test_loc('copyrights/maia-Maia')
         expected = [
             'Copyright 2004 by Robert LeBlanc',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_adobeglyph(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_adobeglyph-MIT_AdobeGlyph')
+    def test_mit_adobeglyph(self):
+        test_file = self.get_test_loc('copyrights/mit_adobeglyph-MIT_AdobeGlyph')
         expected = [
             'Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_cmu(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_cmu-MIT_CMU')
+    def test_mit_cmu(self):
+        test_file = self.get_test_loc('copyrights/mit_cmu-MIT_CMU')
         expected = [
             'Copyright 1989, 1991, 1992 by Carnegie Mellon University',
             'Copyright 1996, 1998-2000 The Regents of the University of California',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_danse(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_danse-MIT_danse')
-        expected = [
-            'Copyright (c) 2009 California Institute of Technology.',
-        ]
-        check_detection(expected, test_file)
-
-    def test_copyright_license_text_mit_enna(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_enna-MIT_enna')
+    def test_mit_enna(self):
+        test_file = self.get_test_loc('copyrights/mit_enna-MIT_enna')
         expected = [
             'Copyright (c) 2000 Carsten Haitzler',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_hylafax(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_hylafax-MIT_hylafax')
+    def test_mit_hylafax(self):
+        test_file = self.get_test_loc('copyrights/mit_hylafax-MIT_hylafax')
         expected = [
             'Copyright (c) 1990-1996 Sam Leffler',
             'Copyright (c) 1991-1996 Silicon Graphics, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_icu(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_icu-MIT_ICU')
+    def test_mit_icu(self):
+        test_file = self.get_test_loc('copyrights/mit_icu-MIT_ICU')
         expected = [
             'Copyright (c) 1995-2006 International Business Machines Corporation and others',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_lucent(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_lucent-MIT_Lucent')
+    def test_mit_lucent(self):
+        test_file = self.get_test_loc('copyrights/mit_lucent-MIT_Lucent')
         expected = [
             'Copyright (c) 1989-1998 by Lucent Technologies',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_mlton(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_mlton-MIT_MLton')
+    def test_mit_mlton(self):
+        test_file = self.get_test_loc('copyrights/mit_mlton-MIT_MLton')
         expected = [
             'Copyright (c) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh Jagannathan, and Stephen Weeks.',
             'Copyright (c) 1997-2000 by the NEC Research',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_oldstyle_disclaimer4(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer')
+    def test_mit_oldstyle_disclaimer4(self):
+        test_file = self.get_test_loc('copyrights/mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer')
         expected = [
             'Copyright (c) 2001, 2002, 2003, 2004, 2005 by The Regents of the University of California.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_unicode(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_unicode-MIT_unicode')
+    def test_mit_unicode(self):
+        test_file = self.get_test_loc('copyrights/mit_unicode-MIT_unicode')
         expected = [
             'Copyright (c) 1991-2005 Unicode, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mit_wordnet(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mit_wordnet-MIT_WordNet')
+    def test_mit_wordnet(self):
+        test_file = self.get_test_loc('copyrights/mit_wordnet-MIT_WordNet')
         expected = [
             'Copyright 2006 by Princeton University.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mitre(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mitre-MITRE')
+    def test_mitre(self):
+        test_file = self.get_test_loc('copyrights/mitre-MITRE')
         expected = [
             'Copyright (c) 1994-1999. The MITRE Corporation',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ms_pl(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ms_pl-Ms_PL')
+    def test_ms_pl(self):
+        test_file = self.get_test_loc('copyrights/ms_pl-Ms_PL')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ms_rl(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ms_rl-Ms_RL')
+    def test_ms_rl(self):
+        test_file = self.get_test_loc('copyrights/ms_rl-Ms_RL')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ms_rsl(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ms_rsl-Ms_RSL')
+    def test_ms_rsl(self):
+        test_file = self.get_test_loc('copyrights/ms_rsl-Ms_RSL')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_msntp(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_msntp-MSNTP')
+    def test_msntp(self):
+        test_file = self.get_test_loc('copyrights/msntp-MSNTP')
         expected = [
             '(c) Copyright, University of Cambridge, 1996, 1997, 2000',
             '(c) Copyright University of Cambridge.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_mysql_gplexception(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_mysql_gplexception-MySQL_gplexception')
+    def test_mysql_gplexception(self):
+        test_file = self.get_test_loc('copyrights/mysql_gplexception-MySQL_gplexception')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_naumen(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_naumen-Naumen')
+    def test_naumen(self):
+        test_file = self.get_test_loc('copyrights/naumen-Naumen')
         expected = [
             'Copyright (c) NAUMEN (tm) and Contributors.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_netcomponents(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_netcomponents-NetComponents')
+    def test_netcomponents(self):
+        test_file = self.get_test_loc('copyrights/netcomponents-NetComponents')
         expected = [
             'Copyright (c) 1996-1999 Daniel F. Savarese.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_nethack(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_nethack-Nethack')
+    def test_nethack(self):
+        test_file = self.get_test_loc('copyrights/nethack-Nethack')
         expected = [
             'Copyright (c) 1989 M. Stephenson',
             'copyright 1988 Richard M. Stallman',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_nokia(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_nokia-Nokia')
+    def test_nokia(self):
+        test_file = self.get_test_loc('copyrights/nokia-Nokia')
         expected = [
             'Copyright (c) Nokia and others.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_npl_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_npl_v1_0-NPL_v.0')
+    def test_npl_v1_0(self):
+        test_file = self.get_test_loc('copyrights/npl_v1_0-NPL_v.0')
         expected = [
             'Copyright (c) 1998 Netscape Communications Corporation.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_nvidia_source(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_nvidia_source-Nvidia_source')
+    def test_nvidia_source(self):
+        test_file = self.get_test_loc('copyrights/nvidia_source-Nvidia_source')
         expected = [
             'Copyright (c) 1996-1998 NVIDIA, Corp.',
             'Copyright (c) 1996-1998 NVIDIA, Corp.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_oclc_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_oclc_v1_0-OCLC_v.0')
+    def test_oclc_v1_0(self):
+        test_file = self.get_test_loc('copyrights/oclc_v1_0-OCLC_v.0')
         expected = [
             'Copyright (c) 2000. OCLC Research.',
             'Copyright (c) 2000- (insert then current year) OCLC OCLC Research and others.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_oclc_v2_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_oclc_v2_0-OCLC_v.0')
+    def test_oclc_v2_0(self):
+        test_file = self.get_test_loc('copyrights/oclc_v2_0-OCLC_v.0')
         expected = [
             'Copyright (c) 2002. OCLC Research.',
             'Copyright (c) 2000- (insert then current year) OCLC Online Computer Library Center, Inc. and other contributors.',
@@ -2476,124 +2460,131 @@ def test_copyright_license_text_oclc_v2_0(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_openldap(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_openldap-OpenLDAP')
+    def test_openldap(self):
+        test_file = self.get_test_loc('copyrights/openldap-OpenLDAP')
         expected = [
             'Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, California',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_openmotif(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_openmotif-OpenMotif')
+    def test_openmotif(self):
+        test_file = self.get_test_loc('copyrights/openmotif-OpenMotif')
         expected = [
             'Copyright (c) date here, The Open Group Ltd. and others.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_openpbs(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_openpbs-OpenPBS')
+    def test_openpbs(self):
+        test_file = self.get_test_loc('copyrights/openpbs-OpenPBS')
         expected = [
             'Copyright (c) 1999-2000 Veridian Information Solutions, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_openpublicationref(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_openpublicationref-OpenPublicationref')
+    def test_openpublicationref(self):
+        test_file = self.get_test_loc('copyrights/openpublicationref-OpenPublicationref')
         expected = [
             'Copyright (c) 2000 by ThisOldHouse.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_openssl(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_openssl-OpenSSL')
+    def test_openssl_c(self):
+        test_file = self.get_test_loc('copyrights/openssl-c.c')
+        expected = [
+            'Copyright (c) 1995-1997 Eric Young (eay@mincom.oz.au)',
+        ]
+        check_detection(expected, test_file)
+
+    def test_openssl(self):
+        test_file = self.get_test_loc('copyrights/openssl-OpenSSL')
         expected = [
             'Copyright (c) 1998-2000 The OpenSSL Project.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_osl_v3_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_osl_v3_0-OSL_v.0')
+    def test_osl_v3_0(self):
+        test_file = self.get_test_loc('copyrights/osl_v3_0-OSL_v.0')
         expected = [
             'Copyright (c) 2005 Lawrence Rosen.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_phorum(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_phorum-Phorum')
+    def test_phorum(self):
+        test_file = self.get_test_loc('copyrights/phorum-Phorum')
         expected = [
             'Copyright (c) 2001 The Phorum Development Team.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_pine(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_pine-Pine')
+    def test_pine(self):
+        test_file = self.get_test_loc('copyrights/pine-Pine')
         expected = [
             'Copyright 1989-2007 by the University of Washington.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_python_v1_6(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_python_v1_6-Python_v.6')
+    def test_python_v1_6(self):
+        test_file = self.get_test_loc('copyrights/python_v1_6-Python_v.6')
         expected = [
             'Copyright (c) 1995-2000 Corporation for National Research Initiatives',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_python_v1_6_1(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_python_v1_6_1-Python_v.1')
+    def test_python_v1_6_1(self):
+        test_file = self.get_test_loc('copyrights/python_v1_6_1-Python_v.1')
         expected = [
             'Copyright 1995-2001 Corporation for National Research Initiatives',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_python_v2(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_python_v2-Python_v')
+    def test_python_v2(self):
+        test_file = self.get_test_loc('copyrights/python_v2-Python_v')
         expected = [
             'Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation',
             'Copyright (c) 1995-2001 Corporation for National Research Initiatives',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_qpl_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_qpl_v1_0-QPL_v.0')
+    def test_qpl_v1_0(self):
+        test_file = self.get_test_loc('copyrights/qpl_v1_0-QPL_v.0')
         expected = [
             'Copyright (c) 1999 Trolltech AS',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_realcsl_v2_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_realcsl_v2_0-RealCSL_v.0')
+    def test_realcsl_v2_0(self):
+        test_file = self.get_test_loc('copyrights/realcsl_v2_0-RealCSL_v.0')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_realpsl_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_realpsl_v1_0-RealPSL_v.0')
+    def test_realpsl_v1_0(self):
+        test_file = self.get_test_loc('copyrights/realpsl_v1_0-RealPSL_v.0')
         expected = [
             'Copyright (c) 1995-2002 RealNetworks, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_realpsl_v1_0ref(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_realpsl_v1_0ref-RealPSL_v_ref.0ref')
+    def test_realpsl_v1_0ref(self):
+        test_file = self.get_test_loc('copyrights/realpsl_v1_0ref-RealPSL_v_ref.0ref')
         expected = [
             'Copyright (c) 1995-2004 RealNetworks, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_reciprocal_v1_5(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_reciprocal_v1_5-Reciprocal_v.5')
+    def test_reciprocal_v1_5(self):
+        test_file = self.get_test_loc('copyrights/reciprocal_v1_5-Reciprocal_v.5')
         expected = [
             'Copyright (c) 2001-2007 Technical Pursuit Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_redhateula(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_redhateula-RedHatEULA')
+    def test_redhateula(self):
+        test_file = self.get_test_loc('copyrights/redhateula-RedHatEULA')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_redhatref(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_redhatref-RedHatref')
+    def test_redhatref(self):
+        test_file = self.get_test_loc('copyrights/redhatref-RedHatref')
         expected = [
             'Copyright (c) 2005 Red Hat, Inc.',
             'Copyright (c) 1995-2005 Red Hat, Inc. and others.',
@@ -2601,16 +2592,16 @@ def test_copyright_license_text_redhatref(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_ricoh_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_ricoh_v1_0-Ricoh_v.0')
+    def test_ricoh_v1_0(self):
+        test_file = self.get_test_loc('copyrights/ricoh_v1_0-Ricoh_v.0')
         expected = [
             'Ricoh Silicon Valley, Inc. are Copyright (c) 1995-1999.',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_license_text_scilab(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_scilab-Scilab')
+    def test_scilab(self):
+        test_file = self.get_test_loc('copyrights/scilab-Scilab')
         expected = [
             'Scilab (c) INRIA-ENPC.',
             'Scilab (c) INRIA-ENPC.',
@@ -2622,79 +2613,79 @@ def test_copyright_license_text_scilab(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_sgi_cid_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_sgi_cid_v1_0-SGI_CID_v.0')
+    def test_sgi_cid_v1_0(self):
+        test_file = self.get_test_loc('copyrights/sgi_cid_v1_0-SGI_CID_v.0')
         expected = [
             'Copyright (c) 1994-1999 Silicon Graphics, Inc.',
             'Copyright (c) 1994-1999 Silicon Graphics, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_sgi_glx_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_sgi_glx_v1_0-SGI_GLX_v.0')
+    def test_sgi_glx_v1_0(self):
+        test_file = self.get_test_loc('copyrights/sgi_glx_v1_0-SGI_GLX_v.0')
         expected = [
             '(c) 1991-9 Silicon Graphics, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_sissl_v1_1refa(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_sissl_v1_1refa-SISSL_v_refa.1refa')
+    def test_sissl_v1_1refa(self):
+        test_file = self.get_test_loc('copyrights/sissl_v1_1refa-SISSL_v_refa.1refa')
         expected = [
             'Copyright 2000 by Sun Microsystems, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_sleepycat(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_sleepycat-Sleepycat')
+    def test_sleepycat(self):
+        test_file = self.get_test_loc('copyrights/sleepycat-Sleepycat')
         expected = [
             'Copyright (c) 1990-1999 Sleepycat Software.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_sybaseopenwatcom_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0')
+    def test_sybaseopenwatcom_v1_0(self):
+        test_file = self.get_test_loc('copyrights/sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0')
         expected = [
             'Portions Copyright (c) 1983-2002 Sybase, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_uofu_rfpl(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_uofu_rfpl-UofU_RFPL')
+    def test_uofu_rfpl(self):
+        test_file = self.get_test_loc('copyrights/uofu_rfpl-UofU_RFPL')
         expected = [
             'Copyright (c) 2001, 1998 University of Utah.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_vovida_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_vovida_v1_0-Vovida_v.0')
+    def test_vovida_v1_0(self):
+        test_file = self.get_test_loc('copyrights/vovida_v1_0-Vovida_v.0')
         expected = [
             'Copyright (c) 2000 Vovida Networks, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_wtfpl(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_wtfpl-WTFPL')
+    def test_wtfpl(self):
+        test_file = self.get_test_loc('copyrights/wtfpl-WTFPL')
         expected = [
             'Copyright (c) 2004 Sam Hocevar',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_x_net(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_x_net-X_Net.Net')
+    def test_x_net(self):
+        test_file = self.get_test_loc('copyrights/x_net-X_Net.Net')
         expected = [
             'Copyright (c) 2000-2001 X.Net, Inc. Lafayette, California',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_zend(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_zend-Zend')
+    def test_zend(self):
+        test_file = self.get_test_loc('copyrights/zend-Zend')
         expected = [
             'Copyright (c) 1999-2002 Zend Technologies Ltd.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_zliback(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_zliback-zLibAck')
+    def test_zliback(self):
+        test_file = self.get_test_loc('copyrights/zliback-zLibAck')
         expected = [
             'Portions Copyright (c) 2002-2007 Charlie Poole',
             'Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov',
@@ -2702,110 +2693,117 @@ def test_copyright_license_text_zliback(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_zope_v1_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_zope_v1_0-Zope_v.0')
+    def test_zope_v1_0(self):
+        test_file = self.get_test_loc('copyrights/zope_v1_0-Zope_v.0')
         expected = [
             'Copyright (c) Digital Creations.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_license_text_zope_v2_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_license_text_zope_v2_0-Zope_v.0')
+    def test_zope_v2_0(self):
+        test_file = self.get_test_loc('copyrights/zope_v2_0-Zope_v.0')
         expected = [
             'Copyright (c) Zope Corporation (tm) and Contributors.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_linux_source_2_6_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_linux_source_2_6_copyright-linux_source__copyright.copyright')
+    def test_linux_source_2_6(self):
+        test_file = self.get_test_loc('copyrights/linux_source_2_6-linux_source.copyright')
         expected = [
             'copyrighted by Linus Torvalds and others.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_loss_of_holder_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_loss_of_holder_c-c.c')
+    def test_loss_of_holder_c(self):
+        test_file = self.get_test_loc('copyrights/loss_of_holder_c-c.c')
         expected = [
             'COPYRIGHT (c) DIONYSOS 2006 - 2009',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_matroska_demux1_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_matroska_demux1_c-matroska_demux_c.c')
+    def test_matroska_demux1_c(self):
+        test_file = self.get_test_loc('copyrights/matroska_demux1_c-matroska_demux_c.c')
         expected = [
             '(c) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>',
             '(c) 2011 Debarshi Ray <rishi@gnu.org>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_matroska_demux_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_matroska_demux_c-matroska_demux_c.c')
+    def test_matroska_demux_c(self):
+        test_file = self.get_test_loc('copyrights/matroska_demux_c-matroska_demux_c.c')
         expected = [
             '(c) 2006 Tim-Philipp Muller',
             '(c) 2008 Sebastian Droge <slomo@circular-chaos.org>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_matroska_demux_muller_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_matroska_demux_muller_c-matroska_demux_c.c')
+    def test_matroska_demux_muller_c(self):
+        test_file = self.get_test_loc('copyrights/matroska_demux_muller_c-matroska_demux_c.c')
         expected = [
             '(c) 2006 Tim-Philipp Muller',
             '(c) 2008 Sebastian Droge <slomo@circular-chaos.org>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_memcmp_assembly(self):
-        test_file = self.get_test_loc('copyrights/copyright_memcmp_assembly-9_9_memcmp_S.S')
+    def test_memcmp_assembly(self):
+        test_file = self.get_test_loc('copyrights/memcmp_assembly-9_9_memcmp_S.S')
         expected = [
             'Copyright (c) 2007 ARC International (UK) LTD',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_mergesort_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_mergesort_java-MergeSort_java.java')
+    def test_mergesort_java(self):
+        test_file = self.get_test_loc('copyrights/mergesort_java-MergeSort_java.java')
         expected = [
             'Copyright (c) 1998 Sun Microsystems, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_michal_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_michal_txt.txt')
+    def test_michal_txt(self):
+        test_file = self.get_test_loc('copyrights/michal_txt.txt')
         expected = [
             'copyright 2005 Michal Migurski',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_mips1_be_elf_hal_o_uu(self):
-        test_file = self.get_test_loc('copyrights/copyright_mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu')
+    def test_mips1_be_elf_hal_o_uu(self):
+        test_file = self.get_test_loc('copyrights/mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu')
         expected = [
             'Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_missing_statement_file_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_missing_statement_file_txt-file.txt')
+    def test_missing_statement_file_txt(self):
+        test_file = self.get_test_loc('copyrights/missing_statement_file_txt-file.txt')
         expected = [
             'Copyright 2003-2009 The Apache Geronimo development community',
             'Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_mit(self):
-        test_file = self.get_test_loc('copyrights/copyright_mit.txt')
+    def test_mit(self):
+        test_file = self.get_test_loc('copyrights/mit.txt')
         expected = [
             'Copyright 2010-2011 by MitSomething',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_mit_danse(self):
-        test_file = self.get_test_loc('copyrights/copyright_mit_danse-MIT_Danse')
+    def test_mit_danse(self):
+        test_file = self.get_test_loc('copyrights/mit_danse-MIT_danse')
         expected = [
             'Copyright (c) 2009 California Institute of Technology.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_mixedcaps_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_mixedcaps_c-mixedcaps_c.c')
+    def test_mit_danse2(self):
+        test_file = self.get_test_loc('copyrights/mit_danse-MIT_Danse')
+        expected = [
+            'Copyright (c) 2009 California Institute of Technology.',
+        ]
+        check_detection(expected, test_file)
+
+    def test_mixedcaps_c(self):
+        test_file = self.get_test_loc('copyrights/mixedcaps_c-mixedcaps_c.c')
         expected = [
             'COPYRIGHT (c) 2006 MyCompany2 MYCOP',
             'copyright (c) 2006 MyCompany2 MYCOP',
@@ -2828,15 +2826,15 @@ def test_copyright_mixedcaps_c(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_mixedcase_company_name_in_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_mixedcase_company_name_in_c-lowercase_company_c.c')
+    def test_mixedcase_company_name_in_c(self):
+        test_file = self.get_test_loc('copyrights/mixedcase_company_name_in_c-lowercase_company_c.c')
         expected = [
             'Copyright (c) 2001 nexB',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_mkisofs_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_mkisofs_copyright-mkisofs_copyright.copyright')
+    def test_mkisofs(self):
+        test_file = self.get_test_loc('copyrights/mkisofs-mkisofs.copyright')
         expected = [
             'Copyright 1998-2003 Heiko Eissfeldt',
             '(c) Peter Widow',
@@ -2853,37 +2851,37 @@ def test_copyright_mkisofs_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_moto_broad(self):
-        test_file = self.get_test_loc('copyrights/copyright_moto_broad-c.c')
+    def test_moto_broad(self):
+        test_file = self.get_test_loc('copyrights/moto_broad-c.c')
         expected = [
             'COPYRIGHT (c) 2005 MOTOROLA, BROADBAND COMMUNICATIONS SECTOR',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_motorola_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_motorola_c-c.c')
+    def test_motorola_c(self):
+        test_file = self.get_test_loc('copyrights/motorola_c-c.c')
         expected = [
             'Copyright (c) 2003, 2010 Motorola, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_motorola_mobility_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_motorola_mobility_c-c.c')
+    def test_motorola_mobility_c(self):
+        test_file = self.get_test_loc('copyrights/motorola_mobility_c-c.c')
         expected = [
             'Copyright (c) 2009 Motorola, Inc.',
             'Copyright (c) 2011 Motorola Mobility, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_mplayer_skin_blue_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_mplayer_skin_blue_copyright-mplayer_skin_blue_copyright.copyright')
+    def test_mplayer_skin_blue(self):
+        test_file = self.get_test_loc('copyrights/mplayer_skin_blue-mplayer_skin_blue.copyright')
         expected = [
             'Copyright (c) 2005-06 Franciszek Wilamowski, xenomorph@irc.pl',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_muller(self):
-        test_file = self.get_test_loc('copyrights/copyright_muller-c.c')
+    def test_muller(self):
+        test_file = self.get_test_loc('copyrights/muller-c.c')
         expected = [
             '(c) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>',
             '(c) 2006 Tim-Philipp Muller',
@@ -2892,8 +2890,8 @@ def test_copyright_muller(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_multiline(self):
-        test_file = self.get_test_loc('copyrights/copyright_multiline-Historical.txt')
+    def test_multiline(self):
+        test_file = self.get_test_loc('copyrights/multiline-Historical.txt')
         expected = [
             'COPYRIGHT (c) 1990-1994 BY GEORGE J. CARRETTE, CONCORD, MASSACHUSETTS.',
         ]
@@ -2901,114 +2899,114 @@ def test_copyright_multiline(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_multiline_george(self):
-        test_file = self.get_test_loc('copyrights/copyright_multiline_george-Historical.txt')
+    def test_multiline_george(self):
+        test_file = self.get_test_loc('copyrights/multiline_george-Historical.txt')
         expected = [
             'COPYRIGHT (c) 1990-1994 BY GEORGE',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_mycorp_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_mycorp_c-c.c')
+    def test_mycorp_c(self):
+        test_file = self.get_test_loc('copyrights/mycorp_c-c.c')
         expected = [
             'Copyright (c) 2012 MyCorp Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_name_before_copyright_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_name_before_copyright_c-c.c')
+    def test_name_before_c(self):
+        test_file = self.get_test_loc('copyrights/name_before_c-c.c')
         expected = [
             'Russ Dill <Russ.Dill@asu.edu> 2001-2003',
             'Vladimir Oleynik <dzo@simtreas.ru> (c) 2003'
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_name_sign_year(self):
-        test_file = self.get_test_loc('copyrights/copyright_name_sign_year_correct-c.c')
+    def test_name_sign_year(self):
+        test_file = self.get_test_loc('copyrights/name_sign_year_correct-c.c')
         expected = [
             'Copyright (c) 2008 Daisy Ltd. http://www.daisy.com',
             'Daisy (c) 1997 - 2008',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_naumen_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_naumen_txt.txt')
+    def test_naumen_txt(self):
+        test_file = self.get_test_loc('copyrights/naumen_txt.txt')
         expected = [
             'Copyright (c) NAUMEN (tm) and Contributors.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ncurses_bin_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_ncurses_bin_copyright-ncurses_bin_copyright.copyright')
+    def test_ncurses_bin(self):
+        test_file = self.get_test_loc('copyrights/ncurses_bin-ncurses_bin.copyright')
         expected = [
             'Copyright (c) 1998 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_nederlof(self):
-        test_file = self.get_test_loc('copyrights/copyright_nederlof.txt')
+    def test_nederlof(self):
+        test_file = self.get_test_loc('copyrights/nederlof.txt')
         expected = [
             '(c) 2005 - Peter Nederlof',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_trailing_copyleft(self):
-        test_file = self.get_test_loc('copyrights/copyright_trailing_copyleft.txt')
+    def test_trailing_copyleft(self):
+        test_file = self.get_test_loc('copyrights/trailing_copyleft.txt')
         expected = [
             'Copyright (c) 1992 Ronald S. Karr',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_no_copyright_in_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_no_copyright_in_c-c.c')
+    def test_no_c(self):
+        test_file = self.get_test_loc('copyrights/no_c-c.c')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_no_copyright_in_class_file_2(self):
-        test_file = self.get_test_loc('copyrights/copyright_no_copyright_in_class_file_2-PersistentElementHolder_class.class')
+    def test_no_class_file_2(self):
+        test_file = self.get_test_loc('copyrights/no_class_file_2-PersistentElementHolder_class.class')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_no_copyright_in_class_file_3(self):
-        test_file = self.get_test_loc('copyrights/copyright_no_copyright_in_class_file_3-PersistentIndexedElementHolder_class.class')
+    def test_no_class_file_3(self):
+        test_file = self.get_test_loc('copyrights/no_class_file_3-PersistentIndexedElementHolder_class.class')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_no_copyright_in_class_file_4(self):
-        test_file = self.get_test_loc('copyrights/copyright_no_copyright_in_class_file_4-PersistentListElementHolder_class.class')
+    def test_no_class_file_4(self):
+        test_file = self.get_test_loc('copyrights/no_class_file_4-PersistentListElementHolder_class.class')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_no_holder_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_no_holder_java-java.java')
+    def test_no_holder_java(self):
+        test_file = self.get_test_loc('copyrights/no_holder_java-java.java')
         expected = [
             'Copyright (c) 2005',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_nokia_cpp(self):
-        test_file = self.get_test_loc('copyrights/copyright_nokia_cpp-cpp.cpp')
+    def test_nokia_cpp(self):
+        test_file = self.get_test_loc('copyrights/nokia_cpp-cpp.cpp')
         expected = [
             'Copyright (c) 2002, Nokia Mobile Phones.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_north_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_north_c-99_c.c')
+    def test_north_c(self):
+        test_file = self.get_test_loc('copyrights/north_c-99_c.c')
         expected = [
             'Copyright (c) 2010 42North Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_notice2(self):
-        test_file = self.get_test_loc('copyrights/copyright_notice2-9_NOTICE')
+    def test_notice2(self):
+        test_file = self.get_test_loc('copyrights/notice2-9_NOTICE')
         expected = [
             'Copyright 2003-2009 The Apache Geronimo development community',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_notice2_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_notice2_txt-NOTICE.txt')
+    def test_notice2_txt(self):
+        test_file = self.get_test_loc('copyrights/notice2_txt-NOTICE.txt')
         expected = [
             'Copyright (c) 2004, Richard S. Hall',
             'Copyright (c) 2002,2003, Stefan Haustein, Oberhausen',
@@ -3017,15 +3015,15 @@ def test_copyright_notice2_txt(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_notice_name_before_statement(self):
-        test_file = self.get_test_loc('copyrights/copyright_notice_name_before_statement-NOTICE')
+    def test_notice_name_before_statement(self):
+        test_file = self.get_test_loc('copyrights/notice_name_before_statement-NOTICE')
         expected = [
             'at iClick, Inc., software copyright (c) 1999.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_notice_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_notice_txt-NOTICE.txt')
+    def test_notice_txt(self):
+        test_file = self.get_test_loc('copyrights/notice_txt-NOTICE.txt')
         expected = [
             'Copyright 2003-2010 The Knopflerfish Project http://www.knopflerfish.org',
             'Copyright (c) OSGi Alliance (2000, 2009).',
@@ -3042,15 +3040,15 @@ def test_copyright_notice_txt(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_o_brien_style_name(self):
-        test_file = self.get_test_loc('copyrights/copyright_o_brien_style_name.txt')
+    def test_o_brien_style_name(self):
+        test_file = self.get_test_loc('copyrights/o_brien_style_name.txt')
         expected = [
             "Copyright (c) 2001-2003, Patrick K. O'Brien",
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_oberhummer_c_code(self):
-        test_file = self.get_test_loc('copyrights/copyright_oberhummer_c_code-c.c')
+    def test_oberhummer_c_code(self):
+        test_file = self.get_test_loc('copyrights/oberhummer_c_code-c.c')
         expected = [
             'Copyright (c) 2005 Markus Franz Xaver Johannes Oberhumer',
             'Copyright (c) 2004 Markus Franz Xaver Johannes Oberhumer',
@@ -3065,8 +3063,8 @@ def test_copyright_oberhummer_c_code(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_oberhummer_text(self):
-        test_file = self.get_test_loc('copyrights/copyright_oberhummer_text.txt')
+    def test_oberhummer_text(self):
+        test_file = self.get_test_loc('copyrights/oberhummer_text.txt')
         expected = [
             'Copyright (c) 2005 Markus Franz Xaver Johannes Oberhumer',
             'Copyright (c) 2004 Markus Franz Xaver Johannes Oberhumer',
@@ -3081,23 +3079,23 @@ def test_copyright_oberhummer_text(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_objectivec(self):
-        test_file = self.get_test_loc('copyrights/copyright_objectivec-objectiveC_m.m')
+    def test_objectivec(self):
+        test_file = self.get_test_loc('copyrights/objectivec-objectiveC_m.m')
         expected = [
             'Copyright (c) 2009 ABC',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_openhackware_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_openhackware_copyright_label-openhackware_copyright_label.label')
+    def test_openhackware(self):
+        test_file = self.get_test_loc('copyrights/openhackware-openhackware.label')
         expected = [
             'Copyright (c) 2004-2005 Jocelyn Mayer <l_indien@magic.fr>',
             'Copyright (c) 2004-2005 Fabrice Bellard',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_openoffice_org_report_builder_bin_copyright(self):
-        test_file = self.get_test_loc('copyrights/openoffice_org_report_builder_bin_copyright.copyright')
+    def test_openoffice_org_report_builder_bin(self):
+        test_file = self.get_test_loc('copyrights/openoffice_org_report_builder_bin.copyright')
         expected = [
             'Copyright (c) 2002-2009 Software in the Public Interest, Inc.',
             'Copyright (c) 2002-2009 ooo-build/Go-OO Team',
@@ -3251,23 +3249,16 @@ def test_copyright_openoffice_org_report_builder_bin_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_openoffice_org_report_builder_bin_copyright2(self):
-        test_file = self.get_test_loc('copyrights/copyright_openoffice_org_report_builder_bin_copyright2-openoffice_org_report_builder_bin_copyright.copyright2')
+    def test_openoffice_org_report_builder_bin_2(self):
+        test_file = self.get_test_loc('copyrights/openoffice_org_report_builder_bin_2-openoffice_org_report_builder_bin.copyright2')
         expected = [
             'Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of California',
             'Copyright (c) 1995, 1996 The President and Fellows of Harvard University',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_openssl(self):
-        test_file = self.get_test_loc('copyrights/copyright_openssl-c.c')
-        expected = [
-            'Copyright (c) 1995-1997 Eric Young (eay@mincom.oz.au)',
-        ]
-        check_detection(expected, test_file)
-
-    def test_copyright_partial_detection(self):
-        test_file = self.get_test_loc('copyrights/copyright_partial_detection.txt')
+    def test_partial_detection(self):
+        test_file = self.get_test_loc('copyrights/partial_detection.txt')
         expected = [
             'Copyright 1991 by the Massachusetts Institute of Technology',
             'Copyright (c) 2001 AT&T',
@@ -3287,8 +3278,8 @@ def test_copyright_partial_detection(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_partial_detection_mit(self):
-        test_file = self.get_test_loc('copyrights/copyright_partial_detection_mit.txt')
+    def test_partial_detection_mit(self):
+        test_file = self.get_test_loc('copyrights/partial_detection_mit.txt')
         expected = [
             'Copyright 1991 by the Massachusetts Institute of Technology',
             'Copyright (c) 2001 AT&T',
@@ -3308,8 +3299,8 @@ def test_copyright_partial_detection_mit(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_perl_base_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_perl_base_copyright-perl_base_copyright.copyright')
+    def test_perl_base(self):
+        test_file = self.get_test_loc('copyrights/perl_base-perl_base.copyright')
         expected = [
             'Copyright 1989-2001, Larry Wall',
             'Copyright (c) 1995-2005 Jean-loup Gailly and Mark Adler',
@@ -3323,39 +3314,39 @@ def test_copyright_perl_base_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_perl_module(self):
-        test_file = self.get_test_loc('copyrights/copyright_perl_module-pm.pm')
+    def test_perl_module(self):
+        test_file = self.get_test_loc('copyrights/perl_module-pm.pm')
         expected = [
             'Copyright (c) 1995-2000 Name Surname',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_peter_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_peter_c-c.c')
+    def test_peter_c(self):
+        test_file = self.get_test_loc('copyrights/peter_c-c.c')
         expected = [
             '(c) 2005 - Peter Nederlof',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_piersol(self):
-        test_file = self.get_test_loc('copyrights/copyright_piersol-TestMatrix_D_java.java')
+    def test_piersol(self):
+        test_file = self.get_test_loc('copyrights/piersol-TestMatrix_D_java.java')
         expected = [
             'Copyright (c) 1998 Company PIERSOL Engineering Inc.',
             'Copyright (c) 1998 Company PIERSOL Engineering Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_piersol_ok(self):
-        test_file = self.get_test_loc('copyrights/copyright_piersol-TestMatrix_D_java.java')
+    def test_piersol_ok(self):
+        test_file = self.get_test_loc('copyrights/piersol-TestMatrix_D_java.java')
         expected = [
             'Copyright (c) 1998 <p> Company PIERSOL Engineering Inc.',
             'Copyright (c) 1998 <p> Company PIERSOL Engineering Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_postgresql_8_3_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_postgresql_8_3_copyright_label-postgresql__copyright_label.label')
+    def test_postgresql_8_3(self):
+        test_file = self.get_test_loc('copyrights/postgresql_8_3-postgresql.label')
         expected = [
             'Portions Copyright (c) 1996-2003, The PostgreSQL Global Development Group',
             'Portions Copyright (c) 1994, The Regents of the University of California',
@@ -3364,36 +3355,36 @@ def test_copyright_postgresql_8_3_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_prof_informatics(self):
-        test_file = self.get_test_loc('copyrights/copyright_prof_informatics.txt')
+    def test_prof_informatics(self):
+        test_file = self.get_test_loc('copyrights/prof_informatics.txt')
         expected = [
             'Professional Informatics (c) 1994',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_professional_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_professional_txt-copyright.txt')
+    def test_professional_txt(self):
+        test_file = self.get_test_loc('copyrights/professional_txt-copyright.txt')
         expected = [
             'Professional Informatics (c) 1994',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_properties(self):
-        test_file = self.get_test_loc('copyrights/copyright_properties-properties.properties')
+    def test_properties(self):
+        test_file = self.get_test_loc('copyrights/properties-properties.properties')
         expected = [
             '(c) 2004-2007 Restaurant.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_psf_in_python(self):
-        test_file = self.get_test_loc('copyrights/copyright_psf_in_python-BitVector_py.py')
+    def test_psf_in_python(self):
+        test_file = self.get_test_loc('copyrights/psf_in_python-BitVector_py.py')
         expected = [
             'copyright (c) 2008 Avinash Kak. Python Software Foundation.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_python_dateutil_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_python_dateutil_copyright-python_dateutil_copyright.copyright')
+    def test_python_dateutil(self):
+        test_file = self.get_test_loc('copyrights/python_dateutil-python_dateutil.copyright')
         expected = [
             'Copyright (c) 2001, 2002 Python Software Foundation',
             'Copyright (c) 1995-2001 Corporation for National Research Initiatives',
@@ -3401,15 +3392,15 @@ def test_copyright_python_dateutil_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_python_psyco_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_python_psyco_copyright-python_psyco_copyright.copyright')
+    def test_python_psyco(self):
+        test_file = self.get_test_loc('copyrights/python_psyco-python_psyco.copyright')
         expected = [
             'Copyright (c) 2001-2003 Armin Rigo',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_python_reportbug_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_python_reportbug_copyright_label-python_report_copyright_label.label')
+    def test_python_reportbug(self):
+        test_file = self.get_test_loc('copyrights/python_reportbug-python_report.label')
         expected = [
             'Copyright (c) 1999-2006 Chris Lawrence',
             'Copyright (c) 2008-2009 Sandro Tosi <morph@debian.org>',
@@ -3424,8 +3415,8 @@ def test_copyright_python_reportbug_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_python_software_properties_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_python_software_properties_copyright-python_software_properties_copyright.copyright')
+    def test_python_software_properties(self):
+        test_file = self.get_test_loc('copyrights/python_software_properties-python_software_properties.copyright')
         expected = [
             'Copyright 2004-2007 Canonical Ltd. 2004-2005 Michiel Sikkes 2006',
         ]
@@ -3433,24 +3424,24 @@ def test_copyright_python_software_properties_copyright(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_red_hat_openoffice_org_report_builder_bin_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_red_hat_openoffice_org_report_builder_bin_copyright-openoffice_org_report_builder_bin_copyright.copyright')
+    def test_red_hat_openoffice_org_report_builder_bin(self):
+        test_file = self.get_test_loc('copyrights/red_hat_openoffice_org_report_builder_bin-openoffice_org_report_builder_bin.copyright')
         expected = [
             'Copyright (c) 2007 Red Hat, Inc',
             'Copyright (c) 2007 Red Hat, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_regents_complex(self):
-        test_file = self.get_test_loc('copyrights/copyright_regents_complex-strtol_c.c')
+    def test_regents_complex(self):
+        test_file = self.get_test_loc('copyrights/regents_complex-strtol_c.c')
         expected = [
             'Copyright (c) 1990 The Regents of the University of California.',
         ]
         check_detection(expected, test_file)
 
     # #@expectedFailure
-    def test_copyright_regents_license(self):
-        test_file = self.get_test_loc('copyrights/copyright_regents_license-LICENSE')
+    def test_regents_license(self):
+        test_file = self.get_test_loc('copyrights/regents_license-LICENSE')
         expected = [
             'copyrighted by The Regents of the University of California.',
             'Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California.',
@@ -3458,48 +3449,48 @@ def test_copyright_regents_license(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_resig_js(self):
-        test_file = self.get_test_loc('copyrights/copyright_resig_js-js.js')
+    def test_resig_js(self):
+        test_file = self.get_test_loc('copyrights/resig_js-js.js')
         expected = [
             'Copyright (c) 2009 John Resig',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_rusty(self):
-        test_file = self.get_test_loc('copyrights/copyright_rusty.txt')
+    def test_rusty(self):
+        test_file = self.get_test_loc('copyrights/rusty.txt')
         expected = [
             '(c) Rusty Russell, IBM 2002',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_rusty_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_rusty_c-c.c')
+    def test_rusty_c(self):
+        test_file = self.get_test_loc('copyrights/rusty_c-c.c')
         expected = [
             '(c) Rusty Russell, IBM 2002',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_s_fabsl_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_s_fabsl_c-s_fabsl_c.c')
+    def test_s_fabsl_c(self):
+        test_file = self.get_test_loc('copyrights/s_fabsl_c-s_fabsl_c.c')
         expected = [
             'Copyright (c) 2003 Dag-Erling Coidan Smrgrav',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_sample_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_sample_java-java.java')
+    def test_sample_java(self):
+        test_file = self.get_test_loc('copyrights/sample_java-java.java')
         expected = [
             'Copyright (c) 2000-2007, Sample ABC Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_sample_no_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_sample_no_copyright-c.c')
+    def test_sample_no(self):
+        test_file = self.get_test_loc('copyrights/sample_no-c.c')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_seahorse_plugins(self):
-        test_file = self.get_test_loc('copyrights/copyright_seahorse_plugins-seahorse_plugins_copyright.copyright')
+    def test_seahorse_plugins(self):
+        test_file = self.get_test_loc('copyrights/seahorse_plugins-seahorse_plugins.copyright')
         expected = [
             'Copyright (c) 2004-2007 Stefan Walter',
             'Copyright (c) 2004-2006 Adam Schreiber',
@@ -3548,35 +3539,35 @@ def test_copyright_seahorse_plugins(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_simgear1_0_0_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_simgear1_0_0_copyright-simgear__copyright.copyright')
+    def test_simgear1_0_0(self):
+        test_file = self.get_test_loc('copyrights/simgear1_0_0-simgear.copyright')
         expected = [
             'Copyright (c) 1999-2000 Curtis L. Olson <curt@flightgear.org>',
             'Copyright (c) 2002-2004 Mark J. Harris',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_snippet_no_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_snippet_no_copyright')
+    def test_snippet_no(self):
+        test_file = self.get_test_loc('copyrights/snippet_no')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_snmptrapd_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_snmptrapd_c-snmptrapd_c.c')
+    def test_snmptrapd_c(self):
+        test_file = self.get_test_loc('copyrights/snmptrapd_c-snmptrapd_c.c')
         expected = [
             'Copyright 1989, 1991, 1992 by Carnegie Mellon University',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_some_co(self):
-        test_file = self.get_test_loc('copyrights/copyright_some_co-9_h.h')
+    def test_some_co(self):
+        test_file = self.get_test_loc('copyrights/some_co-9_h.h')
         expected = [
             'Copyright Some Company, inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_somefile_cpp(self):
-        test_file = self.get_test_loc('copyrights/copyright_somefile_cpp-somefile_cpp.cpp')
+    def test_somefile_cpp(self):
+        test_file = self.get_test_loc('copyrights/somefile_cpp-somefile_cpp.cpp')
         expected = [
             '(c) 2005',
             'Copyright Private Company (PC) Property of Private Company',
@@ -3584,67 +3575,67 @@ def test_copyright_somefile_cpp(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_source_auditor_projectinfo_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_source_auditor_projectinfo_java-ProjectInfo_java.java')
+    def test_source_auditor_projectinfo_java(self):
+        test_file = self.get_test_loc('copyrights/source_auditor_projectinfo_java-ProjectInfo_java.java')
         expected = [
             'Copyright (c) 2009 Source Auditor Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_stacktrace_cpp(self):
-        test_file = self.get_test_loc('copyrights/copyright_stacktrace_cpp-stacktrace_cpp.cpp')
+    def test_stacktrace_cpp(self):
+        test_file = self.get_test_loc('copyrights/stacktrace_cpp-stacktrace_cpp.cpp')
         expected = [
             'Copyright 2003, 2004 Rickard E. Faith (faith@dict.org)',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_stmicro_in_h(self):
-        test_file = self.get_test_loc('copyrights/copyright_stmicro_in_h-h.h')
+    def test_stmicro_in_h(self):
+        test_file = self.get_test_loc('copyrights/stmicro_in_h-h.h')
         expected = [
             'COPYRIGHT (c) ST-Microelectronics 1998.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_stmicro_in_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_stmicro_in_txt.txt')
+    def test_stmicro_in_txt(self):
+        test_file = self.get_test_loc('copyrights/stmicro_in_txt.txt')
         expected = [
             'COPYRIGHT (c) STMicroelectronics 2005.',
             'COPYRIGHT (c) ST-Microelectronics 1998.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_strchr_assembly(self):
-        test_file = self.get_test_loc('copyrights/copyright_strchr_assembly-9_9_strchr_S.S')
+    def test_strchr_assembly(self):
+        test_file = self.get_test_loc('copyrights/strchr_assembly-9_9_strchr_S.S')
         expected = [
             'Copyright (c) 2007 ARC International (UK) LTD',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_super_tech_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_super_tech_c-c.c')
+    def test_super_tech_c(self):
+        test_file = self.get_test_loc('copyrights/super_tech_c-c.c')
         expected = [
             'Copyright (c) $LastChangedDate$ Super Technologies Corporation, Cedar Rapids, Iowa, U.S.A.',
             'Copyright (c) 2004 Benjamin Herrenschmuidt (benh@kernel.crashing.org), IBM Corp.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_tcl_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_tcl_copyright-tcl_copyright.copyright')
+    def test_tcl(self):
+        test_file = self.get_test_loc('copyrights/tcl-tcl.copyright')
         expected = [
             'copyrighted by the Regents of the University of California , Sun Microsystems, Inc. , Scriptics Corporation',  # not found, rather complex
             'Copyright (c) 2007 Software in the Public Interest',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_tech_sys(self):
-        test_file = self.get_test_loc('copyrights/copyright_tech_sys.txt')
+    def test_tech_sys(self):
+        test_file = self.get_test_loc('copyrights/tech_sys.txt')
         expected = [
             '(c) Copyright 1985-1999 SOME TECHNOLOGY SYSTEMS',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_texinfo_tex(self):
-        test_file = self.get_test_loc('copyrights/copyright_texinfo_tex-texinfo_tex.tex')
+    def test_texinfo_tex(self):
+        test_file = self.get_test_loc('copyrights/texinfo_tex-texinfo_tex.tex')
         expected = [
             'Copyright (c) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.',
         ]
@@ -3652,32 +3643,32 @@ def test_copyright_texinfo_tex(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_texlive_lang_greek_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_texlive_lang_greek_copyright-texlive_lang_greek_copyright.copyright')
+    def test_texlive_lang_greek(self):
+        test_file = self.get_test_loc('copyrights/texlive_lang_greek-texlive_lang_greek.copyright')
         expected = [
             'Copyright 1999 2002-2006 LaTeX3 Project',
             'Copyright 2005 M. Y. Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_texlive_lang_spanish_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_texlive_lang_spanish_copyright-texlive_lang_spanish_copyright.copyright')
+    def test_texlive_lang_spanish(self):
+        test_file = self.get_test_loc('copyrights/texlive_lang_spanish-texlive_lang_spanish.copyright')
         expected = [
             'Copyright 1999 2002-2006 LaTeX3 Project',
             'Copyright 2005 M. Y. Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_texlive_lang_vietnamese_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_texlive_lang_vietnamese_copyright_label-texlive_lang_vietnamese_copyright_label.label')
+    def test_texlive_lang_vietnamese(self):
+        test_file = self.get_test_loc('copyrights/texlive_lang_vietnamese-texlive_lang_vietnamese.label')
         expected = [
             'Copyright 1999 2002-2006 LaTeX3 Project',
             'Copyright 2005 M. Y. Name',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_tfc_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_tfc_c-c.c')
+    def test_tfc_c(self):
+        test_file = self.get_test_loc('copyrights/tfc_c-c.c')
         expected = [
             'Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Traditional Food Consortium, Inc.',
             'Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Traditional Food Consortium, Inc.',
@@ -3686,23 +3677,23 @@ def test_copyright_tfc_c(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_thirdpartyproject_prop(self):
-        test_file = self.get_test_loc('copyrights/copyright_thirdpartyproject_prop-ThirdPartyProject_prop.prop')
+    def test_thirdpartyproject_prop(self):
+        test_file = self.get_test_loc('copyrights/thirdpartyproject_prop-ThirdPartyProject_prop.prop')
         expected = [
             'Copyright 2010 Google Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_trailing_For(self):
-        test_file = self.get_test_loc('copyrights/copyright_trailing_For-copyright_c.c')
+    def test_trailing_For(self):
+        test_file = self.get_test_loc('copyrights/trailing_For-c.c')
         expected = [
             'Copyright . 2008 Mycom Pany, inc.',
             'Copyright (c) 1995-2003 Jean-loup Gailly.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_trailing_name(self):
-        test_file = self.get_test_loc('copyrights/copyright_trailing_name-copyright.txt')
+    def test_trailing_name(self):
+        test_file = self.get_test_loc('copyrights/trailing_name-copyright.txt')
         expected = [
             'Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper',
         ]
@@ -3710,23 +3701,23 @@ def test_copyright_trailing_name(self):
                         expected_in_results=False,
                         results_in_expected=True)
 
-    def test_copyright_trailing_redistribution(self):
-        test_file = self.get_test_loc('copyrights/copyright_trailing_redistribution-bspatch_c.c')
+    def test_trailing_redistribution(self):
+        test_file = self.get_test_loc('copyrights/trailing_redistribution-bspatch_c.c')
         expected = [
             'Copyright (c) 2008 The Android Open Source Project',
             'Copyright 2003-2005 Colin Percival',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_transcode_doc_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_transcode_doc_copyright-transcode_doc_copyright.copyright')
+    def test_transcode_doc(self):
+        test_file = self.get_test_loc('copyrights/transcode_doc-transcode_doc.copyright')
         expected = [
             'Copyright (c) 2001 Thomas Ostreich',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_transfig_copyright_with_parts(self):
-        test_file = self.get_test_loc('copyrights/copyright_transfig_copyright_with_parts-transfig_copyright.copyright')
+    def test_transfig_with_parts(self):
+        test_file = self.get_test_loc('copyrights/transfig_with_parts-transfig.copyright')
         expected = [
             'Copyright (c) 1985-1988 Supoj Sutantavibul',
             'Copyright (c) 1991-1999 Micah Beck',
@@ -3748,50 +3739,50 @@ def test_copyright_transfig_copyright_with_parts(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_treetablemodeladapter_java(self):
-        test_file = self.get_test_loc('copyrights/copyright_treetablemodeladapter_java-TreeTableModelAdapter_java.java')
+    def test_treetablemodeladapter_java(self):
+        test_file = self.get_test_loc('copyrights/treetablemodeladapter_java-TreeTableModelAdapter_java.java')
         expected = [
             'Copyright 1997, 1998 by Sun Microsystems, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_truncated_dmv_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_truncated_dmv_c-9_c.c')
+    def test_truncated_dmv_c(self):
+        test_file = self.get_test_loc('copyrights/truncated_dmv_c-9_c.c')
         expected = [
             'Copyright (c) 1995 DMV - DigiMedia Vision',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_truncated_doe(self):
-        test_file = self.get_test_loc('copyrights/copyright_truncated_doe-c.c')
+    def test_truncated_doe(self):
+        test_file = self.get_test_loc('copyrights/truncated_doe-c.c')
         expected = [
             'Copyright (c) 2008 by John Doe',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_truncated_inria(self):
-        test_file = self.get_test_loc('copyrights/copyright_truncated_inria.txt')
+    def test_truncated_inria(self):
+        test_file = self.get_test_loc('copyrights/truncated_inria.txt')
         expected = [
             '(c) 1998-2000 (W3C) MIT, INRIA, Keio University',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_truncated_rusty(self):
-        test_file = self.get_test_loc('copyrights/copyright_truncated_rusty-c.c')
+    def test_truncated_rusty(self):
+        test_file = self.get_test_loc('copyrights/truncated_rusty-c.c')
         expected = [
             '(c) 1999-2001 Paul Rusty Russell',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_truncated_swfobject_js(self):
-        test_file = self.get_test_loc('copyrights/copyright_truncated_swfobject_js-swfobject_js.js')
+    def test_truncated_swfobject_js(self):
+        test_file = self.get_test_loc('copyrights/truncated_swfobject_js-swfobject_js.js')
         expected = [
             'Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_ttf_malayalam_fonts_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_ttf_malayalam_fonts_copyright-ttf_malayalam_fonts_copyright.copyright')
+    def test_ttf_malayalam_fonts(self):
+        test_file = self.get_test_loc('copyrights/ttf_malayalam_fonts-ttf_malayalam_fonts.copyright')
         expected = [
             'Copyright (c) Jeroen Hellingman <jehe@kabelfoon.nl> , N.V Shaji <nvshaji@yahoo.com>',
             'Copyright (c) 2004 Kevin & Siji',
@@ -3806,38 +3797,38 @@ def test_copyright_ttf_malayalam_fonts_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_tunnel_h(self):
-        test_file = self.get_test_loc('copyrights/copyright_tunnel_h-tunnel_h.h')
+    def test_tunnel_h(self):
+        test_file = self.get_test_loc('copyrights/tunnel_h-tunnel_h.h')
         expected = [
             'Copyright (c) 2000 Frank Strauss <strauss@ibr.cs.tu-bs.de>',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_two_digits_years(self):
-        test_file = self.get_test_loc('copyrights/copyright_two_digits_years-digits_c.c')
+    def test_two_digits_years(self):
+        test_file = self.get_test_loc('copyrights/two_digits_years-digits_c.c')
         expected = [
             'Copyright (c) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.',
         ]
         check_detection(expected, test_file)
 
     @expectedFailure
-    def test_copyright_url_in_html(self):
-        test_file = self.get_test_loc('copyrights/copyright_url_in_html-detail_9_html.html')
+    def test_url_in_html(self):
+        test_file = self.get_test_loc('copyrights/url_in_html-detail_9_html.html')
         expected = [
             '(c) 2004-2009 pudn.com',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_utilities_js(self):
-        test_file = self.get_test_loc('copyrights/copyright_utilities_js-utilities_js.js')
+    def test_utilities_js(self):
+        test_file = self.get_test_loc('copyrights/utilities_js-utilities_js.js')
         expected = [
             'Copyright (c) 2009, Yahoo! Inc.',
             'Copyright 2001 Robert Penner',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_var_route_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_var_route_c-var_route_c.c')
+    def test_var_route_c(self):
+        test_file = self.get_test_loc('copyrights/var_route_c-var_route_c.c')
         expected = [
             'Copyright 1988, 1989 by Carnegie Mellon University',
             'Copyright 1989 TGV, Incorporated',
@@ -3846,63 +3837,63 @@ def test_copyright_var_route_c(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_view_layout2_xml(self):
-        test_file = self.get_test_loc('copyrights/copyright_view_layout2_xml-view_layout_xml.xml')
+    def test_view_layout2_xml(self):
+        test_file = self.get_test_loc('copyrights/view_layout2_xml-view_layout_xml.xml')
         expected = [
             'Copyright (c) 2008 Esmertec AG.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_warning_parsing_empty_text(self):
-        test_file = self.get_test_loc('copyrights/copyright_warning_parsing_empty_text-controlpanel_anjuta.anjuta')
+    def test_warning_parsing_empty_text(self):
+        test_file = self.get_test_loc('copyrights/warning_parsing_empty_text-controlpanel_anjuta.anjuta')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_web_app_dtd__b_sun(self):
-        test_file = self.get_test_loc('copyrights/copyright_web_app_dtd_b_sun-web_app__dtd.dtd')
+    def test_web_app_dtd_b_sun(self):
+        test_file = self.get_test_loc('copyrights/web_app_dtd_b_sun-web_app_dtd.dtd')
         expected = [
             'Copyright 2000-2007 Sun Microsystems, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_web_app_dtd_sun_twice(self):
-        test_file = self.get_test_loc('copyrights/copyright_web_app_dtd_sun_twice-web_app__b_dtd.dtd')
+    def test_web_app_dtd_sun_twice(self):
+        test_file = self.get_test_loc('copyrights/web_app_dtd_sun_twice-web_app_b_dtd.dtd')
         expected = [
             'Copyright (c) 2000 Sun Microsystems, Inc.',
             'Copyright (c) 2000 Sun Microsystems, Inc.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_wide_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_wide_c-c.c')
+    def test_wide_c(self):
+        test_file = self.get_test_loc('copyrights/wide_c-c.c')
         expected = [
             'Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_wide_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_wide_txt.txt')
+    def test_wide_txt(self):
+        test_file = self.get_test_loc('copyrights/wide_txt.txt')
         expected = [
             'Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_with_verbatim_lf(self):
-        test_file = self.get_test_loc('copyrights/copyright_with_verbatim_lf-verbatim_lf_c.c')
+    def test_with_verbatim_lf(self):
+        test_file = self.get_test_loc('copyrights/with_verbatim_lf-verbatim_lf_c.c')
         expected = [
             'Copyright 2003-2005 Colin Percival',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_xconsortium_sh(self):
-        test_file = self.get_test_loc('copyrights/copyright_xconsortium_sh-9_sh.sh')
+    def test_xconsortium_sh(self):
+        test_file = self.get_test_loc('copyrights/xconsortium_sh-9_sh.sh')
         expected = [
             'Copyright (c) 1994 X Consortium',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_xfonts_utils_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_xfonts_utils_copyright-xfonts_utils_copyright.copyright')
+    def test_xfonts_utils(self):
+        test_file = self.get_test_loc('copyrights/xfonts_utils-xfonts_utils.copyright')
         expected = [
             'Copyright 1991, 1993, 1998 The Open Group',
             'Copyright 2005 Red Hat, Inc.',
@@ -3923,8 +3914,8 @@ def test_copyright_xfonts_utils_copyright(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_xresprobe_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_xresprobe_copyright_label-xresprobe_copyright_label.label')
+    def test_xresprobe(self):
+        test_file = self.get_test_loc('copyrights/xresprobe-xresprobe.label')
         expected = [
             'copyright (c) 2004 Canonical Software',
             'Copyright (c) 2002 Terra Soft Solutions, Inc.',
@@ -3935,51 +3926,51 @@ def test_copyright_xresprobe_copyright_label(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_xsane_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_xsane_copyright_label-xsane_copyright_label.label')
+    def test_xsane(self):
+        test_file = self.get_test_loc('copyrights/xsane-xsane.label')
         expected = [
             'Copyright (c) 1998-2005 Oliver Rauch',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_does_not_return_junk_in_pdf(self):
+    def test_does_not_return_junk_in_pdf(self):
         # from https://github.com/ttgurney/yocto-spdx/blob/master/doc/Yocto-SPDX_Manual_Install_Walkthrough.pdf
-        test_file = self.get_test_loc('copyrights/copyright_Yocto-SPDX.pdf')
+        test_file = self.get_test_loc('copyrights/Yocto-SPDX.pdf')
         expected = [
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_name_and_co(self):
-        test_file = self.get_test_loc('copyrights/copyright_nnp_and_co.txt')
+    def test_name_and_co(self):
+        test_file = self.get_test_loc('copyrights/nnp_and_co.txt')
         expected = [
             'Copyright (c) 2001, Sandra and Klaus Rennecke.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_with_ascii_art(self):
-        test_file = self.get_test_loc('copyrights/copyright_with_ascii_art.txt')
+    def test_with_ascii_art(self):
+        test_file = self.get_test_loc('copyrights/with_ascii_art.txt')
         expected = [
             'Copyright (c) 1996. The Regents of the University of California.',
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_should_not_be_detected_in_pixel_data_stream(self):
-        test_file = self.get_test_loc('copyrights/copyright_pixelstream.rgb')
+    def test_should_not_be_detected_in_pixel_data_stream(self):
+        test_file = self.get_test_loc('copyrights/pixelstream.rgb')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_should_not_contain_leading_or_trailing_colon(self):
-        test_file = self.get_test_loc('copyrights/copyright_with_colon')
+    def test_should_not_contain_leading_or_trailing_colon(self):
+        test_file = self.get_test_loc('copyrights/with_colon')
         expected = ['copyright (c) 2013 by Armin Ronacher.']
         check_detection(expected, test_file)
 
-    def test_copyright_in_markup_should_not_be_truncated(self):
-        test_file = self.get_test_loc('copyrights/copyright_in_html.html')
+    def test_markup_should_not_be_truncated(self):
+        test_file = self.get_test_loc('copyrights/html.html')
         expected = ["(c) Copyright 2010 by the <a href http://wtforms.simplecodes.com'> WTForms Team"]
         check_detection(expected, test_file)
 
-    def test_copyright_should_not_have_trailing_garbage(self):
-        test_file = self.get_test_loc('copyrights/copyright_with_trailing_words.js')
+    def test_should_not_have_trailing_garbage(self):
+        test_file = self.get_test_loc('copyrights/with_trailing_words.js')
         expected = [
             'Copyright 2012-2015 The Dojo Foundation',
             'Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters',
@@ -3992,93 +3983,93 @@ def test_copyright_should_not_have_trailing_garbage(self):
         ]
         check_detection(expected, test_file)
 
-    def test_copyright_should_not_have_trailing_available(self):
-        test_file = self.get_test_loc('copyrights/copyright_hostapd_trailing_available.c')
+    def test_should_not_have_trailing_available(self):
+        test_file = self.get_test_loc('copyrights/hostapd_trailing_available.c')
         expected = ['Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>']
         check_detection(expected, test_file)
 
-    def test_copyright_with_dots_and_all_lowercase_on_multilines(self):
+    def test_with_dots_and_all_lowercase_on_multilines(self):
         test_lines = ['Copyright . 2008 company name, inc.',
                       '  Change: Add functions', ]
         expected = ['Copyright . 2008 company name, inc.']
         check_detection(expected, test_lines)
 
-    def test_copyright_with_dots_and_all_lowercase_on_single_line(self):
+    def test_with_dots_and_all_lowercase_on_single_line(self):
         test_lines = ['Copyright . 2008 foo name, inc.']
         expected = ['Copyright . 2008 foo name, inc.']
         check_detection(expected, test_lines)
 
-    def test_copyright_copy_copy_by_name3(self):
+    def test_copy_copy_by_name3(self):
         test_lines = ['Copyright (c) by 2007  Joachim Foerster <JOFT@gmx.de>']
         expected = ['Copyright (c) by 2007 Joachim Foerster <JOFT@gmx.de>']
         check_detection(expected, test_lines)
 
-    def test_copyright_rimini(self):
+    def test_rimini(self):
         test_file = self.get_test_loc('copyrights/rimini.c')
         expected = ['(c) Copyright 2000 Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it']
         check_detection(expected, test_file)
 
-    def test_copyright_should_not_be_detected_in_apache_html(self):
-        test_file = self.get_test_loc('copyrights/copyright_apache_in_html.html')
+    def test_should_not_be_detected_in_apache_html(self):
+        test_file = self.get_test_loc('copyrights/apache_in_html.html')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_bv_legal_entity(self):
+    def test_bv_legal_entity(self):
         test_file = self.get_test_loc('copyrights/bv.txt')
         expected = ['Copyright (c) 2016 HERE Europe B.V.', '(c) HERE 2016']
         check_detection(expected, test_file)
 
-    def test_copyright_with_dash_and_dotted_name(self):
+    def test_with_dash_and_dotted_name(self):
         test_lines = ['Copyright 1999, 2000 - D.T.Shield.']
         expected = ['Copyright 1999, 2000 - D.T.Shield.']
         check_detection(expected, test_lines)
 
-    def test_copyright_with_sign_dash_and_dotted_name(self):
+    def test_with_sign_dash_and_dotted_name(self):
         test_lines = ['Copyright (c) 1999, 2000 - D.T.Shield.']
         expected = ['Copyright (c) 1999, 2000 - D.T.Shield.']
         check_detection(expected, test_lines)
 
-    def test_copyright_with_sign_year_comp_and_auth(self):
+    def test_with_sign_year_comp_and_auth(self):
         test_lines = ['Copyright (c) 2012-2016, Project contributors']
         expected = ['Copyright (c) 2012-2016, Project contributors']
         check_detection(expected, test_lines)
 
-    def test_copyright_with_year_comp_and_auth(self):
+    def test_with_year_comp_and_auth(self):
         test_lines = ['Copyright 2012-2016, Project contributors']
         expected = ['Copyright 2012-2016, Project contributors']
         check_detection(expected, test_lines)
 
-    def test_copyright_with_year_noun_junk_auth_noun_and_auth(self):
+    def test_with_year_noun_junk_auth_noun_and_auth(self):
         test_lines = ['Copyright 2007-2010 the original author or authors.']
         expected = ['Copyright 2007-2010 the original author or authors.']
         check_detection(expected, test_lines)
 
-    def test_copyright_with_sign_year_noun_junk_auth_noun_and_auth(self):
+    def test_with_sign_year_noun_junk_auth_noun_and_auth(self):
         test_lines = ['Copyright (c) 2007-2010 the original author or authors.']
         expected = ['Copyright (c) 2007-2010 the original author or authors.']
         check_detection(expected, test_lines)
 
-    def test_copyright_byten_c_exactly(self):
+    def test_byten_c_exactly(self):
         test_lines = ['... don’t fit into your fixed-size buffer.\nByten ( c )\nExactly n bytes. If the']
         expected = []
         check_detection(expected, test_lines)
 
-    def test_copyright_should_not_be_detected_in_junk_strings_with_year_prefix(self):
+    def test_should_not_be_detected_in_junk_strings_with_year_prefix(self):
         test_file = self.get_test_loc('copyrights/access_strings.txt')
         expected = []
         check_detection(expected, test_file)
 
-    def test_copyright_chromium_authors(self):
+    def test_chromium_authors(self):
         test_lines = ['© 2017 The Chromium Authors']
         expected = ['(c) 2017 The Chromium Authors']
         check_detection(expected, test_lines)
 
-    def test_copyright_rim(self):
+    def test_rim(self):
         test_lines = ['Copyright (C) Research In Motion Limited 2010. All rights reserved.']
         expected = ['Copyright (c) Research In Motion Limited 2010.']
         check_detection(expected, test_lines)
 
-    def test_copyright_sinica(self):
+    def test_sinica(self):
         test_lines = '''
             #  Copyright (c) 1999 Computer Systems and Communication Lab,
             #                    Institute of Information Science, Academia Sinica.
@@ -4089,70 +4080,70 @@ def test_copyright_sinica(self):
 
         check_detection(expected, test_lines)
 
-    def test_copyright_copr1(self):
+    def test_copr1(self):
         test_lines = ['Copyright or Copr. CNRS']
         expected = ['Copyright or Copr. CNRS']
         check_detection(expected, test_lines)
 
-    def test_copyright_copr2(self):
+    def test_copr2(self):
         test_lines = ['Copyright  or Copr. 2006 INRIA - CIRAD - INRA']
         expected = ['Copr. 2006 INRIA - CIRAD - INRA']
         check_detection(expected, test_lines)
 
     @expectedFailure
-    def test_copyright_copr2_correct(self):
+    def test_copr2_correct(self):
         test_lines = ['Copyright  or Copr. 2006 INRIA - CIRAD - INRA']
         expected = ['Copyright or Copr. 2006 INRIA - CIRAD - INRA']
         check_detection(expected, test_lines)
 
-    def test_copyright_copr3(self):
+    def test_copr3(self):
         test_lines = ['Copyright or © or Copr. SSD Research Team 2011']
         expected = ['Copr. SSD Research Team 2011']
         check_detection(expected, test_lines)
 
     @expectedFailure
-    def test_copyright_copr3_correct(self):
+    def test_copr3_correct(self):
         test_lines = ['Copyright or © or Copr. SSD Research Team 2011']
         expected = ['Copyright or (c) or Copr. SSD Research Team 2011']
         check_detection(expected, test_lines)
 
-    def test_copyright_copr4(self):
+    def test_copr4(self):
         test_lines = ["(C) Copr. 1986-92 Numerical Recipes Software i9k''3"]
         expected = ['(c) Copr. 1986-92 Numerical Recipes Software']
         check_detection(expected, test_lines)
 
-    def test_copyright_copr5(self):
+    def test_copr5(self):
         test_lines = ['Copyright or Copr. Mines Paristech, France - Mark NOBLE, Alexandrine GESRET']
         expected = ['Copr. Mines Paristech, France - Mark NOBLE']
         check_detection(expected, test_lines)
 
     @expectedFailure
-    def test_copyright_copr5_correct(self):
+    def test_copr5_correct(self):
         test_lines = ['Copyright or Copr. Mines Paristech, France - Mark NOBLE, Alexandrine GESRET']
         expected = ['Copyright or Copr. Mines Paristech, France - Mark NOBLE, Alexandrine GESRET']
         check_detection(expected, test_lines)
 
-    def test_copyright_oracle(self):
+    def test_oracle(self):
         test_lines = ['Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.']
         expected = ['Copyright (c) 1997-2015 Oracle and/or its affiliates.']
         check_detection(expected, test_lines)
 
-    def test_copyright_windows(self):
+    def test_windows(self):
         test_lines = ['This release supports NT-based Windows releases like Windows 2000 SP4, Windows XP, and Windows 2003.']
         expected = []
         check_detection(expected, test_lines)
 
-    def test_copyright_in_binary_sql_server(self):
+    def test_binary_sql_server(self):
         test_lines = ['2005charchar? 7 DDLSQL Server 2005smalldatetimedatetimeLDDDDDD7']
         expected = []
         check_detection(expected, test_lines)
 
-    def test_copyright_with_example_com_url(self):
+    def test_with_example_com_url(self):
         test_lines = ['"domain": function(c) { assert.equal(c.domain, "example.com") },']
         expected = []
         check_detection(expected, test_lines)
 
-    def test_copyright_various(self):
+    def test_various(self):
         test_lines = '''
             libwmf (<libwmf/api.h>): library for wmf conversion
             Copyright (C) 2000 - various; see CREDITS, ChangeLog, and sources
@@ -4161,7 +4152,7 @@ def test_copyright_various(self):
         expected = ['Copyright (c) 2000 - various']  # ; see CREDITS, ChangeLog, and sources
         check_detection(expected, test_lines)
 
-    def test_copyright_natural_docs(self):
+    def test_natural_docs(self):
         test_lines = '''
             // Search script generated by doxygen
             // Copyright (C) 2009 by Dimitri van Heesch.
@@ -4176,7 +4167,7 @@ def test_copyright_natural_docs(self):
         ]
         check_detection(expected, test_lines)
 
-    def test_copyright_and_authors_mixed(self):
+    def test_and_authors_mixed(self):
         test_lines = '''
              * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
              *
@@ -4192,7 +4183,7 @@ def test_copyright_and_authors_mixed(self):
         ]
         check_detection(expected, test_lines)
 
-    def test_copyright_word_in_html(self):
+    def test_word_in_html(self):
         test_lines = '''
             <td width="40%" align="left">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>
         '''.splitlines(False)
@@ -4201,7 +4192,7 @@ def test_copyright_word_in_html(self):
         ]
         check_detection(expected, test_lines)
 
-    def test_copyright_with_date_in_angle_brackets(self):
+    def test_with_date_in_angle_brackets(self):
         test_lines = '''
          * Copyright (C) <2013>, GENIVI Alliance, Inc.
          * Author: bj@open-rnd.pl
@@ -4215,7 +4206,7 @@ def test_copyright_with_date_in_angle_brackets(self):
         ]
         check_detection(expected, test_lines, what='authors')
 
-    def test_copyright_with_zoo(self):
+    def test_with_zoo(self):
         test_lines = '''
              *  Download Upload Messaging Manager
              *
@@ -4227,7 +4218,7 @@ def test_copyright_with_zoo(self):
         ]
         check_detection(expected, test_lines, what='copyrights')
 
-    def test_copyright_in_man_page(self):
+    def test_man_page(self):
         test_lines = '''COPYRIGHT
         Copyright \(co 2001-2017 Free Software Foundation, Inc., and others.
             print "Copyright \\(co ". $args{'copyright'} . ".\n";
@@ -4242,7 +4233,7 @@ def test_copyright_in_man_page(self):
         ]
         check_detection(expected, test_lines, what='holders')
 
-    def test_copyright_is_not_mixed_with_authors(self):
+    def test_is_not_mixed_with_authors(self):
         test_lines = '''
          * Copyright (C) 2000-2012 Free Software Foundation, Inc.
          * Author: Nikos Mavrogiannopoulos
@@ -4257,7 +4248,7 @@ def test_copyright_is_not_mixed_with_authors(self):
         ]
         check_detection(expected, test_lines, what='authors')
 
-    def test_ibm_copyright_and_authors_are_detected(self):
+    def test_ibm_and_authors_are_detected(self):
         test_lines = '''
          * Copyright IBM, Corp. 2007
          *
@@ -4279,7 +4270,7 @@ def test_ibm_copyright_and_authors_are_detected(self):
         ]
         check_detection(expected, test_lines, what='holders')
 
-    def test_copyright_germany(self):
+    def test_germany(self):
         test_lines = '''
          * Copyright (C) 2011
          * Bardenheuer GmbH, Munich and Bundesdruckerei GmbH, Berlin
@@ -4290,7 +4281,7 @@ def test_copyright_germany(self):
         check_detection(expected, test_lines, what='holders')
 
     @expectedFailure
-    def test_copyright_germany_should_detect_trailing_city(self):
+    def test_germany_should_detect_trailing_city(self):
         test_lines = '''
          * Copyright (C) 2011
          * Bardenheuer GmbH, Munich and Bundesdruckerei GmbH, Berlin
@@ -4300,7 +4291,7 @@ def test_copyright_germany_should_detect_trailing_city(self):
         ]
         check_detection(expected, test_lines, what='holders')
 
-    def test_copyright_does_not_detect_junk_in_texinfo(self):
+    def test_does_not_detect_junk_in_texinfo(self):
         test_lines = '''
           \DeclareUnicodeCharacter{00A8}{\"{ }}
           \DeclareUnicodeCharacter{00A9}{\copyright}
@@ -4343,7 +4334,7 @@ def test_author_does_not_report_trailing_junk_and_incorrect_authors(self):
         ]
         check_detection(expected, test_lines, what='authors')
 
-    def test_copyright_in_assembly_data(self):
+    def test_assembly_data(self):
         test_lines = '''
         [assembly: AssemblyProduct("")]
         [assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")]
@@ -4364,7 +4355,7 @@ def test_author_does_not_report_incorrect_junk(self):
         ]
         check_detection(expected, test_lines, what='authors')
 
-    def test_copyright_does_not_truncate_last_name(self):
+    def test_does_not_truncate_last_name(self):
         test_lines = '''
             /* Copyright 2014, Kenneth MacKay. Licensed under the BSD 2-clause license. */
         '''.splitlines(False)
@@ -4374,7 +4365,7 @@ def test_copyright_does_not_truncate_last_name(self):
         check_detection(expected, test_lines, what='copyrights')
 
     @expectedFailure
-    def test_copyright_with_leading_date_andtrailing_plus(self):
+    def test_with_leading_date_andtrailing_plus(self):
         test_lines = '''
         * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
           * All rights reserved.
diff --git a/tests/cluecode/test_copyrights_lines.py b/tests/cluecode/test_copyrights_lines.py
index 285798f88b6..3adc8ebe3a9 100644
--- a/tests/cluecode/test_copyrights_lines.py
+++ b/tests/cluecode/test_copyrights_lines.py
@@ -34,7 +34,7 @@ class TestCopyrightDetector(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
     def test_copyright_detect2_basic(self):
-        location = self.get_test_loc('copyrights/copyright_essential_smoke-ibm_c.c')
+        location = self.get_test_loc('copyright_lines/essential_smoke-ibm_c.c')
         expected = [
             ([u'Copyright IBM and others (c) 2008'], [], [u'2008'], [u'IBM and others'], 6, 6),
             ([u'Copyright Eclipse, IBM and others (c) 2008'], [], [u'2008'], [u'Eclipse, IBM and others'], 8, 8)
@@ -76,14 +76,14 @@ class TestCopyrightLinesDetection(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
     def test_company_name_in_java(self):
-        test_file = self.get_test_loc('copyrights/company_name_in_java-9_java.java')
+        test_file = self.get_test_loc('copyright_lines/company_name_in_java-9_java.java')
         expected = [
             ([u'Copyright (c) 2008-2011 Company Name Incorporated'], 2, 3)
         ]
         check_detection(expected, test_file)
 
     def test_copyright_03e16f6c_0(self):
-        test_file = self.get_test_loc('copyrights/copyright_03e16f6c_0-e_f_c.0')
+        test_file = self.get_test_loc('copyright_lines/03e16f6c_0-e_f_c.0')
         expected = [
             ([u'Copyright (c) 1997 Microsoft Corp., OU Microsoft Corporation, CN Microsoft Root',
               u'Copyright (c) 1997 Microsoft Corp., OU Microsoft Corporation, CN Microsoft Root'],
@@ -95,7 +95,7 @@ def test_copyright_03e16f6c_0(self):
     def test_copyright_3a3b02ce_0(self):
         # this is a certificate and the actual copyright holder is not clear:
         # could be either Wisekey or OISTE Foundation.
-        test_file = self.get_test_loc('copyrights/copyright_3a3b02ce_0-a_b_ce.0')
+        test_file = self.get_test_loc('copyright_lines/3a3b02ce_0-a_b_ce.0')
         expected = [([
                 u'Copyright (c) 2005, OU OISTE Foundation Endorsed, CN OISTE WISeKey Global Root',
                 u'Copyright (c) 2005, OU OISTE Foundation Endorsed, CN OISTE WISeKey Global Root'
@@ -105,47 +105,47 @@ def test_copyright_3a3b02ce_0(self):
         check_detection(expected, test_file)
 
     def test_copyright_boost_vector(self):
-        test_file = self.get_test_loc('copyrights/vector50.hpp')
+        test_file = self.get_test_loc('copyright_lines/vector50.hpp')
         expected = [([u'Copyright (c) 2005 Arkadiy Vertleyb', u'Copyright (c) 2005 Peder Holt'], 2, 3)]
         check_detection(expected, test_file)
 
     def test_copyright_ABC_cpp(self):
-        test_file = self.get_test_loc('copyrights/copyright_ABC_cpp-Case_cpp.cpp')
+        test_file = self.get_test_loc('copyright_lines/ABC_cpp-Case_cpp.cpp')
         expected = [([u'Copyright (c) ABC Company'], 12, 12)]
         check_detection(expected, test_file)
 
     def test_copyright_ABC_file_cpp(self):
-        test_file = self.get_test_loc('copyrights/copyright_ABC_file_cpp-File_cpp.cpp')
+        test_file = self.get_test_loc('copyright_lines/ABC_file_cpp-File_cpp.cpp')
         expected = [([u'Copyright (c) ABC Company'], 12, 12)]
         check_detection(expected, test_file)
 
     def test_copyright_heunrich_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_heunrich_c-c.c')
+        test_file = self.get_test_loc('copyright_lines/heunrich_c-c.c')
         expected = [([u'Copyright (c) 2000 HEUNRICH HERTZ INSTITUTE'], 5, 5)]
         check_detection(expected, test_file)
 
     def test_copyright_isc(self):
-        test_file = self.get_test_loc('copyrights/copyright_isc-c.c')
+        test_file = self.get_test_loc('copyright_lines/isc-c.c')
         expected = [([u'Copyright (c) 1998-2000 The Internet Software Consortium.'], 1, 3)]
         check_detection(expected, test_file)
 
     def test_copyright_sample_py(self):
-        test_file = self.get_test_loc('copyrights/copyright_sample_py-py.py')
+        test_file = self.get_test_loc('copyright_lines/sample_py-py.py')
         expected = [([u'COPYRIGHT 2006 ABC ABC'], 6, 7)]
         check_detection(expected, test_file)
 
     def test_copyright_abc(self):
-        test_file = self.get_test_loc('copyrights/copyright_abc')
+        test_file = self.get_test_loc('copyright_lines/abc')
         expected = [([u'Copyright (c) 2006 abc.org'], 1, 2)]
         check_detection(expected, test_file)
 
     def test_copyright_abc_loss_of_holder_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_abc_loss_of_holder_c-c.c')
+        test_file = self.get_test_loc('copyright_lines/abc_loss_of_holder_c-c.c')
         expected = [([u'copyright abc 2001'], 1, 2)]
         check_detection(expected, test_file)
 
     def test_copyright_abiword_common_copyright(self):
-        test_file = self.get_test_loc('copyrights/copyright_abiword_common_copyright-abiword_common_copyright.copyright')
+        test_file = self.get_test_loc('copyright_lines/abiword_common.copyright')
         expected = [
             ([u'Copyright (c) 1998- AbiSource, Inc. & Co.'], 17, 17),
              ([u'Copyright (c) 2009 Masayuki Hatta',
@@ -155,17 +155,17 @@ def test_copyright_abiword_common_copyright(self):
         check_detection(expected, test_file)
 
     def test_copyright_acme_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_acme_c-c.c')
+        test_file = self.get_test_loc('copyright_lines/acme_c-c.c')
         expected = [([u'Copyright (c) 2000 ACME, Inc.'], 1, 1)]
         check_detection(expected, test_file)
 
     def test_copyright_activefieldattribute_cs(self):
-        test_file = self.get_test_loc('copyrights/copyright_activefieldattribute_cs-ActiveFieldAttribute_cs.cs')
+        test_file = self.get_test_loc('copyright_lines/activefieldattribute_cs-ActiveFieldAttribute_cs.cs')
         expected = [([u'Web Applications Copyright 2009 - Thomas Hansen thomas@ra-ajax.org.'], 2, 5)]
         check_detection(expected, test_file)
 
     def test_copyright_addr_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_addr_c-addr_c.c')
+        test_file = self.get_test_loc('copyright_lines/addr_c-addr_c.c')
         expected = [
             ([u'Copyright 1999 Cornell University.'], 2, 4),
             ([u'Copyright 2000 Jon Doe.'], 5, 5)
@@ -173,17 +173,17 @@ def test_copyright_addr_c(self):
         check_detection(expected, test_file)
 
     def test_copyright_adler_inflate_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_adler_inflate_c-inflate_c.c')
+        test_file = self.get_test_loc('copyright_lines/adler_inflate_c-inflate_c.c')
         expected = [([u'Not copyrighted 1992 by Mark Adler'], 1, 2)]
         check_detection(expected, test_file)
 
     def test_copyright_aleal(self):
-        test_file = self.get_test_loc('copyrights/copyright_aleal-c.c')
+        test_file = self.get_test_loc('copyright_lines/aleal-c.c')
         expected = [([u'copyright (c) 2006 by aleal'], 2, 2)]
         check_detection(expected, test_file)
 
     def test_copyright_andre_darcy(self):
-        test_file = self.get_test_loc('copyrights/copyright_andre_darcy-c.c')
+        test_file = self.get_test_loc('copyright_lines/andre_darcy-c.c')
         expected = [
             ([u'Copyright (c) 1995, Pascal Andre (andre@via.ecp.fr).'], 2, 6),
             ([u"copyright 1997, 1998, 1999 by D'Arcy J.M. Cain (darcy@druid.net)"], 25, 26)
@@ -191,7 +191,7 @@ def test_copyright_andre_darcy(self):
         check_detection(expected, test_file)
 
     def test_copyright_android_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_android_c-c.c')
+        test_file = self.get_test_loc('copyright_lines/android_c-c.c')
         expected = [
             ([u'Copyright (c) 2009 The Android Open Source Project'], 2, 2),
             ([u'Copyright 2003-2005 Colin Percival'], 23, 24)
@@ -199,7 +199,7 @@ def test_copyright_android_c(self):
         check_detection(expected, test_file)
 
     def test_copyright_apache_notice(self):
-        test_file = self.get_test_loc('copyrights/copyright_apache_notice-NOTICE')
+        test_file = self.get_test_loc('copyright_lines/apache_notice-NOTICE')
         expected = [
             ([u'Copyright 1999-2006 The Apache Software Foundation'], 6, 7),
             ([u'Copyright 1999-2006 The Apache Software Foundation'], 16, 17),
@@ -209,12 +209,12 @@ def test_copyright_apache_notice(self):
         check_detection(expected, test_file)
 
     def test_copyright_aptitude_copyright_label(self):
-        test_file = self.get_test_loc('copyrights/copyright_aptitude_copyright_label-aptitude_copyright_label.label')
+        test_file = self.get_test_loc('copyright_lines/aptitude-aptitude.label')
         expected = [([u'Copyright 1999-2005 Daniel Burrows <dburrows@debian.org>'], 1, 1)]
         check_detection(expected, test_file)
 
     def test_copyright_atheros_spanning_lines(self):
-        test_file = self.get_test_loc('copyrights/copyright_atheros_spanning_lines-py.py')
+        test_file = self.get_test_loc('copyright_lines/atheros_spanning_lines-py.py')
         expected = [
             ([u'Copyright (c) 2000 Atheros Communications, Inc.'], 2, 2),
             ([u'Copyright (c) 2001 Atheros Communications, Inc.'], 3, 3),
@@ -223,18 +223,18 @@ def test_copyright_atheros_spanning_lines(self):
         check_detection(expected, test_file)
 
     def test_copyright_att_in_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_att_in_c-9_c.c')
+        test_file = self.get_test_loc('copyright_lines/att_in_c-9_c.c')
         expected = [([u'Copyright (c) 1991 by AT&T.'], 5, 5)]
         check_detection(expected, test_file)
 
     def test_copyright_audio_c(self):
-        test_file = self.get_test_loc('copyrights/copyright_audio_c-c.c')
+        test_file = self.get_test_loc('copyright_lines/audio_c-c.c')
         expected = [([u'copyright (c) 1995, AudioCodes, DSP Group, France Telecom, Universite de Sherbrooke.'], 2, 4)]
 
         check_detection(expected, test_file)
 
     def test_copyright_babkin_txt(self):
-        test_file = self.get_test_loc('copyrights/copyright_babkin_txt.txt')
+        test_file = self.get_test_loc('copyright_lines/babkin_txt.txt')
         expected = [
             ([u'Copyright (c) North',
               u'Copyright (c) South',
@@ -245,7 +245,7 @@ def test_copyright_babkin_txt(self):
         check_detection(expected, test_file)
 
     def test_copyright_blender_debian(self):
-        test_file = self.get_test_loc('copyrights/copyright_blender_debian-blender_copyright.copyright')
+        test_file = self.get_test_loc('copyright_lines/blender_debian-blender.copyright')
         expected = [
             ([u'Copyright (c) 2002-2008 Blender Foundation'], 8, 11),
             ([u'Copyright (c) 2004-2005 Masayuki Hatta <mhatta@debian.org>',

From 3639ac95c375d36673025a4c7a5a1b5bc82eb19a Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 01:18:52 +0100
Subject: [PATCH 088/122] Correct test failures #787 #685 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/scancode/test_cli.py | 42 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index bbeb6db0371..5e25376a36a 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -313,14 +313,14 @@ def test_scan_works_with_multiple_processes():
     assert sorted(res1['files']) == sorted(res3['files'])
 
 
-def test_scan_works_with_no_processes_in_single_threaded_mode():
+def test_scan_works_with_no_processes_in_threaded_mode():
     test_dir = test_env.get_test_loc('multiprocessing', copy=True)
 
     # run the same scan with zero or one process
     result_file_0 = test_env.get_temp_file('json')
     result0 = run_scan_click([ '--copyright', '--processes', '0', test_dir, '--json', result_file_0])
     assert result0.exit_code == 0
-    assert 'Disabling multi-processing.' in result0.output
+    assert 'Disabling multi-processing' in result0.output
 
     result_file_1 = test_env.get_temp_file('json')
     result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--json', result_file_1])
@@ -330,6 +330,22 @@ def test_scan_works_with_no_processes_in_single_threaded_mode():
     assert sorted(res0['files']) == sorted(res1['files'])
 
 
+def test_scan_works_with_no_processes_non_threaded_mode():
+    test_dir = test_env.get_test_loc('multiprocessing', copy=True)
+
+    # run the same scan with zero or one process
+    result_file_0 = test_env.get_temp_file('json')
+    result0 = run_scan_click([ '--copyright', '--processes', '-1', test_dir, '--json', result_file_0])
+    assert result0.exit_code == 0
+    assert 'Disabling multi-processing and multi-threading' in result0.output
+
+    result_file_1 = test_env.get_temp_file('json')
+    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--json', result_file_1])
+    assert result1.exit_code == 0
+    res0 = json.loads(open(result_file_0).read())
+    res1 = json.loads(open(result_file_1).read())
+    assert sorted(res0['files']) == sorted(res1['files'])
+
 def test_scan_works_with_multiple_processes_and_timeouts():
     # this contains test files with a lot of copyrights that should
     # take more thant timeout to scan
@@ -596,7 +612,6 @@ def test_scan_logs_errors_messages_verbosely_with_verbose_and_multiprocessing():
     assert 'delimiter: line 5 column 12' in stderr
     assert 'ValueError: Expecting' in stdout
 
-
 def test_scan_progress_display_is_not_damaged_with_long_file_names_plain():
     test_dir = test_env.get_test_loc('long_file_name')
     result_file = test_env.get_temp_file('json')
@@ -618,13 +633,20 @@ def test_scan_progress_display_is_not_damaged_with_long_file_names(monkeypatch):
     result_file = test_env.get_temp_file('json')
     result = run_scan_click(['--copyright', test_dir, '--json', result_file], monkeypatch)
     assert result.exit_code == 0
-    expected1 = 'Scanned: abcdefghijklmnopqr...234567890123456789.c'
-    expected2 = 'Scanned: 0123456789012345678901234567890123456789.c'
-    expected3 = 'abcdefghijklmnopqrtu0123456789012345678901234567890123456789abcdefghijklmnopqrtu0123456789012345678901234567890123456789.c'
-    assert expected1 in result.output
-    assert expected2 in result.output
-    assert expected3 not in result.output
-
+    if on_windows:
+        expected1 = 'Scanned: 0123456789012345678901234567890123456789.c'
+        expected2 = 'Scanned: abcdefghijklmnopqrt...0123456789012345678'
+        expected3 = 'abcdefghijklmnopqrtu0123456789012345678901234567890123456789abcdefghijklmnopqrtu0123456789012345678901234567890123456789.c'
+        assert expected1 in result.output
+        assert expected2 in result.output
+        assert expected3 not in result.output
+    else:
+        expected1 = 'Scanned: abcdefghijklmnopqr...234567890123456789.c'
+        expected2 = 'Scanned: 0123456789012345678901234567890123456789.c'
+        expected3 = 'abcdefghijklmnopqrtu0123456789012345678901234567890123456789abcdefghijklmnopqrtu0123456789012345678901234567890123456789.c'
+        assert expected1 in result.output
+        assert expected2 in result.output
+        assert expected3 not in result.output
 
 def test_scan_does_scan_php_composer():
     test_file = test_env.get_test_loc('composer/composer.json')

From 1d8a43d241032d99c2363a7399b40d4bac70d2c8 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 01:20:02 +0100
Subject: [PATCH 089/122] Make multiprocessing working on Windows #787 #685
 #357

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py       | 52 ++++++++++++++++----------
 src/scancode/interrupt.py | 78 +++++++++++++++++++++++++++------------
 2 files changed, 88 insertions(+), 42 deletions(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 265522ac255..1c77e85606a 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -75,6 +75,7 @@
 from scancode import validate_option_dependencies
 from scancode.api import get_file_info
 from scancode.interrupt import DEFAULT_TIMEOUT
+from scancode.interrupt import fake_interruptible
 from scancode.interrupt import interruptible
 from scancode.resource import Codebase
 from scancode.utils import BaseCommand
@@ -86,11 +87,11 @@
     # Python 2
     unicode
     str_orig = str
-    bytes = str  # @ReservedAssignment
-    str = unicode  # @ReservedAssignment
+    bytes = str  # NOQA
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 
 # Tracing flags
@@ -257,7 +258,7 @@ class ScanCommand(BaseCommand):
 Try 'scancode --help' for help on options and arguments.'''
 
     def __init__(self, name, context_settings=None, callback=None, params=None,
-                 help=None,  # @ReservedAssignment
+                 help=None,  # NOQA
                  epilog=None, short_help=None,
                  options_metavar='[OPTIONS]', add_help_option=True,
                  plugin_options=()):
@@ -336,8 +337,8 @@ def print_plugins(ctx, param, value):
             name = option.name
             opts = ', '.join(option.opts)
             help_group = option.help_group
-            help = option.help  # noqa
-            click.echo('    help_group: {help_group!s}, name: {name!s}: {opts}\n      help: {help!s}'.format(**locals()))
+            help_txt = option.help  # noqa
+            click.echo('    help_group: {help_group!s}, name: {name!s}: {opts}\n      help: {help_txt!s}'.format(**locals()))
         click.echo('')
     ctx.exit()
 
@@ -378,7 +379,7 @@ def print_plugins(ctx, param, value):
     type=int, default=1,
     metavar='INT',
     help='Set the number of parallel processes to use. '
-         'Disable parallel processing if 0.  [default: 1]',
+         'Disable parallel processing if 0. Disable also threading if -1 [default: 1]',
     help_group=CORE_GROUP, sort_order=10, cls=CommandLineOption)
 
 @click.option('--timeout',
@@ -481,7 +482,7 @@ def print_plugins(ctx, param, value):
     help='Run ScanCode in a special "test mode". Only for testing.',
     help_group=MISC_GROUP, sort_order=1000, cls=CommandLineOption)
 
-def scancode(ctx, input,
+def scancode(ctx, input, #NOQA
              info,
              strip_root, full_root,
              processes, timeout,
@@ -538,7 +539,8 @@ def scancode(ctx, input,
       These options are mutually exclusive.
 
     - `processes`: int: run the scan using up to this number of processes in
-      parallel. If 0, disable the multiprocessing machinery.
+      parallel. If 0, disable the multiprocessing machinery. if -1 also
+      disable the multithreading machinery.
 
     - `timeout`: float: intterup the scan of a file if it does not finish within
       `timeout` seconds. This applied to each file and scan individually (e.g.
@@ -589,7 +591,9 @@ def scancode(ctx, input,
     try:
 
         if not processes and not quiet:
-            echo_stderr('Disabling multi-processing.', fg='yellow')
+            echo_stderr('Disabling multi-processing for debugging.', fg='yellow')
+        if processes == -1  and not quiet:
+            echo_stderr('Disabling multi-processing and multi-threading for debugging.', fg='yellow')
 
         ########################################################################
         # 1. get command options and create all plugin instances
@@ -934,7 +938,8 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
     resources = ((r.get_path(absolute=True), r.rid) for r in codebase.walk())
 
     runner = partial(scan_resource, scanners=scanners,
-                     timeout=timeout, with_timing=with_timing)
+                     timeout=timeout, with_timing=with_timing,
+                     with_threading=processes >= 0)
 
     if TRACE:
         logger_debug('scan_codebase: scanners:', '\n'.join(repr(s) for s in scanners))
@@ -945,7 +950,7 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
     pool = None
     scans = None
     try:
-        if processes:
+        if processes >= 1:
             # maxtasksperchild helps with recycling processes in case of leaks
             pool = get_pool(processes=processes, maxtasksperchild=1000)
             # Using chunksize is documented as much more efficient in the Python doc.
@@ -954,7 +959,7 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
             scans = pool.imap_unordered(runner, resources, chunksize=1)
             pool.close()
         else:
-            # no multiprocessing with processes=0
+            # no multiprocessing with processes=0 or -1
             scans = imap(runner, resources)
 
         if progress_manager:
@@ -1021,15 +1026,16 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
     return success
 
 
-def scan_resource(location_rid, scanners,
-                  timeout=DEFAULT_TIMEOUT,
-                  with_timing=False):
+def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT,
+                  with_timing=False, with_threading=True):
     """
     Return a tuple of (location, rid, errors, scan_time, scan_results, timings)
     by running the `scanners` Scanner objects for the file or directory resource
     with id `rid` at `location` provided as a `location_rid` tuple of (location,
     rid) for up to `timeout` seconds.
-    In the returned tuple:
+    If `with_threading` is False, threading is disabled.
+
+    The returned tuple has these values (:
     - `location` and `rid` are the orginal arguments.
     - `errors` is a list of error strings.
     - `scan_results` is a mapping of scan results keyed by scanner.key.
@@ -1037,6 +1043,9 @@ def scan_resource(location_rid, scanners,
     - `timings` is a mapping of scan {scanner.key: execution time in seconds}
       tracking the execution duration each each scan individually.
       `timings` is empty unless `with_timing` is True.
+
+    All these values MUST be serializable/pickable because of the way multi-
+    processing/threading works.
     """
     scan_time = time()
 
@@ -1044,6 +1053,11 @@ def scan_resource(location_rid, scanners,
     if with_timing:
         timings = OrderedDict((scanner.key, 0) for scanner in scanners)
 
+    if not with_threading:
+        interruptor= fake_interruptible
+    else:
+        interruptor = interruptible
+
     location, rid = location_rid
     errors = []
     results = OrderedDict((scanner.key, []) for scanner in scanners)
@@ -1054,8 +1068,8 @@ def scan_resource(location_rid, scanners,
             start = time()
 
         try:
-            error, value = interruptible(
-                partial(scanner.function, location), timeout=timeout)
+            runner = partial(scanner.function, location)
+            error, value = interruptor(runner, timeout=timeout)
             if error:
                 msg = 'ERROR: for scanner: ' + scanner.key + ':\n' + error
                 errors.append(msg)
diff --git a/src/scancode/interrupt.py b/src/scancode/interrupt.py
index 286ae438ccf..25ff6d2bc2e 100644
--- a/src/scancode/interrupt.py
+++ b/src/scancode/interrupt.py
@@ -11,10 +11,12 @@
 # specific language governing permissions and limitations under the License.
 #
 
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import print_function
 from __future__ import unicode_literals
 
+from traceback import format_exc as traceback_format_exc
+
 from commoncode.system import on_windows
 
 
@@ -72,7 +74,11 @@ class TimeoutError(Exception):
     permissions and limitations under the License.
     """
 
-    import signal
+    from signal import ITIMER_REAL
+    from signal import SIGALRM
+    from signal import setitimer
+    from signal import signal as create_signal
+
 
     def interruptible(func, args=None, kwargs=None, timeout=DEFAULT_TIMEOUT):
         """
@@ -83,19 +89,18 @@ def handler(signum, frame):
             raise TimeoutError
 
         try:
-            signal.signal(signal.SIGALRM, handler)
-            signal.setitimer(signal.ITIMER_REAL, timeout)
+            create_signal(SIGALRM, handler)
+            setitimer(ITIMER_REAL, timeout)
             return NO_ERROR, func(*(args or ()), **(kwargs or {}))
 
         except TimeoutError:
             return TIMEOUT_MSG % locals(), NO_VALUE
 
         except Exception:
-            import traceback
-            return ERROR_MSG + traceback.format_exc(), NO_VALUE
+            return ERROR_MSG + traceback_format_exc(), NO_VALUE
 
         finally:
-            signal.setitimer(signal.ITIMER_REAL, 0)
+            setitimer(ITIMER_REAL, 0)
 
 else:
     """
@@ -105,13 +110,16 @@ def handler(signum, frame):
     But not code has been reused from this post.
     """
 
-    import ctypes
-    import multiprocessing
-    import Queue
+    from ctypes import c_long
+    from ctypes import py_object
+    from ctypes import pythonapi
+    from multiprocessing import TimeoutError as MpTimeoutError
+    from Queue import Empty as Queue_Empty
+    from Queue import Queue
     try:
-        import thread
+        from thread import start_new_thread
     except ImportError:
-        import _thread as thread
+        from _thread import start_new_thread
 
 
     def interruptible(func, args=None, kwargs=None, timeout=DEFAULT_TIMEOUT):
@@ -120,20 +128,31 @@ def interruptible(func, args=None, kwargs=None, timeout=DEFAULT_TIMEOUT):
         POSIX, but is not reliable and works only if everything is pickable.
         """
         # We run `func` in a thread and block on a queue until timeout
-        results = Queue.Queue()
+        results = Queue()
 
         def runner():
-            results.put(func(*(args or ()), **(kwargs or {})))
+            try:
+                _res = func(*(args or ()), **(kwargs or {}))
+                results.put((NO_ERROR, _res,))
+            except Exception:
+                results.put((ERROR_MSG + traceback_format_exc(), NO_VALUE,))
 
-        tid = thread.start_new_thread(runner, ())
+        tid = start_new_thread(runner, ())
 
         try:
-            return NO_ERROR, results.get(timeout=timeout)
-        except (Queue.Empty, multiprocessing.TimeoutError):
+            err_res = results.get(timeout=timeout)
+
+            if not err_res:
+                return ERROR_MSG, NO_VALUE
+
+            return err_res
+
+        except (Queue_Empty, MpTimeoutError):
             return TIMEOUT_MSG % locals(), NO_VALUE
+
         except Exception:
-            import traceback
-            return ERROR_MSG + traceback.format_exc(), NO_VALUE
+            return ERROR_MSG + traceback_format_exc(), NO_VALUE
+
         finally:
             try:
                 async_raise(tid, Exception)
@@ -152,13 +171,26 @@ def async_raise(tid, exctype=Exception):
         """
         assert isinstance(tid, int), 'Invalid  thread id: must an integer'
 
-        tid = ctypes.c_long(tid)
-        exception = ctypes.py_object(Exception)
-        res = ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, exception)
+        tid = c_long(tid)
+        exception = py_object(Exception)
+        res = pythonapi.PyThreadState_SetAsyncExc(tid, exception)
         if res == 0:
             raise ValueError('Invalid thread id.')
         elif res != 1:
             # if it returns a number greater than one, you're in trouble,
             # and you should call it again with exc=NULL to revert the effect
-            ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, 0)
+            pythonapi.PyThreadState_SetAsyncExc(tid, 0)
             raise SystemError('PyThreadState_SetAsyncExc failed.')
+
+
+def fake_interruptible(func, args=None, kwargs=None, timeout=DEFAULT_TIMEOUT):
+    """
+    Fake, non-interruptible, using no threads and no signals
+    implementation used for debugging. This ignores the timeout and just
+    the function as-is.
+    """
+
+    try:
+        return NO_ERROR, func(*(args or ()), **(kwargs or {}))
+    except Exception:
+        return ERROR_MSG + traceback_format_exc(), NO_VALUE

From e7aabf17659f9269ac540bcd0fb4461e99fee5a0 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 01:37:38 +0100
Subject: [PATCH 090/122] Use NOQA tags consistently. Cleanup up dead code

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/scripts/test_json2csv.py                   |  2 +-
 src/commoncode/command.py                      |  6 +++---
 src/commoncode/fileutils.py                    | 12 ++++++------
 src/commoncode/text.py                         |  5 +----
 src/commoncode/timeutils.py                    | 11 +++++++----
 src/extractcode/tarfile_patch/tarfile.py       |  3 ++-
 src/formattedcode/output_html.py               |  4 +++-
 src/formattedcode/output_spdx.py               | 18 +++++++++++-------
 src/licensedcode/cache.py                      |  2 +-
 src/licensedcode/index.py                      |  1 -
 src/plugincode/output.py                       |  6 +++---
 src/scancode/__init__.py                       |  8 ++++----
 src/scancode/api.py                            |  1 -
 src/scancode/extract_cli.py                    |  6 +++---
 src/scancode/plugin_copyright.py               |  2 +-
 src/scancode/plugin_license.py                 |  2 +-
 src/scancode/resource.py                       |  8 ++++----
 src/scancode/utils.py                          |  8 ++++----
 src/scancode_config.py                         |  4 ++--
 src/typecode/magic2.py                         |  2 +-
 tests/cluecode/data/finder/email/jardiff.py    |  2 +-
 tests/cluecode/data/finder/email/thomas.py     |  1 +
 .../cluecode/data/finder/url/BeautifulSoup.py  |  3 +++
 tests/commoncode/test_command.py               |  1 -
 tests/commoncode/test_fileutils.py             |  2 +-
 tests/extractcode/test_archive.py              |  1 -
 tests/licensedcode/data/perf/whatever.py       |  1 +
 tests/licensedcode/license_test_utils.py       |  2 +-
 tests/packagedcode/data/pypi/setup.py          |  1 +
 tests/packagedcode/data/pypi/setup2.py         |  1 +
 .../data/contenttype/code/python/__init__.py   |  1 +
 .../contenttype/code/python/contenttype.py     |  1 +
 .../data/contenttype/code/python/extract.py    |  1 +
 33 files changed, 71 insertions(+), 58 deletions(-)

diff --git a/etc/scripts/test_json2csv.py b/etc/scripts/test_json2csv.py
index d083b76aac8..fa834dd21f0 100644
--- a/etc/scripts/test_json2csv.py
+++ b/etc/scripts/test_json2csv.py
@@ -216,9 +216,9 @@ def test_can_process_scan_from_json_scan(self):
         rc, _stdout, _stderr = execute(scan_cmd,
             ['-clip', '--email', '--url', '--strip-root', test_dir, 
              '--json', json_file])
-        assert rc == 0
         result_file = self.get_temp_file('.csv')
         with open(result_file, 'wb') as rf:
             json2csv.json_scan_to_csv(json_file, rf)
         expected_file = self.get_test_loc('livescan/expected.csv')
         check_csvs(result_file, expected_file, regen=False)
+        assert rc == 0
diff --git a/src/commoncode/command.py b/src/commoncode/command.py
index 829ba3bc68e..57b90d2a154 100644
--- a/src/commoncode/command.py
+++ b/src/commoncode/command.py
@@ -55,10 +55,10 @@
 try:
     # Python 2
     unicode
-    str = unicode  # @ReservedAssignment
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 
 """
@@ -328,7 +328,7 @@ def close_pipe(p):
     try:
         # Ensure process death otherwise proc.wait may hang in some cases
         # NB: this will run only on POSIX OSes supporting signals
-        os.kill(proc.pid, signal.SIGKILL)  # @UndefinedVariable
+        os.kill(proc.pid, signal.SIGKILL)  # NOQA
     except:
         pass
 
diff --git a/src/commoncode/fileutils.py b/src/commoncode/fileutils.py
index 9772b1f9a95..7b32adc596a 100644
--- a/src/commoncode/fileutils.py
+++ b/src/commoncode/fileutils.py
@@ -30,17 +30,17 @@
 try:
     # Python 2
     unicode
-    str = unicode  # @ReservedAssignment
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 try:
     from os import fsencode
     from os import fsdecode
 except ImportError:
     from backports.os import fsencode
-    from backports.os import fsdecode  # @UnusedImport
+    from backports.os import fsdecode  # NOQA
 
 import codecs
 import errno
@@ -65,9 +65,9 @@
 
 # this exception is not available on posix
 try:
-    WindowsError  # @UndefinedVariable
+    WindowsError  # NOQA
 except NameError:
-    WindowsError = None  # @ReservedAssignment
+    WindowsError = None  # NOQA
 
 
 TRACE = False
@@ -603,7 +603,7 @@ def chmod_tree(location, flags):
 # DELETION
 #
 
-def _rm_handler(function, path, excinfo):  # @UnusedVariable
+def _rm_handler(function, path, excinfo):  # NOQA
     """
     shutil.rmtree handler invoked on error when deleting a directory tree.
     This retries deleting once before giving up.
diff --git a/src/commoncode/text.py b/src/commoncode/text.py
index 5be67b83fba..b613df485ca 100644
--- a/src/commoncode/text.py
+++ b/src/commoncode/text.py
@@ -35,15 +35,13 @@
 import chardet
 from text_unidecode import unidecode
 
-
 # Python 2 and 3 support
 try:
     # Python 2
     unicode
 except NameError:
     # Python 3
-    unicode = str
-
+    unicode = str  # NOQA
 
 """
 A text processing module providing functions to process and prepare text
@@ -54,7 +52,6 @@
  - line separator stripping and conversion
  """
 
-
 LOG = logging.getLogger(__name__)
 
 
diff --git a/src/commoncode/timeutils.py b/src/commoncode/timeutils.py
index 37790f1b05a..99cc33db260 100644
--- a/src/commoncode/timeutils.py
+++ b/src/commoncode/timeutils.py
@@ -30,21 +30,22 @@
 from functools import wraps
 from time import time
 
-
 """
 Time is of the essence: path safe time stamps creation and conversion to
 datetime objects.
 """
 
+
 class UTC(tzinfo):
     """UTC timezone"""
-    def utcoffset(self, dt):  # @UnusedVariable
+
+    def utcoffset(self, dt):  # NOQA
         return None
 
-    def tzname(self, dt):  # @UnusedVariable
+    def tzname(self, dt):  # NOQA
         return 'UTC'
 
-    def dst(self, dt):  # @UnusedVariable
+    def dst(self, dt):  # NOQA
         return None
 
 
@@ -115,9 +116,11 @@ def timed(fun):
     Note: this decorator will not work as expected for functions that return
     generators.
     """
+
     @wraps(fun)
     def _timed(*args, **kwargs):
         start = time()
         result = fun(*args, **kwargs)
         return time() - start, result
+
     return update_wrapper(_timed, fun)
diff --git a/src/extractcode/tarfile_patch/tarfile.py b/src/extractcode/tarfile_patch/tarfile.py
index 1b0b2f7d2d3..f826401dd2c 100644
--- a/src/extractcode/tarfile_patch/tarfile.py
+++ b/src/extractcode/tarfile_patch/tarfile.py
@@ -1,4 +1,5 @@
 # -*- coding: iso-8859-1 -*-
+# flake8: noqa
 #-------------------------------------------------------------------
 # tarfile.py
 #-------------------------------------------------------------------
@@ -2650,7 +2651,7 @@ def writestr(self, zinfo, bytes):
             from cStringIO import StringIO
         except ImportError:
             from StringIO import StringIO
-        import calendar  # @UnresolvedImport
+        import calendar  # NOQA
         tinfo = TarInfo(zinfo.filename)
         tinfo.size = len(bytes)
         tinfo.mtime = calendar.timegm(zinfo.date_time)
diff --git a/src/formattedcode/output_html.py b/src/formattedcode/output_html.py
index 3614bab2d1a..42b3719c310 100644
--- a/src/formattedcode/output_html.py
+++ b/src/formattedcode/output_html.py
@@ -139,7 +139,9 @@ class HtmlAppOutput(OutputPlugin):
     def is_enabled(self, output_html_app, **kwargs):
         return output_html_app
 
-    def process_codebase(self, codebase, input, output_html_app, 
+    def process_codebase(self, codebase, 
+                         input, # NOQA
+                         output_html_app, 
                          scancode_version, **kwargs):
 
         results = self.get_results(codebase, **kwargs)
diff --git a/src/formattedcode/output_spdx.py b/src/formattedcode/output_spdx.py
index b3c769d9b80..0546518d0c8 100644
--- a/src/formattedcode/output_spdx.py
+++ b/src/formattedcode/output_spdx.py
@@ -57,11 +57,11 @@
     # Python 2
     unicode
     str_orig = str
-    bytes = str  # @ReservedAssignment
-    str = unicode  # @ReservedAssignment
+    bytes = str  # NOQA
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 
 # Tracing flags
@@ -104,7 +104,9 @@ class SpdxTvOutput(OutputPlugin):
     def is_enabled(self, output_spdx_tv, **kwargs):
         return output_spdx_tv
 
-    def process_codebase(self, codebase, input, output_spdx_tv,
+    def process_codebase(self, codebase, 
+                         input, # NOQA
+                         output_spdx_tv,
                          scancode_version, scancode_notice, **kwargs):
 
         results = self.get_results(codebase, **kwargs)
@@ -127,7 +129,9 @@ class SpdxRdfOutput(OutputPlugin):
     def is_enabled(self, output_spdx_rdf, **kwargs):
         return output_spdx_rdf
 
-    def process_codebase(self, codebase, input, output_spdx_rdf,
+    def process_codebase(self, codebase, 
+                         input, #NOQA
+                         output_spdx_rdf,
                          scancode_version, scancode_notice, **kwargs):
 
         results = self.get_results(codebase, **kwargs)
@@ -277,9 +281,9 @@ def write_spdx(output_file, results, scancode_version, scancode_notice,
     package.conc_lics = NoAssert()
 
     if as_tagvalue:
-        from spdx.writers.tagvalue import write_document  # @UnusedImport
+        from spdx.writers.tagvalue import write_document  # NOQA
     else:
-        from spdx.writers.rdf import write_document  # @Reimport
+        from spdx.writers.rdf import write_document  # NOQA
 
     # The spdx-tools write_document returns either:
     # - unicode for tag values
diff --git a/src/licensedcode/cache.py b/src/licensedcode/cache.py
index 384dcd7c6ff..c538f6f6c8a 100644
--- a/src/licensedcode/cache.py
+++ b/src/licensedcode/cache.py
@@ -31,7 +31,7 @@
 from os.path import getsize
 from os.path import join
 
-import yg.lockfile  # @UnresolvedImport
+import yg.lockfile  # NOQA
 
 from commoncode.fileutils import resource_iter
 from commoncode.fileutils import create_dir
diff --git a/src/licensedcode/index.py b/src/licensedcode/index.py
index 8f9b8afe15d..d370e2bb7da 100644
--- a/src/licensedcode/index.py
+++ b/src/licensedcode/index.py
@@ -34,7 +34,6 @@
 from functools import partial
 from itertools import izip
 from operator import itemgetter
-import os
 import sys
 from time import time
 
diff --git a/src/plugincode/output.py b/src/plugincode/output.py
index d861bc1c84d..1a9d1a3dbf8 100644
--- a/src/plugincode/output.py
+++ b/src/plugincode/output.py
@@ -42,11 +42,11 @@
     # Python 2
     unicode
     str_orig = str
-    bytes = str  # @ReservedAssignment
-    str = unicode  # @ReservedAssignment
+    bytes = str  # NOQA
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 
 # Tracing flags
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index bff9c6d289f..46cc28852a8 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -47,11 +47,11 @@
     # Python 2
     unicode
     str_orig = str
-    bytes = str  # @ReservedAssignment
-    str = unicode  # @ReservedAssignment
+    bytes = str  # NOQA
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 
 scan_src_dir = abspath(dirname(__file__))
@@ -112,7 +112,7 @@ def __init__(self, param_decls=None, show_default=False,
                  prompt=False, confirmation_prompt=False,
                  hide_input=False, is_flag=None, flag_value=None,
                  multiple=False, count=False, allow_from_autoenv=True,
-                 type=None, help=None,  # @ReservedAssignment
+                 type=None, help=None,  # NOQA
                  # custom additions #
                  # a string that set the CLI help group for this option
                  help_group=MISC_GROUP,
diff --git a/src/scancode/api.py b/src/scancode/api.py
index 7883a46e1c8..b578fb9e7f6 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -129,7 +129,6 @@ def get_licenses(location, min_score=0, include_text=False, diag=False,
     from licensedcode.cache import get_index
     from licensedcode.cache import get_licenses_db
 
-    from scancode_config import SCANCODE_DEV_MODE
     idx = get_index(cache_dir, SCANCODE_DEV_MODE)
     licenses = get_licenses_db()
 
diff --git a/src/scancode/extract_cli.py b/src/scancode/extract_cli.py
index 0930205e70a..c0d7e51697f 100644
--- a/src/scancode/extract_cli.py
+++ b/src/scancode/extract_cli.py
@@ -46,10 +46,10 @@
 try:
     # Python 2
     unicode
-    str = unicode  # @ReservedAssignment
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 
 echo_stderr = partial(click.secho, err=True)
@@ -103,7 +103,7 @@ class ExtractCommand(utils.BaseCommand):
 @click.option('--about', is_flag=True, is_eager=True, callback=print_about, help='Show information about ScanCode and licensing and exit.')
 @click.option('--version', is_flag=True, is_eager=True, callback=print_version, help='Show the version and exit.')
 
-def extractcode(ctx, input, verbose, quiet, shallow, *args, **kwargs):  # @ReservedAssignment
+def extractcode(ctx, input, verbose, quiet, shallow, *args, **kwargs):  # NOQA
     """extract archives and compressed files found in the <input> file or directory tree.
 
     Use this command before scanning proper as an <input> preparation step.
diff --git a/src/scancode/plugin_copyright.py b/src/scancode/plugin_copyright.py
index 838f64dfbe0..73a66c646b7 100644
--- a/src/scancode/plugin_copyright.py
+++ b/src/scancode/plugin_copyright.py
@@ -48,7 +48,7 @@ class CopyrightScanner(ScanPlugin):
             sort_order=50),
     ]
 
-    def is_enabled(self, copyright, **kwargs):  # @ReservedAssignment
+    def is_enabled(self, copyright, **kwargs):  # NOQA
         return copyright
 
     def get_scanner(self, **kwargs):
diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index 9b5b1bde085..e9ef08deede 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -99,7 +99,7 @@ class LicenseScanner(ScanPlugin):
             help_group=MISC_GROUP)
     ]
 
-    def is_enabled(self, license, **kwargs):  # @ReservedAssignment
+    def is_enabled(self, license, **kwargs):  # NOQA
         return license
 
     def setup(self, cache_dir, **kwargs):
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index 298e09d4098..bd0fa23b0f7 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -42,7 +42,7 @@
 import sys
 
 import attr
-import yg.lockfile  # @UnresolvedImport
+import yg.lockfile  # NOQA
 
 from scancode_config import scancode_temp_dir
 
@@ -65,11 +65,11 @@
     # Python 2
     unicode
     str_orig = str
-    bytes = str  # @ReservedAssignment
-    str = unicode  # @ReservedAssignment
+    bytes = str  # NOQA
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 
 """
diff --git a/src/scancode/utils.py b/src/scancode/utils.py
index c51207928f7..57ec8a236f3 100644
--- a/src/scancode/utils.py
+++ b/src/scancode/utils.py
@@ -43,11 +43,11 @@
     # Python 2
     unicode
     str_orig = str
-    bytes = str  # @ReservedAssignment
-    str = unicode  # @ReservedAssignment
+    bytes = str  # NOQA
+    str = unicode  # NOQA
 except NameError:
     # Python 3
-    unicode = str  # @ReservedAssignment
+    unicode = str  # NOQA
 
 
 """
@@ -135,7 +135,7 @@ def render_finish(self):
 def progressmanager(iterable=None, length=None, label=None, show_eta=True,
                     show_percent=None, show_pos=True, item_show_func=None,
                     fill_char='#', empty_char='-', bar_template=None,
-                    info_sep=BAR_SEP, width=BAR_WIDTH, file=None, color=None,  # @ReservedAssignment
+                    info_sep=BAR_SEP, width=BAR_WIDTH, file=None, color=None,  # NOQA
                     verbose=False):
 
     """
diff --git a/src/scancode_config.py b/src/scancode_config.py
index f2a206de96a..196eda01c5f 100644
--- a/src/scancode_config.py
+++ b/src/scancode_config.py
@@ -46,9 +46,9 @@
 
 # this exception is not available on posix
 try:
-    WindowsError  # @UndefinedVariable
+    WindowsError  # noqa
 except NameError:
-    WindowsError = None  # @ReservedAssignment
+    WindowsError = None  # NOQA
 
 def _create_dir(location):
     """
diff --git a/src/typecode/magic2.py b/src/typecode/magic2.py
index 870a285b5d0..9af702264fe 100644
--- a/src/typecode/magic2.py
+++ b/src/typecode/magic2.py
@@ -221,7 +221,7 @@ def load_lib():
 libmagic = load_lib()
 
 
-def check_error(result, func, args):  # @UnusedVariable
+def check_error(result, func, args):  # NOQA
     """
     ctypes error handler/checker:  Check for errors and raise an exception or
     return the result otherwise.
diff --git a/tests/cluecode/data/finder/email/jardiff.py b/tests/cluecode/data/finder/email/jardiff.py
index 30db07c128b..bf0acd06069 100644
--- a/tests/cluecode/data/finder/email/jardiff.py
+++ b/tests/cluecode/data/finder/email/jardiff.py
@@ -1,5 +1,5 @@
 #!/ms/dist/python/PROJ/core/2.4/bin/python
-
+# flake8: noqa
 '''
 Compares API differences between two jar files
 
diff --git a/tests/cluecode/data/finder/email/thomas.py b/tests/cluecode/data/finder/email/thomas.py
index ca17ec40ee1..9eab0f7d8ee 100644
--- a/tests/cluecode/data/finder/email/thomas.py
+++ b/tests/cluecode/data/finder/email/thomas.py
@@ -1,3 +1,4 @@
+# flake8: noqa
 # This module is part of the Divmod project and is Copyright 2003 Amir Bakhtiar:
 # amir@divmod.org.  This is free software; you can redistribute it and/or
 # modify it under the terms of version 2.1 of the GNU Lesser General Public
diff --git a/tests/cluecode/data/finder/url/BeautifulSoup.py b/tests/cluecode/data/finder/url/BeautifulSoup.py
index 0e214630c80..975ddd3276e 100644
--- a/tests/cluecode/data/finder/url/BeautifulSoup.py
+++ b/tests/cluecode/data/finder/url/BeautifulSoup.py
@@ -1,3 +1,6 @@
+
+# flake8: noqa
+
 """Beautiful Soup
 Elixir and Tonic
 "The Screen-Scraper's Friend"
diff --git a/tests/commoncode/test_command.py b/tests/commoncode/test_command.py
index f1cbaf27478..04e22188aab 100644
--- a/tests/commoncode/test_command.py
+++ b/tests/commoncode/test_command.py
@@ -33,7 +33,6 @@
 from commoncode.system import on_linux
 from commoncode.system import on_mac
 from commoncode.system import on_windows
-from unittest.case import skipUnless
 
 
 class TestCommand(FileBasedTesting):
diff --git a/tests/commoncode/test_fileutils.py b/tests/commoncode/test_fileutils.py
index c5942b59a42..fb2ffa35c75 100644
--- a/tests/commoncode/test_fileutils.py
+++ b/tests/commoncode/test_fileutils.py
@@ -253,7 +253,7 @@ def test_copytree_does_not_copy_fifo(self):
         src = self.get_test_loc('fileutils/filetype', copy=True)
         dest = self.get_temp_dir()
         src_file = join(src, 'myfifo')
-        os.mkfifo(src_file)  # @UndefinedVariable
+        os.mkfifo(src_file)  # NOQA
         dest_dir = join(dest, 'dest')
         fileutils.copytree(src, dest_dir)
         assert not os.path.exists(join(dest_dir, 'myfifo'))
diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index 4e33e176724..28f3d22ad93 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -2439,7 +2439,6 @@ class TestExtractArchiveWithIllegalFilenamesWithPytarOnMacWarnings(TestExtractAr
 class TestExtractArchiveWithIllegalFilenamesWithSevenzipOnWin(ExtractArchiveWithIllegalFilenamesTestCase):
     check_only_warnings = False
 
-    @expectedFailure  # not a problem: we use libarchive for these
     def test_extract_7zip_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.7z')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
diff --git a/tests/licensedcode/data/perf/whatever.py b/tests/licensedcode/data/perf/whatever.py
index 132cb692b3a..52e19fcc1e2 100644
--- a/tests/licensedcode/data/perf/whatever.py
+++ b/tests/licensedcode/data/perf/whatever.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# flake8: noqa
 #
 # Stonith module for RILOE Stonith device
 #
diff --git a/tests/licensedcode/license_test_utils.py b/tests/licensedcode/license_test_utils.py
index 92be2126122..87720c72b77 100644
--- a/tests/licensedcode/license_test_utils.py
+++ b/tests/licensedcode/license_test_utils.py
@@ -40,7 +40,7 @@
     unicode
 except NameError:
     # Python 3
-    unicode = str
+    unicode = str #NOQA
 
 
 """
diff --git a/tests/packagedcode/data/pypi/setup.py b/tests/packagedcode/data/pypi/setup.py
index b66230b99dd..90274e96609 100644
--- a/tests/packagedcode/data/pypi/setup.py
+++ b/tests/packagedcode/data/pypi/setup.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
+# flake8: noqa
 from __future__ import absolute_import, print_function
 
 import io
diff --git a/tests/packagedcode/data/pypi/setup2.py b/tests/packagedcode/data/pypi/setup2.py
index b66230b99dd..90274e96609 100644
--- a/tests/packagedcode/data/pypi/setup2.py
+++ b/tests/packagedcode/data/pypi/setup2.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
+# flake8: noqa
 from __future__ import absolute_import, print_function
 
 import io
diff --git a/tests/typecode/data/contenttype/code/python/__init__.py b/tests/typecode/data/contenttype/code/python/__init__.py
index 2e2033b3c05..cc085fdc029 100644
--- a/tests/typecode/data/contenttype/code/python/__init__.py
+++ b/tests/typecode/data/contenttype/code/python/__init__.py
@@ -1,4 +1,5 @@
 # this is a namespace package
+# flake8: noqa
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
diff --git a/tests/typecode/data/contenttype/code/python/contenttype.py b/tests/typecode/data/contenttype/code/python/contenttype.py
index ad4e0aed0c7..fe48a8c5a58 100644
--- a/tests/typecode/data/contenttype/code/python/contenttype.py
+++ b/tests/typecode/data/contenttype/code/python/contenttype.py
@@ -1,4 +1,5 @@
 #
+# flake8: noqa
 import unittest
 from os.path import join
 
diff --git a/tests/typecode/data/contenttype/code/python/extract.py b/tests/typecode/data/contenttype/code/python/extract.py
index d2b9e48784c..9a488abb8b1 100644
--- a/tests/typecode/data/contenttype/code/python/extract.py
+++ b/tests/typecode/data/contenttype/code/python/extract.py
@@ -1,4 +1,5 @@
 
+# flake8: noqa
 
 import os
 from os.path import join, dirname, basename, exists

From 481f9e125e9ec3ff9aac6fe203a7a96c7c8e68a3 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 01:41:02 +0100
Subject: [PATCH 091/122] Improve CLI help text

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py               | 2 +-
 tests/scancode/data/help/help.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 1c77e85606a..35f2352cbf4 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -379,7 +379,7 @@ def print_plugins(ctx, param, value):
     type=int, default=1,
     metavar='INT',
     help='Set the number of parallel processes to use. '
-         'Disable parallel processing if 0. Disable also threading if -1 [default: 1]',
+         'Disable parallel processing if 0. Also disable threading if -1. [default: 1]',
     help_group=CORE_GROUP, sort_order=10, cls=CommandLineOption)
 
 @click.option('--timeout',
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index 2c007bfb209..b3502ac1afb 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -69,7 +69,8 @@ Options:
     --timeout <secs>     Stop an unfinished file scan after a timeout in seconds.
                          [default: 120 seconds]
     -n, --processes INT  Set the number of parallel processes to use. Disable
-                         parallel processing if 0.  [default: 1]
+                         parallel processing if 0. Also disable threading if -1.
+                         [default: 1]
     --quiet              Do not print summary or progress.
     --verbose            Print progress  as file-by-file path instead of a
                          progress bar. Print a verbose scan summary.

From 5c6eae5395b45645aa0721b8bcd4243339eb5ece Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 13:23:31 +0100
Subject: [PATCH 092/122] Improve scan test run calls. Cleanup and format code

 * run_scan* calls now check for return code
 * removed dead code for printouts and similar
 * formatted code
 * ensure that scancode_toot_dir is used consistently

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 etc/conf/base.py                              |   8 +-
 etc/conf/dev/base.py                          |  10 +-
 etc/configure.py                              |   4 +-
 etc/scripts/sch2js/sch2js.py                  |   2 -
 etc/scripts/synclic.py                        |   5 +-
 etc/scripts/test_json2csv.py                  |   6 +-
 src/cluecode/copyrights.py                    |  20 +-
 src/cluecode/copyrights_hint.py               |   8 +-
 src/cluecode/finder.py                        |  68 ++--
 src/cluecode/finder_data.py                   |   7 +-
 src/commoncode/__init__.py                    |   7 +-
 src/commoncode/command.py                     |   2 -
 src/commoncode/dict_utils.py                  |   2 -
 src/commoncode/fetch.py                       |   1 -
 src/commoncode/fileset.py                     |   5 +-
 src/commoncode/filetype.py                    |   5 +-
 src/commoncode/fileutils.py                   |  11 +-
 src/commoncode/functional.py                  |   3 +
 src/commoncode/hash.py                        |  12 +-
 src/commoncode/ignore.py                      |   4 +-
 src/commoncode/misc.ABOUT                     |   8 -
 src/commoncode/misc.LICENSE                   |  21 --
 src/commoncode/misc.py                        |  57 ----
 src/commoncode/paths.py                       |   6 +-
 src/commoncode/saneyaml.py                    |   9 +-
 src/commoncode/system.py                      |   7 +-
 src/commoncode/testcase.py                    |   5 +-
 src/commoncode/version.py                     |   1 -
 src/extractcode/__init__.py                   |  11 +-
 src/extractcode/archive.py                    |   7 +-
 src/extractcode/extract.py                    |   2 -
 src/extractcode/libarchive2.py                |  45 +--
 src/extractcode/patch.py                      |   1 -
 src/extractcode/sevenzip.py                   |   2 -
 src/extractcode/tar.py                        |   2 -
 src/formattedcode/output_html.py              |   6 +-
 src/formattedcode/output_json.py              |   4 +-
 src/formattedcode/output_spdx.py              |  14 +-
 src/licensedcode/cache.py                     |   2 -
 src/licensedcode/index.py                     |   3 +-
 src/licensedcode/legal.py                     |   5 +-
 src/licensedcode/match.py                     |   5 +-
 src/licensedcode/match_aho.py                 |   1 +
 src/licensedcode/match_hash.py                |   3 +-
 src/licensedcode/match_seq.py                 |   4 +-
 src/licensedcode/match_set.py                 |   5 +-
 src/licensedcode/models.py                    |  14 +-
 src/licensedcode/query.py                     |   5 +-
 src/licensedcode/seq.py                       |   2 -
 src/licensedcode/spans.py                     |   2 +-
 src/licensedcode/tokenize.py                  |   6 +-
 src/packagedcode/__init__.py                  |   3 +-
 src/packagedcode/maven.py                     |   6 +-
 src/packagedcode/models.py                    |   7 +-
 src/packagedcode/nevra.py                     |   5 +-
 src/packagedcode/npm.py                       |   3 -
 src/packagedcode/phpcomposer.py               |   9 +-
 src/packagedcode/pypi.py                      |   2 -
 src/packagedcode/pyrpm/rpm.py                 |   3 +-
 src/packagedcode/pyrpm/rpmdefs.py             |   7 +-
 src/packagedcode/recognize.py                 |   5 +-
 src/packagedcode/rpm.py                       |   7 +-
 src/packagedcode/utils.py                     |   3 +-
 src/packagedcode/xmlutils.py                  |   4 +-
 src/plugincode/__init__.py                    |   2 -
 src/plugincode/output.py                      |   9 +-
 src/plugincode/output_filter.py               |   1 -
 src/plugincode/post_scan.py                   |   1 -
 src/plugincode/pre_scan.py                    |   1 -
 src/plugincode/scan.py                        |   1 -
 src/scancode/__init__.py                      |  16 +-
 src/scancode/api.py                           |   1 -
 src/scancode/cli.py                           |  10 +-
 src/scancode/cli_test_utils.py                |  47 ++-
 src/scancode/extract_cli.py                   |   4 -
 src/scancode/interrupt.py                     |   5 -
 src/scancode/pool.py                          |   5 +-
 src/scancode/resource.py                      |   7 +-
 src/scancode/utils.py                         |   5 +-
 src/scancode_config.py                        |   6 +-
 src/textcode/markup.py                        |   3 +-
 src/textcode/strings.py                       |  11 +-
 src/textcode/strings2.py                      |   5 +-
 src/typecode/contenttype.py                   |  12 +-
 src/typecode/entropy.py                       |   1 -
 src/typecode/magic2.py                        |   8 +-
 tests/cluecode/test_authors.py                |   2 +-
 tests/cluecode/test_copyrights_ics.py         |   6 +-
 tests/commoncode/test_codec.py                |   4 +-
 tests/commoncode/test_date.py                 |   7 +-
 tests/commoncode/test_fileset.py              |   4 +-
 tests/commoncode/test_fileutils.py            |   4 +-
 tests/commoncode/test_functional.py           |   4 +-
 tests/commoncode/test_ignore.py               |   7 +-
 tests/commoncode/test_version.py              |   5 +-
 tests/extractcode/extractcode_assert_utils.py |   5 +-
 tests/extractcode/test_archive.py             |  35 +-
 tests/extractcode/test_extractcode.py         |   7 +-
 tests/extractcode/test_patch.py               |   1 -
 tests/extractcode/test_tar.py                 |   4 +-
 tests/formattedcode/test_output_csv.py        |  22 +-
 tests/formattedcode/test_output_json.py       |  38 +--
 tests/formattedcode/test_output_jsonlines.py  |  19 +-
 tests/formattedcode/test_output_spdx.py       |  82 ++---
 tests/formattedcode/test_output_templated.py  |  44 +--
 tests/licensedcode/license_test_utils.py      |   4 +-
 tests/licensedcode/test_cache.py              |   1 -
 tests/licensedcode/test_detect.py             |   4 +-
 .../licensedcode/test_detection_datadriven.py |   4 +-
 tests/licensedcode/test_detection_validate.py |   2 +-
 tests/licensedcode/test_index.py              |   9 -
 tests/licensedcode/test_legal.py              |   1 -
 tests/licensedcode/test_match.py              |   2 +-
 tests/licensedcode/test_match_aho.py          |   2 +-
 tests/licensedcode/test_match_hash.py         |   2 -
 tests/licensedcode/test_match_seq.py          |   2 +-
 tests/licensedcode/test_models.py             |   2 +-
 tests/licensedcode/test_performance.py        |   3 +-
 tests/licensedcode/test_query.py              |   3 +-
 tests/licensedcode/test_tokenize.py           |   1 -
 tests/packagedcode/packages_test_utils.py     |   4 +-
 tests/packagedcode/test_maven.py              |   9 +
 tests/packagedcode/test_nuget.py              |   7 +-
 tests/packagedcode/test_package_utils.py      |   2 +-
 tests/packagedcode/test_pypi.py               |   1 -
 tests/scancode/test_cli.py                    | 321 +++++++-----------
 tests/scancode/test_extract_cli.py            |  12 +-
 tests/scancode/test_interrupt.py              |   4 +-
 tests/scancode/test_plugin_ignore.py          |  59 ++--
 tests/scancode/test_plugin_mark_source.py     |   6 +-
 tests/scancode/test_plugin_only_findings.py   |   6 +-
 tests/scancode/test_resource.py               |   7 +-
 tests/scancode/test_scan_utils.py             |   5 +-
 tests/textcode/test_pdf.py                    |  10 +-
 134 files changed, 576 insertions(+), 899 deletions(-)
 delete mode 100644 src/commoncode/misc.ABOUT
 delete mode 100644 src/commoncode/misc.LICENSE
 delete mode 100644 src/commoncode/misc.py

diff --git a/etc/conf/base.py b/etc/conf/base.py
index f716895d59c..d5643fb4246 100644
--- a/etc/conf/base.py
+++ b/etc/conf/base.py
@@ -5,17 +5,18 @@
 
 import sys
 
-
 """
 Check that we run a supported OS and architecture.
 """
 
+
 def unsupported(platform):
     print('Unsupported OS/platform %r.' % platform)
     print('See https://github.com/nexB/scancode-toolkit/ for supported OS/platforms.')
     print('Enter a ticket https://github.com/nexB/scancode-toolkit/issues asking for support of your OS/platform combo.')
     sys.exit(1)
 
+
 if sys.maxsize > 2 ** 32:
     arch = '64'
 else:
@@ -31,11 +32,10 @@ def unsupported(platform):
 else:
     unsupported(sys_platform)
 
-
 supported_combos = {
     'linux': ['32', '64'],
-    'win': ['32',],
-    'mac': ['64',],
+    'win': ['32', ],
+    'mac': ['64', ],
 }
 
 arches = supported_combos[os]
diff --git a/etc/conf/dev/base.py b/etc/conf/dev/base.py
index 588a475c0c2..e78bdd149f3 100644
--- a/etc/conf/dev/base.py
+++ b/etc/conf/dev/base.py
@@ -12,8 +12,8 @@ def setup_dev_mode():
     not rely on license data to remain untouched and will always check the
     license index cache for consistency, rebuilding it if necessary.
     """
-    from scancode import root_dir
-    with open(os.path.join(root_dir, 'SCANCODE_DEV_MODE'), 'wb') as sdm:
+    from scancode_config import scancode_root_dir
+    with open(os.path.join(scancode_root_dir, 'SCANCODE_DEV_MODE'), 'wb') as sdm:
         sdm.write('This is a tag file to notify that ScanCode is used in development mode.')
 
 
@@ -21,14 +21,14 @@ def setup_vscode():
     """
     Add base settings for .vscode
     """
-    from scancode import root_dir
+    from scancode_config import scancode_root_dir
     from commoncode.fileutils import create_dir
     from commoncode.fileutils import copyfile
 
-    settings = os.path.join(root_dir, 'etc', 'vscode', 'settings.json')
+    settings = os.path.join(scancode_root_dir, 'etc', 'vscode', 'settings.json')
 
     if os.path.exists(settings):
-        vscode = os.path.join(root_dir, '.vscode')
+        vscode = os.path.join(scancode_root_dir, '.vscode')
         create_dir(vscode)
         copyfile(settings, vscode)
 
diff --git a/etc/configure.py b/etc/configure.py
index 7d5bb6448f0..207e7988f25 100644
--- a/etc/configure.py
+++ b/etc/configure.py
@@ -64,7 +64,6 @@
 import shutil
 import subprocess
 
-
 # platform-specific file base names
 sys_platform = str(sys.platform).lower()
 on_win = False
@@ -79,7 +78,6 @@
     raise Exception('Unsupported OS/platform %r' % sys_platform)
     platform_names = tuple()
 
-
 # common file basenames for requirements and scripts
 base = ('base',)
 
@@ -213,7 +211,7 @@ def create_virtualenv(std_python, root_dir, tpp_dirs, quiet=False):
 
 def activate(root_dir):
     """ Activate a virtualenv in the current process."""
-    #print("* Activating...")
+    # print("* Activating...")
     bin_dir = os.path.join(root_dir, 'bin')
     activate_this = os.path.join(bin_dir, 'activate_this.py')
     with open(activate_this) as f:
diff --git a/etc/scripts/sch2js/sch2js.py b/etc/scripts/sch2js/sch2js.py
index e99527a0b2e..812dd2ab4c9 100644
--- a/etc/scripts/sch2js/sch2js.py
+++ b/etc/scripts/sch2js/sch2js.py
@@ -46,10 +46,8 @@
 from schematics.types.compound import ListType
 from schematics.types.compound import ModelType
 
-
 __version__ = '1.0.1.patch'
 
-
 SCHEMATIC_TYPE_TO_JSON_TYPE = {
     'NumberType': 'number',
     'IntType': 'integer',
diff --git a/etc/scripts/synclic.py b/etc/scripts/synclic.py
index a7a3b3e1b96..6fdd2902b74 100644
--- a/etc/scripts/synclic.py
+++ b/etc/scripts/synclic.py
@@ -50,7 +50,6 @@
 from licensedcode.models import load_licenses
 from licensedcode.models import License
 
-
 """
 Sync and update the ScanCode licenses against:
  - the SPDX license list
@@ -63,6 +62,7 @@
 TRACE_DEEP = False
 TRACE_FETCH = False
 
+
 class ExternalLicensesSource(object):
     """
     Base class to provide (including possibly fetch) licenses from an
@@ -614,11 +614,13 @@ def merge_licenses(scancode_license, other_license, updatable_attributes):
         (attribute name, value before, value after)
     """
     scancode_updated = []
+
     def update_sc(_attrib, _sc_val, _o_val):
         setattr(scancode_license, _attrib, _o_val)
         scancode_updated.append((_attrib, _sc_val, _o_val))
 
     other_updated = []
+
     def update_ot(_attrib, _sc_val, _o_val):
         setattr(other_license, _attrib, _sc_val)
         other_updated.append((_attrib, _o_val, _sc_val))
@@ -799,7 +801,6 @@ def synchronize_licenses(external_source):
     for k in others_changed | others_added:
         others_by_key[k].dump()
 
-
 # TODO: at last: print report of incorrect OTHER licenses to submit
 # updates eg. make API calls to DejaCode to create or update
 # licenses and submit review request e.g. submit requests to SPDX
diff --git a/etc/scripts/test_json2csv.py b/etc/scripts/test_json2csv.py
index fa834dd21f0..75b17e9cb2f 100644
--- a/etc/scripts/test_json2csv.py
+++ b/etc/scripts/test_json2csv.py
@@ -208,13 +208,13 @@ class TestJson2CSVWithLiveScans(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'testdata')
 
     def test_can_process_scan_from_json_scan(self):
-        import scancode
+        from scancode_config import scancode_root_dir
         from commoncode.command import execute
         test_dir = self.get_test_loc('livescan/scan')
         json_file = self.get_temp_file('json')
-        scan_cmd = os.path.join(scancode.root_dir, 'scancode')
+        scan_cmd = os.path.join(scancode_root_dir, 'scancode')
         rc, _stdout, _stderr = execute(scan_cmd,
-            ['-clip', '--email', '--url', '--strip-root', test_dir, 
+            ['-clip', '--email', '--url', '--strip-root', test_dir,
              '--json', json_file])
         result_file = self.get_temp_file('.csv')
         with open(result_file, 'wb') as rf:
diff --git a/src/cluecode/copyrights.py b/src/cluecode/copyrights.py
index d16757ba54c..296ef0a4a68 100644
--- a/src/cluecode/copyrights.py
+++ b/src/cluecode/copyrights.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -36,14 +36,13 @@
 from textcode import analysis
 from cluecode import copyrights_hint
 
-
-COPYRIGHT_TRACE = 0
+TRACE = 0
 logger = logging.getLogger(__name__)
 if os.environ.get('SCANCODE_DEBUG_COPYRIGHT'):
     import sys
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
-    COPYRIGHT_TRACE = 1
+    TRACE = 1
 
 """
 Detect and collect copyright statements.
@@ -133,7 +132,6 @@ def detect(location):
     '\&nbsp'  # html entity sometimes are double escaped
 ')*')  # repeated 0 or more times
 
-
 _YEAR_PUNCT = _YEAR + _PUNCT
 _YEAR_YEAR_PUNCT = _YEAR_YEAR + _PUNCT
 _YEAR_SHORT_PUNCT = _YEAR_SHORT + _PUNCT
@@ -1069,11 +1067,12 @@ class CopyrightDetector(object):
     """
     Class to detect copyrights and authorship.
     """
+
     def __init__(self):
         from nltk import RegexpTagger
         from nltk import RegexpParser
         self.tagger = RegexpTagger(patterns)
-        self.chunker = RegexpParser(grammar, trace=COPYRIGHT_TRACE)
+        self.chunker = RegexpParser(grammar, trace=TRACE)
 
     @classmethod
     def as_str(cls, node, ignores=()):
@@ -1386,24 +1385,29 @@ def lowercase_well_known_word(text):
         lines_append(' '.join(words))
     return '\n'.join(lines)
 
-
 # FIXME: instead of using functions, use plain re and let the re cache do its work
 
+
 def IGNORED_PUNCTUATION_RE():
     return re.compile(r'[*#"%\[\]\{\}`]+', re.I | re.M | re.U)
 
+
 def ASCII_LINE_DECO_RE():
     return re.compile(r'[-_=!\\*]{2,}')
 
+
 def ASCII_LINE_DECO2_RE():
     return re.compile(r'/{3,}')
 
+
 def WHITESPACE_RE():
     return re.compile(r' +')
 
+
 def MULTIQUOTES_RE():
     return re.compile(r"\'{2,}")
 
+
 # TODO: add debian <s> </s> POS name taggings
 def DEBIAN_COPYRIGHT_TAGS_RE():
     return re.compile(r"(\<s\>|\<s\\/>)")
@@ -1418,7 +1422,7 @@ def prepare_text_line(line):
 
     # strip whitespace
     line = line.strip()
-    #FIXME: how did we get line returns in this????
+    # FIXME: how did we get line returns in this????
     line = line.replace('\n', ' ')
 
     # remove some junk in man pages: \(co
diff --git a/src/cluecode/copyrights_hint.py b/src/cluecode/copyrights_hint.py
index 90f2be1be0f..33739cfb368 100644
--- a/src/cluecode/copyrights_hint.py
+++ b/src/cluecode/copyrights_hint.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -23,7 +23,6 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-
 from __future__ import absolute_import
 
 from datetime import datetime
@@ -37,7 +36,6 @@
 years = r'[\(\.,\-\)\s]+(' + '|'.join(years) + r')[\(\.,\-\)\s]+'
 years = re.compile(years).findall
 
-
 statement_markers = u'''
 ©
 cop
@@ -54,7 +52,6 @@
 devel
 '''.split()
 
-
 # (various copyright/copyleft signs tm, r etc) http://en.wikipedia.org/wiki/Copyright_symbol
 
 # ™ U+2122 TRADE MARK SIGN, decimal: 8482, HTML: &#8482;, UTF-8: 0xE2 0x84 0xA2, block: Letterlike Symbols, decomposition: <super> U+0054 U+004D
@@ -63,7 +60,6 @@
 #      �     U+00AE (174)
 #     �     U+2122 (8482)
 
-
 '''HTML Entity (decimal)     &#169;
 HTML Entity (hex)     &#xa9;
 HTML Entity (named)     &copy;
@@ -79,13 +75,11 @@
 Python source code     u"\u00A9"
 '''
 
-
 end_of_statement = '''
 rights reserve
 right reserve
 '''.split()
 
-
 # others stuffs
 '''
 &reg;
diff --git a/src/cluecode/finder.py b/src/cluecode/finder.py
index a1bc5aee525..5ba20343b63 100644
--- a/src/cluecode/finder.py
+++ b/src/cluecode/finder.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -22,22 +22,36 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
-import logging
 import string
 import re
 
 import url as urlpy
 import ipaddress
 
-from textcode import analysis
 from cluecode import finder_data
+from textcode import analysis
+
+# Tracing flags
+TRACE = False
 
 
-LOG = logging.getLogger(__name__)
+def logger_debug(*args):
+    pass
 
-DEBUG = False
+
+if TRACE:
+    import logging
+    import sys
+    logger = logging.getLogger(__name__)
+    # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
+
+    def logger_debug(*args):
+        return logger.debug(' '.join(isinstance(a, basestring) and a or repr(a) for a in args))
 
 """
 Find patterns in text lines such as a emails and URLs.
@@ -53,18 +67,18 @@ def find(location, patterns):
 
     Note: the location can be a list of lines for testing convenience.
     """
-    if DEBUG:
+    if TRACE:
         from pprint import pformat
         loc = pformat(location)
-        print('find(location=%(loc)r,\n  patterns=%(patterns)r)' % locals())
+        logger_debug('find(location=%(loc)r,\n  patterns=%(patterns)r)' % locals())
 
     for i, line in enumerate(analysis.text_lines(location)):
         lineno = i + 1
         for key, pattern in patterns:
             for match in pattern.findall(line):
 
-                if DEBUG:
-                    print('find: yielding match: key=%(key)r, '
+                if TRACE:
+                    logger_debug('find: yielding match: key=%(key)r, '
                           'match=%(match)r,\n    line=%(line)r' % locals())
                 yield key, unicode(match), line, lineno
 
@@ -110,11 +124,12 @@ def build_regex_filter(pattern):
     Return a filter function using regex pattern, filtering out matches
     matching this regex. The pattern should be text, not a compiled re.
     """
+
     def re_filt(matches):
         for key, match, line, lineno in matches:
             if re.match(regex, match):
-                if DEBUG:
-                    print('build_regex_filter(pattern=%(pattern)r: '
+                if TRACE:
+                    logger_debug('build_regex_filter(pattern=%(pattern)r: '
                           'filtering match: %(match)r' % locals())
                 continue
             yield key, match, line, lineno
@@ -122,7 +137,6 @@ def re_filt(matches):
     regex = re.compile(pattern, re.UNICODE | re.I)
     return re_filt
 
-
 # A good reference page of email address regex is:
 # http://fightingforalostcause.net/misc/2006/compare-email-regex.php email
 # regex from http://www.regular-expressions.info/regexbuddy/email.html
@@ -172,7 +186,6 @@ def uninteresting_emails_filter(matches):
             continue
         yield key, email, line, lineno
 
-
 # TODO: consider: http://www.regexguru.com/2008/11/detecting-urls-in-a-block-of-text/
 # TODO: consider: http://blog.codinghorror.com/the-problem-with-urls/
 
@@ -180,6 +193,7 @@ def uninteresting_emails_filter(matches):
 schemes = 'https?|ftps?|sftp|rsync|ssh|svn|git|hg|https?\+git|https?\+svn|https?\+hg'
 url_body = '[^\s<>\[\]"]'
 
+
 def urls_regex():
     # no space, no < >, no [ ] and no double quote
     return re.compile(r'''
@@ -237,8 +251,8 @@ def empty_urls_filter(matches):
     for key, match, line, lineno in matches:
         junk = match.lower().strip(string.punctuation).strip()
         if not junk or junk in EMPTY_URLS:
-            if DEBUG:
-                print('empty_urls_filter: filtering match: %(match)r'
+            if TRACE:
+                logger_debug('empty_urls_filter: filtering match: %(match)r'
                       % locals())
             continue
         yield key, match, line, lineno
@@ -328,8 +342,8 @@ def user_pass_cleaning_filter(matches):
         if is_filterable(match):
             host, _domain = url_host_domain(match)
             if not host:
-                if DEBUG:
-                    print('user_pass_cleaning_filter: '
+                if TRACE:
+                    logger_debug('user_pass_cleaning_filter: '
                           'filtering match(no host): %(match)r' % locals())
                 continue
             if '@' in host:
@@ -362,14 +376,15 @@ def canonical_url_cleaner(matches):
     for key, match, line, lineno in matches:
         if is_filterable(match):
             match = canonical_url(match)
-            if DEBUG:
-                print('canonical_url_cleaner: '
+            if TRACE:
+                logger_debug('canonical_url_cleaner: '
                       'match=%(match)r, canonic=%(canonic)r' % locals())
         yield key, match , line, lineno
 
 
 IP_V4_RE = r'^(\d{1,3}\.){0,3}\d{1,3}$'
 
+
 def is_ip_v4(s):
     return re.compile(IP_V4_RE).match(s)
 
@@ -449,7 +464,6 @@ def is_good_host(host):
             return False
         return finder_data.classify_ip(host)
 
-
     # at this stage we have a host name, not an IP
 
     if '.' not in host:
@@ -484,14 +498,14 @@ def junk_url_hosts_filter(matches):
         if is_filterable(match):
             host, domain = url_host_domain(match)
             if not is_good_host(host):
-                if DEBUG:
-                    print('junk_url_hosts_filter: '
+                if TRACE:
+                    logger_debug('junk_url_hosts_filter: '
                           '!is_good_host:%(host)r): %(match)r' % locals())
                 continue
 
             if not is_good_host(domain) and not is_ip(host):
-                if DEBUG:
-                    print('junk_url_hosts_filter: ''!is_good_host:%(domain)r '
+                if TRACE:
+                    logger_debug('junk_url_hosts_filter: ''!is_good_host:%(domain)r '
                           'and !is_ip:%(host)r: %(match)r' % locals())
                 continue
         yield key, match, line, lineno
@@ -506,8 +520,8 @@ def junk_urls_filter(matches):
     for key, match, line, lineno in matches:
         good_url = finder_data.classify_url(match)
         if not good_url:
-            if DEBUG:
-                print('junk_url_filter: %(match)r' % locals())
+            if TRACE:
+                logger_debug('junk_url_filter: %(match)r' % locals())
             continue
         yield key, match, line, lineno
 
diff --git a/src/cluecode/finder_data.py b/src/cluecode/finder_data.py
index cbecb6533ce..3baf0a8fef2 100644
--- a/src/cluecode/finder_data.py
+++ b/src/cluecode/finder_data.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -40,7 +40,6 @@ def set_from_text(text):
     test.com
 ''')
 
-
 JUNK_HOSTS_AND_DOMAINS = set_from_text(u'''
     exmaple.com
     example.com
@@ -56,12 +55,10 @@ def set_from_text(text):
     hostname
 ''')
 
-
 JUNK_IPS = set_from_text(u'''
     1.2.3.4
 ''')
 
-
 JUNK_URLS = set_from_text(u'''
     http://www.adobe.com/2006/mxml
     http://www.w3.org/1999/XSL/Transform
@@ -134,7 +131,6 @@ def set_from_text(text):
     http://gcc.gnu.org/bugs.html
 ''')
 
-
 JUNK_URL_PREFIXES = tuple(set_from_text('''
     http://www.springframework.org/dtd/
     http://www.slickedit.com/dtd/
@@ -175,7 +171,6 @@ def set_from_text(text):
     http://www.oasis-open.org/docbook/xml/
 '''))
 
-
 JUNK_URL_SUFFIXES = tuple(set_from_text('''
    .png
    .jpg
diff --git a/src/commoncode/__init__.py b/src/commoncode/__init__.py
index 0eaadbbdb2a..702495e4b65 100644
--- a/src/commoncode/__init__.py
+++ b/src/commoncode/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -34,15 +34,14 @@ def set_re_max_cache(max_cache=1000000):
     """
     import re
     import fnmatch
-    
+
     remax = getattr(re, '_MAXCACHE', 0)
     if remax < max_cache:
         setattr(re, '_MAXCACHE', max_cache)
 
-    
     fnmatchmax = getattr(fnmatch, '_MAXCACHE', 0)
     if fnmatchmax < max_cache:
         setattr(fnmatch, '_MAXCACHE', max_cache)
 
 
-set_re_max_cache()
\ No newline at end of file
+set_re_max_cache()
diff --git a/src/commoncode/command.py b/src/commoncode/command.py
index 57b90d2a154..4594091cabb 100644
--- a/src/commoncode/command.py
+++ b/src/commoncode/command.py
@@ -50,7 +50,6 @@
 from commoncode.system import on_windows
 from commoncode.system import on_linux
 
-
 # Python 2 and 3 support
 try:
     # Python 2
@@ -60,7 +59,6 @@
     # Python 3
     unicode = str  # NOQA
 
-
 """
 Minimal wrapper for executing external commands in sub-processes. The approach
 is unconventionally relying on vendoring scripts or pre-built executable
diff --git a/src/commoncode/dict_utils.py b/src/commoncode/dict_utils.py
index d9df72d7af8..5c71159e0af 100644
--- a/src/commoncode/dict_utils.py
+++ b/src/commoncode/dict_utils.py
@@ -36,13 +36,11 @@
 import collections
 import itertools
 
-
 # Placeholder constants
 FREE = -1
 DUMMY = -2
 
 
-
 class Dict(collections.MutableMapping):
     """
     Space efficient dictionary with fast iteration and cheap resizes.
diff --git a/src/commoncode/fetch.py b/src/commoncode/fetch.py
index 0e003e2d7df..0a1e656a8ab 100644
--- a/src/commoncode/fetch.py
+++ b/src/commoncode/fetch.py
@@ -35,7 +35,6 @@
 from commoncode import fileutils
 import os
 
-
 logger = logging.getLogger(__name__)
 # import sys
 # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
diff --git a/src/commoncode/fileset.py b/src/commoncode/fileset.py
index 589feb88922..b36e2d51e07 100644
--- a/src/commoncode/fileset.py
+++ b/src/commoncode/fileset.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -34,18 +34,15 @@
 from commoncode import paths
 from commoncode.system import on_linux
 
-
 DEBUG = False
 logger = logging.getLogger(__name__)
 # import sys
 # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 # logger.setLevel(logging.DEBUG)
 
-
 POSIX_PATH_SEP = b'/' if on_linux else '/'
 EMPTY_STRING = b'' if on_linux else ''
 
-
 """
 Match files and directories paths based on inclusion and exclusion glob-style
 patterns.
diff --git a/src/commoncode/filetype.py b/src/commoncode/filetype.py
index 9e24e00b12d..ca4db6f3117 100644
--- a/src/commoncode/filetype.py
+++ b/src/commoncode/filetype.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -33,11 +33,11 @@
 from commoncode.system import on_posix
 from commoncode.functional import memoize
 
-
 """
 Low level file type utilities, essentially a wrapper around os.path and stat.
 """
 
+
 def is_link(location):
     """
     Return True if `location` is a symbolic link.
@@ -192,6 +192,7 @@ def get_last_modified_date(location):
     'file_size': os.path.getsize,
 }
 
+
 @memoize
 def counter(location, counting_function):
     """
diff --git a/src/commoncode/fileutils.py b/src/commoncode/fileutils.py
index 7b32adc596a..dea5e94cb19 100644
--- a/src/commoncode/fileutils.py
+++ b/src/commoncode/fileutils.py
@@ -62,23 +62,23 @@
 from commoncode.system import on_linux
 from commoncode import text
 
-
 # this exception is not available on posix
 try:
     WindowsError  # NOQA
 except NameError:
     WindowsError = None  # NOQA
 
-
 TRACE = False
 
 import logging
 
 logger = logging.getLogger(__name__)
 
+
 def logger_debug(*args):
     pass
 
+
 if TRACE:
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
@@ -86,7 +86,6 @@ def logger_debug(*args):
     def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, basestring) and a or repr(a) for a in args))
 
-
 # Paths can only be sanely handled as raw bytes on Linux
 PATH_TYPE = bytes if on_linux else unicode
 POSIX_PATH_SEP = b'/' if on_linux else '/'
@@ -102,6 +101,7 @@ def logger_debug(*args):
 # DIRECTORIES
 #
 
+
 def create_dir(location):
     """
     Create directory and all sub-directories recursively at location ensuring these
@@ -173,6 +173,7 @@ def get_temp_dir(base_dir=scancode_temp_dir, prefix=''):
 # FILE READING
 #
 
+
 def file_chunks(file_object, chunk_size=1024):
     """
     Yield a file piece by piece. Default chunk size: 1k.
@@ -368,6 +369,7 @@ def splitext(path, force_posix=False):
 # DIRECTORY AND FILES WALKING/ITERATION
 #
 
+
 ignore_nothing = lambda _: False
 
 
@@ -439,6 +441,7 @@ def resource_iter(location, ignored=ignore_nothing, with_dirs=True):
 # COPY
 #
 
+
 def copytree(src, dst):
     """
     Copy recursively the `src` directory to the `dst` directory. If `dst` is an
@@ -544,6 +547,7 @@ def copytime(src, dst):
 # PERMISSIONS
 #
 
+
 # modes: read, write, executable
 R = stat.S_IRUSR
 RW = stat.S_IRUSR | stat.S_IWUSR
@@ -603,6 +607,7 @@ def chmod_tree(location, flags):
 # DELETION
 #
 
+
 def _rm_handler(function, path, excinfo):  # NOQA
     """
     shutil.rmtree handler invoked on error when deleting a directory tree.
diff --git a/src/commoncode/functional.py b/src/commoncode/functional.py
index 281dee5e831..93049018a06 100644
--- a/src/commoncode/functional.py
+++ b/src/commoncode/functional.py
@@ -157,7 +157,9 @@ def memoize_to_attribute(attr_name, _test=False):
     The Obj().expensive property value will be cached to attr_name
     self._expensive and computed only once in the life of the Obj instance.
     """
+
     def memoized_to_attr(meth):
+
         @functools.wraps(meth)
         def wrapper(self, *args, **kwargs):
             if getattr(self, attr_name) is None:
@@ -166,6 +168,7 @@ def wrapper(self, *args, **kwargs):
             else:
                 res = getattr(self, attr_name)
             return res
+
         return wrapper
 
     return memoized_to_attr
diff --git a/src/commoncode/hash.py b/src/commoncode/hash.py
index d8f9ab94feb..d7b3f48ec40 100644
--- a/src/commoncode/hash.py
+++ b/src/commoncode/hash.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -33,7 +33,6 @@
 from commoncode.codec import urlsafe_b64encode
 from commoncode import filetype
 
-
 """
 Hashes and checksums.
 
@@ -44,12 +43,15 @@
 Checksums are operating on files.
 """
 
+
 def _hash_mod(bitsize, hmodule):
     """
     Return a hashing class returning hashes with a `bitsize` bit length. The
     interface of this class is similar to the hash module API.
     """
+
     class hasher(object):
+
         def __init__(self, msg=None):
             self.digest_size = bitsize // 8
             self.h = msg and hmodule(msg).digest()[:self.digest_size] or None
@@ -94,6 +96,7 @@ class sha1_git_hasher(object):
     """
     Hash content using the git blob SHA1 convention.
     """
+
     def __init__(self, msg=None):
         self.digest_size = 160 // 8
         self.h = msg and self._compute(msg) or None
@@ -148,18 +151,23 @@ def checksum(location, name, base64=False):
 def md5(location):
     return checksum(location, name='md5', base64=False)
 
+
 def sha1(location):
     return checksum(location, name='sha1', base64=False)
 
+
 def b64sha1(location):
     return checksum(location, name='sha1', base64=True)
 
+
 def sha256(location):
     return checksum(location, name='sha256', base64=False)
 
+
 def sha512(location):
     return checksum(location, name='sha512', base64=False)
 
+
 def sha1_git(location):
     return checksum(location, name='sha1_git', base64=False)
 
diff --git a/src/commoncode/ignore.py b/src/commoncode/ignore.py
index 111a70166a8..d04e4892342 100644
--- a/src/commoncode/ignore.py
+++ b/src/commoncode/ignore.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -74,6 +74,7 @@ def get_ignores(location, include_defaults=True):
 # Default ignores
 #
 
+
 ignores_MacOSX = {
     '.DS_Store': 'Default ignore: MacOSX artifact',
     '._.DS_Store': 'Default ignore: MacOSX artifact',
@@ -293,7 +294,6 @@ def get_ignores(location, include_defaults=True):
     '/.ssh': 'Default ignore: SSH configuration',
 }
 
-
 default_ignores = {}
 
 default_ignores.update(chain(*[d.items() for d in [
diff --git a/src/commoncode/misc.ABOUT b/src/commoncode/misc.ABOUT
deleted file mode 100644
index 5cd542f93b1..00000000000
--- a/src/commoncode/misc.ABOUT
+++ /dev/null
@@ -1,8 +0,0 @@
-about_resource: misc.py
-download_url: 
-    - http://code.activestate.com/recipes/578433-mixin-for-pickling-objects-with-__slots__/
-
-dje_license: mit
-license_text_file: misc.LICENSE
-copyright: Copyright (c) 2013 Oren Tirosh
-owner: Oren Tirosh
diff --git a/src/commoncode/misc.LICENSE b/src/commoncode/misc.LICENSE
deleted file mode 100644
index 4a72b80190d..00000000000
--- a/src/commoncode/misc.LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2013  Oren Tirosh
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-#     The above copyright notice and this permission notice shall be
-#     included in all copies or substantial portions of the Software.
-#
-#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-#     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-#     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-#     OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/src/commoncode/misc.py b/src/commoncode/misc.py
deleted file mode 100644
index be957dfdaed..00000000000
--- a/src/commoncode/misc.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
-# http://nexb.com and https://github.com/nexB/scancode-toolkit/
-# The ScanCode software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode require an acknowledgment.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# When you publish or redistribute any data created with ScanCode or any ScanCode
-# derivative work, you must accompany this data with the following acknowledgment:
-#
-#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-#  ScanCode should be considered or used as legal advice. Consult an Attorney
-#  for any legal advice.
-#  ScanCode is a free software code scanning tool from nexB Inc. and others.
-#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-from __future__ import absolute_import, print_function
-
-
-class SlotPickleMixin(object):
-    # SlotPickelMixin is originally from:
-    # http://code.activestate.com/recipes/578433-mixin-for-pickling-objects-with-__slots__/
-    # Copyright (c) 2013  Created by Oren Tirosh
-    #
-    # Permission is hereby granted, free of charge, to any person
-    # obtaining a copy of this software and associated documentation files
-    # (the "Software"), to deal in the Software without restriction,
-    # including without limitation the rights to use, copy, modify, merge,
-    # publish, distribute, sublicense, and/or sell copies of the Software,
-    # and to permit persons to whom the Software is furnished to do so,
-    # subject to the following conditions:
-    #
-    #     The above copyright notice and this permission notice shall be
-    #     included in all copies or substantial portions of the Software.
-    #
-    #     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    #     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    #     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    #     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    #     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    #     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    #     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    #     OTHER DEALINGS IN THE SOFTWARE.
-    def __getstate__(self):
-        return {slot: getattr(self, slot) for slot in self.__slots__ if hasattr(self, slot)}
-
-    def __setstate__(self, state):
-        for slot, value in state.items():
-            setattr(self, slot, value)
diff --git a/src/commoncode/paths.py b/src/commoncode/paths.py
index 71ff649aa11..17defd15a52 100644
--- a/src/commoncode/paths.py
+++ b/src/commoncode/paths.py
@@ -38,13 +38,11 @@
 from commoncode.fileutils import is_posixpath
 from commoncode.system import on_linux
 
-
 """
 Various path utilities such as common prefix and suffix functions, conversion
 to OS-safe paths and to POSIX paths.
 """
 
-
 POSIX_PATH_SEP = b'/' if on_linux else '/'
 WIN_PATH_SEP = b'\\' if on_linux else '\\'
 EMPTY_STRING = b'' if on_linux else ''
@@ -52,6 +50,7 @@
 #
 # Build OS-portable and safer paths
 
+
 def safe_path(path, posix=False):
     """
     Convert `path` to a safe and portable POSIX path usable on multiple OSes. The
@@ -87,7 +86,6 @@ def safe_path(path, posix=False):
     return as_posixpath(path)
 
 
-
 def path_handlers(path, posix=True):
     """
     Return a path module and path separator to use for handling (e.g. split and join)
@@ -221,7 +219,6 @@ def portable_filename(filename):
     if basename.lower() in windows_illegal_names:
         filename = ''.join([basename, '_', dot, extension])
 
-
     # no name made only of dots.
     if set(filename) == set(['.']):
         filename = 'dot' * len(filename)
@@ -237,6 +234,7 @@ def portable_filename(filename):
 # paths comparisons, common prefix and suffix extraction
 #
 
+
 def common_prefix(s1, s2):
     """
     Return the common leading subsequence of two sequences and its length.
diff --git a/src/commoncode/saneyaml.py b/src/commoncode/saneyaml.py
index 2de2aa78d74..17634a6f39e 100644
--- a/src/commoncode/saneyaml.py
+++ b/src/commoncode/saneyaml.py
@@ -22,7 +22,6 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-
 from __future__ import absolute_import
 from __future__ import print_function
 
@@ -38,7 +37,6 @@
     from yaml import SafeLoader
     from yaml import SafeDumper
 
-
 """
 Wrapper around PyYAML to provide sane defaults ensuring that dump/load does not
 damage content, keeps ordering, use always block-style and use four spaces
@@ -57,6 +55,7 @@
 # https://pypi.python.org/pypi/ruamel.yaml/0.9.1
 # https://pypi.python.org/pypi/yaml2rst/0.2
 
+
 def load(s):
     """
     Return an object safely loaded from YAML string `s`. `s` must be unicode
@@ -90,6 +89,7 @@ class SaneLoader(SafeLoader):
     """
     A safe loader configured with many sane defaults.
     """
+
     def ignore_aliases(self, data):
         return True
 
@@ -120,6 +120,7 @@ def string_loader(loader, node):
 # keep  boolean conversion
 # SaneLoader.add_constructor(u'tag:yaml.org,2002:boolean', string_loader)
 
+
 def ordered_loader(loader, node):
     """
     Ensure that YAML maps ordered is preserved and loaded in an OrderedDict.
@@ -143,6 +144,7 @@ def ordered_loader(loader, node):
 
 
 class SaneDumper(SafeDumper):
+
     def increase_indent(self, flow=False, indentless=False):
         """
         Ensure that lists items are always indented.
@@ -162,6 +164,7 @@ def ordered_dumper(dumper, data):
     """
     return dumper.represent_mapping(u'tag:yaml.org,2002:map', data.items())
 
+
 SaneDumper.add_representer(OrderedDict, ordered_dumper)
 
 
@@ -171,6 +174,7 @@ def null_dumper(dumper, value):
     """
     return dumper.represent_scalar(u'tag:yaml.org,2002:null', u'')
 
+
 SafeDumper.add_representer(type(None), null_dumper)
 
 
@@ -210,4 +214,5 @@ def boolean_dumper(dumper, value):
     style = None
     return dumper.represent_scalar(u'tag:yaml.org,2002:bool', value, style=style)
 
+
 SaneDumper.add_representer(bool, boolean_dumper)
diff --git a/src/commoncode/system.py b/src/commoncode/system.py
index c0264a1ac45..250d1f4b0e6 100644
--- a/src/commoncode/system.py
+++ b/src/commoncode/system.py
@@ -50,8 +50,9 @@ def os_arch():
         raise Exception('Unsupported OS/platform %r' % sys_platform)
     return os, arch
 
-
 # FIXME use these for architectures
+
+
 '''
 darwin/386
 darwin/amd64
@@ -85,12 +86,10 @@ def os_arch():
 on_linux = current_os == 'linux'
 on_posix = not on_windows and (on_mac or on_linux)
 
-
 current_os_arch = '%(current_os)s-%(current_arch)s' % locals()
 noarch = 'noarch'
 current_os_noarch = '%(current_os)s-%(noarch)s' % locals()
 
-
 #
 # Shared library file extensions
 #
@@ -101,7 +100,6 @@ def os_arch():
 if on_linux:
     lib_ext = '.so'
 
-
 #
 # Python versions
 #
@@ -116,7 +114,6 @@ def os_arch():
 py36 = py3 and _sys_v1 == 6
 py37 = py3 and _sys_v1 == 7
 
-
 # Do not let Windows error pop up messages with default SetErrorMode
 # See http://msdn.microsoft.com/en-us/library/ms680621(VS100).aspx
 #
diff --git a/src/commoncode/testcase.py b/src/commoncode/testcase.py
index 1f53a6898da..d341e4b7173 100644
--- a/src/commoncode/testcase.py
+++ b/src/commoncode/testcase.py
@@ -22,7 +22,6 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-
 from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import division
@@ -53,7 +52,6 @@ class EnhancedAssertions(TestCaseClass):
     # always show full diff
     maxDiff = None
 
-
     def failUnlessRaisesInstance(self, excInstance, callableObj,
                                  *args, **kwargs):
         """
@@ -79,11 +77,9 @@ def failUnlessRaisesInstance(self, excInstance, callableObj,
 # to ensure that multiple tests run can be launched in parallel
 test_run_temp_dir = None
 
-
 # set to 1 to see the slow tests
 timing_threshold = sys.maxint
 
-
 POSIX_PATH_SEP = b'/' if on_linux else '/'
 WIN_PATH_SEP = b'\\' if on_linux else '\\'
 EMPTY_STRING = b'' if on_linux else ''
@@ -298,6 +294,7 @@ def _extract_tar_raw(test_path, target_dir, to_bytes, *args, **kwargs):
     tar.extractall(path=target_dir)
     tar.close()
 
+
 extract_tar_raw = partial(_extract_tar_raw, to_bytes=True)
 
 extract_tar_uni = partial(_extract_tar_raw, to_bytes=False)
diff --git a/src/commoncode/version.py b/src/commoncode/version.py
index c980ee04f87..61323746a8a 100644
--- a/src/commoncode/version.py
+++ b/src/commoncode/version.py
@@ -24,7 +24,6 @@
 
 from __future__ import absolute_import, print_function
 
-
 import re
 
 from commoncode.system import on_linux
diff --git a/src/extractcode/__init__.py b/src/extractcode/__init__.py
index ea885fe269c..8b70e72c64c 100644
--- a/src/extractcode/__init__.py
+++ b/src/extractcode/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -44,17 +44,14 @@
 from os.path import join
 from os.path import exists
 
-
 logger = logging.getLogger(__name__)
 DEBUG = False
 # import sys
 # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 # logger.setLevel(logging.DEBUG)
 
-
 root_dir = join(dirname(__file__), 'bin')
 
-
 POSIX_PATH_SEP = b'/' if on_linux else '/'
 WIN_PATH_SEP = b'\\' if on_linux else '\\'
 PATHS_SEPS = POSIX_PATH_SEP + WIN_PATH_SEP
@@ -66,7 +63,6 @@
 # Suffix added to extracted target_dir paths
 EXTRACT_SUFFIX = b'-extract' if on_linux else r'-extract'
 
-
 # high level archive "kinds"
 docs = 1
 regular = 2
@@ -76,7 +72,6 @@
 patches = 6
 special_package = 7
 
-
 kind_labels = {
     1: 'docs',
     2: 'regular',
@@ -294,14 +289,18 @@ def to_dict(self):
 class ExtractError(Exception):
     pass
 
+
 class ExtractErrorPasswordProtected(ExtractError):
     pass
 
+
 class ExtractErrorFailedToExtract(ExtractError):
     pass
 
+
 class ExtractWarningIncorrectEntry(ExtractError):
     pass
 
+
 class ExtractWarningTrailingGarbage(ExtractError):
     pass
diff --git a/src/extractcode/archive.py b/src/extractcode/archive.py
index e641d9014c1..555b33b5a0c 100644
--- a/src/extractcode/archive.py
+++ b/src/extractcode/archive.py
@@ -51,7 +51,6 @@
 from extractcode.uncompress import uncompress_gzip
 from extractcode.uncompress import uncompress_bzip2
 
-
 logger = logging.getLogger(__name__)
 TRACE = False
 TRACE_DEEP = False
@@ -61,8 +60,6 @@
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
 
-
-
 """
 Archive formats handling. The purpose of this module is to select an extractor
 suitable for the accurate extraction of a given kind of archive. An extractor is
@@ -391,10 +388,10 @@ def try_to_extract(location, target_dir, extractor):
         fileutils.delete(temp_target)
     return warnings
 
-
 # High level aliases to lower level extraction functions
 ########################################################
 
+
 extract_tar = libarchive2.extract
 extract_patch = patch.extract
 
@@ -411,7 +408,6 @@ def try_to_extract(location, target_dir, extractor):
 
 extract_springboot = functools.partial(try_to_extract, extractor=extract_zip)
 
-
 extract_iso = sevenzip.extract
 extract_rar = sevenzip.extract
 extract_rpm = sevenzip.extract
@@ -424,7 +420,6 @@ def try_to_extract(location, target_dir, extractor):
 extract_Z = sevenzip.extract
 extract_xarpkg = sevenzip.extract
 
-
 # Archive handlers.
 ####################
 
diff --git a/src/extractcode/extract.py b/src/extractcode/extract.py
index 08935a1ab1d..88ae9e5d57e 100644
--- a/src/extractcode/extract.py
+++ b/src/extractcode/extract.py
@@ -46,7 +46,6 @@
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
 
-
 """
 Extract archives and compressed files recursively to get the file content available for
 further processing. This the high level extraction entry point.
@@ -86,7 +85,6 @@
    the original archive.
 """
 
-
 """
 An ExtractEvent contains data about an archive extraction progress:
  - `source` is the location of the archive being extracted
diff --git a/src/extractcode/libarchive2.py b/src/extractcode/libarchive2.py
index 40e0011e460..424b41315dc 100644
--- a/src/extractcode/libarchive2.py
+++ b/src/extractcode/libarchive2.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -22,7 +22,6 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
@@ -50,19 +49,16 @@
 from extractcode import ExtractError
 from extractcode import ExtractErrorPasswordProtected
 
-
 # Python 2 and 3 support
 try:
     from os import fsencode
 except ImportError:
     from backports.os import fsencode
 
-
 logger = logging.getLogger(__name__)
 DEBUG = False
 # logging.basicConfig(level=logging.DEBUG)
 
-
 """
 libarchive2 is a minimal and specialized wrapper around a vendored libarchive archive
 extraction library. It only deals with archive extraction and does not know how to
@@ -179,6 +175,7 @@ class Archive(object):
             for entry in archive:
                 # dome something with entry
     """
+
     def __init__(self, location, uncompress=True, extract=True, block_size=10240):
         """
         Build an Archive object from file at `location`.
@@ -381,6 +378,7 @@ def __repr__(self):
 
 
 class ArchiveException(ExtractError):
+
     def __init__(self, rc=None, archive_struct=None, archive_func=None, root_ex=None):
         self.root_ex = root_ex
         if root_ex and isinstance(root_ex, ArchiveException):
@@ -405,29 +403,35 @@ def __str__(self):
 class ArchiveWarning(ArchiveException):
     pass
 
+
 class ArchiveErrorRetryable(ArchiveException):
     pass
 
+
 class ArchiveError(ArchiveException):
     pass
 
+
 class ArchiveErrorFatal(ArchiveException):
     pass
 
+
 class ArchiveErrorFailedToWriteEntry(ArchiveException):
     pass
 
+
 class ArchiveErrorPasswordProtected(ArchiveException, ExtractErrorPasswordProtected):
     pass
 
+
 class ArchiveErrorIllegalOperationOnClosedArchive(ArchiveException):
     pass
 
-
 #################################################
 # ctypes defintion of the interface to libarchive
 #################################################
 
+
 def errcheck(rc, archive_func, args, null=False):
     """
     ctypes error check handler for functions returning int, or null if null is True.
@@ -455,7 +459,6 @@ def errcheck(rc, archive_func, args, null=False):
 
 errcheck_null = partial(errcheck, null=True)
 
-
 # libarchive return codes
 ARCHIVE_EOF = 1
 ARCHIVE_OK = 0
@@ -464,7 +467,6 @@ def errcheck(rc, archive_func, args, null=False):
 ARCHIVE_FAILED = -25
 ARCHIVE_FATAL = -30
 
-
 # libarchive stat/file types
 AE_IFREG = 0o0100000  # Regular file
 AE_IFLNK = 0o0120000  # Symbolic link
@@ -476,7 +478,6 @@ def errcheck(rc, archive_func, args, null=False):
 
 AE_IFMT = 0o0170000  # Format mask
 
-
 #####################################
 # libarchive C functions declarations
 #####################################
@@ -492,7 +493,6 @@ def errcheck(rc, archive_func, args, null=False):
 # wide string and then store a narrow string for the same data, the previously-set
 # wide string will be discarded in favor of the new data.
 
-
 """
 To read an archive, you must first obtain an initialized struct archive object
 from archive_read_new()
@@ -506,7 +506,6 @@ def errcheck(rc, archive_func, args, null=False):
 archive_reader.restype = c_void_p
 archive_reader.errcheck = errcheck_null
 
-
 """
 Given a struct archive object, you can enable support for formats and filters.
 Enables support for all available formats except the "raw" format.
@@ -522,7 +521,6 @@ def errcheck(rc, archive_func, args, null=False):
 use_all_formats.restype = c_int
 use_all_formats.errcheck = errcheck
 
-
 """
 Given a struct archive object, you can enable support for formats and filters.
 
@@ -539,7 +537,6 @@ def errcheck(rc, archive_func, args, null=False):
 use_raw_formats.restype = c_int
 use_raw_formats.errcheck = errcheck
 
-
 """
 Given a struct archive object, you can enable support for formats and filters.
 
@@ -555,7 +552,6 @@ def errcheck(rc, archive_func, args, null=False):
 use_all_filters.restype = c_int
 use_all_filters.errcheck = errcheck
 
-
 """
 Once formats and filters have been set, you open an archive filename for
 actual reading.
@@ -575,7 +571,6 @@ def errcheck(rc, archive_func, args, null=False):
 open_file.restype = c_int
 open_file.errcheck = errcheck
 
-
 """
 Wide char version of archive_read_open_filename.
 """
@@ -585,7 +580,6 @@ def errcheck(rc, archive_func, args, null=False):
 open_file_w.restype = c_int
 open_file_w.errcheck = errcheck
 
-
 """
 When done with reading an archive you must free its resources.
 
@@ -618,7 +612,6 @@ def errcheck(rc, archive_func, args, null=False):
 new_entry.restype = c_void_p
 new_entry.errcheck = errcheck_null
 
-
 """
 Given an opened archive struct object, you can iterate through the archive
 entries. An entry has a header with various data and usually a payload that is
@@ -639,7 +632,6 @@ def errcheck(rc, archive_func, args, null=False):
 next_entry.restype = c_int
 next_entry.errcheck = errcheck
 
-
 """
 Read data associated with the header just read. Internally, this is a
 convenience function that calls archive_read_data_block() and fills any gaps
@@ -651,7 +643,6 @@ def errcheck(rc, archive_func, args, null=False):
 read_entry_data.restype = c_ssize_t
 read_entry_data.errcheck = errcheck
 
-
 """
 Return the next available block of data for this entry. Unlike
 archive_read_data(), the archive_read_data_block() function avoids copying
@@ -667,7 +658,6 @@ def errcheck(rc, archive_func, args, null=False):
 read_entry_data_block.restype = c_int
 read_entry_data_block.errcheck = errcheck
 
-
 """
 Releases the struct archive_entry object.
 The struct entry object must be freed when no longer needed.
@@ -677,7 +667,6 @@ def errcheck(rc, archive_func, args, null=False):
 free_entry.argtypes = [c_void_p]
 free_entry.restype = None
 
-
 #
 # Entry attributes: path, type, size, etc. are collected with these functions:
 #
@@ -704,7 +693,6 @@ def errcheck(rc, archive_func, args, null=False):
 entry_type.argtypes = [c_void_p]
 entry_type.restype = c_int
 
-
 """
 This function retrieves the mtime field in an archive_entry. (modification
 time).
@@ -718,7 +706,6 @@ def errcheck(rc, archive_func, args, null=False):
 entry_time.argtypes = [c_void_p]
 entry_time.restype = c_int
 
-
 """
 Path in the archive.
 
@@ -737,14 +724,12 @@ def errcheck(rc, archive_func, args, null=False):
 entry_path_w.argtypes = [c_void_p]
 entry_path_w.restype = c_wchar_p
 
-
 # int64_t archive_entry_size(struct archive_entry *a);
 entry_size = libarchive.archive_entry_size
 entry_size.argtypes = [c_void_p]
 entry_size.restype = c_longlong
 entry_size.errcheck = errcheck
 
-
 """
 Destination of the hardlink.
 """
@@ -753,13 +738,11 @@ def errcheck(rc, archive_func, args, null=False):
 hardlink_path.argtypes = [c_void_p]
 hardlink_path.restype = c_char_p
 
-
 # const wchar_t * archive_entry_hardlink_w(struct archive_entry *a);
 hardlink_path_w = libarchive.archive_entry_hardlink_w
 hardlink_path_w.argtypes = [c_void_p]
 hardlink_path_w.restype = c_wchar_p
 
-
 """
 The number of references (hardlinks) can be obtained by calling
 archive_entry_nlinks()
@@ -769,7 +752,6 @@ def errcheck(rc, archive_func, args, null=False):
 hardlink_count.argtypes = [c_void_p]
 hardlink_count.restype = c_int
 
-
 """
 The functions archive_entry_dev() and archive_entry_ino64() are used by
 ManPageArchiveEntryLinkify3 to find hardlinks. The pair of device and inode is
@@ -779,7 +761,6 @@ def errcheck(rc, archive_func, args, null=False):
 # dev_t archive_entry_dev(struct archive_entry *a);
 # int archive_entry_dev_is_set(struct archive_entry *a);
 
-
 """
 Destination of the symbolic link.
 """
@@ -789,14 +770,12 @@ def errcheck(rc, archive_func, args, null=False):
 symlink_path.restype = c_char_p
 symlink_path.errcheck = errcheck_null
 
-
 # const wchar_t * archive_entry_symlink_w(struct archive_entry *);
 symlink_path_w = libarchive.archive_entry_symlink_w
 symlink_path_w.argtypes = [c_void_p]
 symlink_path_w.restype = c_wchar_p
 symlink_path_w.errcheck = errcheck_null
 
-
 #
 # Utilities and error handling: not all are defined for now
 #
@@ -812,7 +791,6 @@ def errcheck(rc, archive_func, args, null=False):
 errno.argtypes = [c_void_p]
 errno.restype = c_int
 
-
 """
 Returns a textual error message suitable for display. The error message here
 is usually more specific than that obtained from passing the result of
@@ -823,7 +801,6 @@ def errcheck(rc, archive_func, args, null=False):
 err_msg.argtypes = [c_void_p]
 err_msg.restype = c_char_p
 
-
 """
 Returns a count of the number of files processed by this archive object. The
 count is incremented by calls to ManPageArchiveWriteHeader3 or
@@ -844,13 +821,11 @@ def errcheck(rc, archive_func, args, null=False):
 """
 # int archive_filter_count(struct archive *, int);
 
-
 """
 Synonym for archive_filter_code(a,(0)).
 """
 # int archive_compression(struct archive *);
 
-
 """
 Returns a textual name identifying the indicated filter. See
 archive_filter_count() for details of the numbering.
diff --git a/src/extractcode/patch.py b/src/extractcode/patch.py
index 765295ab731..9882a5bce92 100644
--- a/src/extractcode/patch.py
+++ b/src/extractcode/patch.py
@@ -48,7 +48,6 @@
 more conveniently.
 """
 
-
 LOG = logging.getLogger(__name__)
 
 
diff --git a/src/extractcode/sevenzip.py b/src/extractcode/sevenzip.py
index ff800eaa7ca..c21e26d0c10 100644
--- a/src/extractcode/sevenzip.py
+++ b/src/extractcode/sevenzip.py
@@ -43,12 +43,10 @@
 
 root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), 'bin'))
 
-
 """
 Low level support for p/7zip-based archive extraction.
 """
 
-
 sevenzip_errors = [
     ('unsupported method', 'Unsupported archive or broken archive'),
     ('wrong password', 'Password protected archive, unable to extract'),
diff --git a/src/extractcode/tar.py b/src/extractcode/tar.py
index f7c5b0a628d..fa3f3e24c6a 100644
--- a/src/extractcode/tar.py
+++ b/src/extractcode/tar.py
@@ -50,7 +50,6 @@
 #
 # Credits: Gustavo Niemeyer, Niels Gustabel, Richard Townsend.
 
-
 from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
@@ -71,7 +70,6 @@
 logger = logging.getLogger('extractcode')
 # logging.basicConfig(level=logging.DEBUG)
 
-
 """
 Low level support for tar-based archive extraction using Python built-in tar
 support.
diff --git a/src/formattedcode/output_html.py b/src/formattedcode/output_html.py
index 42b3719c310..5cee9fab016 100644
--- a/src/formattedcode/output_html.py
+++ b/src/formattedcode/output_html.py
@@ -139,9 +139,9 @@ class HtmlAppOutput(OutputPlugin):
     def is_enabled(self, output_html_app, **kwargs):
         return output_html_app
 
-    def process_codebase(self, codebase, 
-                         input, # NOQA
-                         output_html_app, 
+    def process_codebase(self, codebase,
+                         input,  # NOQA
+                         output_html_app,
                          scancode_version, **kwargs):
 
         results = self.get_results(codebase, **kwargs)
diff --git a/src/formattedcode/output_json.py b/src/formattedcode/output_json.py
index 7eba8590d59..f168c854543 100644
--- a/src/formattedcode/output_json.py
+++ b/src/formattedcode/output_json.py
@@ -56,7 +56,7 @@ def is_enabled(self, output_json, **kwargs):
         return output_json
 
     def process_codebase(self, codebase, output_json, files_count,
-                         scancode_version, scancode_notice, pretty_options, 
+                         scancode_version, scancode_notice, pretty_options,
                          **kwargs):
 
         results = self.get_results(codebase, **kwargs)
@@ -84,7 +84,7 @@ def is_enabled(self, output_json_pp, **kwargs):
         return output_json_pp
 
     def process_codebase(self, codebase, output_json_pp, files_count,
-                         scancode_version, scancode_notice, pretty_options, 
+                         scancode_version, scancode_notice, pretty_options,
                          **kwargs):
 
         results = self.get_results(codebase, **kwargs)
diff --git a/src/formattedcode/output_spdx.py b/src/formattedcode/output_spdx.py
index 0546518d0c8..3ec2770f5d0 100644
--- a/src/formattedcode/output_spdx.py
+++ b/src/formattedcode/output_spdx.py
@@ -63,14 +63,15 @@
     # Python 3
     unicode = str  # NOQA
 
-
 # Tracing flags
 TRACE = False
 TRACE_DEEP = False
 
+
 def logger_debug(*args):
     pass
 
+
 if TRACE or TRACE_DEEP:
     import logging
 
@@ -82,11 +83,11 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, unicode)
                                      and a or repr(a) for a in args))
 
-
 """
 Output plugins to write scan results in SPDX format.
 """
 
+
 @output_impl
 class SpdxTvOutput(OutputPlugin):
 
@@ -104,8 +105,8 @@ class SpdxTvOutput(OutputPlugin):
     def is_enabled(self, output_spdx_tv, **kwargs):
         return output_spdx_tv
 
-    def process_codebase(self, codebase, 
-                         input, # NOQA
+    def process_codebase(self, codebase,
+                         input,  # NOQA
                          output_spdx_tv,
                          scancode_version, scancode_notice, **kwargs):
 
@@ -129,8 +130,8 @@ class SpdxRdfOutput(OutputPlugin):
     def is_enabled(self, output_spdx_rdf, **kwargs):
         return output_spdx_rdf
 
-    def process_codebase(self, codebase, 
-                         input, #NOQA
+    def process_codebase(self, codebase,
+                         input,  # NOQA
                          output_spdx_rdf,
                          scancode_version, scancode_notice, **kwargs):
 
@@ -246,7 +247,6 @@ def write_spdx(output_file, results, scancode_version, scancode_notice,
         else:
             file_entry.copyright = SPDXNone()
 
-
         package.add_file(file_entry)
 
     if len(package.files) == 0:
diff --git a/src/licensedcode/cache.py b/src/licensedcode/cache.py
index c538f6f6c8a..31a207b9464 100644
--- a/src/licensedcode/cache.py
+++ b/src/licensedcode/cache.py
@@ -41,14 +41,12 @@
 from scancode_config import scancode_src_dir
 from scancode_config import SCANCODE_DEV_MODE
 
-
 """
 An on-disk persistent cache of LicenseIndex. The index is pickled and invalidated if
 there are any changes in the code or licenses text or rules. Loading and dumping the
 cached index is safe to use across multiple processes using lock files.
 """
 
-
 LICENSE_INDEX_LOCK_TIMEOUT = 60 * 3
 
 # global in-memory cache of the main license index instance
diff --git a/src/licensedcode/index.py b/src/licensedcode/index.py
index d370e2bb7da..2c298dbc2af 100644
--- a/src/licensedcode/index.py
+++ b/src/licensedcode/index.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -82,6 +82,7 @@
 def logger_debug(*args):
     pass
 
+
 if TRACE or TRACE_INDEXING_PERF or TRACE_QUERY_RUN_SIMPLE or TRACE_NEGATIVE:
     import logging
 
diff --git a/src/licensedcode/legal.py b/src/licensedcode/legal.py
index 7a7e0933af8..e7af15faa9d 100644
--- a/src/licensedcode/legal.py
+++ b/src/licensedcode/legal.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -28,17 +28,14 @@
 
 from commoncode import fileutils
 
-
 """
 Recognition of typical "legal" files such as "LICENSE", "COPYING", etc.
 """
 
-
 special_names = (
     'COPYING', 'COPYRIGHT', 'NOTICE', 'LICENSE', 'LICENCE',
     'LEGAL', 'EULA', 'AGREEMENT', 'ABOUT', 'COPYLEFT', 'LICENSING')
 
-
 special_names_lower = tuple(x.lower() for x in special_names)
 
 
diff --git a/src/licensedcode/match.py b/src/licensedcode/match.py
index 9a404ecdde7..d3e35dae75d 100644
--- a/src/licensedcode/match.py
+++ b/src/licensedcode/match.py
@@ -53,6 +53,7 @@
 
 def logger_debug(*args): pass
 
+
 if (TRACE or TRACE_FILTER_CONTAINS or TRACE_MERGE
     or TRACE_REFINE_RULE_MIN_COVERAGE or TRACE_REFINE_SINGLE
     or TRACE_REFINE_SMALL):
@@ -473,7 +474,6 @@ def merge_matches(matches, max_dist=MAX_DIST):
                     if TRACE_MERGE: logger_debug('    ---> ###merge_matches: MAX_DIST reached, breaking')
                     break
 
-
                 # keep one of equal matches
                 # with same qspan: FIXME: is this ever possible?
                 if current_match.qspan == next_match.qspan and current_match.ispan == next_match.ispan:
@@ -562,10 +562,10 @@ def merge_matches(matches, max_dist=MAX_DIST):
         merged.extend(rule_matches)
     return merged
 
-
 # FIXME we should consider the length and distance between matches to break
 # early from the loops: trying to check containment on wildly separated matches does not make sense
 
+
 def filter_contained_matches(matches):
     """
     Return a filtered list of LicenseMatch given a `matches` list of LicenseMatch by
@@ -1066,6 +1066,7 @@ def get_full_matched_text(
     dictionary_get = idx.dictionary.get
 
     import attr
+
     @attr.s(slots=True)
     class Token(object):
         value = attr.ib()
diff --git a/src/licensedcode/match_aho.py b/src/licensedcode/match_aho.py
index 8c7b090775f..d5c706877dd 100644
--- a/src/licensedcode/match_aho.py
+++ b/src/licensedcode/match_aho.py
@@ -51,6 +51,7 @@ def logger_debug(*args):
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
 else:
+
     def logger_debug(*args):
         pass
 
diff --git a/src/licensedcode/match_hash.py b/src/licensedcode/match_hash.py
index 76bfc5de15c..512d2a1e2e3 100644
--- a/src/licensedcode/match_hash.py
+++ b/src/licensedcode/match_hash.py
@@ -30,7 +30,6 @@
 from licensedcode.spans import Span
 from licensedcode.match import LicenseMatch
 
-
 """
 Matching strategy using hashes to match a whole text chunk at once.
 """
@@ -51,10 +50,10 @@ def logger_debug(*args):
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
 else:
+
     def logger_debug(*args):
         pass
 
-
 MATCH_HASH = '1-hash'
 
 
diff --git a/src/licensedcode/match_seq.py b/src/licensedcode/match_seq.py
index 90d5d870f9e..8f70143555e 100644
--- a/src/licensedcode/match_seq.py
+++ b/src/licensedcode/match_seq.py
@@ -24,7 +24,6 @@
 
 from __future__ import absolute_import, division, print_function
 
-
 from licensedcode.match import get_texts
 from licensedcode.match import LicenseMatch
 from licensedcode.seq import match_blocks
@@ -33,8 +32,10 @@
 TRACE = False
 TRACE2 = False
 
+
 def logger_debug(*args): pass
 
+
 if TRACE:
     import logging
     import sys
@@ -54,6 +55,7 @@ def logger_debug(*args):
 
 MATCH_SEQ = '3-seq'
 
+
 def match_sequence(idx, candidate, query_run, start_offset=0):
     """
     Return a list of LicenseMatch by matching the `query_run` tokens sequence
diff --git a/src/licensedcode/match_set.py b/src/licensedcode/match_set.py
index 4aa99e05865..e7da310e75e 100644
--- a/src/licensedcode/match_set.py
+++ b/src/licensedcode/match_set.py
@@ -35,7 +35,6 @@
 
 from licensedcode.models import Rule
 
-
 """
 Approximate matching strategies using token sets and multisets.
 
@@ -123,6 +122,7 @@
 
 def logger_debug(*args): pass
 
+
 if TRACE:
     import logging
     import sys
@@ -134,10 +134,10 @@ def logger_debug(*args): pass
     def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, basestring) and a or repr(a) for a in args))
 
-
 # TODO: add bigrams sets and multisets
 # TODO: see also https://github.com/bolo1729/python-memopt/blob/master/memopt/memopt.py for multisets
 
+
 def tids_sets_intersector(qset, iset):
     """
     Return the intersection of a query and index token ids sets.
@@ -225,6 +225,7 @@ def index_token_sets(token_ids, len_junk, len_good):
 # would discard when we compute candaites to eventually discard many or all candidates
 # we compute too many candidates that may waste time in seq matching for no reason
 
+
 # FIXME: Also we should remove any weak and or small rules from the top candidates
 # and anything that cannot be seq matched at all. (e.g. no high match)
 def compute_candidates(query_run, idx, rules_subset, top=30):
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index e6eaa931d0a..99791aa7a52 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -51,14 +51,11 @@
 from licensedcode.tokenize import rule_tokenizer
 from licensedcode.tokenize import query_tokenizer
 
-
 # these are globals but always side-by-side with the code so not moving
 data_dir = join(abspath(dirname(__file__)), 'data')
 licenses_data_dir = join(data_dir, 'licenses')
 rules_data_dir = join(data_dir, 'rules')
 
-
-
 """
 Reference License and license Rule structures persisted as a combo of a YAML
 data file and one or more text files containing license or notice texts.
@@ -396,7 +393,6 @@ def validate(licenses, verbose=False, no_dupe_urls=False):
                 # for global dedupe
                 by_text[license_qtokens].append(key + ': TEXT')
 
-
             # SPDX consistency
             if lic.spdx_license_key:
                 by_spdx_key[lic.spdx_license_key].append(key)
@@ -747,11 +743,11 @@ def thresholds(self):
         Return a Thresholds tuple considering the occurrence of all tokens.
         """
         if not self._thresholds:
-            length = self.length 
+            length = self.length
             high_length = self.high_length
             if length > 200:
-                min_high = high_length//10
-                min_len = length//10
+                min_high = high_length // 10
+                min_len = length // 10
             else:
                 min_high = min([high_length, MIN_MATCH_HIGH_LENGTH])
                 min_len = MIN_MATCH_LENGTH
@@ -792,8 +788,8 @@ def thresholds_unique(self):
             length_unique = self.length_unique
 
             if length > 200:
-                min_high = high_unique//10
-                min_len = length//10
+                min_high = high_unique // 10
+                min_len = length // 10
             else:
                 highu = (int(high_unique // 2)) or high_unique
                 min_high = min([highu, MIN_MATCH_HIGH_LENGTH])
diff --git a/src/licensedcode/query.py b/src/licensedcode/query.py
index baa94c827a1..2f76bd16226 100644
--- a/src/licensedcode/query.py
+++ b/src/licensedcode/query.py
@@ -23,7 +23,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import print_function
 
 from collections import defaultdict
 
@@ -35,7 +36,6 @@
 from licensedcode.tokenize import query_lines
 from licensedcode.tokenize import query_tokenizer
 
-
 """
 Build license queries from scanned files to feed the detection pipeline.
 
@@ -84,6 +84,7 @@
 def logger_debug(*args):
     pass
 
+
 if TRACE:
     import logging
     import sys
diff --git a/src/licensedcode/seq.py b/src/licensedcode/seq.py
index cf23d0dd9ea..68555c4f58e 100644
--- a/src/licensedcode/seq.py
+++ b/src/licensedcode/seq.py
@@ -3,7 +3,6 @@
 
 from collections import namedtuple as _namedtuple
 
-
 """
 Token sequences alignement and diffing based on the longest common substrings of
 "high tokens". This essentially a non-optimal and reasonably fast single local
@@ -15,7 +14,6 @@
 license: PSF. See seq.ABOUT file for details.
 """
 
-
 Match = _namedtuple('Match', 'a b size')
 
 
diff --git a/src/licensedcode/spans.py b/src/licensedcode/spans.py
index bb258ad36f2..4b60d0cf155 100644
--- a/src/licensedcode/spans.py
+++ b/src/licensedcode/spans.py
@@ -37,7 +37,6 @@
 
 from intbitset import intbitset
 
-
 """
 Ranges and intervals of integers using bitmaps.
 Used as a compact and faster data structure for token and position sets.
@@ -51,6 +50,7 @@ class Span(Set):
     It is equivalent to a sparse closed interval.
     Originally derived and heavily modified from Whoosh Span.
     """
+
     def __init__(self, *args):
         """
         Create a new Span from a start and end ints or an iterable of ints.
diff --git a/src/licensedcode/tokenize.py b/src/licensedcode/tokenize.py
index ef53e9094ca..4549621bc7e 100644
--- a/src/licensedcode/tokenize.py
+++ b/src/licensedcode/tokenize.py
@@ -34,12 +34,12 @@
 
 from textcode.analysis import text_lines
 
-
 """
 Utilities to break texts in lines and tokens (aka. words) with specialized version
 for queries and rules texts.
 """
 
+
 def query_lines(location=None, query_string=None, strip=True):
     """
     Return an iterable of text lines given a file at `location` or a
@@ -70,6 +70,7 @@ def query_lines(location=None, query_string=None, strip=True):
 query_pattern = '[^\W]+\+?[^\W]*'
 word_splitter = re.compile(query_pattern, re.UNICODE).findall
 
+
 def query_tokenizer(text, lower=True):
     """
     Return an iterable of tokens from a unicode query text.
@@ -84,11 +85,11 @@ def query_tokenizer(text, lower=True):
 # matched text collection
 not_query_pattern = '[\W\s\+]+[\W\s]?'
 
-
 # collect tokens and non-token texts in two different groups
 _text_capture_pattern = '(?P<token>' + query_pattern + ')' + '|' + '(?P<punct>' + not_query_pattern + ')'
 tokens_and_non_tokens = re.compile(_text_capture_pattern, re.UNICODE).finditer
 
+
 def matched_query_text_tokenizer(text):
     """
     Return an iterable of tokens and non-tokens from a unicode query text keeping
@@ -118,6 +119,7 @@ def matched_query_text_tokenizer(text):
 rule_pattern = '%s|%s+' % (query_pattern, template_pattern,)
 template_splitter = re.compile(rule_pattern , re.UNICODE).findall
 
+
 def rule_tokenizer(text, lower=True):
     """
     Return an iterable of tokens from a unicode rule text, skipping templated
diff --git a/src/packagedcode/__init__.py b/src/packagedcode/__init__.py
index 47aab4d7a92..68fd453243e 100644
--- a/src/packagedcode/__init__.py
+++ b/src/packagedcode/__init__.py
@@ -22,6 +22,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
+from __future__ import absolute_import
+
 from packagedcode import models
 from packagedcode import maven
 from packagedcode import npm
@@ -29,7 +31,6 @@
 from packagedcode import phpcomposer
 from packagedcode import rpm
 
-
 # Note: the order matters: from the most to the least specific
 # Package classes MUST be added to this list to be active
 PACKAGE_TYPES = [
diff --git a/src/packagedcode/maven.py b/src/packagedcode/maven.py
index 4ceb12fe7dd..cb8e5fe9832 100644
--- a/src/packagedcode/maven.py
+++ b/src/packagedcode/maven.py
@@ -45,7 +45,6 @@
 from typecode import contenttype
 from textcode import analysis
 
-
 logger = logging.getLogger(__name__)
 TRACE = False
 
@@ -54,12 +53,12 @@
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
 
-
 """
 Support Maven2 POMs.
 Attempts to resolve Maven properties when possible.
 """
 
+
 class MavenPomPackage(models.Package):
     metafiles = ('.pom', 'pom.xml',)
     extensions = ('.pom', '.xml',)
@@ -118,6 +117,7 @@ def to_dict(self):
 
 
 class MavenPom(pom.Pom):
+
     def __init__(self, location=None, text=None):
         """
         Build a POM from a location or unicode text.
@@ -217,6 +217,7 @@ def _extra_properties(self):
     def _replace_props(cls, text, properties):
         if not text:
             return text
+
         def subfunc(matchobj):
             """Return the replacement value for a matched property key."""
             key = matchobj.group(1)
@@ -775,6 +776,7 @@ class MavenRecognizer(object):
     """
     A package recognizer for Maven-based packages.
     """
+
     def __init__(self):
         return NotImplementedError()
 
diff --git a/src/packagedcode/models.py b/src/packagedcode/models.py
index ed1f0b07368..ce6e039b779 100644
--- a/src/packagedcode/models.py
+++ b/src/packagedcode/models.py
@@ -54,7 +54,6 @@
 from schematics.types.compound import ModelType
 from schematics.transforms import blacklist
 
-
 """
 Common data model for package information and dependencies, abstracting the
 many small differences existing between package management formats and tools.
@@ -127,6 +126,7 @@ class BaseListType(ListType):
     """
     ListType with a default of an empty list.
     """
+
     def __init__(self, field, **kwargs):
         super(BaseListType, self).__init__(field=field, default=[], **kwargs)
 
@@ -138,6 +138,7 @@ class PackageIndentifierType(BaseType):
     """
     Global identifier for a package
     """
+
     def __init__(self, **kwargs):
         super(PackageIndentifierType, self).__init__(**kwargs)
 
@@ -298,6 +299,7 @@ class BaseModel(Model):
     """
     Base class for all schematics models.
     """
+
     def __init__(self, **kwargs):
         super(BaseModel, self).__init__(raw_data=kwargs)
 
@@ -514,7 +516,6 @@ def resolve(self):
 payload_doc = 'doc'
 PAYLOADS = (payload_src, payload_bin, payload_doc)
 
-
 # Packaging types
 #################################
 as_archive = 'archive'
@@ -946,7 +947,6 @@ def identifier(self):
         """
         return PackageId(self.type, self.name, self.version)
 
-
 #
 # Package sub types
 # NOTE: this is somewhat redundant with extractcode archive handlers
@@ -1212,7 +1212,6 @@ class SquashfsPackage(Package):
     type = StringType(default='squashfs image')
     packaging = StringType(default=as_archive)
 
-
 #
 # these very generic archive packages must come last in recogniztion order
 #
diff --git a/src/packagedcode/nevra.py b/src/packagedcode/nevra.py
index a840ff9f651..8d6718a72ca 100644
--- a/src/packagedcode/nevra.py
+++ b/src/packagedcode/nevra.py
@@ -22,13 +22,13 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 import re
 
 from commoncode import fileutils
 
-
 """
 Utilities to handle RPM NEVRA (name, epoch, version, release, architecture)
 """
@@ -50,6 +50,7 @@
 # modified and originally from:
 # https://raw.githubusercontent.com/sassoftware/conary/c26507001b62b0839539908cc5bf28893c45c0b4/conary/rpmhelper.py
 
+
 def from_name(filename):
     """
     Return an (E, N, V, R, A) tuple given a file name, by splitting
diff --git a/src/packagedcode/npm.py b/src/packagedcode/npm.py
index 756d1806222..655ded0b885 100644
--- a/src/packagedcode/npm.py
+++ b/src/packagedcode/npm.py
@@ -48,7 +48,6 @@
 https://github.com/pombredanne/normalize-package-data
 """
 
-
 logger = logging.getLogger(__name__)
 # import sys
 # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
@@ -129,7 +128,6 @@ def build_package(package_data, base_dir=None, metafile_name='package.json'):
         ('repository', repository_mapper),
     ])
 
-
     if not package_data.get('name') or not package_data.get('version'):
         # a package.json without name and version is not a usable NPM package
         return
@@ -404,7 +402,6 @@ def deps_mapper(deps, package, field_name):
 peer_dependencies_mapper = partial(deps_mapper, field_name='peerDependencies')
 optional_dependencies_mapper = partial(deps_mapper, field_name='optionalDependencies')
 
-
 person_parser = re.compile(
     r'^(?P<name>[^\(<]+)'
     r'\s?'
diff --git a/src/packagedcode/phpcomposer.py b/src/packagedcode/phpcomposer.py
index 7877cc58048..909cedb2c81 100644
--- a/src/packagedcode/phpcomposer.py
+++ b/src/packagedcode/phpcomposer.py
@@ -31,7 +31,6 @@
 from collections import OrderedDict
 from functools import partial
 
-
 from commoncode import filetype
 from commoncode import fileutils
 
@@ -42,7 +41,6 @@
 Handle PHP composer packages, refer to https://getcomposer.org/
 """
 
-
 logger = logging.getLogger(__name__)
 # import sys
 # logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
@@ -84,7 +82,7 @@ def parse(location):
     return build_package(package_data, base_dir, metafile_name)
 
 
-def build_package(package_data, base_dir =None, metafile_name='composer.json'):
+def build_package(package_data, base_dir=None, metafile_name='composer.json'):
     """
     Return a composer Package object from a package data mapping or
     None.
@@ -112,11 +110,10 @@ def build_package(package_data, base_dir =None, metafile_name='composer.json'):
         ('support', support_mapper),
     ])
 
-
     # A composer.json without name and description is not a usable PHP
     # composer package. Name and description fields are required but
     # only for published packages:
-    # https://getcomposer.org/doc/04-schema.md#name 
+    # https://getcomposer.org/doc/04-schema.md#name
     # We want to catch both published and non-published packages here.
 
     package = PHPComposerPackage()
@@ -141,7 +138,7 @@ def build_package(package_data, base_dir =None, metafile_name='composer.json'):
             if value:
                 func(value, package)
     # Parse vendor from name value
-    vendor_mapper(package)  
+    vendor_mapper(package)
     return package
 
 
diff --git a/src/packagedcode/pypi.py b/src/packagedcode/pypi.py
index ae724c4d550..8b76246122a 100644
--- a/src/packagedcode/pypi.py
+++ b/src/packagedcode/pypi.py
@@ -34,12 +34,10 @@
 from packagedcode.models import PythonPackage
 from packagedcode import models
 
-
 """
 Detect and collect Python packages information.
 """
 
-
 PKG_INFO_ATTRIBUTES = [
     'Name',
     'Version',
diff --git a/src/packagedcode/pyrpm/rpm.py b/src/packagedcode/pyrpm/rpm.py
index 9502c270821..371f69db558 100644
--- a/src/packagedcode/pyrpm/rpm.py
+++ b/src/packagedcode/pyrpm/rpm.py
@@ -35,7 +35,6 @@
 
 from __future__ import absolute_import
 
-
 from StringIO import StringIO
 import struct
 import re
@@ -63,6 +62,7 @@ def find_magic_number(regexp, data):
 class Entry(object):
     ''' RPM Header Entry
     '''
+
     def __init__(self, entry, store):
         self.entry = entry
         self.store = store
@@ -155,6 +155,7 @@ def __readbin(self):
 class Header(object):
     ''' RPM Header Structure
     '''
+
     def __init__(self, header, entries, store):
         self.header = header
         self.entries = entries
diff --git a/src/packagedcode/pyrpm/rpmdefs.py b/src/packagedcode/pyrpm/rpmdefs.py
index bd416ad68b0..f1077874503 100644
--- a/src/packagedcode/pyrpm/rpmdefs.py
+++ b/src/packagedcode/pyrpm/rpmdefs.py
@@ -27,9 +27,10 @@
 
 '''
 rpm definitions
-
 '''
 
+from __future__ import absolute_import
+
 RPM_LEAD_MAGIC_NUMBER = '\xed\xab\xee\xdb'
 RPM_HEADER_MAGIC_NUMBER = '\x8e\xad\xe8'
 
@@ -45,11 +46,9 @@
 RPMSIGTAG_GPG = 1005
 RPMSIGTAG_PGP5 = 1006
 
-
 MD5_SIZE = 16  # 16 bytes long
 PGP_SIZE = 152  # 152 bytes long
 
-
 # data types definition
 RPM_DATA_TYPE_NULL = 0
 RPM_DATA_TYPE_CHAR = 1
@@ -102,7 +101,6 @@
 RPMTAG_SOURCEPACKAGE = 1106
 RPMTAG_DISTURL = 1123
 
-
 RPMTAGS = {
    RPMTAG_NAME: 'name',
    RPMTAG_EPOCH: 'epoch',
@@ -124,7 +122,6 @@
    RPMTAG_DISTURL: 'dist_url',
 }
 
-
 """
 from rpm.org lib/rpmtag.h
 See also: http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/pkgformat.html
diff --git a/src/packagedcode/recognize.py b/src/packagedcode/recognize.py
index 220d0164f6d..2a6fe4260db 100644
--- a/src/packagedcode/recognize.py
+++ b/src/packagedcode/recognize.py
@@ -34,12 +34,13 @@
 from packagedcode import PACKAGE_TYPES
 from typecode import contenttype
 
-
 TRACE = False
 
+
 def logger_debug(*args):
     pass
 
+
 logger = logging.getLogger(__name__)
 
 if TRACE:
@@ -49,7 +50,6 @@ def logger_debug(*args):
     def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, basestring) and a or repr(a) for a in args))
 
-
 """
 Recognize packages in files or directories.
 """
@@ -67,7 +67,6 @@ def recognize_package(location):
     ftype = T.filetype_file.lower()
     mtype = T.mimetype_file
 
-
     for package_type in PACKAGE_TYPES:
         # Note: default to True if there is nothing to match against
         metafiles = package_type.metafiles
diff --git a/src/packagedcode/rpm.py b/src/packagedcode/rpm.py
index 5d25131842f..f0c9ee3d7bb 100644
--- a/src/packagedcode/rpm.py
+++ b/src/packagedcode/rpm.py
@@ -30,19 +30,19 @@
 import string
 import sys
 
-
 from packagedcode import models
 from packagedcode import nevra
 from packagedcode.pyrpm.rpm import RPM
 
 import typecode.contenttype
 
-
 TRACE = False
 
+
 def logger_debug(*args):
     pass
 
+
 logger = logging.getLogger(__name__)
 
 if TRACE:
@@ -52,7 +52,6 @@ def logger_debug(*args):
     def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, basestring) and a or repr(a) for a in args))
 
-
 # TODO: retrieve dependencies
 
 # TODO: parse spec files see:
@@ -82,7 +81,6 @@ def logger_debug(*args):
     'bin_or_src',
 )
 
-
 RPMInfo = namedtuple('RPMInfo', list(RPM_TAGS))
 
 
@@ -125,6 +123,7 @@ class EVR(namedtuple('EVR', 'epoch version release')):
     """
     The RPM Epoch, Version, Release tuple.
     """
+
     # note: the order of the named tuple is the sort order.
     # But for creation we put the rarely used epoch last
     def __new__(self, version, release, epoch=None):
diff --git a/src/packagedcode/utils.py b/src/packagedcode/utils.py
index 423033c739f..69ce4aeb8a2 100644
--- a/src/packagedcode/utils.py
+++ b/src/packagedcode/utils.py
@@ -22,7 +22,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import print_function
 
 
 VCS_URLS = (
diff --git a/src/packagedcode/xmlutils.py b/src/packagedcode/xmlutils.py
index 75b3c5af730..3cd018103f0 100644
--- a/src/packagedcode/xmlutils.py
+++ b/src/packagedcode/xmlutils.py
@@ -26,13 +26,11 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-
 import chardet
 from lxml import etree
 
 from textcode import analysis
 
-
 """
 Utility functions for dealing with XML.
 """
@@ -61,7 +59,7 @@ def parse(location, handler):
     except:
         parser = etree.XMLParser(recover=True, remove_blank_text=True, resolve_entities=False)
         text = analysis.unicode_text(location)
-        xdoc= etree.fromstring(_as_unicode_bytes(text), parser)
+        xdoc = etree.fromstring(_as_unicode_bytes(text), parser)
         return handler(xdoc)
 
 
diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 3cdfa01c318..50a9f51a76f 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -22,7 +22,6 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-
 from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
@@ -275,7 +274,6 @@ def setup(self):
                     'Invalid plugin: %(qname)r: %(plugin_class)r '
                     'must extend %(plugin_base_class)r.' % locals())
 
-
             for option in plugin_class.options:
                 if not isinstance(option, CommandLineOption):
                     qname = '%(entrypoint)s:%(name)s' % locals()
diff --git a/src/plugincode/output.py b/src/plugincode/output.py
index 1a9d1a3dbf8..5ce2475e76b 100644
--- a/src/plugincode/output.py
+++ b/src/plugincode/output.py
@@ -36,7 +36,6 @@
 from plugincode import HookspecMarker
 from scancode.resource import Resource
 
-
 # Python 2 and 3 support
 try:
     # Python 2
@@ -48,14 +47,15 @@
     # Python 3
     unicode = str  # NOQA
 
-
 # Tracing flags
 TRACE = False
 TRACE_DEEP = False
 
+
 def logger_debug(*args):
     pass
 
+
 if TRACE or TRACE_DEEP:
     import logging
     import sys
@@ -68,7 +68,6 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, unicode)
                                      and a or repr(a) for a in args))
 
-
 stage = 'output'
 entrypoint = 'scancode_output'
 
@@ -93,8 +92,8 @@ def get_results(cls, codebase, info, full_root, strip_root, timing, **kwargs):
         """
         Return an iterable of serialized scan results from a codebase.
         """
-        serializer = partial(Resource.to_dict, 
-                             full_root=full_root,strip_root=strip_root, 
+        serializer = partial(Resource.to_dict,
+                             full_root=full_root, strip_root=strip_root,
                              with_info=info, with_timing=timing)
 
         resources = codebase.walk(topdown=True, skip_root=strip_root,
diff --git a/src/plugincode/output_filter.py b/src/plugincode/output_filter.py
index e42eec527db..8f5e06ca84b 100644
--- a/src/plugincode/output_filter.py
+++ b/src/plugincode/output_filter.py
@@ -32,7 +32,6 @@
 from plugincode import HookimplMarker
 from plugincode import HookspecMarker
 
-
 stage = 'output_filter'
 entrypoint = 'scancode_output_filter'
 
diff --git a/src/plugincode/post_scan.py b/src/plugincode/post_scan.py
index f165598d8f9..2281f759fb8 100644
--- a/src/plugincode/post_scan.py
+++ b/src/plugincode/post_scan.py
@@ -30,7 +30,6 @@
 from plugincode import HookimplMarker
 from plugincode import HookspecMarker
 
-
 stage = 'post_scan'
 entrypoint = 'scancode_post_scan'
 
diff --git a/src/plugincode/pre_scan.py b/src/plugincode/pre_scan.py
index 913fe57f0fc..7d67b2d03eb 100644
--- a/src/plugincode/pre_scan.py
+++ b/src/plugincode/pre_scan.py
@@ -30,7 +30,6 @@
 from plugincode import HookimplMarker
 from plugincode import HookspecMarker
 
-
 stage = 'pre_scan'
 entrypoint = 'scancode_pre_scan'
 
diff --git a/src/plugincode/scan.py b/src/plugincode/scan.py
index 29f61c33f42..1a79a051c17 100644
--- a/src/plugincode/scan.py
+++ b/src/plugincode/scan.py
@@ -30,7 +30,6 @@
 from plugincode import HookimplMarker
 from plugincode import HookspecMarker
 
-
 stage = 'scan'
 entrypoint = 'scancode_scan'
 
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index 46cc28852a8..5c07e10a1c7 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -53,23 +53,14 @@
     # Python 3
     unicode = str  # NOQA
 
-
-scan_src_dir = abspath(dirname(__file__))
-src_dir = dirname(scan_src_dir)
-root_dir = dirname(src_dir)
-cache_dir = join(root_dir, '.cache')
-scans_cache_dir = join(cache_dir, 'scan_results_caches')
-
-if not exists(scans_cache_dir):
-    fileutils.create_dir(scans_cache_dir)
-
-
 # Tracing flags
 TRACE = False
 
+
 def logger_debug(*args):
     pass
 
+
 if TRACE:
     import logging
     import sys
@@ -81,7 +72,6 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, (unicode, str))
                                      and a or repr(a) for a in args))
 
-
 # CLI help groups
 SCAN_GROUP = 'primary scans'
 SCAN_OPTIONS_GROUP = 'scan options'
@@ -95,7 +85,6 @@ def logger_debug(*args):
 DOC_GROUP = 'documentation'
 CORE_GROUP = 'core'
 
-
 # Holds a scan plugin result "key and the corresponding function.
 # click.Parameter instance
 Scanner = namedtuple('Scanner', 'key function')
@@ -280,6 +269,7 @@ class FileOptionType(click.File):
     A click.File subclass that ensures that a file name is not set to an
     existing option parameter to avoid mistakes.
     """
+
     def convert(self, value, param, ctx):
         known_opts = set(chain.from_iterable(p.opts for p in ctx.command.params
                                              if isinstance(p, click.Option)))
diff --git a/src/scancode/api.py b/src/scancode/api.py
index b578fb9e7f6..5a0092ba41c 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -39,7 +39,6 @@
 from commoncode.system import on_linux
 from typecode.contenttype import get_type
 
-
 """
 Main scanning functions.
 
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 35f2352cbf4..c66d1e343c8 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -93,14 +93,15 @@
     # Python 3
     unicode = str  # NOQA
 
-
 # Tracing flags
 TRACE = False
 TRACE_DEEP = False
 
+
 def logger_debug(*args):
     pass
 
+
 if TRACE or TRACE_DEEP:
     import logging
 
@@ -112,10 +113,8 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, unicode)
                                      and a or repr(a) for a in args))
 
-
 echo_stderr = partial(click.secho, err=True)
 
-
 info_text = '''
 ScanCode scans code and other files for origin and license.
 Visit https://github.com/nexB/scancode-toolkit/ for support and download.
@@ -481,8 +480,7 @@ def print_plugins(ctx, param, value):
     hidden=True,
     help='Run ScanCode in a special "test mode". Only for testing.',
     help_group=MISC_GROUP, sort_order=1000, cls=CommandLineOption)
-
-def scancode(ctx, input, #NOQA
+def scancode(ctx, input,  # NOQA
              info,
              strip_root, full_root,
              processes, timeout,
@@ -1054,7 +1052,7 @@ def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT,
         timings = OrderedDict((scanner.key, 0) for scanner in scanners)
 
     if not with_threading:
-        interruptor= fake_interruptible
+        interruptor = fake_interruptible
     else:
         interruptor = interruptible
 
diff --git a/src/scancode/cli_test_utils.py b/src/scancode/cli_test_utils.py
index d2899fd71b4..11137b01aa3 100644
--- a/src/scancode/cli_test_utils.py
+++ b/src/scancode/cli_test_utils.py
@@ -33,24 +33,38 @@
 import os
 
 from commoncode.system import on_linux
+from scancode_config import scancode_root_dir
 
 
-def run_scan_plain(options, cwd=None, test_mode=True):
+def run_scan_plain(options, cwd=None, test_mode=True, expected_rc=0):
     """
     Run a scan as a plain subprocess. Return rc, stdout, stderr.
     """
     from commoncode.command import execute
-    import scancode
 
     if test_mode and '--test-mode' not in options:
         options.append('--test-mode')
 
     scmd = b'scancode' if on_linux else 'scancode'
-    scan_cmd = os.path.join(scancode.root_dir, scmd)
-    return execute(scan_cmd, options, cwd=cwd)
+    scan_cmd = os.path.join(scancode_root_dir, scmd)
+    rc, stdout, stderr = execute(scan_cmd, options, cwd=cwd)
 
+    if rc != expected_rc:
+        opts = get_opts(options)
+        error = '''
+Failure to run: scancode %(opts)s
+stdout:
+%(stdout)s
 
-def run_scan_click(options, monkeypatch=None, test_mode=True):
+stderr:
+%(stderr)s
+''' % locals()
+        assert rc == expected_rc, error
+
+    return rc, stdout, stderr
+
+
+def run_scan_click(options, monkeypatch=None, test_mode=True, expected_rc=0):
     """
     Run a scan as a Click-controlled subprocess
     If monkeypatch is provided, a tty with a size (80, 43) is mocked.
@@ -68,7 +82,28 @@ def run_scan_click(options, monkeypatch=None, test_mode=True):
         monkeypatch.setattr(click , 'get_terminal_size', lambda : (80, 43,))
     runner = CliRunner()
 
-    return runner.invoke(cli.scancode, options, catch_exceptions=False)
+    result = runner.invoke(cli.scancode, options, catch_exceptions=False)
+
+    output = result.output
+    if result.exit_code != expected_rc:
+        opts = get_opts(options)
+        error = '''
+Failure to run: scancode %(opts)s
+output:
+%(output)s
+''' % locals()
+        assert result.exit_code == expected_rc, error
+    return result
+
+
+def get_opts(options):
+    try:
+        return ' '.join(options)
+    except:
+        try:
+            return b' '.join(options)
+        except:
+            return b' '.join(map(repr, options))
 
 
 def check_json_scan(expected_file, result_file, regen=False,
diff --git a/src/scancode/extract_cli.py b/src/scancode/extract_cli.py
index c0d7e51697f..df4d12f1bbc 100644
--- a/src/scancode/extract_cli.py
+++ b/src/scancode/extract_cli.py
@@ -41,7 +41,6 @@
 from scancode_config import __version__
 from scancode import utils
 
-
 # Python 2 and 3 support
 try:
     # Python 2
@@ -51,7 +50,6 @@
     # Python 3
     unicode = str  # NOQA
 
-
 echo_stderr = partial(click.secho, err=True)
 
 
@@ -102,7 +100,6 @@ class ExtractCommand(utils.BaseCommand):
 @click.help_option('-h', '--help')
 @click.option('--about', is_flag=True, is_eager=True, callback=print_about, help='Show information about ScanCode and licensing and exit.')
 @click.option('--version', is_flag=True, is_eager=True, callback=print_version, help='Show the version and exit.')
-
 def extractcode(ctx, input, verbose, quiet, shallow, *args, **kwargs):  # NOQA
     """extract archives and compressed files found in the <input> file or directory tree.
 
@@ -161,7 +158,6 @@ def display_extract_summary():
 
         echo_stderr('Extracting done.', fg=summary_color, reset=True)
 
-
     # use for relative paths computation
     len_base_path = len(abs_location)
     base_is_dir = filetype.is_dir(abs_location)
diff --git a/src/scancode/interrupt.py b/src/scancode/interrupt.py
index 25ff6d2bc2e..913d0859e76 100644
--- a/src/scancode/interrupt.py
+++ b/src/scancode/interrupt.py
@@ -19,7 +19,6 @@
 
 from commoncode.system import on_windows
 
-
 """
 This modules povides an interruptible() function to run a callable and stop it
 after a timeout with a windows and POSIX implementation.
@@ -52,7 +51,6 @@ class TimeoutError(Exception):
 NO_ERROR = None
 NO_VALUE = None
 
-
 if not on_windows:
     """
     Some code based in part and inspired from the RobotFramework and
@@ -79,7 +77,6 @@ class TimeoutError(Exception):
     from signal import setitimer
     from signal import signal as create_signal
 
-
     def interruptible(func, args=None, kwargs=None, timeout=DEFAULT_TIMEOUT):
         """
         POSIX, signals-based interruptible runner.
@@ -121,7 +118,6 @@ def handler(signum, frame):
     except ImportError:
         from _thread import start_new_thread
 
-
     def interruptible(func, args=None, kwargs=None, timeout=DEFAULT_TIMEOUT):
         """
         Windows, threads-based interruptible runner. It can work also on
@@ -159,7 +155,6 @@ def runner():
             except (SystemExit, ValueError):
                 pass
 
-
     def async_raise(tid, exctype=Exception):
         """
         Raise an Exception in the Thread with id `tid`. Perform cleanup if
diff --git a/src/scancode/pool.py b/src/scancode/pool.py
index 6fdc4f71d0a..ba3875e3f92 100644
--- a/src/scancode/pool.py
+++ b/src/scancode/pool.py
@@ -9,7 +9,6 @@
 Apply proper monkeypatch to work around some bugs or limitations.
 """
 
-
 """
 Monkeypatch Pool iterators so that Ctrl-C interrupts everything properly
 derived from https://gist.github.com/aljungberg/626518
@@ -39,15 +38,19 @@
 
 from multiprocessing import pool
 
+
 def wrapped(func):
     # ensure that we do not double wrap
     if func.func_name != 'wrap':
+
         def wrap(self, timeout=None):
             return func(self, timeout=timeout or 1e10)
+
         return wrap
     else:
         return func
 
+
 pool.IMapIterator.next = wrapped(pool.IMapIterator.next)
 pool.IMapIterator.__next__ = pool.IMapIterator.next
 pool.IMapUnorderedIterator.next = wrapped(pool.IMapUnorderedIterator.next)
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index bd0fa23b0f7..59df1a1b777 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -59,7 +59,6 @@
 from commoncode import ignore
 from commoncode.system import on_linux
 
-
 # Python 2 and 3 support
 try:
     # Python 2
@@ -71,7 +70,6 @@
     # Python 3
     unicode = str  # NOQA
 
-
 """
 This module provides Codebase and Resource objects as an abstraction for files
 and directories used throughout ScanCode. ScanCode deals with a lot of these as
@@ -83,14 +81,15 @@
 scans.
 """
 
-
 # Tracing flags
 TRACE = False
 TRACE_DEEP = False
 
+
 def logger_debug(*args):
     pass
 
+
 if TRACE or TRACE_DEEP:
     import logging
 
@@ -103,7 +102,6 @@ def logger_debug(*args):
         return logger.debug(' '.join(isinstance(a, unicode)
                                      and a or repr(a) for a in args))
 
-
 # A global cache of codebase objects, keyed by a unique integer ID.
 # We use this weird structure such that a Resource object can reference its
 # parent codebase object without actually storing it as an instance variable.
@@ -445,7 +443,6 @@ def compute_counts(self, skip_root=False, skip_filtered=False):
 
         return files_count, dirs_count, size_count
 
-
     def update_counts(self, skip_filtered=False):
         """
         Update files_count, dirs_count and size_count attributes of each
diff --git a/src/scancode/utils.py b/src/scancode/utils.py
index 57ec8a236f3..621236f14b1 100644
--- a/src/scancode/utils.py
+++ b/src/scancode/utils.py
@@ -37,7 +37,6 @@
 from commoncode.fileutils import fsdecode
 from commoncode.fileutils import splitext
 
-
 # Python 2 and 3 support
 try:
     # Python 2
@@ -49,7 +48,6 @@
     # Python 3
     unicode = str  # NOQA
 
-
 """
 Command line UI utilities for help and and progress reporting.
 """
@@ -85,6 +83,7 @@ class EnhancedProgressBar(ProgressBar):
     """
     Enhanced progressbar ensuring that nothing is displayed when the bar is hidden.
     """
+
     def render_progress(self):
         if not self.is_hidden:
             return super(EnhancedProgressBar, self).render_progress()
@@ -104,6 +103,7 @@ class ProgressLogger(ProgressBar):
 
     If no item_show_func is provided a simple dot is printed for each event.
     """
+
     def __init__(self, *args, **kwargs):
         super(ProgressLogger, self).__init__(*args, **kwargs)
         self.is_hidden = False
@@ -132,6 +132,7 @@ def render_finish(self):
 BAR_SEP = ' '
 BAR_SEP_LEN = len(BAR_SEP)
 
+
 def progressmanager(iterable=None, length=None, label=None, show_eta=True,
                     show_percent=None, show_pos=True, item_show_func=None,
                     fill_char='#', empty_char='-', bar_template=None,
diff --git a/src/scancode_config.py b/src/scancode_config.py
index 196eda01c5f..b6ca551d832 100644
--- a/src/scancode_config.py
+++ b/src/scancode_config.py
@@ -36,20 +36,19 @@
 from os.path import exists
 import tempfile
 
-
 """
 Core configuration globals.
 
 Note: this module MUST import ONLY from the standard library.
 """
 
-
 # this exception is not available on posix
 try:
     WindowsError  # noqa
 except NameError:
     WindowsError = None  # NOQA
 
+
 def _create_dir(location):
     """
     Create directory and all sub-directories recursively at `location`.
@@ -85,7 +84,6 @@ def _create_dir(location):
         else:
             raise
 
-
 ################################################################################
 # INVARIABLE INSTALLATION-SPECIFIC, BUILT-IN LOCATIONS AND FLAGS
 ################################################################################
@@ -93,6 +91,7 @@ def _create_dir(location):
 # current installation location. This is where the source code and static data
 # lives.
 
+
 from pkg_resources import get_distribution, DistributionNotFound
 try:
     __version__ = get_distribution('scancode-toolkit').version
@@ -104,7 +103,6 @@ def _create_dir(location):
 scancode_src_dir = dirname(__file__)
 scancode_root_dir = dirname(scancode_src_dir)
 
-
 ################################################################################
 # USAGE MODE FLAGS
 ################################################################################
diff --git a/src/textcode/markup.py b/src/textcode/markup.py
index d675e8be83c..c32e51c79bb 100644
--- a/src/textcode/markup.py
+++ b/src/textcode/markup.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -46,7 +46,6 @@
 
 bin_dir = os.path.join(os.path.dirname(__file__), 'bin')
 
-
 extensions = ('.html', '.htm', '.php', '.phps', '.jsp', '.jspx' , '.xml', '.pom',)
 
 
diff --git a/src/textcode/strings.py b/src/textcode/strings.py
index 9876e4bf235..6f411402979 100644
--- a/src/textcode/strings.py
+++ b/src/textcode/strings.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -22,14 +22,14 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
-import string
 import re
+import string
 
 from commoncode.text import toascii
 
-
 """
 Extract raw ASCII strings from (possibly) binary strings.
 Both plain ASCII and UTF-16-LE-encoded (aka. wide) strings are extracted.
@@ -78,7 +78,6 @@ def strings_from_file(location, buff_size=1024 * 1024, ascii=False, clean=True,
 printable = 'A-Za-z0-9' + whitespaces + punctuation
 null_byte = '\x00'
 
-
 ascii_strings = re.compile(
     # plain ASCII is a sequence of printable of a minimum length
       '('
@@ -145,6 +144,7 @@ def clean_string(s, min_len=MIN_LEN,
      * not made of only of digits, punctuations and whitespaces
     """
     s = s.strip()
+
     def valid(st):
         st = remove_junk('', st)
         return (st and len(st) >= min_len
@@ -156,7 +156,6 @@ def valid(st):
     if valid(s):
         yield s.strip()
 
-
 #####################################################################################
 # TODO: Strings classification
 # Classify strings, detect junk, detect paths, symbols, demangle symbols, unescape
diff --git a/src/textcode/strings2.py b/src/textcode/strings2.py
index 64bb20a7a45..7bddb04cb89 100644
--- a/src/textcode/strings2.py
+++ b/src/textcode/strings2.py
@@ -23,12 +23,11 @@
 # - removed main()
 # - do not cache compiled patterns. re does cache patterns alright.
 
-
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 import re
 
-
 ASCII_BYTE = (
     " !\"#\$%&\'\(\)\*\+,-\./0123456789:;<=>\?@ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "\[\]\^_`abcdefghijklmnopqrstuvwxyz\{\|\}\\\~\t"
diff --git a/src/typecode/contenttype.py b/src/typecode/contenttype.py
index 73052500fff..3731ac5ac6d 100644
--- a/src/typecode/contenttype.py
+++ b/src/typecode/contenttype.py
@@ -22,7 +22,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import print_function
 
 import contextlib
 import os
@@ -52,13 +53,11 @@
 extension and mostly its content.
 """
 
-
 LOG = logging.getLogger(__name__)
 
 data_dir = os.path.join(os.path.dirname(__file__), 'data')
 bin_dir = os.path.join(os.path.dirname(__file__), 'bin')
 
-
 # Python mimetypes path setup using Apache mimetypes DB
 os.environ['XDG_DATA_DIRS'] = os.path.join(data_dir, 'apache')
 os.environ['XDG_DATA_HOME'] = os.environ['XDG_DATA_DIRS']
@@ -67,31 +66,26 @@
 # Ensure that all dates are UTC, especially for fine free file.
 os.environ['TZ'] = 'UTC'
 
-
 PLAIN_TEXT_EXTENSIONS = ('.rst', '.rest', '.txt', '.md',
                         # This one is actually not handled by Pygments. There
                         # are probably more.
                          '.log')
 
-
 C_EXTENSIONS = set(['.c', '.cc', '.cp', '.cpp', '.cxx', '.c++', '.h', '.hh',
                     '.s', '.asm', '.hpp', '.hxx', '.h++', '.i', '.ii', '.m'])
 
-
 ELF_EXE = 'executable'
 ELF_SHARED = 'shared object'
 ELF_RELOC = 'relocatable'
 ELF_UNKNOWN = 'unknown'
 elf_types = (ELF_EXE, ELF_SHARED, ELF_RELOC,)
 
-
 # TODO:
 # http://svn.zope.org/z3c.mimetype/trunk/?pathrev=103648
 # http://svn.zope.org/z3c.sharedmimeinfo/trunk/TODO.txt?revision=103668&view=markup
 # https://pypi.python.org/pypi/z3c.sharedmimeinfo/0.1.0
 # https://github.com/plone/Products.MimetypesRegistry/
 
-
 # Global registry of Type objects, keyed by location
 # TODO: can this be a memroy hog for very large scans?
 _registry = {}
@@ -109,9 +103,9 @@ def get_type(location):
         _registry[abs_loc] = t
         return t
 
-
 # TODO: simplify code using a cached property decorator
 
+
 class Type(object):
     """
     Content, media and mime type information about a file.
diff --git a/src/typecode/entropy.py b/src/typecode/entropy.py
index 142b46fae2b..9b8d9175d79 100644
--- a/src/typecode/entropy.py
+++ b/src/typecode/entropy.py
@@ -22,7 +22,6 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-
 from __future__ import division
 from __future__ import absolute_import
 
diff --git a/src/typecode/magic2.py b/src/typecode/magic2.py
index 9af702264fe..36e2c92ddd7 100644
--- a/src/typecode/magic2.py
+++ b/src/typecode/magic2.py
@@ -45,6 +45,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from __future__ import absolute_import
+from __future__ import print_function
 
 import os.path
 import ctypes
@@ -58,18 +60,15 @@
 except ImportError:
     from backports.os import fsencode
 
-
 """
 magic2 is minimal and specialized wrapper around a vendored libmagic file
 identification library. This is NOT thread-safe. It is based on python-magic
 by Adam Hup and adapted to the specific needs of ScanCode.
 """
 
-
 data_dir = os.path.join(os.path.dirname(__file__), 'data')
 bin_dir = os.path.join(os.path.dirname(__file__), 'bin')
 
-
 # path to vendored magic DB, possibly OS-specific
 basemag = os.path.join(data_dir, 'magic')
 # keep the first which is the most specific directory
@@ -81,7 +80,6 @@
 #
 detectors = {}
 
-
 # libmagic flags
 MAGIC_NONE = 0
 MAGIC_MIME = 16
@@ -90,7 +88,6 @@
 MAGIC_NO_CHECK_TEXT = 131072
 MAGIC_NO_CHECK_CDF = 262144
 
-
 DETECT_TYPE = MAGIC_NONE
 DETECT_MIME = MAGIC_NONE | MAGIC_MIME
 DETECT_ENC = MAGIC_NONE | MAGIC_MIME | MAGIC_MIME_ENCODING
@@ -149,6 +146,7 @@ class MagicException(Exception):
 
 
 class Detector(object):
+
     def __init__(self, flags, magic_file=magic_db):
         """
         Create a new libmagic detector.
diff --git a/tests/cluecode/test_authors.py b/tests/cluecode/test_authors.py
index 0c8d18aa169..e77c600445c 100644
--- a/tests/cluecode/test_authors.py
+++ b/tests/cluecode/test_authors.py
@@ -122,7 +122,7 @@ def test_author_nathan(self):
         test_file = self.get_test_loc('authors/author_nathan-KEYS')
         # name +email is not enough to create an author
         expected = [
-            #'Nathan Mittler <nathan.mittler@gmail.com>',
+            # 'Nathan Mittler <nathan.mittler@gmail.com>',
         ]
         check_detection(expected, test_file, what='authors')
 
diff --git a/tests/cluecode/test_copyrights_ics.py b/tests/cluecode/test_copyrights_ics.py
index c1de9209456..1268aee8a58 100644
--- a/tests/cluecode/test_copyrights_ics.py
+++ b/tests/cluecode/test_copyrights_ics.py
@@ -23,7 +23,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 import os.path
 from unittest.case import expectedFailure
@@ -36,6 +37,7 @@
 rather diversified sample of a typical Linux-based user space environment.
 """
 
+
 class TestCopyright(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -8672,7 +8674,6 @@ def test_ics_iptables_extensions_libxt_tcpoptstrip_c(self):
         ]
         check_detection(expected, test_file)
 
-
     def test_ics_iptables_extensions_libxt_tee_c(self):
         test_file = self.get_test_loc('ics/iptables-extensions/libxt_TEE.c')
         expected = [
@@ -10752,7 +10753,6 @@ def test_ics_libffi_ltconfig(self):
         ]
         check_detection(expected, test_file, what='authors')
 
-
     def test_ics_libffi_ltmain_sh(self):
         test_file = self.get_test_loc('ics/libffi/ltmain.sh')
         expected = [
diff --git a/tests/commoncode/test_codec.py b/tests/commoncode/test_codec.py
index cd667c079f8..7f9fddbedd7 100644
--- a/tests/commoncode/test_codec.py
+++ b/tests/commoncode/test_codec.py
@@ -22,7 +22,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 from unittest import TestCase
 
@@ -32,6 +33,7 @@
 
 
 class TestCodec(TestCase):
+
     def test_bin_to_num_basic(self):
         expected = 123
         result = bin_to_num('{')
diff --git a/tests/commoncode/test_date.py b/tests/commoncode/test_date.py
index ed6d62af2fe..33f389953e7 100644
--- a/tests/commoncode/test_date.py
+++ b/tests/commoncode/test_date.py
@@ -22,17 +22,18 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
-import os
 from datetime import datetime
+import os
 
 from commoncode import testcase
-
 import commoncode.date
 
 
 class TestDate(testcase.FileBasedTesting):
+
     def test_secs_from_epoch_can_handle_micro_and_nano_secs(self):
         test_file = self.get_temp_file()
         open(test_file, 'w').close()
diff --git a/tests/commoncode/test_fileset.py b/tests/commoncode/test_fileset.py
index e12f2f29543..0e3f07d6856 100644
--- a/tests/commoncode/test_fileset.py
+++ b/tests/commoncode/test_fileset.py
@@ -22,13 +22,15 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 import os
 
 import commoncode.testcase
 from commoncode import fileset
 
+
 class FilesetTest(commoncode.testcase.FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
diff --git a/tests/commoncode/test_fileutils.py b/tests/commoncode/test_fileutils.py
index fb2ffa35c75..63e9989ef47 100644
--- a/tests/commoncode/test_fileutils.py
+++ b/tests/commoncode/test_fileutils.py
@@ -22,7 +22,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 import os
 from os.path import join
@@ -315,6 +316,7 @@ def test_fsdecode_and_fsencode_are_idempotent(self):
         assert b == fsdecode(fsencode(a))
         assert b == fsdecode(fsencode(b))
 
+
 class TestFileUtilsWalk(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
diff --git a/tests/commoncode/test_functional.py b/tests/commoncode/test_functional.py
index afc6004bebe..1857f4b8e18 100644
--- a/tests/commoncode/test_functional.py
+++ b/tests/commoncode/test_functional.py
@@ -22,7 +22,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 from unittest.case import TestCase
 
@@ -37,6 +38,7 @@ def test_flatten(self):
         assert expected == test
 
     def test_flatten_generator(self):
+
         def gen():
             for _ in range(2):
                 yield range(5)
diff --git a/tests/commoncode/test_ignore.py b/tests/commoncode/test_ignore.py
index cc4fb868543..4a4166bdd63 100644
--- a/tests/commoncode/test_ignore.py
+++ b/tests/commoncode/test_ignore.py
@@ -22,17 +22,16 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 import os
+from unittest.case import skipIf
 
 import commoncode.testcase
 from commoncode import fileutils
-
-
 from commoncode import ignore
 from commoncode.system import on_mac
-from unittest.case import skipIf
 
 
 class IgnoreTest(commoncode.testcase.FileBasedTesting):
diff --git a/tests/commoncode/test_version.py b/tests/commoncode/test_version.py
index 49ed53b7f19..8c5ed2ce219 100644
--- a/tests/commoncode/test_version.py
+++ b/tests/commoncode/test_version.py
@@ -22,13 +22,16 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 import unittest
 
 from commoncode import version
 
+
 class TestVersionHint(unittest.TestCase):
+
     def test_version_hint(self):
         data = {
             '/xmlgraphics/fop/source/fop-1.0-src.zip': '1.0',
diff --git a/tests/extractcode/extractcode_assert_utils.py b/tests/extractcode/extractcode_assert_utils.py
index b8b4f8a459c..bfda20d4b8b 100644
--- a/tests/extractcode/extractcode_assert_utils.py
+++ b/tests/extractcode/extractcode_assert_utils.py
@@ -22,17 +22,18 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 import os
 from commoncode import filetype
 from commoncode import fileutils
 
-
 """
 Shared archiving test utils.
 """
 
+
 def check_size(expected_size, location):
     assert expected_size == os.stat(location).st_size
 
diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index 28f3d22ad93..f0af7176df4 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -54,7 +54,6 @@
 from extractcode import sevenzip
 from extractcode import tar
 
-
 """
 For each archive type --when possible-- we are testing extraction of:
  - basic, plain archive, no tricks
@@ -288,7 +287,6 @@ def collect_extracted_path(self, test_dir):
         result = sorted(result)
         return result
 
-
     def assertExceptionContains(self, text, callableObj, *args, **kwargs):
         try:
             callableObj(*args, **kwargs)
@@ -304,6 +302,7 @@ def assertExceptionContains(self, text, callableObj, *args, **kwargs):
 
 
 class TestTarGzip(BaseArchiveTestCase):
+
     def test_extract_targz_basic(self):
         test_file = self.get_test_loc('archive/tgz/tarred_gzipped.tar.gz')
         test_dir = self.get_temp_dir()
@@ -412,6 +411,7 @@ def test_extract_targz_with_unicode_path_should_extract_without_error(self):
 
 
 class TestGzip(BaseArchiveTestCase):
+
     def test_uncompress_gzip_basic(self):
         test_file = self.get_test_loc('archive/gzip/file_4.26-1.diff.gz')
         test_dir = self.get_temp_dir()
@@ -467,12 +467,12 @@ def test_uncompress_gzip_can_uncompress_windows_ntfs_wmz(self):
         test_file = self.get_test_loc('archive/wmz/image003.wmz')
         test_dir = self.get_temp_dir()
         archive.uncompress_gzip(test_file, test_dir)
-        print(os.listdir(test_dir))
         result = os.path.join(test_dir, 'image003.wmz-extract')
         assert os.path.exists(result)
 
 
 class TestTarBz2(BaseArchiveTestCase):
+
     def test_extract_tar_bz2_basic(self):
         test_file = self.get_test_loc('archive/tbz/tarred_bzipped.tar.bz2')
         test_dir = self.get_temp_dir()
@@ -548,6 +548,7 @@ def test_extract_tar_bz2_multistream(self):
 
 
 class TestBz2(BaseArchiveTestCase):
+
     def test_uncompress_bzip2_basic(self):
         test_file = self.get_test_loc('archive/bz2/single_file_not_tarred.bz2')
         test_dir = self.get_temp_dir()
@@ -597,6 +598,7 @@ def test_sevenzip_extract_can_handle_bz2_multistream_differently(self):
 
 
 class TestShellArchives(BaseArchiveTestCase):
+
     def test_extract_springboot(self):
         # a self executable springboot Jar is a zip with a shell script prefix
         test_file = self.get_test_loc('archive/shar/demo-spring-boot.jar')
@@ -608,6 +610,7 @@ def test_extract_springboot(self):
 
 
 class TestZip(BaseArchiveTestCase):
+
     def test_extract_zip_basic(self):
         test_file = self.get_test_loc('archive/zip/basic.zip')
         test_dir = self.get_temp_dir()
@@ -864,8 +867,6 @@ def test_extract_zip_with_backslash_in_path_3(self):
         test_file = self.get_test_loc('archive/zip/backslash/boo-0.3-src.zip')
         test_dir = self.get_temp_dir()
         archive.extract_zip(test_file, test_dir)
-        print()
-        map(print, fileutils.resource_iter(test_dir, with_dirs=False))
         result = os.path.join(test_dir, 'src/Boo.Lang.Compiler/TypeSystem/InternalCallableType.cs')
         assert os.path.exists(result)
 
@@ -909,6 +910,7 @@ def test_extract_zip_can_extract_zip_with_directory_not_marked_with_trailing_sla
 
 
 class TestLibarch(BaseArchiveTestCase):
+
     def test_extract_zip_with_relative_path_libarchive(self):
         test_file = self.get_test_loc('archive/zip/relative_parent_folders.zip')
         test_dir = self.get_temp_dir()
@@ -925,6 +927,7 @@ def test_extract_zip_with_relative_path_libarchive(self):
 
 
 class TestTar(BaseArchiveTestCase):
+
     def test_extract_tar_basic(self):
         test_file = self.get_test_loc('archive/tar/tarred.tar')
         test_dir = self.get_temp_dir()
@@ -1047,6 +1050,7 @@ def test_extract_python_testtar_tar_archive_with_special_files(self):
 
 
 class TestDebian(BaseArchiveTestCase):
+
     def test_extract_deb_package_1(self):
         test_file = self.get_test_loc('archive/deb/adduser_3.112ubuntu1_all.deb')
         test_dir = self.get_temp_dir()
@@ -1072,6 +1076,7 @@ def test_extract_deb_package_3(self):
 
 
 class TestAr(BaseArchiveTestCase):
+
     def test_extract_ar_basic_7z(self):
         test_file = self.get_test_loc('archive/ar/liby.a')
         test_dir = self.get_temp_dir()
@@ -1304,6 +1309,7 @@ def test_extract_ar_with_permissions(self):
 
 
 class TestCpio(BaseArchiveTestCase):
+
     def test_extract_cpio_basic(self):
         test_file = self.get_test_loc('archive/cpio/elfinfo-1.0-1.fc9.src.cpio')
         test_dir = self.get_temp_dir()
@@ -1371,7 +1377,6 @@ def test_extract_cpio_with_invalidpath(self):
         result = os.path.join(test_dir, 'this/that')
         assert os.path.exists(result)
 
-
     def test_extract_cpio_with_weird_filename_extension(self):
         test_file = self.get_test_loc('archive/cpio/t.cpio.foo')
         test_dir = self.get_temp_dir()
@@ -1381,6 +1386,7 @@ def test_extract_cpio_with_weird_filename_extension(self):
         expected = ['/t/', '/t/t.txt']
         assert expected == extracted
 
+
 class TestRpm(BaseArchiveTestCase):
 
     def test_extract_rpm_basic_1(self):
@@ -1430,6 +1436,7 @@ def test_extract_rpm_broken(self):
 
 
 class TestExtractTwice(BaseArchiveTestCase):
+
     def test_extract_twice_with_rpm_with_xz_compressed_cpio(self):
         test_file = self.get_test_loc('archive/rpm/xz-compressed-cpio.rpm')
         test_dir = self.get_temp_dir()
@@ -1535,6 +1542,7 @@ def test_extract_twice_can_extract_to_relative_paths(self):
 
 
 class TestRar(BaseArchiveTestCase):
+
     def test_extract_rar_basic(self):
         test_file = self.get_test_loc('archive/rar/basic.rar')
         test_dir = self.get_temp_dir()
@@ -1610,6 +1618,7 @@ def test_extract_rar_with_non_ascii_path(self):
 
 
 class TestSevenZip(BaseArchiveTestCase):
+
     def test_extract_7z_basic(self):
         test_file = self.get_test_loc('archive/7z/z.7z')
         test_dir = self.get_temp_dir()
@@ -1725,6 +1734,7 @@ def test_extract_7z_basic_with_space_in_file_name(self):
 
 
 class TestIso(BaseArchiveTestCase):
+
     def test_extract_iso_basic(self):
         test_file = self.get_test_loc('archive/iso/small.iso')
         test_dir = self.get_temp_dir()
@@ -1754,6 +1764,7 @@ def test_extract_iso_basic_with_with_weird_filename_extension(self):
 
 
 class TestXzLzma(BaseArchiveTestCase):
+
     def check_lzma_extract(self, extract_fun, test_file, expected):
         """
         Run the 'extract_fun' function using the 'test_file' file as an input
@@ -1846,6 +1857,7 @@ def test_extract_archive_tar_lzma_5(self):
 
 
 class TestDia(BaseArchiveTestCase):
+
     def test_extract_dia_basic(self):
         test_file = self.get_test_loc('archive/dia/dia.dia')
         test_dir = self.get_temp_dir()
@@ -1901,6 +1913,7 @@ def test_extract_can_get_extractor_and_uncompress_dia_files(self):
 
 
 class TestTarZ(BaseArchiveTestCase):
+
     def test_extract_tarz_compress_basic(self):
         test_file = self.get_test_loc('archive/Z/tkWWW-0.11.tar.Z')
         test_dir = self.get_temp_dir()
@@ -1917,6 +1930,7 @@ def test_extract_z_compress_basic(self):
 
 
 class TestXar(BaseArchiveTestCase):
+
     def test_extract_xar_basic(self):
         test_file = self.get_test_loc('archive/xar/xar-1.4.xar')
         test_dir = self.get_temp_dir()
@@ -1928,6 +1942,7 @@ def test_extract_xar_basic(self):
 
 
 class TestCb7(BaseArchiveTestCase):
+
     def test_get_extractor_cb7(self):
         test_file = self.get_test_loc('archive/cb7/t .cb7')
         result = archive.get_extractor(test_file)
@@ -1950,7 +1965,9 @@ def test_extract_cb7_basic_with_weird_filename_extension(self):
         expected = ['/t/', '/t/t.txt']
         assert expected == extracted
 
+
 class TestCab(BaseArchiveTestCase):
+
     def test_get_extractor_cab(self):
         test_file = self.get_test_loc('archive/cab/basic.cab')
         result = archive.get_extractor(test_file)
@@ -1973,7 +1990,9 @@ def test_extract_cab_basic_with_weird_filename_extension(self):
         expected = ['/t/', '/t/t.txt']
         assert expected == extracted
 
+
 class TestCbr(BaseArchiveTestCase):
+
     def test_get_extractor_cbr(self):
         test_file = self.get_test_loc('archive/cbr/t.cbr')
         result = archive.get_extractor(test_file)
@@ -1996,7 +2015,9 @@ def test_extract_cbr_basic_with_weird_filename_extension(self):
         expected = ['/t/', '/t/t.txt']
         assert expected == extracted
 
+
 class TestCbt(BaseArchiveTestCase):
+
     def test_get_extractor_cbt(self):
         test_file = self.get_test_loc('archive/cbt/t.cbt')
         result = archive.get_extractor(test_file)
@@ -2019,7 +2040,9 @@ def test_extract_cbt_basic_with_weird_filename_extension(self):
         expected = ['/t/', '/t/t.txt']
         assert expected == extracted
 
+
 class TestCbz(BaseArchiveTestCase):
+
     def test_get_extractor_cbz(self):
         test_file = self.get_test_loc('archive/cbz/t.cbz')
         result = archive.get_extractor(test_file)
diff --git a/tests/extractcode/test_extractcode.py b/tests/extractcode/test_extractcode.py
index 9d8cf294735..3ed0a7ddf0a 100644
--- a/tests/extractcode/test_extractcode.py
+++ b/tests/extractcode/test_extractcode.py
@@ -22,16 +22,17 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
-
+from __future__ import absolute_import
+from __future__ import print_function
 
 from os.path import dirname
+from os.path import exists
 from os.path import join
 
 from commoncode.testcase import FileBasedTesting
 from commoncode import fileutils
 from extractcode import new_name
-from os.path import exists
+
 
 class TestNewName(FileBasedTesting):
     test_data_dir = join(dirname(__file__), 'data')
diff --git a/tests/extractcode/test_patch.py b/tests/extractcode/test_patch.py
index da8767a8f8b..4138101e153 100644
--- a/tests/extractcode/test_patch.py
+++ b/tests/extractcode/test_patch.py
@@ -26,7 +26,6 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-
 import codecs
 import json
 import os
diff --git a/tests/extractcode/test_tar.py b/tests/extractcode/test_tar.py
index 0e1e7b41bb9..c1a79d1e2e6 100644
--- a/tests/extractcode/test_tar.py
+++ b/tests/extractcode/test_tar.py
@@ -26,7 +26,6 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-
 import os
 from unittest.case import skipIf
 
@@ -38,6 +37,7 @@
 
 
 class TestTarGzip(BaseArchiveTestCase):
+
     def test_extract_targz_basic(self):
         test_file = self.get_test_loc('archive/tgz/tarred_gzipped.tar.gz')
         test_dir = self.get_temp_dir()
@@ -141,6 +141,7 @@ def test_extract_targz_from_apache_should_not_return_errors(self):
 
 
 class TestTarBz2(BaseArchiveTestCase):
+
     def test_extract_tar_bz2_basic(self):
         test_file = self.get_test_loc('archive/tbz/tarred_bzipped.tar.bz2')
         test_dir = self.get_temp_dir()
@@ -217,6 +218,7 @@ def test_extract_tar_bz2_multistream(self):
 
 
 class TestTar(BaseArchiveTestCase):
+
     def test_extract_tar_basic(self):
         test_file = self.get_test_loc('archive/tar/tarred.tar')
         test_dir = self.get_temp_dir()
diff --git a/tests/formattedcode/test_output_csv.py b/tests/formattedcode/test_output_csv.py
index 4328fd7d32a..054e76e2c90 100644
--- a/tests/formattedcode/test_output_csv.py
+++ b/tests/formattedcode/test_output_csv.py
@@ -40,7 +40,6 @@
 
 from formattedcode.output_csv import flatten_scan
 
-
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -193,9 +192,8 @@ def test_csv_minimal():
     test_dir = test_env.get_test_loc('csv/srp')
     result_file = test_env.get_temp_file('csv')
     expected_file = test_env.get_test_loc('csv/srp.csv')
-    result = run_scan_click(['--copyright', test_dir, '--output-csv', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--copyright', test_dir, '--output-csv', result_file]
+    run_scan_click(args)
     check_csvs(result_file, expected_file)
 
 
@@ -203,23 +201,15 @@ def test_csv_tree():
     test_dir = test_env.get_test_loc('csv/tree/scan')
     result_file = test_env.get_temp_file('csv')
     expected_file = test_env.get_test_loc('csv/tree/expected.csv')
-    result = run_scan_click(['--copyright', test_dir, 
-                             '--output-csv', result_file])
-    assert result.exit_code == 0
+    args = ['--copyright', test_dir, '--output-csv', result_file]
+    run_scan_click(args)
     check_csvs(result_file, expected_file)
 
 
 def test_can_process_live_scan_with_all_options():
     test_dir = test_env.get_test_loc('csv/livescan/scan')
     result_file = test_env.get_temp_file('csv')
-    rc, stdout, stderr = run_scan_plain(['-clip', '--email', '--url', 
-        '--strip-root', test_dir, '--output-csv', result_file])
-    try:
-        assert rc == 0
-    except:
-        print(stdout, stderr)
-        print(stdout, stderr)
-        raise
-
+    args = ['-clip', '--email', '--url', '--strip-root', test_dir, '--output-csv', result_file]
+    run_scan_plain(args)
     expected_file = test_env.get_test_loc('csv/livescan/expected.csv')
     check_csvs(result_file, expected_file, regen=False)
diff --git a/tests/formattedcode/test_output_json.py b/tests/formattedcode/test_output_json.py
index 6985a05f3c9..e49e85023ce 100644
--- a/tests/formattedcode/test_output_json.py
+++ b/tests/formattedcode/test_output_json.py
@@ -33,7 +33,6 @@
 from scancode.cli_test_utils import check_json_scan
 from scancode.cli_test_utils import run_scan_click
 
-
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -41,51 +40,34 @@
 def test_json_pretty_print():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['-clip', test_dir, '--json-pp', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    args = ['-clip', test_dir, '--json-pp', result_file]
+    run_scan_click(args)
     expected = test_env.get_test_loc('json/simple-expected.jsonpp')
-    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True, regen=False)
+    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True)
 
 
 def test_json_compact():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['-clip', test_dir, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    run_scan_click(['-clip', test_dir, '--json', result_file])
     with open(result_file, 'rb') as res:
         assert len(res.read().splitlines()) == 1
-
     expected = test_env.get_test_loc('json/simple-expected.json')
-    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True, regen=False)
+    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True)
 
 
 def test_scan_output_does_not_truncate_copyright_json():
     test_dir = test_env.get_test_loc('json/tree/scan/')
     result_file = test_env.get_temp_file('test.json')
-
-    result = run_scan_click(
-        ['-clip', '--strip-root', test_dir, '--json-pp', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    run_scan_click(['-clip', '--strip-root', test_dir, '--json-pp', result_file])
     expected = test_env.get_test_loc('json/tree/expected.json')
-    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True, regen=False)
+    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True)
 
 
 def test_scan_output_does_not_truncate_copyright_with_json_to_stdout():
     test_dir = test_env.get_test_loc('json/tree/scan/')
     result_file = test_env.get_temp_file('test.json')
-
-    result = run_scan_click(
-        ['-clip', '--strip-root', test_dir, '--json-pp', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    args = ['-clip', '--strip-root', test_dir, '--json-pp', result_file]
+    run_scan_click(args)
     expected = test_env.get_test_loc('json/tree/expected.json')
-    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True, regen=False)
+    check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True)
diff --git a/tests/formattedcode/test_output_jsonlines.py b/tests/formattedcode/test_output_jsonlines.py
index f1406bd141f..78ae7202497 100644
--- a/tests/formattedcode/test_output_jsonlines.py
+++ b/tests/formattedcode/test_output_jsonlines.py
@@ -35,7 +35,6 @@
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
 
-
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -91,11 +90,7 @@ def _load_json_result_for_jsonlines(result_file):
 def test_jsonlines():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('jsonline')
-
-    result = run_scan_click(['-i', test_dir, '--json-lines', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    run_scan_click(['-i', test_dir, '--json-lines', result_file])
     expected = test_env.get_test_loc('json/simple-expected.jsonlines')
     check_jsonlines_scan(test_env.get_test_loc(expected), result_file, regen=False)
 
@@ -103,17 +98,13 @@ def test_jsonlines():
 def test_jsonlines_with_timing():
     test_dir = test_env.get_test_loc('json/simple')
     result_file = test_env.get_temp_file('jsonline')
-
-    result = run_scan_click(['-i', '--timing', test_dir, '--json-lines', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    run_scan_click(['-i', '--timing', test_dir, '--json-lines', result_file])
     file_results = _load_jsonlines_result(result_file)
-    first =True
-
+    first_line = True
     for res in file_results:
-        if first:
+        if first_line:
             # skip header
-            first = False
+            first_line = False
             continue
         scan_timings = res['files'][0]['scan_timings']
         assert scan_timings
diff --git a/tests/formattedcode/test_output_spdx.py b/tests/formattedcode/test_output_spdx.py
index be5f41d1417..5c8f64d4d24 100644
--- a/tests/formattedcode/test_output_spdx.py
+++ b/tests/formattedcode/test_output_spdx.py
@@ -38,7 +38,6 @@
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import run_scan_plain
 
-
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -150,71 +149,63 @@ def test_spdx_rdf_basic():
     test_file = test_env.get_test_loc('spdx/simple/test.txt')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/simple/expected.rdf')
-    result = run_scan_click([test_file, '-clip', '--output-spdx-rdf', result_file])
+    run_scan_click([test_file, '-clip', '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
-    assert result.exit_code == 0
 
 
 def test_spdx_tv_basic():
     test_dir = test_env.get_test_loc('spdx/simple/test.txt')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/simple/expected.tv')
-    result = run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
+    run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
-    assert result.exit_code == 0
 
 
 def test_spdx_rdf_with_known_licenses():
     test_dir = test_env.get_test_loc('spdx/license_known/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/license_known/expected.rdf')
-    result = run_scan_click([test_dir, '-clip', '--output-spdx-rdf', result_file])
+    run_scan_click([test_dir, '-clip', '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
-    assert result.exit_code == 0
 
 
 def test_spdx_rdf_with_license_ref():
     test_dir = test_env.get_test_loc('spdx/license_ref/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/license_ref/expected.rdf')
-    result = run_scan_click([test_dir, '-clip', '--output-spdx-rdf', result_file])
+    run_scan_click([test_dir, '-clip', '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
-    assert result.exit_code == 0
 
 
 def test_spdx_tv_with_known_licenses():
     test_dir = test_env.get_test_loc('spdx/license_known/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/license_known/expected.tv')
-    result = run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
+    run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
-    assert result.exit_code == 0
 
 
 def test_spdx_tv_with_license_ref():
     test_dir = test_env.get_test_loc('spdx/license_ref/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/license_ref/expected.tv')
-    result = run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
+    run_scan_click([test_dir, '-clip', '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
-    assert result.exit_code == 0
 
 
 def test_spdx_rdf_with_known_licenses_with_text():
     test_dir = test_env.get_test_loc('spdx/license_known/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/license_known/expected_with_text.rdf')
-    result = run_scan_click([ '-clip', '--license-text', test_dir, '--output-spdx-rdf', result_file])
+    run_scan_click([ '-clip', '--license-text', test_dir, '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
-    assert result.exit_code == 0
 
 
 def test_spdx_rdf_with_license_ref_with_text():
     test_dir = test_env.get_test_loc('spdx/license_ref/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/license_ref/expected_with_text.rdf')
-    result = run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-rdf', result_file])
-    assert result.exit_code == 0
+    run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
 
 
@@ -222,8 +213,7 @@ def test_spdx_tv_with_known_licenses_with_text():
     test_dir = test_env.get_test_loc('spdx/license_known/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/license_known/expected_with_text.tv')
-    result = run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-tv', result_file])
-    assert result.exit_code == 0
+    run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
 
 
@@ -231,8 +221,7 @@ def test_spdx_tv_with_license_ref_with_text():
     test_dir = test_env.get_test_loc('spdx/license_ref/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/license_ref/expected_with_text.tv')
-    result = run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-tv', result_file])
-    assert result.exit_code == 0
+    run_scan_click(['-clip', '--license-text', test_dir, '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
 
 
@@ -240,8 +229,7 @@ def test_spdx_tv_tree():
     test_dir = test_env.get_test_loc('spdx/tree/scan')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/tree/expected.tv')
-    result = run_scan_click(['-clip', test_dir, '--output-spdx-tv', result_file])
-    assert result.exit_code == 0
+    run_scan_click(['-clip', test_dir, '--output-spdx-tv', result_file])
     check_tv_scan(expected_file, result_file)
 
 
@@ -249,8 +237,7 @@ def test_spdx_rdf_tree():
     test_dir = test_env.get_test_loc('spdx/tree/scan')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/tree/expected.rdf')
-    result = run_scan_click(['-clip', test_dir, '--output-spdx-rdf', result_file])
-    assert result.exit_code == 0
+    run_scan_click(['-clip', test_dir, '--output-spdx-rdf', result_file])
     check_rdf_scan(expected_file, result_file)
 
 
@@ -258,48 +245,27 @@ def test_spdx_tv_with_unicode_license_text_does_not_fail():
     test_file = test_env.get_test_loc('spdx/unicode/et131x.h')
     result_file = test_env.get_temp_file('tv')
     expected_file = test_env.get_test_loc('spdx/unicode/expected.tv')
-    rc, stdout, stderr = run_scan_plain([
-        '--license', '--copyright', '--info',
-        '--strip-root', '--license-text',
-        '--license-diag',
-         test_file, '--output-spdx-tv', result_file
-    ])
-    if rc != 0:
-        print('stdout', stdout)
-        print('stderr', stderr)
-    assert rc == 0
-    check_tv_scan(expected_file, result_file, regen=False)
+    args = ['--license', '--copyright', '--info', '--strip-root', '--license-text',
+            '--license-diag', test_file, '--output-spdx-tv', result_file]
+    run_scan_plain(args)
+    check_tv_scan(expected_file, result_file)
 
 
 def test_spdx_rdf_with_unicode_license_text_does_not_fail():
     test_file = test_env.get_test_loc('spdx/unicode/et131x.h')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/unicode/expected.rdf')
-    rc, stdout, stderr = run_scan_plain([
-        '--license', '--copyright', '--info',
-        '--strip-root', '--license-text',
-        '--license-diag',
-         test_file, '--output-spdx-rdf', result_file
-    ])
-    if rc != 0:
-        print('stdout', stdout)
-        print('stderr', stderr)
-    assert rc == 0
-    check_rdf_scan(expected_file, result_file, regen=False)
+    args = ['--license', '--copyright', '--info', '--strip-root',
+            '--license-text', '--license-diag', test_file, '--output-spdx-rdf', result_file]
+    run_scan_plain(args)
+    check_rdf_scan(expected_file, result_file)
 
 
 def test_spdx_rdf_with_or_later_license_does_not_fail():
     test_file = test_env.get_test_loc('spdx/or_later/test.java')
     result_file = test_env.get_temp_file('rdf')
     expected_file = test_env.get_test_loc('spdx/or_later/expected.rdf')
-    rc, stdout, stderr = run_scan_plain([
-        '--license', '--copyright', '--info',
-        '--strip-root', '--license-text',
-        '--license-diag',
-         test_file, '--output-spdx-rdf', result_file
-    ])
-    if rc != 0:
-        print('stdout', stdout)
-        print('stderr', stderr)
-    assert rc == 0
-    check_rdf_scan(expected_file, result_file, regen=False)
+    args = ['--license', '--copyright', '--info', '--strip-root', '--license-text',
+            '--license-diag', test_file, '--output-spdx-rdf', result_file]
+    run_scan_plain(args)
+    check_rdf_scan(expected_file, result_file)
diff --git a/tests/formattedcode/test_output_templated.py b/tests/formattedcode/test_output_templated.py
index 63eb341e69b..7f3c0c528ed 100644
--- a/tests/formattedcode/test_output_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -37,7 +37,6 @@
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
 
-
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -45,11 +44,7 @@
 def test_paths_are_posix_paths_in_html_app_format_output():
     test_dir = test_env.get_test_loc('templated/simple')
     result_file = test_env.get_temp_file(extension='html', file_name='test_html')
-
-    result = run_scan_click(['--copyright', test_dir, '--output-html-app', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    run_scan_click(['--copyright', test_dir, '--output-html-app', result_file])
     # the data we want to test is in the data.json file
     data_file = os.path.join(fileutils.parent_directory(result_file), 'test_html_files', 'data.json')
     assert '/copyright_acme_c-c.c' in open(data_file).read()
@@ -60,10 +55,7 @@ def test_paths_are_posix_paths_in_html_app_format_output():
 def test_paths_are_posix_in_html_format_output():
     test_dir = test_env.get_test_loc('templated/simple')
     result_file = test_env.get_temp_file('html')
-
-    result = run_scan_click(['--copyright', test_dir, '--output-html', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    run_scan_click(['--copyright', test_dir, '--output-html', result_file])
     results = open(result_file).read()
     assert '/copyright_acme_c-c.c' in results
     assert __version__ in results
@@ -72,13 +64,8 @@ def test_paths_are_posix_in_html_format_output():
 def test_scanned_path_is_present_in_html_app_output():
     test_dir = test_env.get_test_loc('templated/html_app')
     result_file = test_env.get_temp_file('test.html')
-
-    result = run_scan_click(['--copyright', '--output-html-app', result_file, test_dir])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    run_scan_click(['--copyright', '--output-html-app', result_file, test_dir])
     results = open(result_file).read()
-
     assert '<title>ScanCode scan results for: %(test_dir)s</title>' % locals() in results
     assert '<div class="row" id = "scan-result-header">' % locals() in results
     assert '<strong>scan results for:</strong>' % locals() in results
@@ -95,12 +82,7 @@ def test_scan_html_output_does_not_truncate_copyright_html():
     if on_windows:
         args += ['--timeout', '400']
 
-    result = run_scan_click(args)
-    print('------------------------------------------------')
-    print(result.output)
-    print('------------------------------------------------')
-    assert 'Scanning done' in result.output
-
+    run_scan_click(args)
     results = open(result_file).read()
     assert __version__ in results
 
@@ -132,17 +114,12 @@ def test_scan_html_output_does_not_truncate_copyright_html():
         check = re.findall(exp, results, re.MULTILINE)
         assert check
 
-    assert result.exit_code == 0
-
 
 def test_custom_format_with_custom_filename_fails_for_directory():
     test_dir = test_env.get_temp_dir('html')
     result_file = test_env.get_temp_file('html')
-
-    result = run_scan_click(['--custom-template', test_dir,
-                             '--output-custom', result_file,
-                             test_dir])
-    assert result.exit_code != 0
+    args = ['--custom-template', test_dir, '--output-custom', result_file, test_dir]
+    result = run_scan_click(args, expected_rc=2)
     assert 'Invalid value for "--custom-template": Path' in result.output
 
 
@@ -150,11 +127,8 @@ def test_custom_format_with_custom_filename():
     test_dir = test_env.get_test_loc('templated/simple')
     custom_template = test_env.get_test_loc('templated/sample-template.html')
     result_file = test_env.get_temp_file('html')
-
-    result = run_scan_click(['--custom-template', custom_template,
-                             '--output-custom', result_file,
-                             test_dir])
-    assert result.exit_code == 0
+    args = ['--custom-template', custom_template, '--output-custom', result_file, test_dir]
+    run_scan_click(args)
     results = open(result_file).read()
     assert 'Custom Template' in results
     assert __version__ in results
diff --git a/tests/licensedcode/license_test_utils.py b/tests/licensedcode/license_test_utils.py
index 87720c72b77..701a22fd176 100644
--- a/tests/licensedcode/license_test_utils.py
+++ b/tests/licensedcode/license_test_utils.py
@@ -40,13 +40,13 @@
     unicode
 except NameError:
     # Python 3
-    unicode = str #NOQA
-
+    unicode = str  # NOQA
 
 """
 License test utilities.
 """
 
+
 def make_license_test_function(
         expected_licenses, test_file, test_data_file, test_name,
         detect_negative=True, min_score=0,
diff --git a/tests/licensedcode/test_cache.py b/tests/licensedcode/test_cache.py
index 3e65aea5719..54b149b45d0 100644
--- a/tests/licensedcode/test_cache.py
+++ b/tests/licensedcode/test_cache.py
@@ -35,7 +35,6 @@
 from licensedcode import cache
 from licensedcode.cache import get_license_cache_paths
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
diff --git a/tests/licensedcode/test_detect.py b/tests/licensedcode/test_detect.py
index 11c80141213..5581f85c111 100644
--- a/tests/licensedcode/test_detect.py
+++ b/tests/licensedcode/test_detect.py
@@ -45,11 +45,11 @@
 
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
-
 """
 Test the core license detection mechanics.
 """
 
+
 class TestIndexMatch(FileBasedTesting):
     test_data_dir = TEST_DATA_DIR
 
@@ -1018,7 +1018,7 @@ def test_match_texts_with_short_lgpl_and_gpl_notices(self):
         matches = idx.match(location=test_loc)
         assert 6 == len(matches)
         results = [m.matched_text(whole_lines=False) for m in matches]
-        expected =[
+        expected = [
             'GNU General Public License (GPL',
             'GNU Lesser General Public License (LGPL',
             'GNU General Public License (GPL',
diff --git a/tests/licensedcode/test_detection_datadriven.py b/tests/licensedcode/test_detection_datadriven.py
index 359990f649d..4e3c3782b29 100644
--- a/tests/licensedcode/test_detection_datadriven.py
+++ b/tests/licensedcode/test_detection_datadriven.py
@@ -39,17 +39,16 @@
 
 from license_test_utils import make_license_test_function
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data/licenses')
 
 # set to True to print matched texts on test failure.
 TRACE_TEXTS = True
 
-
 """
 Data-driven tests using expectations stored in YAML files.
 """
 
+
 class LicenseTest(object):
     """
     A license detection test is used to verify that license detection works
@@ -69,6 +68,7 @@ class LicenseTest(object):
     If the list of licenses is empty, then this test should not detect any
     license in the test file.
     """
+
     def __init__(self, data_file=None, test_file=None):
         self.data_file = data_file
         self.test_file = test_file
diff --git a/tests/licensedcode/test_detection_validate.py b/tests/licensedcode/test_detection_validate.py
index 364d21d1735..bfd83b9b1f3 100644
--- a/tests/licensedcode/test_detection_validate.py
+++ b/tests/licensedcode/test_detection_validate.py
@@ -35,11 +35,11 @@
 
 from license_test_utils import make_license_test_function
 
-
 """
 Validate that each license text and each rule is properly detected.
 """
 
+
 def build_license_validation_tests(licenses_by_key, cls):
     """
     Dynamically build an individual test method for each license texts in a licenses
diff --git a/tests/licensedcode/test_index.py b/tests/licensedcode/test_index.py
index c5f7a1536c0..efe1b3f53fc 100644
--- a/tests/licensedcode/test_index.py
+++ b/tests/licensedcode/test_index.py
@@ -39,7 +39,6 @@
 from licensedcode.query import Query
 from licensedcode import match_seq
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
@@ -477,14 +476,6 @@ def test_match_with_template_and_multiple_rules(self):
             NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
             SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
         """.split()
-#         q = Query(query_string=querys, idx=idx)
-
-#         print('######################')
-#         print('######################')
-#         print('q=', querys.lower().replace('*', ' ').replace('/', ' '). split())
-#         print('q2=', [None if t is None else idx.tokens_by_tid[t] for t in q.tokens_with_unknowns()])
-#         print('######################')
-
 
         qtext, itext = get_texts(match, query_string=querys, idx=idx)
         assert exp_qtext == qtext.split()
diff --git a/tests/licensedcode/test_legal.py b/tests/licensedcode/test_legal.py
index 215e4f47ead..3a896e4a5bf 100644
--- a/tests/licensedcode/test_legal.py
+++ b/tests/licensedcode/test_legal.py
@@ -31,7 +31,6 @@
 from commoncode.testcase import FileBasedTesting
 from licensedcode import legal
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
diff --git a/tests/licensedcode/test_match.py b/tests/licensedcode/test_match.py
index fdaee87f825..ff6109b86c0 100644
--- a/tests/licensedcode/test_match.py
+++ b/tests/licensedcode/test_match.py
@@ -39,7 +39,6 @@
 from licensedcode.match import merge_matches
 from licensedcode.match import get_full_matched_text
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
@@ -715,6 +714,7 @@ def test_LicenseMatch_score_100_non_contiguous(self):
         m1 = LicenseMatch(rule=r1, qspan=Span(0, 19) | Span(30, 51), ispan=Span(0, 41))
         assert m1.score() == 80.77
 
+
 class TestCollectLicenseMatchTexts(FileBasedTesting):
     test_data_dir = TEST_DATA_DIR
 
diff --git a/tests/licensedcode/test_match_aho.py b/tests/licensedcode/test_match_aho.py
index 19111531921..24786e58c3f 100644
--- a/tests/licensedcode/test_match_aho.py
+++ b/tests/licensedcode/test_match_aho.py
@@ -35,9 +35,9 @@
 from licensedcode import models
 from licensedcode import query
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
+
 class TestMatchExact(FileBasedTesting):
     test_data_dir = TEST_DATA_DIR
 
diff --git a/tests/licensedcode/test_match_hash.py b/tests/licensedcode/test_match_hash.py
index 00476f919ec..69e41647b1b 100644
--- a/tests/licensedcode/test_match_hash.py
+++ b/tests/licensedcode/test_match_hash.py
@@ -36,11 +36,9 @@
 from licensedcode import models
 from licensedcode import match_hash
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
-
 class TestHashMatch(FileBasedTesting):
     test_data_dir = TEST_DATA_DIR
 
diff --git a/tests/licensedcode/test_match_seq.py b/tests/licensedcode/test_match_seq.py
index bebfd81c7c1..9781d3878b2 100644
--- a/tests/licensedcode/test_match_seq.py
+++ b/tests/licensedcode/test_match_seq.py
@@ -36,9 +36,9 @@
 from licensedcode.models import load_rules
 from licensedcode import match_seq
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
+
 class TestMatchSeq(FileBasedTesting):
     test_data_dir = TEST_DATA_DIR
 
diff --git a/tests/licensedcode/test_models.py b/tests/licensedcode/test_models.py
index 8bea4026ed5..95d57dd0e92 100644
--- a/tests/licensedcode/test_models.py
+++ b/tests/licensedcode/test_models.py
@@ -36,7 +36,6 @@
 from licensedcode import index
 from licensedcode import models
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
@@ -91,6 +90,7 @@ def test_create_template_rule(self):
         assert 6 == test_rule.length
 
     def test_create_plain_rule_with_text_file(self):
+
         def create_test_file(text):
             tf = self.get_temp_file()
             with open(tf, 'wb') as of:
diff --git a/tests/licensedcode/test_performance.py b/tests/licensedcode/test_performance.py
index 48e4a9a17f9..45c2fa7433b 100644
--- a/tests/licensedcode/test_performance.py
+++ b/tests/licensedcode/test_performance.py
@@ -35,12 +35,11 @@
 from licensedcode import index
 from licensedcode import models
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
-
 # Instructions: Comment out the skip decorators to run a test. Do not commit without a skip
 
+
 class TestMatchingPerf(FileBasedTesting):
     test_data_dir = TEST_DATA_DIR
 
diff --git a/tests/licensedcode/test_query.py b/tests/licensedcode/test_query.py
index 1b4fa3753eb..33f3ec9ec06 100644
--- a/tests/licensedcode/test_query.py
+++ b/tests/licensedcode/test_query.py
@@ -36,7 +36,6 @@
 from licensedcode.models import Rule
 from licensedcode.query import Query
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
@@ -554,7 +553,7 @@ def test_query_run_and_tokenizing_breaking_works__with_plus_as_expected(self):
         result = [qr.to_dict() for qr in q.query_runs]
         expected = [
             {'end': 121, 'start': 0,
-             'tokens': 
+             'tokens':
                 'this library is free software you can redistribute it '
                 'and or modify it under the terms of the gnu library '
                 'general public license as published by the free software '
diff --git a/tests/licensedcode/test_tokenize.py b/tests/licensedcode/test_tokenize.py
index 95c40f94079..5bdb6f19dae 100644
--- a/tests/licensedcode/test_tokenize.py
+++ b/tests/licensedcode/test_tokenize.py
@@ -44,7 +44,6 @@
 from licensedcode.tokenize import matched_query_text_tokenizer
 from licensedcode.tokenize import tokens_and_non_tokens
 
-
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
 
diff --git a/tests/packagedcode/packages_test_utils.py b/tests/packagedcode/packages_test_utils.py
index 4419172f624..2e61491f40e 100644
--- a/tests/packagedcode/packages_test_utils.py
+++ b/tests/packagedcode/packages_test_utils.py
@@ -22,7 +22,8 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
 from collections import OrderedDict
 import os.path
@@ -50,7 +51,6 @@ def make_locations_relative(self, package_dict):
                 package_dict[key] = values
         return package_dict
 
-
     def check_package(self, package, expected_loc, regen=False, fix_locations=True):
         """
         Helper to test a package object against an expected JSON file.
diff --git a/tests/packagedcode/test_maven.py b/tests/packagedcode/test_maven.py
index 8152f271d1e..8652a77644b 100644
--- a/tests/packagedcode/test_maven.py
+++ b/tests/packagedcode/test_maven.py
@@ -404,11 +404,15 @@ def create_test_function(test_pom_loc, test_name, check_pom=True, regen=False):
     """
     # closure on the test params
     if check_pom:
+
         def test_pom(self):
             self.check_parse_pom(test_pom_loc, regen)
+
     else:
+
         def test_pom(self):
             self.check_parse_to_package(test_pom_loc, regen)
+
     # set a proper function name to display in reports and use in discovery
     # function names are best as bytes
     if isinstance(test_name, unicode):
@@ -438,24 +442,28 @@ def build_tests(test_dir, clazz, prefix='test_maven2_parse_', check_pom=True, re
 class TestMavenDataDrivenParsePom(BaseMavenCase):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
+
 build_tests(test_dir='maven_misc/parse', clazz=TestMavenDataDrivenParsePom, prefix='test_maven2_parse_', check_pom=True, regen=False)
 
 
 class TestMavenDataDrivenParsePomBasic(BaseMavenCase):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
+
 build_tests(test_dir='maven2', clazz=TestMavenDataDrivenParsePomBasic, prefix='test_maven2_basic_parse_', check_pom=True, regen=False)
 
 
 class TestMavenDataDrivenCreatePackageBasic(BaseMavenCase):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
+
 build_tests(test_dir='maven2', clazz=TestMavenDataDrivenCreatePackageBasic, prefix='test_maven2_basic_package_', check_pom=False, regen=False)
 
 
 class TestMavenDataDrivenParsePomComprehensive(BaseMavenCase):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
+
 # note: we use short dir names to deal with Windows long paths limitations
 build_tests(test_dir='m2', clazz=TestMavenDataDrivenParsePomComprehensive, prefix='test_maven2_parse', check_pom=True, regen=False)
 
@@ -463,6 +471,7 @@ class TestMavenDataDrivenParsePomComprehensive(BaseMavenCase):
 class TestMavenDataDrivenCreatePackageComprehensive(BaseMavenCase):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
+
 # note: we use short dir names to deal with Windows long paths limitations
 build_tests(test_dir='m2', clazz=TestMavenDataDrivenCreatePackageComprehensive, prefix='test_maven2_package', check_pom=False, regen=False)
 
diff --git a/tests/packagedcode/test_nuget.py b/tests/packagedcode/test_nuget.py
index 8d78c72783e..52c4681c0f0 100644
--- a/tests/packagedcode/test_nuget.py
+++ b/tests/packagedcode/test_nuget.py
@@ -22,14 +22,14 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
+from collections import OrderedDict
 import os.path
 
 from commoncode.testcase import FileBasedTesting
-
 from packagedcode import nuget
-from collections import OrderedDict
 
 
 class TestNuget(FileBasedTesting):
@@ -138,5 +138,4 @@ def test_parse_creates_package_from_nuspec(self):
             ('legal_file_locations', []), ('license_expression', None), ('license_texts', []), ('notice_texts', []),
             ('dependencies', {}), ('related_packages', [])])
 
-
         assert expected == package.to_dict()
diff --git a/tests/packagedcode/test_package_utils.py b/tests/packagedcode/test_package_utils.py
index 34dd02a3473..ff1d5731f90 100644
--- a/tests/packagedcode/test_package_utils.py
+++ b/tests/packagedcode/test_package_utils.py
@@ -101,7 +101,7 @@ def test_parse_repo_url_13(self):
         test = 'git@gitlab.com:foo/private.git'
         expected = 'https://gitlab.com/foo/private.git'
         assert expected == parse_repo_url(test)
-        
+
     def test_parse_git_repo_url_without_slash_slash(self):
         test = 'git@github.com/Filirom1/npm2aur.git'
         expected = 'https://github.com/Filirom1/npm2aur.git'
diff --git a/tests/packagedcode/test_pypi.py b/tests/packagedcode/test_pypi.py
index 4df781123f4..fbb4a3bd660 100644
--- a/tests/packagedcode/test_pypi.py
+++ b/tests/packagedcode/test_pypi.py
@@ -28,7 +28,6 @@
 import os.path
 import shutil
 
-
 from commoncode.testcase import FileBasedTesting
 from packagedcode import pypi
 
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index 5e25376a36a..da05c1c72bd 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -47,25 +47,22 @@
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import run_scan_plain
 
-
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
-
 """
-Some of these CLI tests are dependent on py.test monkeypatch to ensure
-we are testing the actual command outputs as if using a real command
-line call. Some are using a subprocess to the same effect.
+Most of these tests spawn new process as if launched from the command line. Some
+of these CLI tests are dependent on py.test monkeypatch to ensure we are testing
+the actual command outputs as if using a real command line call. Some are using
+a plain subprocess to the same effect.
 """
 
 
 def test_package_option_detects_packages(monkeypatch):
     test_dir = test_env.get_test_loc('package', copy=True)
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--package', test_dir, '--json', result_file], monkeypatch)
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--package', test_dir, '--json', result_file]
+    run_scan_click(args, monkeypatch=monkeypatch)
     assert os.path.exists(result_file)
     result = open(result_file).read()
     assert 'package.json' in result
@@ -74,10 +71,8 @@ def test_package_option_detects_packages(monkeypatch):
 def test_verbose_option_with_packages(monkeypatch):
     test_dir = test_env.get_test_loc('package', copy=True)
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--package', '--verbose', test_dir, '--json', result_file], monkeypatch)
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--package', '--verbose', test_dir, '--json', result_file]
+    result = run_scan_click(args, monkeypatch=monkeypatch)
     assert 'package.json' in result.output
     assert os.path.exists(result_file)
     result = open(result_file).read()
@@ -87,10 +82,7 @@ def test_verbose_option_with_packages(monkeypatch):
 def test_copyright_option_detects_copyrights():
     test_dir = test_env.get_test_loc('copyright', copy=True)
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--copyright', test_dir, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    run_scan_click(['--copyright', test_dir, '--json', result_file])
     assert os.path.exists(result_file)
     assert len(open(result_file).read()) > 10
 
@@ -98,10 +90,8 @@ def test_copyright_option_detects_copyrights():
 def test_verbose_option_with_copyrights(monkeypatch):
     test_dir = test_env.get_test_loc('copyright', copy=True)
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--copyright', '--verbose', test_dir, '--json', result_file], monkeypatch)
-
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--copyright', '--verbose', test_dir, '--json', result_file]
+    result = run_scan_click(args, monkeypatch=monkeypatch)
     assert os.path.exists(result_file)
     assert 'copyright_acme_c-c.c' in result.output
     assert len(open(result_file).read()) > 10
@@ -110,13 +100,10 @@ def test_verbose_option_with_copyrights(monkeypatch):
 def test_license_option_detects_licenses():
     test_dir = test_env.get_test_loc('license', copy=True)
     result_file = test_env.get_temp_file('json')
-
     args = ['--license', test_dir, '--json', result_file]
     if on_windows:
         args += ['--timeout', '400']
-    result = run_scan_click(args)
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    run_scan_click(args)
     assert os.path.exists(result_file)
     assert len(open(result_file).read()) > 10
 
@@ -127,12 +114,12 @@ def test_usage_and_help_return_a_correct_script_name_on_all_platforms():
     # this was showing up on Windows
     assert 'scancode-script.py' not in result.output
 
-    result = run_scan_click([])
+    result = run_scan_click([], expected_rc=2)
     assert 'Usage: scancode [OPTIONS]' in result.output
     # this was showing up on Windows
     assert 'scancode-script.py' not in result.output
 
-    result = run_scan_click(['-xyz'])
+    result = run_scan_click(['-xyz'], expected_rc=2)
     # this was showing up on Windows
     assert 'scancode-script.py' not in result.output
 
@@ -140,30 +127,23 @@ def test_usage_and_help_return_a_correct_script_name_on_all_platforms():
 def test_scan_info_does_collect_infos():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--info', '--strip-root', test_dir, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--info', '--strip-root', test_dir, '--json', result_file]
+    run_scan_click(args)
     check_json_scan(test_env.get_test_loc('info/basic.expected.json'), result_file)
 
 
 def test_scan_info_does_collect_infos_with_root():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--info', test_dir, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    run_scan_click(['--info', test_dir, '--json', result_file])
     check_json_scan(test_env.get_test_loc('info/basic.rooted.expected.json'), result_file)
 
 
 def test_scan_info_returns_full_root():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--info', '--full-root', test_dir, '--json', result_file])
-
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--info', '--full-root', test_dir, '--json', result_file]
+    run_scan_click(args)
     result_data = json.loads(open(result_file, 'rb').read())
     file_paths = [f['path'] for f in result_data['files']]
     assert 12 == len(file_paths)
@@ -174,10 +154,8 @@ def test_scan_info_returns_full_root():
 def test_scan_info_returns_correct_full_root_with_single_file():
     test_file = test_env.get_test_loc('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--info', '--full-root', test_file, '--json', result_file])
-
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--info', '--full-root', test_file, '--json', result_file]
+    run_scan_click(args)
     result_data = json.loads(open(result_file, 'rb').read())
     files = result_data['files']
     # we have a single file
@@ -190,80 +168,65 @@ def test_scan_info_returns_correct_full_root_with_single_file():
 def test_scan_info_returns_does_not_strip_root_with_single_file():
     test_file = test_env.get_test_loc('single/iproute.c')
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--info', '--strip-root', test_file, '--json', result_file])
-    assert result.exit_code == 0
+    args = ['--info', '--strip-root', test_file, '--json', result_file]
+    run_scan_click(args)
     check_json_scan(test_env.get_test_loc('single/iproute.expected.json'), result_file, strip_dates=True)
 
 
 def test_scan_info_license_copyrights():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--info', '--license', '--copyright', '--strip-root', test_dir, '--json', result_file])
-    assert 'Scanning done' in result.output
+    args = ['--info', '--license', '--copyright', '--strip-root', test_dir, '--json', result_file]
+    run_scan_click(args)
     check_json_scan(test_env.get_test_loc('info/all.expected.json'), result_file)
-    assert result.exit_code == 0
 
 
 def test_scan_license_with_url_template():
     test_dir = test_env.get_test_loc('plugin_license/license_url', copy=True)
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(
-        ['--license', '--license-url-template', 'https://example.com/urn:{}',
-         test_dir, '--json-pp', result_file])
-
+    args = ['--license', '--license-url-template', 'https://example.com/urn:{}',
+             test_dir, '--json-pp', result_file]
+    run_scan_click(args)
     check_json_scan(test_env.get_test_loc('plugin_license/license_url.expected.json'), result_file)
-    assert result.exit_code == 0
 
 
 def test_scan_noinfo_license_copyrights_with_root():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--email', '--url', '--license', '--copyright', test_dir, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--email', '--url', '--license', '--copyright', test_dir, '--json', result_file]
+    run_scan_click(args)
     check_json_scan(test_env.get_test_loc('info/all.rooted.expected.json'), result_file)
 
 
 def test_scan_email_url_info():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--email', '--url', '--info', '--strip-root', test_dir, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--email', '--url', '--info', '--strip-root', test_dir, '--json', result_file]
+    run_scan_click(args)
     check_json_scan(test_env.get_test_loc('info/email_url_info.expected.json'), result_file)
 
 
 def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_errors_and_keep_trucking_with_json():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
-
     args = ['--copyright', '--strip-root', test_file, '--json', result_file]
     if on_windows:
         args += ['--timeout', '400']
-    result = run_scan_click(args)
-    assert result.exit_code == 1
-    assert 'Scanning done' in result.output
+    result = run_scan_click(args, expected_rc=1)
     check_json_scan(test_env.get_test_loc('failing/patchelf.expected.json'), result_file)
     assert 'Some files failed to scan' in result.output
     assert 'patchelf.pdf' in result.output
 
+
 def test_scan_with_errors_always_includes_full_traceback():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
-
     args = ['--copyright', test_file, '--json', result_file]
     if on_windows:
         args += ['--timeout', '400']
-    result = run_scan_click(args)
-    assert result.exit_code == 1
-    assert 'Scanning done' in result.output
+    result = run_scan_click(args, expected_rc=1)
     assert 'Some files failed to scan' in result.output
     assert 'patchelf.pdf' in result.output
-
     result_json = json.loads(open(result_file).read())
     expected = 'error: unpack requires a string argument of length 8'
     assert expected in result_json['files'][0]['scan_errors'][-1]
@@ -273,28 +236,22 @@ def test_scan_with_errors_always_includes_full_traceback():
 def test_failing_scan_return_proper_exit_code():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
-
-    result = run_scan_click([ '--copyright', test_file, '--json', result_file])
-    assert result.exit_code == 1
+    args = ['--copyright', test_file, '--json', result_file]
+    run_scan_click(args, expected_rc=1)
 
 
 def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_errors_and_keep_trucking_with_html():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.html')
-
-    result = run_scan_click([ '--copyright', test_file , '--output-html', result_file])
-    print(result.output)
-    assert 'Scanning done' in result.output
-    assert result.exit_code == 1
+    args = ['--copyright', test_file, '--output-html', result_file]
+    run_scan_click(args, expected_rc=1)
 
 
 def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_errors_and_keep_trucking_with_html_app():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.app.html')
-
-    result = run_scan_click([ '--copyright', test_file, '--output-html-app', result_file])
-    assert result.exit_code == 1
-    assert 'Scanning done' in result.output
+    args = ['--copyright', test_file, '--output-html-app', result_file]
+    run_scan_click(args, expected_rc=1)
 
 
 def test_scan_works_with_multiple_processes():
@@ -302,12 +259,12 @@ def test_scan_works_with_multiple_processes():
 
     # run the same scan with one or three processes
     result_file_1 = test_env.get_temp_file('json')
-    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--json', result_file_1])
-    assert result1.exit_code == 0
+    args = ['--copyright', '--processes', '1', test_dir, '--json', result_file_1]
+    run_scan_click(args)
 
     result_file_3 = test_env.get_temp_file('json')
-    result3 = run_scan_click([ '--copyright', '--processes', '3', test_dir, '--json', result_file_3])
-    assert result3.exit_code == 0
+    args = ['--copyright', '--processes', '3', test_dir, '--json', result_file_3]
+    run_scan_click(args)
     res1 = json.loads(open(result_file_1).read())
     res3 = json.loads(open(result_file_3).read())
     assert sorted(res1['files']) == sorted(res3['files'])
@@ -318,13 +275,13 @@ def test_scan_works_with_no_processes_in_threaded_mode():
 
     # run the same scan with zero or one process
     result_file_0 = test_env.get_temp_file('json')
-    result0 = run_scan_click([ '--copyright', '--processes', '0', test_dir, '--json', result_file_0])
-    assert result0.exit_code == 0
+    args = ['--copyright', '--processes', '0', test_dir, '--json', result_file_0]
+    result0 = run_scan_click(args)
     assert 'Disabling multi-processing' in result0.output
 
     result_file_1 = test_env.get_temp_file('json')
-    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--json', result_file_1])
-    assert result1.exit_code == 0
+    args = ['--copyright', '--processes', '1', test_dir, '--json', result_file_1]
+    run_scan_click(args)
     res0 = json.loads(open(result_file_0).read())
     res1 = json.loads(open(result_file_1).read())
     assert sorted(res0['files']) == sorted(res1['files'])
@@ -335,17 +292,18 @@ def test_scan_works_with_no_processes_non_threaded_mode():
 
     # run the same scan with zero or one process
     result_file_0 = test_env.get_temp_file('json')
-    result0 = run_scan_click([ '--copyright', '--processes', '-1', test_dir, '--json', result_file_0])
-    assert result0.exit_code == 0
+    args = ['--copyright', '--processes', '-1', test_dir, '--json', result_file_0]
+    result0 = run_scan_click(args)
     assert 'Disabling multi-processing and multi-threading' in result0.output
 
     result_file_1 = test_env.get_temp_file('json')
-    result1 = run_scan_click([ '--copyright', '--processes', '1', test_dir, '--json', result_file_1])
-    assert result1.exit_code == 0
+    args = ['--copyright', '--processes', '1', test_dir, '--json', result_file_1]
+    run_scan_click(args)
     res0 = json.loads(open(result_file_0).read())
     res1 = json.loads(open(result_file_1).read())
     assert sorted(res0['files']) == sorted(res1['files'])
 
+
 def test_scan_works_with_multiple_processes_and_timeouts():
     # this contains test files with a lot of copyrights that should
     # take more thant timeout to scan
@@ -355,18 +313,15 @@ def test_scan_works_with_multiple_processes_and_timeouts():
     import time, random
     for tf in fileutils.resource_iter(test_dir, with_dirs=False):
         with open(tf, 'ab') as tfh:
-            tfh.write('(c)' + str(time.time()) + repr([random.randint(0, 10 ** 6) for _ in range(10000)]) + '(c)')
+            tfh.write(
+                '(c)' + str(time.time()) + repr([random.randint(0, 10 ** 6) for _ in range(10000)]) + '(c)')
 
     result_file = test_env.get_temp_file('json')
 
-    result = run_scan_click(
-        [ '--copyright', '--processes', '2',
-         '--timeout', '0.000001',
-         '--strip-root', test_dir, '--json', result_file],
-    )
+    args = ['--copyright', '--processes', '2', '--timeout', '0.000001',
+            '--strip-root', test_dir, '--json', result_file]
+    run_scan_click(args, expected_rc=1)
 
-    assert result.exit_code == 1
-    assert 'Scanning done' in result.output
     expected = [
         [(u'path', u'test1.txt'),
          (u'scan_errors',
@@ -397,14 +352,9 @@ def test_scan_does_not_fail_when_scanning_unicode_files_and_paths():
         test_dir = fsencode(test_dir)
         result_file = fsencode(result_file)
 
-    args = ['--info', '--license', '--copyright',
-            '--package', '--email', '--url', '--strip-root',
-            test_dir , '--json', result_file]
-    result = run_scan_click(args)
-    if result.exit_code != 0:
-        raise Exception(result.output, args)
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['--info', '--license', '--copyright', '--package', '--email',
+            '--url', '--strip-root', test_dir , '--json', result_file]
+    run_scan_click(args)
 
     # the paths for each OS end up encoded differently.
     # See for details:
@@ -433,44 +383,35 @@ def test_scan_does_not_fail_when_scanning_unicode_test_files_from_express():
     test_dir = test_env.extract_test_tar_raw(b'unicode_fixtures.tar.gz')
     test_dir = fsencode(test_dir)
 
-    args = ['-n0', '--info', '--license', '--copyright',
-            '--package', '--email', '--url', '--strip-root', '--json', '-',
-            test_dir]
-    result = run_scan_click(args)
-    if result.exit_code != 0:
-        raise Exception(result.output, args)
-    assert 'Scanning done' in result.output
+    args = ['-n0', '--info', '--license', '--copyright', '--package', '--email',
+            '--url', '--strip-root', '--json', '-', test_dir]
+    run_scan_click(args)
 
 
 def test_scan_can_handle_licenses_with_unicode_metadata():
     test_dir = test_env.get_test_loc('license_with_unicode_meta')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--license', test_dir, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    run_scan_click(['--license', test_dir, '--json', result_file])
 
 
 def test_scan_quiet_to_file_does_not_echo_anything():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--quiet', '--info', test_dir, '--json', result_file])
+    args = ['--quiet', '--info', test_dir, '--json', result_file]
+    result = run_scan_click(args)
     assert not result.output
-    assert result.exit_code == 0
 
 
 def test_scan_quiet_to_stdout_only_echoes_json_results():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result_to_file = run_scan_click(['--quiet', '--info', test_dir, '--json-pp', result_file])
-    assert result_to_file.exit_code == 0
+    args = ['--quiet', '--info', test_dir, '--json-pp', result_file]
+    result_to_file = run_scan_click(args)
     assert not result_to_file.output
 
     # also test with an output of JSON to stdout
-    result_to_stdout = run_scan_click(['--quiet', '--info', test_dir, '--json-pp', '-'])
-    assert result_to_stdout.exit_code == 0
+    args = ['--quiet', '--info', test_dir, '--json-pp', '-']
+    result_to_stdout = run_scan_click(args)
 
     # outputs to file or stdout should be identical
     result1_output = open(result_file).read()
@@ -479,9 +420,8 @@ def test_scan_quiet_to_stdout_only_echoes_json_results():
 
 def test_scan_verbose_to_stdout_does_not_echo_ansi_escapes():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
-
-    result = run_scan_click(['--verbose', '--info', test_dir, '--json', '-'])
-    assert result.exit_code == 0
+    args = ['--verbose', '--info', test_dir, '--json', '-']
+    result = run_scan_click(args)
     assert '[?' not in result.output
 
 
@@ -489,9 +429,8 @@ def test_scan_can_return_matched_license_text():
     test_file = test_env.get_test_loc('license_text/test.txt')
     expected_file = test_env.get_test_loc('license_text/test.expected')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['--license', '--license-text', '--strip-root', test_file, '--json', result_file])
-    assert result.exit_code == 0
+    args = ['--license', '--license-text', '--strip-root', test_file, '--json', result_file]
+    run_scan_click(args)
     check_json_scan(test_env.get_test_loc(expected_file), result_file)
 
 
@@ -499,11 +438,9 @@ def test_scan_can_return_matched_license_text():
 def test_scan_can_handle_weird_file_names():
     test_dir = test_env.extract_test_tar('weird_file_name/weird_file_name.tar.gz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(['-c', '-i', '--strip-root', test_dir, '--json', result_file])
-    assert result.exit_code == 0
+    args = ['-c', '-i', '--strip-root', test_dir, '--json', result_file]
+    result = run_scan_click(args)
     assert "KeyError: 'sha1'" not in result.output
-    assert 'Scanning done' in result.output
 
     # Some info vary on each OS
     # See https://github.com/nexB/scancode-toolkit/issues/438 for details
@@ -524,9 +461,8 @@ def test_scan_can_handle_non_utf8_file_names_on_posix():
         test_dir = fsencode(test_dir)
         result_file = fsencode(result_file)
 
-    result = run_scan_click(['-i', '--strip-root', test_dir, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    args = ['-i', '--strip-root', test_dir, '--json', result_file]
+    run_scan_click(args)
 
     # the paths for each OS end up encoded differently.
     # See for details:
@@ -548,18 +484,8 @@ def test_scan_can_run_from_other_directory():
     expected_file = test_env.get_test_loc('altpath/copyright.expected.json')
     result_file = test_env.get_temp_file('json')
     work_dir = os.path.dirname(result_file)
-
-    rc, stdout, stderr = run_scan_plain(
-        ['-ci', '--strip-root', test_file, '--json', result_file], cwd=work_dir)
-
-    if rc != 0:
-        print()
-        print('stdout:')
-        print(stdout)
-        print()
-        print('stderr:')
-        print(stderr)
-    assert rc == 0
+    args = ['-ci', '--strip-root', test_file, '--json', result_file]
+    run_scan_plain(args, cwd=work_dir)
     check_json_scan(test_env.get_test_loc(expected_file), result_file, strip_dates=True)
 
 
@@ -568,8 +494,7 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr():
     args = ['-pi', '-n', '0', test_file, '--json', '-']
     if on_windows:
         args += ['--timeout', '400']
-    rc, stdout, stderr = run_scan_plain(args)
-    assert rc == 1
+    _rc, stdout, stderr = run_scan_plain(args, expected_rc=1)
     assert 'Path: errors/package.json' in stderr
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" not in stderr
@@ -580,8 +505,7 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing(
     args = ['-pi', '-n', '2', test_file, '--json', '-']
     if on_windows:
         args += ['--timeout', '400']
-    rc, stdout, stderr = run_scan_plain(args)
-    assert rc == 1
+    _rc, stdout, stderr = run_scan_plain(args, expected_rc=1)
     assert 'Path: errors/package.json' in stderr
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" not in stderr
@@ -592,8 +516,7 @@ def test_scan_logs_errors_messages_verbosely_with_verbose():
     args = ['-pi', '--verbose', '-n', '0', test_file, '--json', '-']
     if on_windows:
         args += ['--timeout', '400']
-    rc, stdout, stderr = run_scan_plain(args)
-    assert rc == 1
+    _rc, stdout, stderr = run_scan_plain(args, expected_rc=1)
     assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout
     assert 'delimiter: line 5 column 12' in stderr
@@ -605,18 +528,18 @@ def test_scan_logs_errors_messages_verbosely_with_verbose_and_multiprocessing():
     args = ['-pi', '--verbose', '-n', '2', test_file, '--json', '-']
     if on_windows:
         args += ['--timeout', '400']
-    rc, stdout, stderr = run_scan_plain(args)
-    assert rc == 1
+    _rc, stdout, stderr = run_scan_plain(args, expected_rc=1)
     assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout
     assert 'delimiter: line 5 column 12' in stderr
     assert 'ValueError: Expecting' in stdout
 
+
 def test_scan_progress_display_is_not_damaged_with_long_file_names_plain():
     test_dir = test_env.get_test_loc('long_file_name')
     result_file = test_env.get_temp_file('json')
-    rc, stdout, stderr = run_scan_plain(['--copyright', test_dir, '--json', result_file])
-    assert rc == 0
+    args = ['--copyright', test_dir, '--json', result_file]
+    _rc, stdout, stderr = run_scan_plain(args)
     expected1 = 'Scanned: abcdefghijklmnopqr...234567890123456789.c'
     expected2 = 'Scanned: 0123456789012345678901234567890123456789.c'
     expected3 = 'abcdefghijklmnopqrtu0123456789012345678901234567890123456789abcdefghijklmnopqrtu0123456789012345678901234567890123456789.c'
@@ -631,8 +554,8 @@ def test_scan_progress_display_is_not_damaged_with_long_file_names_plain():
 def test_scan_progress_display_is_not_damaged_with_long_file_names(monkeypatch):
     test_dir = test_env.get_test_loc('long_file_name')
     result_file = test_env.get_temp_file('json')
-    result = run_scan_click(['--copyright', test_dir, '--json', result_file], monkeypatch)
-    assert result.exit_code == 0
+    args = ['--copyright', test_dir, '--json', result_file]
+    result = run_scan_click(args, monkeypatch=monkeypatch)
     if on_windows:
         expected1 = 'Scanned: 0123456789012345678901234567890123456789.c'
         expected2 = 'Scanned: abcdefghijklmnopqrt...0123456789012345678'
@@ -648,13 +571,12 @@ def test_scan_progress_display_is_not_damaged_with_long_file_names(monkeypatch):
         assert expected2 in result.output
         assert expected3 not in result.output
 
+
 def test_scan_does_scan_php_composer():
     test_file = test_env.get_test_loc('composer/composer.json')
     expected_file = test_env.get_test_loc('composer/composer.expected.json')
     result_file = test_env.get_temp_file('results.json')
-    result = run_scan_click(['--package', test_file, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    run_scan_click(['--package', test_file, '--json', result_file])
     check_json_scan(expected_file, result_file)
 
 
@@ -662,9 +584,7 @@ def test_scan_does_scan_rpm():
     test_file = test_env.get_test_loc('rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm')
     expected_file = test_env.get_test_loc('rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json')
     result_file = test_env.get_temp_file('results.json')
-    result = run_scan_click(['--package', test_file, '--json', result_file])
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
+    run_scan_click(['--package', test_file, '--json', result_file])
     check_json_scan(expected_file, result_file, regen=False)
 
 
@@ -679,15 +599,15 @@ def test_scan_cli_help(regen=False):
 
 def test_scan_errors_out_with_unknown_option():
     test_file = test_env.get_test_loc('license_text/test.txt')
-    result = run_scan_click([ '--json--info', test_file])
-    assert result.exit_code == 2
+    args = ['--json--info', test_file]
+    result = run_scan_click(args, expected_rc=2)
     assert 'Error: no such option: --json--info' in result.output
 
 
 def test_scan_to_json_without_FILE_does_not_write_to_next_option():
     test_file = test_env.get_test_loc('license_text/test.txt')
-    result = run_scan_click([ '--json', '--info', test_file])
-    assert result.exit_code == 2
+    args = ['--json', '--info', test_file]
+    result = run_scan_click(args, expected_rc=2)
     assert ('Error: Invalid value for "--json": Illegal file name '
             'conflicting with an option name: --info.') in result.output
 
@@ -695,8 +615,8 @@ def test_scan_to_json_without_FILE_does_not_write_to_next_option():
 def test_scan_errors_out_with_conflicting_root_options():
     test_file = test_env.get_test_loc('license_text/test.txt')
     result_file = test_env.get_temp_file('results.json')
-    result = run_scan_click(['--strip-root', '--full-root', '--json', result_file, '--info', test_file])
-    assert result.exit_code == 2
+    args = ['--strip-root', '--full-root', '--json', result_file, '--info', test_file]
+    result = run_scan_click(args, expected_rc=2)
     assert ('Error: The option --strip-root cannot be used together with the '
             '--full-root option(s) and --full-root is used.') in result.output
 
@@ -704,57 +624,44 @@ def test_scan_errors_out_with_conflicting_root_options():
 def test_scan_errors_out_with_conflicting_verbosity_options():
     test_file = test_env.get_test_loc('license_text/test.txt')
     result_file = test_env.get_temp_file('results.json')
-    result = run_scan_click(['--quiet', '--verbose', '--json', result_file, '--info', test_file])
-    assert result.exit_code == 2
-    print(result.output)
+    args = ['--quiet', '--verbose', '--json', result_file, '--info', test_file]
+    result = run_scan_click(args, expected_rc=2)
     assert ('Error: The option --quiet cannot be used together with the '
             '--verbose option(s) and --verbose is used. You can set only one of '
             'these options at a time.') in result.output
 
 
-def test_scan_with_timing_json():
+def test_scan_with_timing_json_return_timings_for_each_scanner():
     test_dir = test_env.extract_test_tar('timing/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(
-        ['--email', '--url', '--license', '--copyright', '--info', '--package',
-         '--timing', '--json', result_file, test_dir, ])
-
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    args = ['--email', '--url', '--license', '--copyright', '--info',
+            '--package', '--timing', '--json', result_file, test_dir]
+    run_scan_click(args)
     file_results = load_json_result(result_file)['files']
 
-    expected_scanners = set(
-        ['emails', 'urls', 'licenses', 'copyrights', 'infos', 'packages'])
+    expected = set(['emails', 'urls', 'licenses', 'copyrights', 'infos', 'packages'])
 
     for res in file_results:
         scan_timings = res['scan_timings']
         assert scan_timings
         for scanner, timing in scan_timings.items():
-            assert scanner in expected_scanners
+            assert scanner in expected
             assert timing
 
 
-def test_scan_with_timing_jsonpp():
+def test_scan_with_timing_jsonpp_return_timings_for_each_scanner():
     test_dir = test_env.extract_test_tar('timing/basic.tgz')
     result_file = test_env.get_temp_file('json')
-
-    result = run_scan_click(
-        ['--email', '--url', '--license', '--copyright', '--info', '--package',
-         '--timing', '--json-pp', result_file, test_dir, ])
-
-    assert result.exit_code == 0
-    assert 'Scanning done' in result.output
-
+    args = ['--email', '--url', '--license', '--copyright', '--info',
+            '--package', '--timing', '--json-pp', result_file, test_dir]
+    run_scan_click(args)
     file_results = load_json_result(result_file)['files']
 
-    expected_scanners = set(
-        ['emails', 'urls', 'licenses', 'copyrights', 'infos', 'packages'])
+    expected = set(['emails', 'urls', 'licenses', 'copyrights', 'infos', 'packages'])
 
     for res in file_results:
         scan_timings = res['scan_timings']
         assert scan_timings
         for scanner, timing in scan_timings.items():
-            assert scanner in expected_scanners
+            assert scanner in expected
             assert timing
diff --git a/tests/scancode/test_extract_cli.py b/tests/scancode/test_extract_cli.py
index 5b0ffca8154..fff78697554 100644
--- a/tests/scancode/test_extract_cli.py
+++ b/tests/scancode/test_extract_cli.py
@@ -33,17 +33,17 @@
 from click.testing import CliRunner
 
 from commoncode.fileutils import as_posixpath
+from commoncode.fileutils import fsencode
 from commoncode.fileutils import resource_iter
 from commoncode.testcase import FileDrivenTesting
+from commoncode.system import on_linux
 from commoncode.system import on_windows
 from scancode import extract_cli
-from commoncode.system import on_linux
-from commoncode.fileutils import fsencode
+
 
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
-
 """
 These CLI tests are dependent on py.test monkeypatch to  ensure we are testing
 the actual command outputs as if using a TTY or not.
@@ -51,6 +51,7 @@
 
 EMPTY_STRING = b'' if on_linux else ''
 
+
 def test_extractcode_command_can_take_an_empty_directory(monkeypatch):
     test_dir = test_env.get_temp_dir()
     monkeypatch.setattr(click._termui_impl, 'isatty', lambda _: True)
@@ -68,11 +69,6 @@ def test_extractcode_command_does_extract_verbose(monkeypatch):
     result = runner.invoke(extract_cli.extractcode, ['--verbose', test_dir])
     assert result.exit_code == 1
     assert os.path.exists(os.path.join(test_dir, 'some.tar.gz-extract'))
-    print()
-    print(result.output)
-    print()
-    print(repr(result.output))
-    print()
     expected = [
         'Extracting archives...',
         'some.tar.gz',
diff --git a/tests/scancode/test_interrupt.py b/tests/scancode/test_interrupt.py
index 738195ab51b..615318fb22f 100644
--- a/tests/scancode/test_interrupt.py
+++ b/tests/scancode/test_interrupt.py
@@ -28,8 +28,8 @@
 from __future__ import unicode_literals
 
 import os
-import threading
 from time import sleep
+import threading
 
 from commoncode.testcase import FileBasedTesting
 
@@ -40,10 +40,10 @@
 verify there is no thread leak.
 """
 
+
 class TestInterrupt(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
-
     def test_interruptible_can_run_function(self):
         before = threading.active_count()
 
diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
index 474a9a62fcd..0729e44b9de 100644
--- a/tests/scancode/test_plugin_ignore.py
+++ b/tests/scancode/test_plugin_ignore.py
@@ -23,7 +23,7 @@
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
 from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import print_function
 
 from os.path import dirname
 from os.path import join
@@ -137,10 +137,8 @@ class TestScanPluginIgnoreFiles(FileDrivenTesting):
     def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
         test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
         result_file = self.get_temp_file('json')
-
-        result = run_scan_click(['--copyright', '--strip-root', test_dir,
-                                 '--json', result_file])
-        assert result.exit_code == 0
+        args = ['--copyright', '--strip-root', test_dir, '--json', result_file]
+        run_scan_click(args)
         scan_result = load_json_result(result_file)
         # a single test.tst file and its directory that is not a VCS file should
         # be listed
@@ -151,11 +149,8 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default(self):
     def test_scancode_ignore_vcs_files_and_dirs_by_default_no_multiprocess(self):
         test_dir = self.extract_test_tar('plugin_ignore/vcs.tgz')
         result_file = self.get_temp_file('json')
-        result = run_scan_click(['--copyright', '--strip-root',
-                                 '--processes', '0',
-                                 test_dir,
-                                 '--json', result_file])
-        assert result.exit_code == 0
+        args = ['--copyright', '--strip-root', '--processes', '0', test_dir, '--json', result_file]
+        run_scan_click(args)
         scan_result = load_json_result(result_file)
         # a single test.tst file and its directory that is not a VCS file should
         # be listed
@@ -166,11 +161,8 @@ def test_scancode_ignore_vcs_files_and_dirs_by_default_no_multiprocess(self):
     def test_scancode_ignore_single_file(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
-
-        result = run_scan_click(
-            ['--copyright', '--strip-root', '--ignore', 'sample.doc',
-             test_dir, '--json', result_file])
-        assert result.exit_code == 0
+        args = ['--copyright', '--strip-root', '--ignore', 'sample.doc', test_dir, '--json', result_file]
+        run_scan_click(args)
         scan_result = load_json_result(result_file)
         assert 3 == scan_result['files_count']
         # FIXME: add assert 3 == scan_result['dirs_count']
@@ -188,11 +180,8 @@ def test_scancode_ignore_single_file(self):
     def test_scancode_ignore_multiple_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
-
-        result = run_scan_click(['--copyright', '--strip-root',
-                                 '--ignore', 'ignore.doc', test_dir,
-                                 '--json', result_file])
-        assert result.exit_code == 0
+        args = ['--copyright', '--strip-root', '--ignore', 'ignore.doc', test_dir, '--json', result_file]
+        run_scan_click(args)
         scan_result = load_json_result(result_file)
         assert 2 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
@@ -207,11 +196,8 @@ def test_scancode_ignore_multiple_files(self):
     def test_scancode_ignore_glob_files(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
-
-        result = run_scan_click(['--copyright', '--strip-root',
-                                 '--ignore', '*.doc', test_dir,
-                                 '--json', result_file])
-        assert result.exit_code == 0
+        args = ['--copyright', '--strip-root', '--ignore', '*.doc', test_dir, '--json', result_file]
+        run_scan_click(args)
         scan_result = load_json_result(result_file)
         assert 1 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
@@ -226,19 +212,16 @@ def test_scancode_ignore_glob_files(self):
     def test_scancode_ignore_glob_path(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
-
-        result = run_scan_click(['--copyright', '--strip-root',
-                                 '--ignore', '*/src/test/*', test_dir,
-                                 '--json', result_file])
-        assert result.exit_code == 0
+        args = ['--copyright', '--strip-root', '--ignore', '*/src/test/*', test_dir, '--json', result_file]
+        run_scan_click(args)
         scan_result = load_json_result(result_file)
         assert 2 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
         expected = [
-            u'user', 
-            u'user/ignore.doc', 
-            u'user/src', 
-            u'user/src/ignore.doc', 
+            u'user',
+            u'user/ignore.doc',
+            u'user/src',
+            u'user/src/ignore.doc',
             u'user/src/test'
         ]
         assert expected == scan_locs
@@ -246,12 +229,8 @@ def test_scancode_ignore_glob_path(self):
     def test_scancode_multiple_ignores(self):
         test_dir = self.extract_test_tar('plugin_ignore/user.tgz')
         result_file = self.get_temp_file('json')
-
-        result = run_scan_click(['--copyright', '--strip-root', 
-                                 '--ignore', '*/src/test', 
-                                 '--ignore', '*.doc', 
-                                 test_dir, '--json', result_file])
-        assert result.exit_code == 0
+        args = ['--copyright', '--strip-root', '--ignore', '*/src/test', '--ignore', '*.doc', test_dir, '--json', result_file]
+        run_scan_click(args)
         scan_result = load_json_result(result_file)
         assert 0 == scan_result['files_count']
         scan_locs = [x['path'] for x in scan_result['files']]
diff --git a/tests/scancode/test_plugin_mark_source.py b/tests/scancode/test_plugin_mark_source.py
index 3a33e156c68..b087da45869 100644
--- a/tests/scancode/test_plugin_mark_source.py
+++ b/tests/scancode/test_plugin_mark_source.py
@@ -52,14 +52,12 @@ def test_scan_mark_source_without_info(self):
         test_dir = self.extract_test_tar('plugin_mark_source/JGroups.tgz')
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_mark_source/without_info.expected.json')
-
-        _result = run_scan_click(['--mark-source', test_dir, '--json', result_file])
+        run_scan_click(['--mark-source', test_dir, '--json', result_file])
         check_json_scan(expected_file, result_file, regen=False)
 
     def test_scan_mark_source_with_info(self):
         test_dir = self.extract_test_tar('plugin_mark_source/JGroups.tgz')
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_mark_source/with_info.expected.json')
-
-        _result = run_scan_click(['--info', '--mark-source', test_dir, '--json', result_file])
+        run_scan_click(['--info', '--mark-source', test_dir, '--json', result_file])
         check_json_scan(expected_file, result_file)
diff --git a/tests/scancode/test_plugin_only_findings.py b/tests/scancode/test_plugin_only_findings.py
index 453e530fb7b..86181f02821 100644
--- a/tests/scancode/test_plugin_only_findings.py
+++ b/tests/scancode/test_plugin_only_findings.py
@@ -60,9 +60,5 @@ def test_scan_only_findings(self):
         test_dir = self.extract_test_tar('plugin_only_findings/basic.tgz')
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_only_findings/expected.json')
-
-        result= run_scan_click(['-clip','--only-findings','--json', result_file,  test_dir])
-        print(result.output)
-        assert result.exit_code == 0
-        
+        run_scan_click(['-clip', '--only-findings', '--json', result_file, test_dir])
         check_json_scan(expected_file, result_file, strip_dates=True)
diff --git a/tests/scancode/test_resource.py b/tests/scancode/test_resource.py
index f12c004ec16..c0b62347cca 100644
--- a/tests/scancode/test_resource.py
+++ b/tests/scancode/test_resource.py
@@ -160,7 +160,7 @@ def test_compute_counts_filtered_all(self):
         for res in codebase.get_resources(None):
             res.is_filtered = True
         results = codebase.compute_counts(skip_filtered=True)
-        expected = (0,0,0)
+        expected = (0, 0, 0)
         assert expected == results
 
     def test_compute_counts_filtered_all_with_cache(self):
@@ -169,7 +169,7 @@ def test_compute_counts_filtered_all_with_cache(self):
         for res in codebase.get_resources(None):
             res.is_filtered = True
         results = codebase.compute_counts(skip_filtered=True)
-        expected = (0,0,0)
+        expected = (0, 0, 0)
         assert expected == results
 
     def test_compute_counts_filtered_files(self):
@@ -340,7 +340,8 @@ def test_get_resources(self):
                 ('this', True),
         ]
 
-        assert expected == [(r.name, r.is_file) for r in codebase.get_resources([0,1,3,6])]
+        assert expected == [(r.name, r.is_file) for r in codebase.get_resources([0, 1, 3, 6])]
+
 
 class TestCodebaseCache(FileBasedTesting):
     test_data_dir = join(dirname(__file__), 'data')
diff --git a/tests/scancode/test_scan_utils.py b/tests/scancode/test_scan_utils.py
index 6d9171df852..4fc08206587 100644
--- a/tests/scancode/test_scan_utils.py
+++ b/tests/scancode/test_scan_utils.py
@@ -45,6 +45,7 @@ class TestUtils(FileDrivenTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
     def test_click_progressbar_with_labels(self):
+
         # test related to https://github.com/mitsuhiko/click/issues/406
         @click.command()
         def mycli():
@@ -129,6 +130,7 @@ class TestHelpGroups(FileDrivenTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
     def test_scan_help_group_and_sort_order_without_custom_class(self):
+
         @click.command(name='scan', cls=ScanCommand)
         @click.option('--opt', is_flag=True, help='Help text for option')
         def scan(opt):
@@ -140,8 +142,8 @@ def scan(opt):
         assert MISC_GROUP in result.output
         assert  '--opt   Help text for option' in result.output
 
-
     def test_scan_help_group_and_sort_order_with_custom_class(self):
+
         @click.command(name='scan', cls=ScanCommand)
         @click.option('--opt', is_flag=True, sort_order=10,
                       help='Help text for option', cls=CommandLineOption)
@@ -155,6 +157,7 @@ def scan(opt):
 
     def test_scan_help_with_group(self):
         from scancode import CORE_GROUP
+
         @click.command(name='scan', cls=ScanCommand)
         @click.option('--opt', is_flag=True, help='Help text for option',
                       help_group=CORE_GROUP, cls=CommandLineOption)
diff --git a/tests/textcode/test_pdf.py b/tests/textcode/test_pdf.py
index d06895dcf01..2d22392a3af 100644
--- a/tests/textcode/test_pdf.py
+++ b/tests/textcode/test_pdf.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 nexB Inc. and others. All rights reserved.
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
 # http://nexb.com and https://github.com/nexB/scancode-toolkit/
 # The ScanCode software is licensed under the Apache License version 2.0.
 # Data generated with ScanCode require an acknowledgment.
@@ -22,13 +22,15 @@
 #  ScanCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
+from __future__ import print_function
 
+import os
 
 from commoncode.testcase import FileBasedTesting
-
 from textcode import pdf
-import os
+
+
 
 class TestPdf(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')

From e8d0df798bae365b992353a85418389b42519732 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 14:31:13 +0100
Subject: [PATCH 093/122] Rename test files to work on Windows

 * two test files were the sane case-insensitive leading to test
   failures on windows

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .../data/copyrights/{mit_danse-MIT_danse => mit_danse}      | 0
 .../copyrights/{mit_danse-MIT_Danse => mit_danse-mojibake}  | 0
 tests/cluecode/test_copyrights.py                           | 6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/cluecode/data/copyrights/{mit_danse-MIT_danse => mit_danse} (100%)
 rename tests/cluecode/data/copyrights/{mit_danse-MIT_Danse => mit_danse-mojibake} (100%)

diff --git a/tests/cluecode/data/copyrights/mit_danse-MIT_danse b/tests/cluecode/data/copyrights/mit_danse
similarity index 100%
rename from tests/cluecode/data/copyrights/mit_danse-MIT_danse
rename to tests/cluecode/data/copyrights/mit_danse
diff --git a/tests/cluecode/data/copyrights/mit_danse-MIT_Danse b/tests/cluecode/data/copyrights/mit_danse-mojibake
similarity index 100%
rename from tests/cluecode/data/copyrights/mit_danse-MIT_Danse
rename to tests/cluecode/data/copyrights/mit_danse-mojibake
diff --git a/tests/cluecode/test_copyrights.py b/tests/cluecode/test_copyrights.py
index ae43fd3e8b3..9f7bdca7700 100644
--- a/tests/cluecode/test_copyrights.py
+++ b/tests/cluecode/test_copyrights.py
@@ -2789,14 +2789,14 @@ def test_mit(self):
         check_detection(expected, test_file)
 
     def test_mit_danse(self):
-        test_file = self.get_test_loc('copyrights/mit_danse-MIT_danse')
+        test_file = self.get_test_loc('copyrights/mit_danse')
         expected = [
             'Copyright (c) 2009 California Institute of Technology.',
         ]
         check_detection(expected, test_file)
 
-    def test_mit_danse2(self):
-        test_file = self.get_test_loc('copyrights/mit_danse-MIT_Danse')
+    def test_mit_danse_mojibake(self):
+        test_file = self.get_test_loc('copyrights/mit_danse-mojibake')
         expected = [
             'Copyright (c) 2009 California Institute of Technology.',
         ]

From 9981c637f51c803273b42b8ee851d17891649e6f Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 14:58:20 +0100
Subject: [PATCH 094/122] Do not use expectedFailure on XPASS tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/extractcode/test_archive.py | 50 ++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index f0af7176df4..6160ef0ab32 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -2351,48 +2351,76 @@ class TestExtractArchiveWithIllegalFilenamesWithPytarOnLinuxWarnings(TestExtract
 
 
 @skipIf(not on_mac, 'Run only on Mac because of specific test expectations.')
-class TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMac(ExtractArchiveWithIllegalFilenamesTestCase):
-    check_only_warnings = False
+class TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings(ExtractArchiveWithIllegalFilenamesTestCase):
+    check_only_warnings = True
 
-    @expectedFailure  # not a problem: we use libarchive for these
     def test_extract_7zip_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.7z')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
 
-    @expectedFailure  # not a problem: we use libarchive for these
     def test_extract_ar_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.ar')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
 
-    @expectedFailure  # not a problem: we use libarchive for these
     def test_extract_cpio_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.cpio')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
 
-    @expectedFailure  # This is a problem
     def test_extract_iso_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.iso')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
 
-    @expectedFailure  # This is a problem, but unrar seems to fail the same way
     def test_extract_rar_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.rar')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
 
-    @expectedFailure  # not a problem: we use libarchive for these
     def test_extract_tar_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.tar')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
 
-    @expectedFailure  # not a problem: we use libarchive for these
     def test_extract_zip_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.zip')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
 
 
 @skipIf(not on_mac, 'Run only on Mac because of specific test expectations.')
-class TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings(TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMac):
-    check_only_warnings = True
+class TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMac(TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings):
+    check_only_warnings = False
+
+    # not a problem: we use libarchive for these
+    test_extract_7zip_with_weird_filenames_with_sevenzip = expectedFailure(
+        TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings
+        .test_extract_7zip_with_weird_filenames_with_sevenzip)
+
+    # not a problem: we use libarchive for these
+    test_extract_ar_with_weird_filenames_with_sevenzip = expectedFailure(
+        TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings
+        .test_extract_ar_with_weird_filenames_with_sevenzip)
+
+    # not a problem: we use libarchive for these
+    test_extract_cpio_with_weird_filenames_with_sevenzip = expectedFailure(
+        TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings
+        .test_extract_cpio_with_weird_filenames_with_sevenzip)
+
+    # This is a problem
+    test_extract_iso_with_weird_filenames_with_sevenzip = expectedFailure(
+        TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings
+        .test_extract_iso_with_weird_filenames_with_sevenzip)
+
+    # This is a problem, but unrar seems to fail the same way
+    test_extract_rar_with_weird_filenames_with_sevenzip = expectedFailure(
+        TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings
+        .test_extract_rar_with_weird_filenames_with_sevenzip)
+
+    # not a problem: we use libarchive for these
+    test_extract_tar_with_weird_filenames_with_sevenzip = expectedFailure(
+        TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings
+        .test_extract_tar_with_weird_filenames_with_sevenzip)
+
+    # not a problem: we use libarchive for these
+    test_extract_zip_with_weird_filenames_with_sevenzip = expectedFailure(
+        TestExtractArchiveWithIllegalFilenamesWithSevenzipOnMacWarnings
+        .test_extract_zip_with_weird_filenames_with_sevenzip)
 
 
 @skipIf(not on_mac, 'Run only on Mac because of specific test expectations.')

From 352507be5956d597354ec31846841def9151f8a1 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 15:14:27 +0100
Subject: [PATCH 095/122] Remove Windows-specific test timeouts #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/formattedcode/test_output_templated.py |  4 +---
 tests/scancode/test_cli.py                   | 14 --------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/tests/formattedcode/test_output_templated.py b/tests/formattedcode/test_output_templated.py
index 7f3c0c528ed..dc202c1ac00 100644
--- a/tests/formattedcode/test_output_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -33,10 +33,10 @@
 from scancode_config import __version__
 
 from commoncode import fileutils
-from commoncode.system import on_windows
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
 
+
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -79,8 +79,6 @@ def test_scan_html_output_does_not_truncate_copyright_html():
 
     args = ['-clip', '--strip-root', '-n', '3', test_dir,
             '--output-html', result_file]
-    if on_windows:
-        args += ['--timeout', '400']
 
     run_scan_click(args)
     results = open(result_file).read()
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index da05c1c72bd..4a3766ce020 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -101,8 +101,6 @@ def test_license_option_detects_licenses():
     test_dir = test_env.get_test_loc('license', copy=True)
     result_file = test_env.get_temp_file('json')
     args = ['--license', test_dir, '--json', result_file]
-    if on_windows:
-        args += ['--timeout', '400']
     run_scan_click(args)
     assert os.path.exists(result_file)
     assert len(open(result_file).read()) > 10
@@ -210,8 +208,6 @@ def test_scan_should_not_fail_on_faulty_pdf_or_pdfminer_bug_but_instead_report_e
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
     args = ['--copyright', '--strip-root', test_file, '--json', result_file]
-    if on_windows:
-        args += ['--timeout', '400']
     result = run_scan_click(args, expected_rc=1)
     check_json_scan(test_env.get_test_loc('failing/patchelf.expected.json'), result_file)
     assert 'Some files failed to scan' in result.output
@@ -222,8 +218,6 @@ def test_scan_with_errors_always_includes_full_traceback():
     test_file = test_env.get_test_loc('failing/patchelf.pdf')
     result_file = test_env.get_temp_file('test.json')
     args = ['--copyright', test_file, '--json', result_file]
-    if on_windows:
-        args += ['--timeout', '400']
     result = run_scan_click(args, expected_rc=1)
     assert 'Some files failed to scan' in result.output
     assert 'patchelf.pdf' in result.output
@@ -492,8 +486,6 @@ def test_scan_can_run_from_other_directory():
 def test_scan_logs_errors_messages_not_verbosely_on_stderr():
     test_file = test_env.get_test_loc('errors', copy=True)
     args = ['-pi', '-n', '0', test_file, '--json', '-']
-    if on_windows:
-        args += ['--timeout', '400']
     _rc, stdout, stderr = run_scan_plain(args, expected_rc=1)
     assert 'Path: errors/package.json' in stderr
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
@@ -503,8 +495,6 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr():
 def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing():
     test_file = test_env.get_test_loc('errors', copy=True)
     args = ['-pi', '-n', '2', test_file, '--json', '-']
-    if on_windows:
-        args += ['--timeout', '400']
     _rc, stdout, stderr = run_scan_plain(args, expected_rc=1)
     assert 'Path: errors/package.json' in stderr
     assert "Expecting ':' delimiter: line 5 column 12 (char 143)" in stdout
@@ -514,8 +504,6 @@ def test_scan_logs_errors_messages_not_verbosely_on_stderr_with_multiprocessing(
 def test_scan_logs_errors_messages_verbosely_with_verbose():
     test_file = test_env.get_test_loc('errors', copy=True)
     args = ['-pi', '--verbose', '-n', '0', test_file, '--json', '-']
-    if on_windows:
-        args += ['--timeout', '400']
     _rc, stdout, stderr = run_scan_plain(args, expected_rc=1)
     assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout
@@ -526,8 +514,6 @@ def test_scan_logs_errors_messages_verbosely_with_verbose():
 def test_scan_logs_errors_messages_verbosely_with_verbose_and_multiprocessing():
     test_file = test_env.get_test_loc('errors', copy=True)
     args = ['-pi', '--verbose', '-n', '2', test_file, '--json', '-']
-    if on_windows:
-        args += ['--timeout', '400']
     _rc, stdout, stderr = run_scan_plain(args, expected_rc=1)
     assert 'package.json' in stderr
     assert 'delimiter: line 5 column 12' in stdout

From 228143affd0e3845ecb5178bf64179ebb0c9a71a Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 15:40:02 +0100
Subject: [PATCH 096/122] Bump help for Windows Python version

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 configure.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.bat b/configure.bat
index 437c7d77983..8ba282a0275 100644
--- a/configure.bat
+++ b/configure.bat
@@ -1,6 +1,6 @@
 @echo OFF
 
-@rem Copyright (c) 2015 nexB Inc. http://www.nexb.com/ - All rights reserved.
+@rem Copyright (c) 2018 nexB Inc. http://www.nexb.com/ - All rights reserved.
 
 @rem ################################
 @rem # change these variables to customize this script locally
@@ -44,7 +44,7 @@ if not exist "c:\python27\python.exe" (
     echo Do NOT install Python v3 or any 64 bits edition.
     echo Instead download Python from this url and see the README.rst file for more details:
     echo(
-    echo    https://www.python.org/ftp/python/2.7.10/python-2.7.10.msi
+    echo    https://www.python.org/ftp/python/2.7.14/python-2.7.14.msi
     echo(
     exit /b 1
 )

From 93ee491f6bd4038e58b4540d38036304242e3164 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 15:50:41 +0100
Subject: [PATCH 097/122] Reset expectedFailure for Windows tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/extractcode/test_archive.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index 6160ef0ab32..bc9a4460f8a 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -2512,7 +2512,6 @@ def test_extract_rar_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.rar')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
 
-    # The results are not correct but not a problem: we use libarchive for these
     def test_extract_tar_with_weird_filenames_with_sevenzip(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.tar')
         self.check_extract(sevenzip.extract, test_file, expected_warnings=[], expected_suffix='7zip')
@@ -2527,6 +2526,11 @@ def test_extract_zip_with_weird_filenames_with_sevenzip(self):
 class TestExtractArchiveWithIllegalFilenamesWithSevenzipOnWinWarning(TestExtractArchiveWithIllegalFilenamesWithSevenzipOnWin):
     check_only_warnings = True
 
+    # The results are not correct but not a problem: we use libarchive for these
+    test_extract_7zip_with_weird_filenames_with_sevenzip = expectedFailure(
+        TestExtractArchiveWithIllegalFilenamesWithSevenzipOnWin
+        .test_extract_7zip_with_weird_filenames_with_sevenzip)
+
 
 @skipIf(not on_windows, 'Run only on Windows because of specific test expectations.')
 class TestExtractArchiveWithIllegalFilenamesWithPytarOnWin(ExtractArchiveWithIllegalFilenamesTestCase):

From 21f86a66ba20a806d7ef95bd8d7f5589cf41c745 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 15:53:01 +0100
Subject: [PATCH 098/122] Add debug print for Windows test failure

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/scancode/test_cli.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index 4a3766ce020..f6ced819a89 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -546,9 +546,16 @@ def test_scan_progress_display_is_not_damaged_with_long_file_names(monkeypatch):
         expected1 = 'Scanned: 0123456789012345678901234567890123456789.c'
         expected2 = 'Scanned: abcdefghijklmnopqrt...0123456789012345678'
         expected3 = 'abcdefghijklmnopqrtu0123456789012345678901234567890123456789abcdefghijklmnopqrtu0123456789012345678901234567890123456789.c'
-        assert expected1 in result.output
-        assert expected2 in result.output
-        assert expected3 not in result.output
+        try:
+            assert expected1 in result.output
+            assert expected2 in result.output
+            assert expected3 not in result.output
+        except:
+            print()
+            print('output:')
+            print(result.output)
+            print()
+            raise
     else:
         expected1 = 'Scanned: abcdefghijklmnopqr...234567890123456789.c'
         expected2 = 'Scanned: 0123456789012345678901234567890123456789.c'

From 2938852a365e44441f51485a6ccacf78164374ae Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 15:59:07 +0100
Subject: [PATCH 099/122] Avoid using multiple processes in tests #787

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/formattedcode/test_output_templated.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/formattedcode/test_output_templated.py b/tests/formattedcode/test_output_templated.py
index dc202c1ac00..9a1b2f37c45 100644
--- a/tests/formattedcode/test_output_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -36,7 +36,6 @@
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
 
-
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -77,8 +76,7 @@ def test_scan_html_output_does_not_truncate_copyright_html():
     test_dir = test_env.get_test_loc('templated/tree/scan/')
     result_file = test_env.get_temp_file('test.html')
 
-    args = ['-clip', '--strip-root', '-n', '3', test_dir,
-            '--output-html', result_file]
+    args = ['-clip', '--strip-root', '--verbose', test_dir, '--output-html', result_file]
 
     run_scan_click(args)
     results = open(result_file).read()

From 715e39d27f7db082ed974da7a159554e2eb8946b Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 16:48:17 +0100
Subject: [PATCH 100/122] Update Windows test expectations for failures

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .../weird_names.7z_7zip_win.expected          | 212 +++++++++---------
 .../unicodepath/unicodepath.expected-win.json |  42 ++--
 tests/scancode/test_cli.py                    |   2 +-
 3 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/tests/extractcode/data/archive/weird_names/weird_names.7z_7zip_win.expected b/tests/extractcode/data/archive/weird_names/weird_names.7z_7zip_win.expected
index d803623116c..10c554f721e 100644
--- a/tests/extractcode/data/archive/weird_names/weird_names.7z_7zip_win.expected
+++ b/tests/extractcode/data/archive/weird_names/weird_names.7z_7zip_win.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man\\1/1.gz", 
-  "/weird_names/man\\1/:.1.gz", 
-  "/weird_names/man\\1/:/.1", 
-  "/weird_names/man\\1/[.1.gz", 
-  "/weird_names/man\\1/[/:*.1", 
+  "/weird_names/man/1/1.gz", 
+  "/weird_names/man/1/[.1.gz", 
+  "/weird_names/man/1/[/__.1", 
+  "/weird_names/man/1/_.1.gz", 
+  "/weird_names/man/1/_/.1", 
   "/weird_names/some 'file", 
-  "/weird_names/some /file", 
   "/weird_names/some file", 
-  "/weird_names/some\"file", 
-  "/weird_names/some/\"file", 
-  "/weird_names/win/AUX", 
-  "/weird_names/win/AUX.txt", 
-  "/weird_names/win/COM1", 
-  "/weird_names/win/COM1.txt", 
-  "/weird_names/win/COM2", 
-  "/weird_names/win/COM2.txt", 
-  "/weird_names/win/COM3", 
-  "/weird_names/win/COM3.txt", 
-  "/weird_names/win/COM4", 
-  "/weird_names/win/COM4.txt", 
-  "/weird_names/win/COM5", 
-  "/weird_names/win/COM5.txt", 
-  "/weird_names/win/COM6", 
-  "/weird_names/win/COM6.txt", 
-  "/weird_names/win/COM7", 
-  "/weird_names/win/COM7.txt", 
-  "/weird_names/win/COM8", 
-  "/weird_names/win/COM8.txt", 
-  "/weird_names/win/COM9", 
-  "/weird_names/win/COM9.txt", 
-  "/weird_names/win/CON", 
-  "/weird_names/win/CON.txt", 
-  "/weird_names/win/LPT1", 
-  "/weird_names/win/LPT1.txt", 
-  "/weird_names/win/LPT2", 
-  "/weird_names/win/LPT2.txt", 
-  "/weird_names/win/LPT3", 
-  "/weird_names/win/LPT3.txt", 
-  "/weird_names/win/LPT4", 
-  "/weird_names/win/LPT4.txt", 
-  "/weird_names/win/LPT5", 
-  "/weird_names/win/LPT5.txt", 
-  "/weird_names/win/LPT6", 
-  "/weird_names/win/LPT6.txt", 
-  "/weird_names/win/LPT7", 
-  "/weird_names/win/LPT7.txt", 
-  "/weird_names/win/LPT8", 
-  "/weird_names/win/LPT8.txt", 
-  "/weird_names/win/LPT9", 
-  "/weird_names/win/LPT9.txt", 
-  "/weird_names/win/NUL", 
-  "/weird_names/win/NUL.txt", 
-  "/weird_names/win/PRN", 
-  "/weird_names/win/PRN.txt", 
-  "/weird_names/win/aux", 
-  "/weird_names/win/aux.txt", 
-  "/weird_names/win/com1", 
-  "/weird_names/win/com1.txt", 
-  "/weird_names/win/com2", 
-  "/weird_names/win/com2.txt", 
-  "/weird_names/win/com3", 
-  "/weird_names/win/com3.txt", 
-  "/weird_names/win/com4", 
-  "/weird_names/win/com4.txt", 
-  "/weird_names/win/com5", 
-  "/weird_names/win/com5.txt", 
-  "/weird_names/win/com6", 
-  "/weird_names/win/com6.txt", 
-  "/weird_names/win/com7", 
-  "/weird_names/win/com7.txt", 
-  "/weird_names/win/com8", 
-  "/weird_names/win/com8.txt", 
-  "/weird_names/win/com9", 
-  "/weird_names/win/com9.txt", 
-  "/weird_names/win/con", 
-  "/weird_names/win/con.txt", 
-  "/weird_names/win/lpt1", 
-  "/weird_names/win/lpt1.txt", 
-  "/weird_names/win/lpt2", 
-  "/weird_names/win/lpt2.txt", 
-  "/weird_names/win/lpt3", 
-  "/weird_names/win/lpt3.txt", 
-  "/weird_names/win/lpt4", 
-  "/weird_names/win/lpt4.txt", 
-  "/weird_names/win/lpt5", 
-  "/weird_names/win/lpt5.txt", 
-  "/weird_names/win/lpt6", 
-  "/weird_names/win/lpt6.txt", 
-  "/weird_names/win/lpt7", 
-  "/weird_names/win/lpt7.txt", 
-  "/weird_names/win/lpt8", 
-  "/weird_names/win/lpt8.txt", 
-  "/weird_names/win/lpt9", 
-  "/weird_names/win/lpt9.txt", 
-  "/weird_names/win/nul", 
-  "/weird_names/win/nul.txt", 
-  "/weird_names/win/prn", 
-  "/weird_names/win/prn.txt", 
-  "/weird_names/winchr/ab\t.t\t", 
-  "/weird_names/winchr/ab\n.t\n", 
-  "/weird_names/winchr/ab\r.t\r", 
-  "/weird_names/winchr/ab\".t\"", 
-  "/weird_names/winchr/ab*_1.t*", 
+  "/weird_names/some/_file", 
+  "/weird_names/some_/file", 
+  "/weird_names/some_file", 
+  "/weird_names/win/_AUX", 
+  "/weird_names/win/_AUX_1.txt", 
+  "/weird_names/win/_COM1", 
+  "/weird_names/win/_COM1.txt", 
+  "/weird_names/win/_COM2", 
+  "/weird_names/win/_COM2_1.txt", 
+  "/weird_names/win/_COM3", 
+  "/weird_names/win/_COM3_1.txt", 
+  "/weird_names/win/_COM4", 
+  "/weird_names/win/_COM4.txt", 
+  "/weird_names/win/_COM5.txt", 
+  "/weird_names/win/_COM5_1", 
+  "/weird_names/win/_COM6", 
+  "/weird_names/win/_COM6.txt", 
+  "/weird_names/win/_COM7", 
+  "/weird_names/win/_COM7.txt", 
+  "/weird_names/win/_COM8", 
+  "/weird_names/win/_COM8.txt", 
+  "/weird_names/win/_COM9", 
+  "/weird_names/win/_COM9.txt", 
+  "/weird_names/win/_CON_1", 
+  "/weird_names/win/_CON_1.txt", 
+  "/weird_names/win/_LPT1", 
+  "/weird_names/win/_LPT1_1.txt", 
+  "/weird_names/win/_LPT2", 
+  "/weird_names/win/_LPT2_1.txt", 
+  "/weird_names/win/_LPT3_1", 
+  "/weird_names/win/_LPT3_1.txt", 
+  "/weird_names/win/_LPT4_1", 
+  "/weird_names/win/_LPT4_1.txt", 
+  "/weird_names/win/_LPT5_1", 
+  "/weird_names/win/_LPT5_1.txt", 
+  "/weird_names/win/_LPT6.txt", 
+  "/weird_names/win/_LPT6_1", 
+  "/weird_names/win/_LPT7", 
+  "/weird_names/win/_LPT7.txt", 
+  "/weird_names/win/_LPT8", 
+  "/weird_names/win/_LPT8.txt", 
+  "/weird_names/win/_LPT9", 
+  "/weird_names/win/_LPT9.txt", 
+  "/weird_names/win/_NUL.txt", 
+  "/weird_names/win/_NUL_1", 
+  "/weird_names/win/_PRN.txt", 
+  "/weird_names/win/_PRN_1", 
+  "/weird_names/win/_aux.txt", 
+  "/weird_names/win/_aux_1", 
+  "/weird_names/win/_com1_1", 
+  "/weird_names/win/_com1_1.txt", 
+  "/weird_names/win/_com2.txt", 
+  "/weird_names/win/_com2_1", 
+  "/weird_names/win/_com3.txt", 
+  "/weird_names/win/_com3_1", 
+  "/weird_names/win/_com4_1", 
+  "/weird_names/win/_com4_1.txt", 
+  "/weird_names/win/_com5", 
+  "/weird_names/win/_com5_1.txt", 
+  "/weird_names/win/_com6_1", 
+  "/weird_names/win/_com6_1.txt", 
+  "/weird_names/win/_com7_1", 
+  "/weird_names/win/_com7_1.txt", 
+  "/weird_names/win/_com8_1", 
+  "/weird_names/win/_com8_1.txt", 
+  "/weird_names/win/_com9_1", 
+  "/weird_names/win/_com9_1.txt", 
+  "/weird_names/win/_con", 
+  "/weird_names/win/_con.txt", 
+  "/weird_names/win/_lpt1.txt", 
+  "/weird_names/win/_lpt1_1", 
+  "/weird_names/win/_lpt2.txt", 
+  "/weird_names/win/_lpt2_1", 
+  "/weird_names/win/_lpt3", 
+  "/weird_names/win/_lpt3.txt", 
+  "/weird_names/win/_lpt4", 
+  "/weird_names/win/_lpt4.txt", 
+  "/weird_names/win/_lpt5", 
+  "/weird_names/win/_lpt5.txt", 
+  "/weird_names/win/_lpt6", 
+  "/weird_names/win/_lpt6_1.txt", 
+  "/weird_names/win/_lpt7_1", 
+  "/weird_names/win/_lpt7_1.txt", 
+  "/weird_names/win/_lpt8_1", 
+  "/weird_names/win/_lpt8_1.txt", 
+  "/weird_names/win/_lpt9_1", 
+  "/weird_names/win/_lpt9_1.txt", 
+  "/weird_names/win/_nul", 
+  "/weird_names/win/_nul_1.txt", 
+  "/weird_names/win/_prn", 
+  "/weird_names/win/_prn_1.txt", 
   "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab:.t:", 
-  "/weird_names/winchr/ab<.t<", 
-  "/weird_names/winchr/ab>.t>", 
-  "/weird_names/winchr/ab?_2.t?", 
-  "/weird_names/winchr/ab|.t|"
+  "/weird_names/winchr/ab_.t_", 
+  "/weird_names/winchr/ab__1.t_", 
+  "/weird_names/winchr/ab__2.t_", 
+  "/weird_names/winchr/ab__3.t_", 
+  "/weird_names/winchr/ab__4.t_", 
+  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/winchr/ab__6.t_", 
+  "/weird_names/winchr/ab__7.t_", 
+  "/weird_names/winchr/ab__8.t_", 
+  "/weird_names/winchr/ab__9.t_"
 ]
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
index a26b6f2f782..2a1ea769eaf 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-win.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
@@ -42,19 +42,19 @@
       "urls": []
     },
     {
-      "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "path": "unicodepath/-\u00bf\u00df+\u00c7G\u00ee\u00bf",
       "type": "file",
-      "name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
-      "base_name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma",
-      "extension": ".pdf",
-      "size": 2,
-      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
-      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
+      "name": "-\u00bf\u00df+\u00c7G\u00ee\u00bf",
+      "base_name": "-\u00bf\u00df+\u00c7G\u00ee\u00bf",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
       "files_count": 0,
       "dirs_count": 0,
       "size_count": 0,
       "mime_type": "text/plain",
-      "file_type": "ASCII text",
+      "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,
@@ -64,16 +64,16 @@
       "is_script": false,
       "scan_errors": [],
       "licenses": [],
-      "copyrights": [],
+      "copyrights": [],0
       "packages": [],
       "emails": [],
       "urls": []
     },
     {
-      "path": "unicodepath/\u03e8\u1f40\u2328",
+      "path": "unicodepath/-\u00bf\u00df+\u00c7G\u00ee\u00bfa",
       "type": "file",
-      "name": "\u03e8\u1f40\u2328",
-      "base_name": "\u03e8\u1f40\u2328",
+      "name": "-\u00bf\u00df+\u00c7G\u00ee\u00bfa",
+      "base_name": "-\u00bf\u00df+\u00c7G\u00ee\u00bfa",
       "extension": "",
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
@@ -98,19 +98,19 @@
       "urls": []
     },
     {
-      "path": "unicodepath/\u03e8\u1f40\u2328a",
+      "path": "unicodepath/Izgradnja sufiksnog polja kori+\u00edtenjem K+\u00f1rkk+\u00f1inen G\u00c7\u00f4 Sandersovog algoritma.pdf",
       "type": "file",
-      "name": "\u03e8\u1f40\u2328a",
-      "base_name": "\u03e8\u1f40\u2328a",
-      "extension": "",
-      "size": 9,
-      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
-      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "name": "Izgradnja sufiksnog polja kori+\u00edtenjem K+\u00f1rkk+\u00f1inen G\u00c7\u00f4 Sandersovog algoritma.pdf",
+      "base_name": "Izgradnja sufiksnog polja kori+\u00edtenjem K+\u00f1rkk+\u00f1inen G\u00c7\u00f4 Sandersovog algoritma",
+      "extension": ".pdf",
+      "size": 2,
+      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
+      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
       "files_count": 0,
       "dirs_count": 0,
       "size_count": 0,
       "mime_type": "text/plain",
-      "file_type": "ASCII text, with no line terminators",
+      "file_type": "ASCII text",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,
@@ -126,4 +126,4 @@
       "urls": []
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index f6ced819a89..34ecbc24cd5 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -548,7 +548,7 @@ def test_scan_progress_display_is_not_damaged_with_long_file_names(monkeypatch):
         expected3 = 'abcdefghijklmnopqrtu0123456789012345678901234567890123456789abcdefghijklmnopqrtu0123456789012345678901234567890123456789.c'
         try:
             assert expected1 in result.output
-            assert expected2 in result.output
+            assert expected2 not in result.output
             assert expected3 not in result.output
         except:
             print()

From cf278a8e16912c0b6d888985b5d9edfbc6ad3349 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 16:54:37 +0100
Subject: [PATCH 101/122] Fix typoe in docstring

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/scan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugincode/scan.py b/src/plugincode/scan.py
index 1a79a051c17..a11a265b2ae 100644
--- a/src/plugincode/scan.py
+++ b/src/plugincode/scan.py
@@ -42,7 +42,7 @@ class ScanPlugin(BasePlugin):
     """
     A scan plugin base class that all scan plugins must extend. A scan plugin
     provides a single `get_scanner()` method that returns a scanner function.
-    The key under which scan results are retruned for a scanner is the plugin
+    The key under which scan results are returned for a scanner is the plugin
     "name" attribute. This attribute is set automatically as the "entrypoint"
     name used for this plugin.
     """

From f66a1fdc61ada54428cb6cd3495efc543dcc5e4e Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 17:41:44 +0100
Subject: [PATCH 102/122] Ensure some failing tests run verbosely

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/formattedcode/test_output_templated.py | 2 +-
 tests/scancode/test_cli.py                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/formattedcode/test_output_templated.py b/tests/formattedcode/test_output_templated.py
index 9a1b2f37c45..824bbaad508 100644
--- a/tests/formattedcode/test_output_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -76,7 +76,7 @@ def test_scan_html_output_does_not_truncate_copyright_html():
     test_dir = test_env.get_test_loc('templated/tree/scan/')
     result_file = test_env.get_temp_file('test.html')
 
-    args = ['-clip', '--strip-root', '--verbose', test_dir, '--output-html', result_file]
+    args = ['-clip', '--strip-root', '--verbose', test_dir, '--output-html', result_file, '--verbose']
 
     run_scan_click(args)
     results = open(result_file).read()
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index 34ecbc24cd5..c4c224edc7c 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -100,7 +100,7 @@ def test_verbose_option_with_copyrights(monkeypatch):
 def test_license_option_detects_licenses():
     test_dir = test_env.get_test_loc('license', copy=True)
     result_file = test_env.get_temp_file('json')
-    args = ['--license', test_dir, '--json', result_file]
+    args = ['--license', test_dir, '--json', result_file, '--verbose']
     run_scan_click(args)
     assert os.path.exists(result_file)
     assert len(open(result_file).read()) > 10
@@ -347,7 +347,7 @@ def test_scan_does_not_fail_when_scanning_unicode_files_and_paths():
         result_file = fsencode(result_file)
 
     args = ['--info', '--license', '--copyright', '--package', '--email',
-            '--url', '--strip-root', test_dir , '--json', result_file]
+            '--url', '--strip-root', test_dir , '--json', result_file, '--verbose']
     run_scan_click(args)
 
     # the paths for each OS end up encoded differently.

From 74797bca1e4eb3d80b75b092ff4aa06fe8f40b62 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 17:42:06 +0100
Subject: [PATCH 103/122] Fix Windows unicode path test expectations

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .../unicodepath/unicodepath.expected-win.json | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
index 2a1ea769eaf..ed205e707c1 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-win.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
@@ -42,19 +42,19 @@
       "urls": []
     },
     {
-      "path": "unicodepath/-\u00bf\u00df+\u00c7G\u00ee\u00bf",
+      "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
       "type": "file",
-      "name": "-\u00bf\u00df+\u00c7G\u00ee\u00bf",
-      "base_name": "-\u00bf\u00df+\u00c7G\u00ee\u00bf",
-      "extension": "",
-      "size": 9,
-      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
-      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "base_name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma",
+      "extension": ".pdf",
+      "size": 2,
+      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
+      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
       "files_count": 0,
       "dirs_count": 0,
       "size_count": 0,
       "mime_type": "text/plain",
-      "file_type": "ASCII text, with no line terminators",
+      "file_type": "ASCII text",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,
@@ -64,16 +64,16 @@
       "is_script": false,
       "scan_errors": [],
       "licenses": [],
-      "copyrights": [],0
+      "copyrights": [],
       "packages": [],
       "emails": [],
       "urls": []
     },
     {
-      "path": "unicodepath/-\u00bf\u00df+\u00c7G\u00ee\u00bfa",
+      "path": "unicodepath/\u03e8\u1f40\u2328",
       "type": "file",
-      "name": "-\u00bf\u00df+\u00c7G\u00ee\u00bfa",
-      "base_name": "-\u00bf\u00df+\u00c7G\u00ee\u00bfa",
+      "name": "\u03e8\u1f40\u2328",
+      "base_name": "\u03e8\u1f40\u2328",
       "extension": "",
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
@@ -98,19 +98,19 @@
       "urls": []
     },
     {
-      "path": "unicodepath/Izgradnja sufiksnog polja kori+\u00edtenjem K+\u00f1rkk+\u00f1inen G\u00c7\u00f4 Sandersovog algoritma.pdf",
+      "path": "unicodepath/\u03e8\u1f40\u2328a",
       "type": "file",
-      "name": "Izgradnja sufiksnog polja kori+\u00edtenjem K+\u00f1rkk+\u00f1inen G\u00c7\u00f4 Sandersovog algoritma.pdf",
-      "base_name": "Izgradnja sufiksnog polja kori+\u00edtenjem K+\u00f1rkk+\u00f1inen G\u00c7\u00f4 Sandersovog algoritma",
-      "extension": ".pdf",
-      "size": 2,
-      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
-      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
+      "name": "\u03e8\u1f40\u2328a",
+      "base_name": "\u03e8\u1f40\u2328a",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
       "files_count": 0,
       "dirs_count": 0,
       "size_count": 0,
       "mime_type": "text/plain",
-      "file_type": "ASCII text",
+      "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
       "is_binary": false,
       "is_text": true,

From 1a4284b03376b01c4672a58b56cdad3b797be148 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 18:13:04 +0100
Subject: [PATCH 104/122] Fix tracing output

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index c66d1e343c8..c7168d608c0 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -891,7 +891,7 @@ def run_plugins(ctx, stage, plugins, codebase, kwargs, quiet, verbose,
             if TRACE_DEEP:
                 from pprint import pformat
                 logger_debug('run_plugins: kwargs passed to %(stage)s:%(name)s' % locals())
-                logger_debug(pformat(sorted(kwargs.item())))
+                logger_debug(pformat(sorted(kwargs.items())))
                 logger_debug()
 
             plugin.process_codebase(codebase, **kwargs)

From 0ad11fea0f71948c5b20e949825152ede09764ea Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 18:32:48 +0100
Subject: [PATCH 105/122] Re-enable license cache warmup

 * this was disabled by a rogue return statement

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/licensedcode/cache.py      | 13 ++++++++-----
 src/scancode/plugin_license.py |  7 +++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/licensedcode/cache.py b/src/licensedcode/cache.py
index 31a207b9464..873ba344bbd 100644
--- a/src/licensedcode/cache.py
+++ b/src/licensedcode/cache.py
@@ -53,7 +53,8 @@
 _LICENSES_INDEX = None
 
 
-def get_index(cache_dir=scancode_cache_dir, check_consistency=SCANCODE_DEV_MODE):
+def get_index(cache_dir=scancode_cache_dir, check_consistency=SCANCODE_DEV_MODE,
+              return_value=True):
     """
     Return and eventually cache an index built from an iterable of rules.
     Build the index from the built-in rules dataset.
@@ -61,7 +62,8 @@ def get_index(cache_dir=scancode_cache_dir, check_consistency=SCANCODE_DEV_MODE)
     global _LICENSES_INDEX
     if not _LICENSES_INDEX:
         _LICENSES_INDEX = get_cached_index(cache_dir, check_consistency)
-    return _LICENSES_INDEX
+    if return_value:
+        return _LICENSES_INDEX
 
 
 # global in-memory cache of a mapping of key -> license instance
@@ -163,13 +165,14 @@ def load_index(cache_file):
     from licensedcode.index import LicenseIndex
     with open(cache_file, 'rb') as ifc:
         # Note: weird but read() + loads() is much (twice++???) faster than load()
-        idx = LicenseIndex.loads(ifc.read())
-    return idx
+        return LicenseIndex.loads(ifc.read())
 
 
 _ignored_from_hash = partial(
     ignore.is_ignored,
-    ignores={'*.pyc': 'pyc files', '*~': 'temp gedit files', '*.swp': 'vi swap files'},
+    ignores={'*.pyc': 'pyc files',
+             '*~': 'temp gedit files',
+             '*.swp': 'vi swap files'},
     unignores={}
 )
 
diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index e9ef08deede..fb953df8d26 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -103,10 +103,13 @@ def is_enabled(self, license, **kwargs):  # NOQA
         return license
 
     def setup(self, cache_dir, **kwargs):
-        return
+        """
+        This is a cache warmup such that child process inherit from this.
+        """
         from scancode_config import SCANCODE_DEV_MODE
         from licensedcode.cache import get_index
-        get_index(cache_dir, check_consistency=SCANCODE_DEV_MODE)
+        get_index(cache_dir, check_consistency=SCANCODE_DEV_MODE,
+                  return_value=False)
 
     def get_scanner(self, license_score=0, license_text=False,
                     license_url_template=DEJACODE_LICENSE_URL,

From 403e80c6bf0505727c5c2567ad7939f89094af89 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 26 Jan 2018 18:36:52 +0100
Subject: [PATCH 106/122] Remove unused plugin test mode code

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/__init__.py | 3 ---
 src/scancode/cli.py        | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 50a9f51a76f..6a1351996fc 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -64,9 +64,6 @@ class BasePlugin(object):
     # Subclasses must not set this.
     name = None
 
-    # set to True for testing
-    _test_mode = False
-
     def __init__(self, *args, **kwargs):
         """
         Initialize a new plugin with a user kwargs.
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index c7168d608c0..63030357d59 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -612,8 +612,6 @@ def scancode(ctx, input,  # NOQA
                 try:
                     plugin = plugin_cls(**kwargs)
                     if plugin.is_enabled(**kwargs):
-                        # Set special test mode flag that plugins can leverage
-                        plugin._test_mode = test_mode
                         stage_plugins[name] = plugin
                 except:
                     msg = 'ERROR: failed to load plugin: %(stage)s:%(name)s:' % locals()

From 877c03e5fd54e099102253e73d0100c1f7407dd7 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Sat, 27 Jan 2018 00:04:24 +0100
Subject: [PATCH 107/122] Correct bug in display of non-ascii progressbar

 * force the display of non-ASCII unicode paths to be ASCII
 * add new tests for scans of non-ASCII unicode paths with quiet
   and verbose progress

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/utils.py                         |   4 +-
 .../unicodepath.expected-linux.json--quiet    | 130 +++++++++++++++++
 .../unicodepath.expected-linux.json--verbose  | 130 +++++++++++++++++
 .../unicodepath.expected-mac.json--quiet      | 133 ++++++++++++++++++
 .../unicodepath.expected-mac.json--verbose    | 133 ++++++++++++++++++
 .../unicodepath.expected-win.json--quiet      | 130 +++++++++++++++++
 .../unicodepath.expected-win.json--verbose    | 130 +++++++++++++++++
 tests/scancode/test_cli.py                    |  31 +++-
 8 files changed, 813 insertions(+), 8 deletions(-)
 create mode 100644 tests/scancode/data/unicodepath/unicodepath.expected-linux.json--quiet
 create mode 100644 tests/scancode/data/unicodepath/unicodepath.expected-linux.json--verbose
 create mode 100644 tests/scancode/data/unicodepath/unicodepath.expected-mac.json--quiet
 create mode 100644 tests/scancode/data/unicodepath/unicodepath.expected-mac.json--verbose
 create mode 100644 tests/scancode/data/unicodepath/unicodepath.expected-win.json--quiet
 create mode 100644 tests/scancode/data/unicodepath/unicodepath.expected-win.json--verbose

diff --git a/src/scancode/utils.py b/src/scancode/utils.py
index 621236f14b1..b9e76b79eec 100644
--- a/src/scancode/utils.py
+++ b/src/scancode/utils.py
@@ -36,6 +36,8 @@
 from commoncode.fileutils import file_name
 from commoncode.fileutils import fsdecode
 from commoncode.fileutils import splitext
+from commoncode.text import toascii
+
 
 # Python 2 and 3 support
 try:
@@ -232,7 +234,7 @@ def path_progress_message(item, verbose=False, prefix='Scanned: '):
         return ''
     location = item[0]
     errors = item[2]
-    location = fsdecode(location)
+    location = unicode(toascii(location))
     progress_line = location
     if not verbose:
         max_file_name_len = file_name_max_len()
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--quiet b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--quiet
new file mode 100644
index 00000000000..09e60ff2009
--- /dev/null
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--quiet
@@ -0,0 +1,130 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--copyright": true,
+    "--email": true,
+    "--info": true,
+    "--json": "<file>",
+    "--license": true,
+    "--package": true,
+    "--quiet": true,
+    "--strip-root": true,
+    "--url": true
+  },
+  "files_count": 3,
+  "files": [
+    {
+      "path": "unicodepath",
+      "type": "directory",
+      "name": "unicodepath",
+      "base_name": "unicodepath",
+      "extension": "",
+      "size": 0,
+      "sha1": null,
+      "md5": null,
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "type": "file",
+      "name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "base_name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma",
+      "extension": ".pdf",
+      "size": 2,
+      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
+      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u1f40\u2328",
+      "type": "file",
+      "name": "\u03e8\u1f40\u2328",
+      "base_name": "\u03e8\u1f40\u2328",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u1f40\u2328a",
+      "type": "file",
+      "name": "\u03e8\u1f40\u2328a",
+      "base_name": "\u03e8\u1f40\u2328a",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--verbose b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--verbose
new file mode 100644
index 00000000000..749e6d3e4ea
--- /dev/null
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--verbose
@@ -0,0 +1,130 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--copyright": true,
+    "--email": true,
+    "--info": true,
+    "--json": "<file>",
+    "--license": true,
+    "--package": true,
+    "--strip-root": true,
+    "--url": true,
+    "--verbose": true
+  },
+  "files_count": 3,
+  "files": [
+    {
+      "path": "unicodepath",
+      "type": "directory",
+      "name": "unicodepath",
+      "base_name": "unicodepath",
+      "extension": "",
+      "size": 0,
+      "sha1": null,
+      "md5": null,
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "type": "file",
+      "name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "base_name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma",
+      "extension": ".pdf",
+      "size": 2,
+      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
+      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u1f40\u2328",
+      "type": "file",
+      "name": "\u03e8\u1f40\u2328",
+      "base_name": "\u03e8\u1f40\u2328",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u1f40\u2328a",
+      "type": "file",
+      "name": "\u03e8\u1f40\u2328a",
+      "base_name": "\u03e8\u1f40\u2328a",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--quiet b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--quiet
new file mode 100644
index 00000000000..3ccd9d9f2a8
--- /dev/null
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--quiet
@@ -0,0 +1,133 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--copyright": true,
+    "--email": true,
+    "--info": true,
+    "--json": "<file>",
+    "--license": true,
+    "--package": true,
+    "--quiet": true,
+    "--strip-root": true,
+    "--url": true
+  },
+  "files_count": 3,
+  "files": [
+    {
+      "path": "unicodepath",
+      "type": "directory",
+      "name": "unicodepath",
+      "base_name": "unicodepath",
+      "extension": "",
+      "size": 0,
+      "sha1": null,
+      "md5": null,
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u03bf\u0313\u2328",
+      "type": "file",
+      "name": "\u03e8\u03bf\u0313\u2328",
+      "base_name": "\u03e8\u03bf\u0313\u2328",
+      "extension": "",
+      "date": "2016-12-05",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u03bf\u0313\u2328a",
+      "type": "file",
+      "name": "\u03e8\u03bf\u0313\u2328a",
+      "base_name": "\u03e8\u03bf\u0313\u2328a",
+      "extension": "",
+      "date": "2016-12-05",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma.pdf",
+      "type": "file",
+      "name": "Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma.pdf",
+      "base_name": "Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma",
+      "extension": ".pdf",
+      "date": "2016-12-05",
+      "size": 2,
+      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
+      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--verbose b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--verbose
new file mode 100644
index 00000000000..4c9354fb8b7
--- /dev/null
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--verbose
@@ -0,0 +1,133 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--copyright": true,
+    "--email": true,
+    "--info": true,
+    "--json": "<file>",
+    "--license": true,
+    "--package": true,
+    "--strip-root": true,
+    "--url": true,
+    "--verbose": true
+  },
+  "files_count": 3,
+  "files": [
+    {
+      "path": "unicodepath",
+      "type": "directory",
+      "name": "unicodepath",
+      "base_name": "unicodepath",
+      "extension": "",
+      "size": 0,
+      "sha1": null,
+      "md5": null,
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u03bf\u0313\u2328",
+      "type": "file",
+      "name": "\u03e8\u03bf\u0313\u2328",
+      "base_name": "\u03e8\u03bf\u0313\u2328",
+      "extension": "",
+      "date": "2016-12-05",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u03bf\u0313\u2328a",
+      "type": "file",
+      "name": "\u03e8\u03bf\u0313\u2328a",
+      "base_name": "\u03e8\u03bf\u0313\u2328a",
+      "extension": "",
+      "date": "2016-12-05",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma.pdf",
+      "type": "file",
+      "name": "Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma.pdf",
+      "base_name": "Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma",
+      "extension": ".pdf",
+      "date": "2016-12-05",
+      "size": 2,
+      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
+      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json--quiet b/tests/scancode/data/unicodepath/unicodepath.expected-win.json--quiet
new file mode 100644
index 00000000000..09e60ff2009
--- /dev/null
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json--quiet
@@ -0,0 +1,130 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--copyright": true,
+    "--email": true,
+    "--info": true,
+    "--json": "<file>",
+    "--license": true,
+    "--package": true,
+    "--quiet": true,
+    "--strip-root": true,
+    "--url": true
+  },
+  "files_count": 3,
+  "files": [
+    {
+      "path": "unicodepath",
+      "type": "directory",
+      "name": "unicodepath",
+      "base_name": "unicodepath",
+      "extension": "",
+      "size": 0,
+      "sha1": null,
+      "md5": null,
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "type": "file",
+      "name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "base_name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma",
+      "extension": ".pdf",
+      "size": 2,
+      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
+      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u1f40\u2328",
+      "type": "file",
+      "name": "\u03e8\u1f40\u2328",
+      "base_name": "\u03e8\u1f40\u2328",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u1f40\u2328a",
+      "type": "file",
+      "name": "\u03e8\u1f40\u2328a",
+      "base_name": "\u03e8\u1f40\u2328a",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json--verbose b/tests/scancode/data/unicodepath/unicodepath.expected-win.json--verbose
new file mode 100644
index 00000000000..749e6d3e4ea
--- /dev/null
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json--verbose
@@ -0,0 +1,130 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--copyright": true,
+    "--email": true,
+    "--info": true,
+    "--json": "<file>",
+    "--license": true,
+    "--package": true,
+    "--strip-root": true,
+    "--url": true,
+    "--verbose": true
+  },
+  "files_count": 3,
+  "files": [
+    {
+      "path": "unicodepath",
+      "type": "directory",
+      "name": "unicodepath",
+      "base_name": "unicodepath",
+      "extension": "",
+      "size": 0,
+      "sha1": null,
+      "md5": null,
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "mime_type": null,
+      "file_type": null,
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": false,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "type": "file",
+      "name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
+      "base_name": "Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma",
+      "extension": ".pdf",
+      "size": 2,
+      "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
+      "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u1f40\u2328",
+      "type": "file",
+      "name": "\u03e8\u1f40\u2328",
+      "base_name": "\u03e8\u1f40\u2328",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    },
+    {
+      "path": "unicodepath/\u03e8\u1f40\u2328a",
+      "type": "file",
+      "name": "\u03e8\u1f40\u2328a",
+      "base_name": "\u03e8\u1f40\u2328a",
+      "extension": "",
+      "size": 9,
+      "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
+      "md5": "552e21cd4cd9918678e3c1a0df491bc3",
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "mime_type": "text/plain",
+      "file_type": "ASCII text, with no line terminators",
+      "programming_language": null,
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": false,
+      "is_script": false,
+      "scan_errors": [],
+      "licenses": [],
+      "copyrights": [],
+      "packages": [],
+      "emails": [],
+      "urls": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index c4c224edc7c..ec7416e35db 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -338,7 +338,7 @@ def test_scan_works_with_multiple_processes_and_timeouts():
     assert sorted(expected) == sorted(x.items() for x in result_json['files'])
 
 
-def test_scan_does_not_fail_when_scanning_unicode_files_and_paths():
+def check_scan_does_not_fail_when_scanning_unicode_files_and_paths(verbosity):
     test_dir = test_env.get_test_loc(u'unicodepath/uc')
     result_file = test_env.get_temp_file('json')
 
@@ -346,9 +346,10 @@ def test_scan_does_not_fail_when_scanning_unicode_files_and_paths():
         test_dir = fsencode(test_dir)
         result_file = fsencode(result_file)
 
-    args = ['--info', '--license', '--copyright', '--package', '--email',
-            '--url', '--strip-root', test_dir , '--json', result_file, '--verbose']
-    run_scan_click(args)
+    args = ['--info', '--license', '--copyright', '--package', 
+            '--email', '--url', '--strip-root', test_dir , '--json', 
+            result_file] + ([verbosity] if verbosity else [])
+    results = run_scan_click(args)
 
     # the paths for each OS end up encoded differently.
     # See for details:
@@ -356,13 +357,29 @@ def test_scan_does_not_fail_when_scanning_unicode_files_and_paths():
     # https://github.com/nexB/scancode-toolkit/issues/688
 
     if on_linux:
-        expected = 'unicodepath/unicodepath.expected-linux.json'
+        expected = 'unicodepath/unicodepath.expected-linux.json' + verbosity
     elif on_mac:
-        expected = 'unicodepath/unicodepath.expected-mac.json'
+        expected = 'unicodepath/unicodepath.expected-mac.json' + verbosity
     elif on_windows:
-        expected = 'unicodepath/unicodepath.expected-win.json'
+        expected = 'unicodepath/unicodepath.expected-win.json' + verbosity
 
     check_json_scan(test_env.get_test_loc(expected), result_file, strip_dates=True)
+    return results
+
+
+def test_scan_does_not_fail_when_scanning_unicode_files_and_paths_default():
+    result = check_scan_does_not_fail_when_scanning_unicode_files_and_paths('')
+    assert result.output
+
+
+def test_scan_does_not_fail_when_scanning_unicode_files_and_paths_verbose():
+    result = check_scan_does_not_fail_when_scanning_unicode_files_and_paths('--verbose')
+    assert result.output
+
+
+def test_scan_does_not_fail_when_scanning_unicode_files_and_paths_quiet():
+    result = check_scan_does_not_fail_when_scanning_unicode_files_and_paths('--quiet')
+    assert not result.output
 
 
 @skipIf(on_windows, 'Python tar cannot extract these files on Windows')

From cec427d7c46e6c46dc513d3165d0cff10998a9fb Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 1 Feb 2018 19:30:25 +0100
Subject: [PATCH 108/122] Allow scan attributes to be direct Resource
 attributes #787

 * all plugins are now required to declare which attributes they add to
   the scan as a list of attr attributes as declare the sort order in
   which these should appear on the scan results
 * To suppprt these plugin-contributed scan attributes, a new Resource
   subclass is created on the fly based on plugin provided attributes
 * Since Scanners functions return the actual attributes that are set
   directty on the Resource oject, the API has been updated accordingly.
   Scanner functions now return a mapping.

 * the whole Resource caching system has been updated: resources are
   either entirely in memory or entirely serialized on disk for caching.
   The new --max-in-memory option sets how many Resources are kept in
   RAM, default to 10K.
 * codebases are no longer cached in a ugly globals

 * only pre-scan plugins can defined a set of "requires" scans that are
   executed in a scan stage before the "pre-scan" (a tad of an ugly
   name).
 * no option is used as a default anymoe: all options need to be set
   explicitly (such as mark-source needing info)
 * codebase.remove_resource can now remove resource during a walk safely
 * info is now a proper scanner and is no longer super special
 * the plugin entrypoint name is NOT used anymore as the primary key
   for scan results attribute of a scan
 * cli.run_scanners is a new function to encapsulate the scanner runs

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 .gitignore                                    |    1 +
 etc/scripts/testdata/livescan/expected.csv    |    8 +-
 setup.py                                      |    1 +
 src/formattedcode/output_json.py              |    5 +-
 src/formattedcode/output_spdx.py              |   18 +-
 src/plugincode/__init__.py                    |  103 +-
 src/plugincode/output.py                      |   11 +-
 src/plugincode/output_filter.py               |    2 +-
 src/plugincode/pre_scan.py                    |   56 +-
 src/plugincode/scan.py                        |   35 +-
 src/scancode/__init__.py                      |    2 +-
 src/scancode/api.py                           |   82 +-
 src/scancode/cli.py                           |  494 +--
 src/scancode/plugin_copyright.py              |    5 +
 src/scancode/plugin_email.py                  |    4 +
 src/scancode/plugin_ignore.py                 |   21 +-
 src/scancode/plugin_info.py                   |   76 +
 src/scancode/plugin_license.py                |    5 +
 src/scancode/plugin_mark_source.py            |   34 +-
 src/scancode/plugin_only_findings.py          |   22 +-
 src/scancode/plugin_package.py                |    5 +
 src/scancode/plugin_url.py                    |    5 +
 src/scancode/resource.py                      | 1021 +++---
 src/scancode/utils.py                         |    2 -
 .../data/csv/livescan/expected.csv            |   12 +-
 .../data/json/simple-expected.json            |   20 +-
 .../data/json/simple-expected.jsonlines       |   12 +-
 .../data/json/simple-expected.jsonpp          |   20 +-
 .../data/json/tree/expected.json              |   80 +-
 tests/formattedcode/test_output_jsonlines.py  |    9 +-
 tests/formattedcode/test_output_templated.py  |    4 +-
 .../data/altpath/copyright.expected.json      |   10 +-
 .../data/composer/composer.expected.json      |    4 +-
 .../data/failing/patchelf.expected.json       |    4 +-
 tests/scancode/data/help/help.txt             |   61 +-
 tests/scancode/data/info/all.expected.json    |  132 +-
 .../data/info/all.rooted.expected.json        |   48 +-
 tests/scancode/data/info/basic.expected.json  |   88 +-
 .../data/info/basic.rooted.expected.json      |   96 +-
 .../data/info/email_url_info.expected.json    |  132 +-
 .../scancode/data/license_text/test.expected  |    4 +-
 .../data/non_utf8/expected-linux.json         |  152 +-
 .../plugin_license/license_url.expected.json  |    8 +-
 .../with_info.expected.json                   |  144 +-
 .../without_info.expected.json                |  396 ---
 .../plugin_only_findings/errors.expected.json |   39 +
 .../errors/illegal.pom.xml                    |   21 +
 .../plugin_only_findings/errors/origin.ABOUT  |    3 +
 .../plugin_only_findings/errors/package.json  |   96 +
 .../data/plugin_only_findings/expected.json   |   30 +-
 .../plugin_only_findings/info.expected.json   |   11 +
 .../data/resource/samples/JGroups/EULA        |  109 +
 .../data/resource/samples/JGroups/LICENSE     |  504 +++
 .../samples/JGroups/licenses/apache-1.1.txt   |   58 +
 .../samples/JGroups/licenses/apache-2.0.txt   |  202 ++
 .../samples/JGroups/licenses/bouncycastle.txt |   18 +
 .../samples/JGroups/licenses/cpl-1.0.txt      |  213 ++
 .../samples/JGroups/licenses/lgpl.txt         |  504 +++
 .../JGroups/src/FixedMembershipToken.java     |  150 +
 .../samples/JGroups/src/GuardedBy.java        |   23 +
 .../JGroups/src/ImmutableReference.java       |   55 +
 .../samples/JGroups/src/RATE_LIMITER.java     |  120 +
 .../samples/JGroups/src/RouterStub.java       |  295 ++
 .../JGroups/src/RouterStubManager.java        |  213 ++
 .../resource/samples/JGroups/src/S3_PING.java | 3025 +++++++++++++++++
 tests/scancode/data/resource/samples/README   |    4 +
 .../data/resource/samples/arch/zlib.tar.gz    |  Bin 0 -> 28103 bytes
 .../data/resource/samples/screenshot.png      |  Bin 0 -> 622754 bytes
 .../data/resource/samples/zlib/ada/zlib.ads   |  328 ++
 .../data/resource/samples/zlib/adler32.c      |  179 +
 .../data/resource/samples/zlib/deflate.c      | 1967 +++++++++++
 .../data/resource/samples/zlib/deflate.h      |  346 ++
 .../samples/zlib/dotzlib/AssemblyInfo.cs      |   58 +
 .../samples/zlib/dotzlib/ChecksumImpl.cs      |  202 ++
 .../samples/zlib/dotzlib/LICENSE_1_0.txt      |   23 +
 .../resource/samples/zlib/dotzlib/readme.txt  |   58 +
 .../samples/zlib/gcc_gvmat64/gvmat64.S        |  574 ++++
 .../resource/samples/zlib/infback9/infback9.c |  615 ++++
 .../resource/samples/zlib/infback9/infback9.h |   37 +
 .../resource/samples/zlib/iostream2/zstream.h |  307 ++
 .../samples/zlib/iostream2/zstream_test.cpp   |   25 +
 .../data/resource/samples/zlib/zlib.h         | 1768 ++++++++++
 .../data/resource/samples/zlib/zutil.c        |  324 ++
 .../data/resource/samples/zlib/zutil.h        |  253 ++
 ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json |    4 +-
 .../data/single/iproute.expected.json         |    6 +-
 .../unicodepath.expected-linux.json           |   40 +-
 .../unicodepath.expected-linux.json--quiet    |   40 +-
 .../unicodepath.expected-linux.json--verbose  |   40 +-
 .../unicodepath/unicodepath.expected-mac.json |   40 +-
 .../unicodepath.expected-mac.json--quiet      |   40 +-
 .../unicodepath.expected-mac.json--verbose    |   40 +-
 .../unicodepath/unicodepath.expected-win.json |   40 +-
 .../unicodepath.expected-win.json--quiet      |   40 +-
 .../unicodepath.expected-win.json--verbose    |   40 +-
 .../data/weird_file_name/expected-linux.json  |   64 +-
 .../data/weird_file_name/expected-mac.json    |   60 +-
 .../data/weird_file_name/expected-win.json    |   60 +-
 tests/scancode/test_api.py                    |   55 +-
 tests/scancode/test_cli.py                    |   49 +-
 tests/scancode/test_extract_cli.py            |    1 -
 tests/scancode/test_plugin_ignore.py          |    5 +-
 tests/scancode/test_plugin_mark_source.py     |    7 +-
 tests/scancode/test_plugin_only_findings.py   |   34 +-
 tests/scancode/test_resource.py               |  332 +-
 105 files changed, 14918 insertions(+), 2330 deletions(-)
 create mode 100644 src/scancode/plugin_info.py
 delete mode 100644 tests/scancode/data/plugin_mark_source/without_info.expected.json
 create mode 100644 tests/scancode/data/plugin_only_findings/errors.expected.json
 create mode 100644 tests/scancode/data/plugin_only_findings/errors/illegal.pom.xml
 create mode 100644 tests/scancode/data/plugin_only_findings/errors/origin.ABOUT
 create mode 100644 tests/scancode/data/plugin_only_findings/errors/package.json
 create mode 100644 tests/scancode/data/plugin_only_findings/info.expected.json
 create mode 100644 tests/scancode/data/resource/samples/JGroups/EULA
 create mode 100644 tests/scancode/data/resource/samples/JGroups/LICENSE
 create mode 100644 tests/scancode/data/resource/samples/JGroups/licenses/apache-1.1.txt
 create mode 100644 tests/scancode/data/resource/samples/JGroups/licenses/apache-2.0.txt
 create mode 100644 tests/scancode/data/resource/samples/JGroups/licenses/bouncycastle.txt
 create mode 100644 tests/scancode/data/resource/samples/JGroups/licenses/cpl-1.0.txt
 create mode 100644 tests/scancode/data/resource/samples/JGroups/licenses/lgpl.txt
 create mode 100644 tests/scancode/data/resource/samples/JGroups/src/FixedMembershipToken.java
 create mode 100644 tests/scancode/data/resource/samples/JGroups/src/GuardedBy.java
 create mode 100644 tests/scancode/data/resource/samples/JGroups/src/ImmutableReference.java
 create mode 100644 tests/scancode/data/resource/samples/JGroups/src/RATE_LIMITER.java
 create mode 100644 tests/scancode/data/resource/samples/JGroups/src/RouterStub.java
 create mode 100644 tests/scancode/data/resource/samples/JGroups/src/RouterStubManager.java
 create mode 100644 tests/scancode/data/resource/samples/JGroups/src/S3_PING.java
 create mode 100644 tests/scancode/data/resource/samples/README
 create mode 100644 tests/scancode/data/resource/samples/arch/zlib.tar.gz
 create mode 100644 tests/scancode/data/resource/samples/screenshot.png
 create mode 100644 tests/scancode/data/resource/samples/zlib/ada/zlib.ads
 create mode 100644 tests/scancode/data/resource/samples/zlib/adler32.c
 create mode 100644 tests/scancode/data/resource/samples/zlib/deflate.c
 create mode 100644 tests/scancode/data/resource/samples/zlib/deflate.h
 create mode 100644 tests/scancode/data/resource/samples/zlib/dotzlib/AssemblyInfo.cs
 create mode 100644 tests/scancode/data/resource/samples/zlib/dotzlib/ChecksumImpl.cs
 create mode 100644 tests/scancode/data/resource/samples/zlib/dotzlib/LICENSE_1_0.txt
 create mode 100644 tests/scancode/data/resource/samples/zlib/dotzlib/readme.txt
 create mode 100644 tests/scancode/data/resource/samples/zlib/gcc_gvmat64/gvmat64.S
 create mode 100644 tests/scancode/data/resource/samples/zlib/infback9/infback9.c
 create mode 100644 tests/scancode/data/resource/samples/zlib/infback9/infback9.h
 create mode 100644 tests/scancode/data/resource/samples/zlib/iostream2/zstream.h
 create mode 100644 tests/scancode/data/resource/samples/zlib/iostream2/zstream_test.cpp
 create mode 100644 tests/scancode/data/resource/samples/zlib/zlib.h
 create mode 100644 tests/scancode/data/resource/samples/zlib/zutil.c
 create mode 100644 tests/scancode/data/resource/samples/zlib/zutil.h

diff --git a/.gitignore b/.gitignore
index 8d35930fb9f..a39bc6d78ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ docs/_build
 
 # pyenv
 /.python-version
+/man/
diff --git a/etc/scripts/testdata/livescan/expected.csv b/etc/scripts/testdata/livescan/expected.csv
index 12a85b45888..6950b3d7305 100644
--- a/etc/scripts/testdata/livescan/expected.csv
+++ b/etc/scripts/testdata/livescan/expected.csv
@@ -1,5 +1,5 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count,size_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
-/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1599,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,0,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Resource,type,name,base_name,extension,size,date,sha1,md5,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,files_count,dirs_count,size_count,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+/json2csv.rb,file,json2csv.rb,json2csv,.rb,1599,2017-10-03,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
@@ -7,9 +7,9 @@ Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,file,license,license,,679,2017-10-03,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,text/plain,ASCII text,,False,True,False,False,False,False,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /license,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
-/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/package.json,file,package.json,package,.json,2200,2017-10-03,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
diff --git a/setup.py b/setup.py
index 8c98901422c..4ccbc0ec9ff 100644
--- a/setup.py
+++ b/setup.py
@@ -224,6 +224,7 @@ def read(*names, **kwargs):
         #
         # See also plugincode.scan module for details and doc.
         'scancode_scan': [
+            'info = scancode.plugin_info:InfoScanner',
             'licenses = scancode.plugin_license:LicenseScanner',
             'copyrights = scancode.plugin_copyright:CopyrightScanner',
             'packages = scancode.plugin_package:PackageScanner',
diff --git a/src/formattedcode/output_json.py b/src/formattedcode/output_json.py
index f168c854543..23751d107de 100644
--- a/src/formattedcode/output_json.py
+++ b/src/formattedcode/output_json.py
@@ -110,10 +110,9 @@ def write_json(results, output_file, files_count,
 
     kwargs = dict(iterable_as_array=True, encoding='utf-8')
     if pretty:
-        kwargs['indent'] = 2 * b' '
+        kwargs.update(dict(indent=2 * b' '))
     else:
-        kwargs['separators'] = (b',', b':',)
+        kwargs.update(dict(separators=(b',', b':',)))
 
-    # FIXME: Why do we wrap the output in unicode? Test output when we do not wrap the output in unicode
     output_file.write(simplejson.dumps(scan, **kwargs))
     output_file.write(b'\n')
diff --git a/src/formattedcode/output_spdx.py b/src/formattedcode/output_spdx.py
index 3ec2770f5d0..e910116e17d 100644
--- a/src/formattedcode/output_spdx.py
+++ b/src/formattedcode/output_spdx.py
@@ -91,19 +91,17 @@ def logger_debug(*args):
 @output_impl
 class SpdxTvOutput(OutputPlugin):
 
-    needs_info = True
-
     options = [
         CommandLineOption(('--output-spdx-tv',),
             type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output as SPDX Tag/Value to FILE. '
-                 'Implies running the --info scan.',
+            requires=['info'],
+            help='Write scan output as SPDX Tag/Value to FILE.',
             help_group=OUTPUT_GROUP)
     ]
 
-    def is_enabled(self, output_spdx_tv, **kwargs):
-        return output_spdx_tv
+    def is_enabled(self, output_spdx_tv, info, **kwargs):
+        return output_spdx_tv and info
 
     def process_codebase(self, codebase,
                          input,  # NOQA
@@ -122,13 +120,13 @@ class SpdxRdfOutput(OutputPlugin):
         CommandLineOption(('--output-spdx-rdf',),
             type=FileOptionType(mode='wb', lazy=False),
             metavar='FILE',
-            help='Write scan output as SPDX RDF to FILE. '
-                 'Implies running the --info scan.',
+            requires=['info'],
+            help='Write scan output as SPDX RDF to FILE.',
             help_group=OUTPUT_GROUP)
     ]
 
-    def is_enabled(self, output_spdx_rdf, **kwargs):
-        return output_spdx_rdf
+    def is_enabled(self, output_spdx_rdf, info, **kwargs):
+        return output_spdx_rdf and info
 
     def process_codebase(self, codebase,
                          input,  # NOQA
diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index 6a1351996fc..f5757b6b81b 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -39,11 +39,6 @@ class BasePlugin(object):
     """
     A base class for all ScanCode plugins.
     """
-    # List of stage:name strings that this plugin requires to run before it
-    # runs.
-    # Subclasses should set this as needed
-    requires = []
-
     # List of CommandLineOption CLI options for this plugin.
     # Subclasses should set this as needed
     options = []
@@ -64,6 +59,17 @@ class BasePlugin(object):
     # Subclasses must not set this.
     name = None
 
+    # An ordered mapping of attr attributes that specifies the data returned by
+    # this plugin. These attributes will be added to a Resource subclass. The
+    # position of these attributes in the returned serialized data is determined
+    # by the sort_order then the plugin name
+    attributes = OrderedDict()
+
+    # a relative sort order number (integer or float). In scan results, results
+    # from scanners are sorted by this sorted_order then by "keys".
+    # This is also used in the CLI UI to sort the SCAN_GROUP option help group.
+    sort_order = 100
+
     def __init__(self, *args, **kwargs):
         """
         Initialize a new plugin with a user kwargs.
@@ -113,71 +119,11 @@ def get_option(self, name):
         """
         return self.options_by_name.get(name)
 
-    def is_active(self, plugins, *args, **kwargs):
-        """
-        Return True is this plugin is enabled meaning it is enabled and all its
-        required plugins are enabled.
-        """
-        return (self.is_enabled()
-                and all(p.is_enabled() for p in self.requirements(plugins)))
-
-    def requirements(self, plugins, resolved=None):
-        """
-        Return a tuple of (original list of `plugins` arg, as-is, list of unique
-        required plugins by this plugin recursively) given a `plugins` list of all
-        plugins and an optional list of already `resolved` plugins.
-
-        Raise an Exception if there are inconsistencies in the plugins graph,
-        such as self-referencing plugins, missing plugins or requirements
-        cycles.
-        """
-        if  resolved is None:
-            resolved = []
-
-        qname = self.qname
-        required_qnames = unique(qn for qn in self.requires if qn != qname)
-        plugins_by_qname = {p.qname: p for p in plugins}
-        resolved_by_qname = {p.qname: p for p in resolved}
-
-        direct_requirements = []
-        for required_qname in self.requires:
-
-            if required_qname == self.name:
-                raise Exception(
-                    'Plugin %(qname)r cannot require itself.' % locals())
-
-            if required_qname not in plugins_by_qname:
-                raise Exception(
-                    'Missing required plugin %(required_qname)r '
-                    'for plugin %(qname)r.' % locals())
-
-            if required_qname in resolved_by_qname:
-                # already satisfied
-                continue
-
-            required = plugins_by_qname[required_qname]
-            direct_requirements.append(required)
-            resolved.append(required)
-
-        for required in direct_requirements:
-            plugins, resolved = required.walk_requirements(plugins, resolved)
-
-            if self in resolved:
-                req_chain = ' -> '.join(p.qname for p in resolved)
-                raise Exception(
-                    'Requirements for plugin %(qname)r are circular: '
-                    '%(req_chain)s.' % locals())
-
-        return plugins, resolved
-
 
 class CodebasePlugin(BasePlugin):
     """
     Base class for plugins that process a whole codebase at once.
     """
-    # flag set to True if this plugin needs file information available to run.
-    # Subclasses should set this as needed.
-    needs_info = False
 
     def process_codebase(self, codebase, **kwargs):
         """
@@ -188,20 +134,6 @@ def process_codebase(self, codebase, **kwargs):
         raise NotImplementedError
 
 
-def unique(iterable):
-    """
-    Return a sequence of unique items in `iterable` keeping their original order.
-    """
-    seen = set()
-    uni = []
-    for item in iterable:
-        if item in seen:
-            continue
-        uni.append(item)
-        seen.add(item)
-    return uni
-
-
 class PluginManager(object):
     """
     A PluginManager class for plugins.
@@ -212,9 +144,9 @@ class PluginManager(object):
 
     def __init__(self, stage, module_qname, entrypoint, plugin_base_class):
         """
-        Initialize this manager for the `stage` string in
-        module `module_qname` with plugins loaded from the setuptools
-        `entrypoint` that must subclass `plugin_base_class`.
+        Initialize this plugin manager for the `stage` specified in the fully
+        qualified Python module name `module_qname` with plugins loaded from the
+        setuptools `entrypoint` that must subclass `plugin_base_class`.
         """
         self.manager = PluggyPluginManager(project_name=stage)
         self.managers[stage] = self
@@ -232,7 +164,7 @@ def __init__(self, stage, module_qname, entrypoint, plugin_base_class):
         self.plugin_classes = OrderedDict()
 
     @classmethod
-    def setup_all(cls):
+    def load_plugins(cls):
         """
         Setup the plugins enviroment.
         Must be called once to initialize all the plugins of all managers.
@@ -266,14 +198,14 @@ def setup(self):
         for name, plugin_class in self.manager.list_name_plugin():
 
             if not issubclass(plugin_class, self.plugin_base_class):
-                qname = '%(entrypoint)s:%(name)s' % locals()
+                qname = '%(stage)s:%(name)s' % locals()
                 raise Exception(
                     'Invalid plugin: %(qname)r: %(plugin_class)r '
                     'must extend %(plugin_base_class)r.' % locals())
 
             for option in plugin_class.options:
                 if not isinstance(option, CommandLineOption):
-                    qname = '%(entrypoint)s:%(name)s' % locals()
+                    qname = '%(stage)s:%(name)s' % locals()
                     oname = option.name
                     clin = CommandLineOption
                     raise Exception(
@@ -288,3 +220,4 @@ def setup(self):
 
         self.initialized = True
         return self.plugin_classes.values(), plugin_options
+
diff --git a/src/plugincode/output.py b/src/plugincode/output.py
index 5ce2475e76b..987e6b04774 100644
--- a/src/plugincode/output.py
+++ b/src/plugincode/output.py
@@ -92,13 +92,10 @@ def get_results(cls, codebase, info, full_root, strip_root, timing, **kwargs):
         """
         Return an iterable of serialized scan results from a codebase.
         """
-        serializer = partial(Resource.to_dict,
-                             full_root=full_root, strip_root=strip_root,
-                             with_info=info, with_timing=timing)
-
-        resources = codebase.walk(topdown=True, skip_root=strip_root,
-                                  skip_filtered=True)
-
+        # FIXME: serialization SHOULD NOT be needed: only some format need it
+        # (e.g. JSON) and only these should serialize
+        serializer = partial(Resource.to_dict, with_info=info, with_timing=timing)
+        resources = codebase.walk_filtered(topdown=True, skip_root=strip_root)
         return imap(serializer, resources)
 
 
diff --git a/src/plugincode/output_filter.py b/src/plugincode/output_filter.py
index 8f5e06ca84b..9c3f4a2e768 100644
--- a/src/plugincode/output_filter.py
+++ b/src/plugincode/output_filter.py
@@ -45,7 +45,7 @@ class OutputFilterPlugin(CodebasePlugin):
     Base plugin class for Resource output filter plugins that all output filter
     plugins must extend.
 
-    Filter plugins SHOULD NOT modify the codebase beyond setting the
+    Filter plugins MUST NOT modify the codebase beyond setting the
     Resource.is_filtered flag on resources.
     """
     pass
diff --git a/src/plugincode/pre_scan.py b/src/plugincode/pre_scan.py
index 7d67b2d03eb..a44026c7135 100644
--- a/src/plugincode/pre_scan.py
+++ b/src/plugincode/pre_scan.py
@@ -42,7 +42,61 @@ class PreScanPlugin(CodebasePlugin):
     """
     A pre-scan plugin base class that all pre-scan plugins must extend.
     """
-    pass
+
+    # List of scanner name strings that this plugin requires to run first
+    # before this pres-scan plugin runs.
+    # Subclasses should set this as needed
+    requires = []
+
+    def get_required(self, scanner_plugins):
+        """
+        Return a list of required scanner plugin instances that are direct
+        requirements of self.
+
+        `scanner_plugins` is a {name: plugin} mapping of enabled scanner
+        plugins.
+        """
+        required = []
+
+        for name in self.requires:
+            required_plugin = scanner_plugins.get(name)
+
+            if not required_plugin:
+                qname = self.qname
+                raise Exception(
+                    'Missing required scan plugin: %(name)r '
+                    'for plugin: %(qname)r.' % locals())
+
+            required.append(required_plugin)
+
+        return unique(required)
+
+    @classmethod
+    def get_all_required(self, prescan_plugins, scanner_plugins):
+        """
+        Return a list of unique required scanner plugin instances that are direct
+        requirements of any of the `prescan_plugins` pre-scan plugin instances.
+        `prescan_plugins` is a list of enabled pre-scan plugins.
+        `scanner_plugins` is a {name: plugin} mapping of enabled scanner
+        plugins.
+        """
+        required = []
+        for plugin in prescan_plugins:
+            required.extend(plugin.get_required(scanner_plugins))
+        return unique(required)
+
+
+def unique(iterable):
+    """
+    Return a sequence of unique items in `iterable` keeping their
+    original order.
+    Note: this can be very slow for large sequences as this is using lists.
+    """
+    uniques = []
+    for item in iterable:
+        if item not in uniques:
+            uniques.append(item)
+    return uniques
 
 
 pre_scan_plugins = PluginManager(
diff --git a/src/plugincode/scan.py b/src/plugincode/scan.py
index a11a265b2ae..77f12ac57e4 100644
--- a/src/plugincode/scan.py
+++ b/src/plugincode/scan.py
@@ -47,19 +47,38 @@ class ScanPlugin(BasePlugin):
     name used for this plugin.
     """
 
-    # a relative sort order number (integer or float). In scan results, results
-    # from scanners are sorted by this sorted_order then by "key" which is the
-    # scanner plugin name. This is also used in the CLI UI
-    sort_order = 100
-
-    # TODO: pass own command options name/values as concrete kwargs
     def get_scanner(self, **kwargs):
         """
-        Return a scanner callable that takes a single `location` argument.
+        Return a scanner callable, receiving all the scancode call arguments as
+        kwargs.
+
+        The returned callable MUST be a top-level module importable function
+        (e.g. that is picklable and it can be possibly closed on argumenst with
+        functools.partial) and accept these arguments:
+
+        - a first `location` argument that is always an absolute path string to
+          a file. This string is using the filesystem encoding (e.g. bytes on
+          Linux and Unicode elsewhere).
+
+        - other **kwargs that will be all the scancode call arguments.
+
+        The returned callable MUST RETURN an ordered mapping of key/values that
+        must be serializable to JSON.
+
+        All mapping keys must be strings, including for any nested mappings.
+
+        Any value must be one of:
+        - None, unicode or str, int, flota, long.
+          str if not unicode WILL be converted to unicode with UTF-8.
+        - iterable/list/tuple/generator or dict/mapping preferrably ordered.
+        - any object beyond these above that has an asdict() ot to_dict() method
+          that returns an ordered mapping of key/values of the same styke the
+          top-level mapping defined here.
+
         This callable (typically a bare function) should carry as little state
         as possible as it may be executed through multiprocessing.
+
         Subclasses must override.
-        This receives all the ScanCode call arguments as kwargs.
         """
         raise NotImplementedError
 
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index 5c07e10a1c7..a691742f4d1 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -87,7 +87,7 @@ def logger_debug(*args):
 
 # Holds a scan plugin result "key and the corresponding function.
 # click.Parameter instance
-Scanner = namedtuple('Scanner', 'key function')
+Scanner = namedtuple('Scanner', 'name function')
 
 
 class CommandLineOption(click.Option):
diff --git a/src/scancode/api.py b/src/scancode/api.py
index 5a0092ba41c..3675807fc2f 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -31,12 +31,7 @@
 from os.path import getsize
 
 from commoncode.filetype import get_last_modified_date
-from commoncode.filetype import get_type as get_simple_type
-from commoncode.filetype import is_file as filetype_is_file
-from commoncode.fileutils import file_name
-from commoncode.fileutils import splitext
 from commoncode.hash import multi_checksums
-from commoncode.system import on_linux
 from typecode.contenttype import get_type
 
 """
@@ -51,7 +46,8 @@
 
 def get_copyrights(location, **kwargs):
     """
-    Return a list of mappings for copyright detected in the file at `location`.
+    Return a mapping with a single 'copyrights' key with a value that is a list
+    of mappings for copyright detected in the file at `location`.
     """
     from cluecode.copyrights import detect_copyrights
     results = []
@@ -64,12 +60,13 @@ def get_copyrights(location, **kwargs):
         result['authors'] = authors
         result['start_line'] = start_line
         result['end_line'] = end_line
-    return results
+    return dict(copyrights=results)
 
 
 def get_emails(location, **kwargs):
     """
-    Return a list of mappings for emails detected in the file at `location`.
+    Return a mapping with a single 'emails' key with a value that is a list of
+    mappings for emails detected in the file at `location`.
     """
     from cluecode.finder import find_emails
     results = []
@@ -81,12 +78,13 @@ def get_emails(location, **kwargs):
         result['email'] = email
         result['start_line'] = line_num
         result['end_line'] = line_num
-    return results
+    return dict(emails=results)
 
 
 def get_urls(location, **kwargs):
     """
-    Return a list of mappings for urls detected in the file at `location`.
+    Return a mapping with a single 'urls' key with a value that is a list of
+    mappings for urls detected in the file at `location`.
     """
     from cluecode.finder import find_urls
     results = []
@@ -98,7 +96,7 @@ def get_urls(location, **kwargs):
         result['url'] = urls
         result['start_line'] = line_num
         result['end_line'] = line_num
-    return results
+    return dict(urls=results)
 
 
 DEJACODE_LICENSE_URL = 'https://enterprise.dejacode.com/urn/urn:dje:license:{}'
@@ -110,7 +108,8 @@ def get_licenses(location, min_score=0, include_text=False, diag=False,
                  cache_dir=None,
                  **kwargs):
     """
-    Return a list of mappings for licenses detected in the file at `location`.
+    Return a mapping with a single 'licenses' key with a value that is list of
+    mappings for licenses detected in the file at `location`.
 
     `minimum_score` is a minimum score threshold from 0 to 100. The default is 0
     means that all license matches are returned. Otherwise, matches with a score
@@ -173,58 +172,45 @@ def get_licenses(location, min_score=0, include_text=False, diag=False,
             if include_text:
                 result['matched_text'] = matched_text
 
-    return results
+    return dict(licenses=results)
 
 
 def get_package_info(location, **kwargs):
     """
-    Return a list of mappings for package information detected in the file at
-    `location`.
+    mappings for package information detected in the file at `location`.
     """
     from packagedcode.recognize import recognize_package
     package = recognize_package(location)
-    results = []
     if package:
-        results.append(package.to_dict())
-    return results
+        return  dict(packages=[package.to_dict()])
+    return dict(packages=[])
 
 
 def get_file_info(location, **kwargs):
     """
-    Return a list of mappings for file information collected for the file or
-    directory at `location`.
+    Return a mappings of file information collected for the file at `location`.
     """
     result = OrderedDict()
-    results = [result]
+
+    # TODO: move date and size these to the inventory collection step???
+    result['date'] = get_last_modified_date(location) or None
+    result['size'] = getsize(location) or 0
+
+    sha1, md5 = multi_checksums(location, ('sha1', 'md5',)).values()
+    result['sha1'] = sha1
+    result['md5'] = md5
 
     collector = get_type(location)
-    result['type'] = get_simple_type(location, short=False)
-    is_file = filetype_is_file(location)
-
-    if is_file:
-        base_name, extension = splitext(location)
-    else:
-        # directories have no extension
-        base_name = file_name(location)
-        extension = b'' if on_linux else ''
-    result['base_name'] = base_name
-    result['extension'] = extension
-
-    if is_file:
-        result['date'] = get_last_modified_date(location) or None
-        result['size'] = getsize(location) or 0
-        result.update(multi_checksums(location, ('sha1', 'md5',)))
-        result['mime_type'] = collector.mimetype_file or None
-        result['file_type'] = collector.filetype_file or None
-        result['programming_language'] = collector.programming_language or None
-        result['is_binary'] = bool(collector.is_binary)
-        result['is_text'] = bool(collector.is_text)
-        result['is_archive'] = bool(collector.is_archive)
-        result['is_media'] = bool(collector.is_media)
-        result['is_source'] = bool(collector.is_source)
-        result['is_script'] = bool(collector.is_script)
-
-    return results
+    result['mime_type'] = collector.mimetype_file or None
+    result['file_type'] = collector.filetype_file or None
+    result['programming_language'] = collector.programming_language or None
+    result['is_binary'] = bool(collector.is_binary)
+    result['is_text'] = bool(collector.is_text)
+    result['is_archive'] = bool(collector.is_archive)
+    result['is_media'] = bool(collector.is_media)
+    result['is_source'] = bool(collector.is_source)
+    result['is_script'] = bool(collector.is_script)
+    return result
 
 
 def extract_archives(location, recurse=True):
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 63030357d59..4a93979a013 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -40,12 +40,15 @@
 from time import time
 import traceback
 
+import attr
 import click
+from scancode.resource import Resource
 click.disable_unicode_literals_warning = True
 
 # import early
 from scancode_config import __version__ as scancode_version
-from scancode_config import scancode_temp_dir, scancode_cache_dir
+from scancode_config import scancode_cache_dir
+from scancode_config import scancode_temp_dir
 
 from commoncode.fileutils import PATH_TYPE
 from commoncode.timeutils import time2tstamp
@@ -73,7 +76,6 @@
 from scancode import SCAN_OPTIONS_GROUP
 from scancode import Scanner
 from scancode import validate_option_dependencies
-from scancode.api import get_file_info
 from scancode.interrupt import DEFAULT_TIMEOUT
 from scancode.interrupt import fake_interruptible
 from scancode.interrupt import interruptible
@@ -313,7 +315,7 @@ def format_options(self, ctx, formatter):
 
 
 # IMPORTANT: this discovers, loads and validates all available plugins
-plugin_classes, plugin_options = PluginManager.setup_all()
+plugin_classes, plugin_options = PluginManager.load_plugins()
 
 
 def print_plugins(ctx, param, value):
@@ -323,13 +325,9 @@ def print_plugins(ctx, param, value):
         click.echo('--------------------------------------------')
         click.echo('Plugin: scancode_{self.stage}:{self.name}'.format(self=plugin_cls), nl=False)
         click.echo('  class: {self.__module__}:{self.__name__}'.format(self=plugin_cls))
-        requires = ', '.join(plugin_cls.requires)
-        click.echo('  requires: {}'.format(requires), nl=False)
-        needs_info = getattr(plugin_cls, 'needs_info', False)
-        if needs_info:
-            click.echo(' needs_info: yes')
-        else:
-            click.echo('')
+        if hasattr(plugin_cls, 'requires'):
+            requires = ', '.join(plugin_cls.requires)
+            click.echo('  requires: {}'.format(requires), nl=False)
         click.echo('  doc: {self.__doc__}'.format(self=plugin_cls))
         click.echo('  options:'.format(self=plugin_cls))
         for option in plugin_cls.options:
@@ -353,11 +351,6 @@ def print_plugins(ctx, param, value):
 @click.argument('input', metavar='<input> <OUTPUT FORMAT OPTION(s)>',
     type=click.Path(exists=True, readable=True, path_type=PATH_TYPE))
 
-@click.option('-i', '--info',
-    is_flag=True,
-    help='Scan <input> for file information (size, type, checksums, etc).',
-    help_group=OTHER_SCAN_GROUP, sort_order=10, cls=CommandLineOption)
-
 @click.option('--strip-root',
     is_flag=True,
     conflicts=['full_root'],
@@ -441,35 +434,40 @@ def print_plugins(ctx, param, value):
     help='Collect scan timing for each scan/scanned file.',
     help_group=CORE_GROUP, sort_order=250, cls=CommandLineOption)
 
-@click.option('--on-disk-results',
-    is_flag=True, default=True,
+@click.option('--max-in-memory',
+    type=int, default=10000,
     show_default=True,
-    help='Save intermediate scan results in temporary files. Uses less memory.',
+    help=
+    'Maximum number of files and directories scan details kept in memory '
+    'during a scan. Additional files and directories scan details above this '
+    'number are cached on-disk rather than in memory. '
+    'Use 0 to use unlimited memory and disable on-disk caching. '
+    'Use -1 to use only on-disk caching.',
     help_group=CORE_GROUP, sort_order=300, cls=CommandLineOption)
 
 @click.help_option('-h', '--help',
     help_group=DOC_GROUP, sort_order=10, cls=CommandLineOption)
 
 @click.option('--about',
-    is_flag=True, is_eager=True,
+    is_flag=True, is_eager=True, expose_value=False,
     callback=print_about,
     help='Show information about ScanCode and licensing and exit.',
     help_group=DOC_GROUP, sort_order=20, cls=CommandLineOption)
 
 @click.option('--version',
-    is_flag=True, is_eager=True,
+    is_flag=True, is_eager=True, expose_value=False,
     callback=print_version,
     help='Show the version and exit.',
     help_group=DOC_GROUP, sort_order=20, cls=CommandLineOption)
 
 @click.option('--examples',
-    is_flag=True, is_eager=True,
+    is_flag=True, is_eager=True, expose_value=False,
     callback=print_examples,
     help=('Show command examples and exit.'),
     help_group=DOC_GROUP, sort_order=50, cls=CommandLineOption)
 
 @click.option('--plugins',
-    is_flag=True, is_eager=True,
+    is_flag=True, is_eager=True, expose_value=False,
     callback=print_plugins,
     help='Show the list of available ScanCode plugins and exit.',
     help_group=DOC_GROUP, cls=CommandLineOption)
@@ -480,14 +478,14 @@ def print_plugins(ctx, param, value):
     hidden=True,
     help='Run ScanCode in a special "test mode". Only for testing.',
     help_group=MISC_GROUP, sort_order=1000, cls=CommandLineOption)
+
 def scancode(ctx, input,  # NOQA
-             info,
              strip_root, full_root,
              processes, timeout,
              quiet, verbose,
              cache_dir, temp_dir,
              timing,
-             on_disk_results,
+             max_in_memory,
              test_mode,
              *args, **kwargs):
     """scan the <input> file or directory for license, origin and packages and save results to FILE(s) using one or more ouput format option.
@@ -568,13 +566,16 @@ def scancode(ctx, input,  # NOQA
     # build mappings of all kwargs to pass down to plugins
     standard_kwargs = dict(
         input=input,
-        info=info,
-        strip_root=strip_root, full_root=full_root,
-        processes=processes, timeout=timeout,
-        quiet=quiet, verbose=verbose,
-        cache_dir=cache_dir, temp_dir=temp_dir,
+        strip_root=strip_root,
+        full_root=full_root,
+        processes=processes,
+        timeout=timeout,
+        quiet=quiet,
+        verbose=verbose,
+        cache_dir=cache_dir,
+        temp_dir=temp_dir,
         timing=timing,
-        on_disk_results=on_disk_results,
+        max_in_memory=max_in_memory,
         test_mode=test_mode
     )
     kwargs.update(standard_kwargs)
@@ -586,16 +587,18 @@ def scancode(ctx, input,  # NOQA
     # UTC start timestamp
     scan_start = time2tstamp()
 
-    try:
-
-        if not processes and not quiet:
+    if not quiet:
+        if not processes:
             echo_stderr('Disabling multi-processing for debugging.', fg='yellow')
-        if processes == -1  and not quiet:
-            echo_stderr('Disabling multi-processing and multi-threading for debugging.', fg='yellow')
+        elif processes == -1:
+            echo_stderr('Disabling multi-processing '
+                        'and multi-threading for debugging.', fg='yellow')
 
+    try:
         ########################################################################
-        # 1. get command options and create all plugin instances
+        # 1. create all plugin instances
         ########################################################################
+        # FIXME:
         validate_option_dependencies(ctx)
 
         if TRACE_DEEP:
@@ -604,6 +607,8 @@ def scancode(ctx, input,  # NOQA
             for co in ctx.params:
                 logger_debug('  scancode: ctx.params:', co)
 
+        # NOTE and FIXME: this is a two level nested mapping, which is TOO
+        # complicated
         enabled_plugins = OrderedDict()
 
         for stage, manager in PluginManager.managers.items():
@@ -619,23 +624,23 @@ def scancode(ctx, input,  # NOQA
                     echo_stderr(traceback.format_exc())
                     ctx.exit(2)
 
-        # these are plugin instances, not classes
+        # NOTE: these are mappings of plugin instances, not classes!
         pre_scan_plugins = enabled_plugins[pre_scan.stage]
         scanner_plugins = enabled_plugins[scan.stage]
         post_scan_plugins = enabled_plugins[post_scan.stage]
         output_filter_plugins = enabled_plugins[output_filter.stage]
         output_plugins = enabled_plugins[output.stage]
 
+        if not scanner_plugins:
+            msg = ('Missing scan option(s): at least one scan '
+                   'option is required.')
+            raise click.UsageError(msg)
+
         if not output_plugins:
             msg = ('Missing output option(s): at least one output '
-                   'option is needed to save scan results.')
+                   'option is required to save scan results.')
             raise click.UsageError(msg)
 
-        # Use default info scan when no other scan options are requested
-        if not scanner_plugins and not info:
-            # add info scan as scan option/kwarg/locals()
-            info = ctx.params['info'] = kwargs['info'] = True
-
         # TODO: check for plugin dependencies and if a plugin is ACTIVE!!!
 
         ########################################################################
@@ -668,6 +673,47 @@ def scancode(ctx, input,  # NOQA
 
         setup_timings['setup'] = time() - plugins_setup_start
 
+        ########################################################################
+        # 2.5. Create a new Resource subclass for this scan
+        ########################################################################
+        # Craft a new Resource class with the attributes contributed by plugins
+        sortable_attributes = []
+
+        # mapping of {"plugin stage:name": [list of attribute keys]}
+        # also available as a kwarg entry for plugin
+        kwargs['attributes_by_plugin'] = attributes_by_plugin = {}
+        for stage, stage_plugins in enabled_plugins.items():
+            for name, plugin in stage_plugins.items():
+                try:
+                    sortable_attributes.append(
+                        (plugin.sort_order, name, plugin.attributes,)
+                    )
+                    attributes_by_plugin[plugin.qname] = plugin.attributes.keys()
+                except:
+                    msg = ('ERROR: failed to collect attributes for plugin: '
+                           '%(stage)s:%(name)s:' % locals())
+                    echo_stderr(msg, fg='red')
+                    echo_stderr(traceback.format_exc())
+                    ctx.exit(2)
+
+        attributes = OrderedDict()
+        for _, name, attribs in sorted(sortable_attributes):
+            attributes.update(attribs)
+
+        # FIXME: workaround for https://github.com/python-attrs/attrs/issues/339
+        # we reset the _CountingAttribute internal .counter to a proper value
+        # that matches our ordering
+        for order, attrib in enumerate(attributes.values(), 100):
+            attrib.counter = order
+
+        if TRACE_DEEP:
+            logger_debug('scancode:attributes')
+            for a in attributes.items():
+                logger_debug(a)
+
+        resource_class = attr.make_class(
+            name=b'ScannedResource', attrs=attributes, bases=(Resource,))
+
         ########################################################################
         # 3. collect codebase inventory
         ########################################################################
@@ -679,59 +725,45 @@ def scancode(ctx, input,  # NOQA
 
         # TODO: add progress indicator
         # note: inventory timing collection is built in Codebase initialization
+        # TODO: this should also compute the basic base_name/ext and collect size/dates
         try:
             codebase = Codebase(
-                location=input, use_cache=on_disk_results, temp_dir=temp_dir)
+                location=input,
+                resource_class=resource_class,
+                full_root=full_root,
+                strip_root=strip_root,
+                temp_dir=temp_dir,
+                max_in_memory=max_in_memory
+            )
         except:
             msg = 'ERROR: failed to collect codebase at: %(input)r' % locals()
             echo_stderr(msg, fg='red')
             echo_stderr(traceback.format_exc())
             ctx.exit(2)
 
-        if TRACE:
-            logger_debug('scancode: codebase.use_cache:', codebase.use_cache)
-
+        # TODO: this is weird: may be the timings should NOt be stored on the
+        # codebase, since they exist in abstract of it??
         codebase.timings.update(setup_timings)
 
         codebase.timings['inventory'] = time() - inventory_start
-
         files_count, dirs_count, size_count = codebase.compute_counts()
-        codebase.summary['initial_files_count'] = files_count
-        codebase.summary['initial_dirs_count'] = dirs_count
-        codebase.summary['initial_size_count'] = size_count
+        codebase.summary['initial:files_count'] = files_count
+        codebase.summary['initial:dirs_count'] = dirs_count
+        codebase.summary['initial:size_count'] = size_count
 
         ########################################################################
-        # 4. if any prescan plugins needs_info run an info scan first
+        # 4. prescan scans: run the early scans required by prescan plugins
         ########################################################################
+        # FIXME: this stage is extremely convoluted and needs cleaning!
 
-        # do we need to collect info before prescan?
-        pre_scan_needs_info = any(p.needs_info for p in pre_scan_plugins.values())
-
-        info_is_collected = False
-
-        if pre_scan_needs_info:
-            # add info scan as scan option/kwarg/locals()
-            info = ctx.params['info'] = kwargs['info'] = True
+        # resolve pre-scan plugin requirements that require a scan first
+        early_scan_plugins = pre_scan.PreScanPlugin.get_all_required(
+            pre_scan_plugins.values(), scanner_plugins)
 
-            info_start = time()
-
-            progress_manager = None
-            if not quiet:
-                echo_stderr('Collect file information for pre-scans '
-                            'with %(processes)d process(es)...' % locals())
-                item_show_func = partial(path_progress_message, verbose=verbose)
-                progress_manager = partial(progressmanager,
-                    item_show_func=item_show_func, verbose=verbose, file=sys.stderr)
-
-            scanners = [Scanner(key='infos', function=get_file_info)]
-            # TODO: add CLI option to bypass cache entirely
-            info_success = scan_codebase(codebase, scanners, processes, timeout,
-                with_timing=timing, progress_manager=progress_manager)
-
-            info_is_collected = True
-            codebase.timings['collect-info'] = time() - info_start
-
-            success = success and info_success
+        success = success and run_scanners(early_scan_plugins , codebase,
+                                           processes, timeout, timing,
+                                           quiet, verbose,
+                                           stage='pre-scan-scan', kwargs=kwargs)
 
         ########################################################################
         # 5. run prescans
@@ -748,59 +780,14 @@ def scancode(ctx, input,  # NOQA
         # 6. run scans.
         ########################################################################
 
-        scan_start = time()
-        scanners = []
-
-        if not info:
-            next_stages = (post_scan_plugins.values()
-                           + output_filter_plugins.values()
-                           + output_plugins.values())
-
-            next_stages_need_info = any(p.needs_info for p in next_stages)
-            # add info is requested or needed but not yet collected
-            if next_stages_need_info:
-                # add info scan as scan option
-                info = True
-                ctx.params['info'] = info
+        # do not rerun scans already done in prescan-scan
+        scan_plugins = [p for p in scanner_plugins.values()
+                        if p not in early_scan_plugins]
 
-        if info and not info_is_collected:
-            scanners = [Scanner(key='infos', function=get_file_info)]
-
-        scan_sorter = lambda s: (s.sort_order, s.name)
-        for scanner in sorted(scanner_plugins.values(), key=scan_sorter):
-            func = scanner.get_scanner(**kwargs)
-            scanners.append(Scanner(key=scanner.name, function=func))
-
-        if TRACE_DEEP: logger_debug('scancode: scanners:', scanners)
-
-        if scanners:
-            scan_names = ', '.join(s.key for s in scanners)
-
-            if not quiet:
-                echo_stderr('Scan files for: %(scan_names)s '
-                            'with %(processes)d process(es)...' % locals())
-
-            progress_manager = None
-            if not quiet:
-                item_show_func = partial(path_progress_message, verbose=verbose)
-                progress_manager = partial(progressmanager,
-                    item_show_func=item_show_func,
-                    verbose=verbose, file=sys.stderr)
-
-            # TODO: add CLI option to bypass cache entirely?
-            scan_success = scan_codebase(
-                codebase, scanners, processes, timeout,
-                with_timing=timing, progress_manager=progress_manager)
-
-            scanned_fc, scanned_dc, scanned_sc = codebase.compute_counts()
-
-            codebase.summary['scan_names'] = scan_names
-            codebase.summary['scanned_files_count'] = scanned_fc
-            codebase.summary['scanned_dirs_count'] = scanned_dc
-            codebase.summary['scanned_size_count'] = scanned_sc
-            codebase.timings['scan'] = time() - scan_start
-
-            success = success and scan_success
+        success = success and run_scanners(scan_plugins, codebase,
+                                           processes, timeout, timing,
+                                           quiet, verbose,
+                                           stage='scan', kwargs=kwargs)
 
         ########################################################################
         # 7. run postscans
@@ -825,19 +812,20 @@ def scancode(ctx, input,  # NOQA
                     plugin_msg=' Apply %(stage)s: %(name)s...')
 
         ########################################################################
-        # 9. run outputs
+        # 9. save outputs
         ########################################################################
 
-        # TODO: cleanup kwargs vs. codebase attrs
-        files_count, dirs_count, size_count = codebase.compute_counts(
-            skip_root=strip_root, skip_filtered=True)
+        counts = codebase.compute_counts(skip_root=strip_root, skip_filtered=True)
+        files_count, dirs_count, size_count = counts
 
-        codebase.summary['final_files_count'] = files_count
-        codebase.summary['final_dirs_count'] = dirs_count
-        codebase.summary['final_size_count'] = size_count
+        # TODO: cleanup kwargs vs. codebase attrs
+        codebase.summary['final:files_count'] = files_count
+        codebase.summary['final:dirs_count'] = dirs_count
+        codebase.summary['final:size_count'] = size_count
 
+        # WHY this count here?
         kwargs['files_count'] = files_count
-        kwargs['pretty_options'] = get_pretty_params(ctx, info=info, generic_paths=test_mode)
+        kwargs['pretty_options'] = get_pretty_params(ctx, generic_paths=test_mode)
         kwargs['scancode_notice'] = notice
         kwargs['scancode_version'] = scancode_version
 
@@ -856,6 +844,7 @@ def scancode(ctx, input,  # NOQA
 
         # TODO: compute summary for output plugins too??
         if not quiet:
+            scan_names = ', '.join(s.name for s in scan_plugins)
             echo_stderr('Scanning done.', fg='green' if success else 'red')
             display_summary(codebase, scan_names, processes, verbose=verbose)
     finally:
@@ -907,38 +896,87 @@ def run_plugins(ctx, stage, plugins, codebase, kwargs, quiet, verbose,
     codebase.timings[stage] = time() - stage_start
 
 
+def run_scanners(scan_plugins, codebase, processes, timeout, timing,
+                 quiet, verbose, stage, kwargs):
+    """
+    Run the `scan_plugins` list of ScanPlugin on the `codebase`. Return True on
+    success or False otherwise.
+
+    Display progress and update the codebase with computed counts and scan
+    results.
+    """
+
+    scan_start = time()
+
+    scanners = []
+    scan_sorter = lambda s: (s.sort_order, s.name)
+    for scanner in sorted(scan_plugins, key=scan_sorter):
+        func = scanner.get_scanner(**kwargs)
+        scanners.append(Scanner(name=scanner.name, function=func))
+
+    if TRACE_DEEP: logger_debug('run_scanners: scanners:', scanners)
+    if not scanners:
+        return True
+
+    scan_names = ', '.join(s.name for s in scanners)
+
+    progress_manager = None
+    if not quiet:
+        echo_stderr('Scan files for: %(scan_names)s '
+                    'with %(processes)d process(es)...' % locals())
+        item_show_func = partial(path_progress_message, verbose=verbose)
+        progress_manager = partial(progressmanager,
+            item_show_func=item_show_func,
+            verbose=verbose, file=sys.stderr)
+
+    # TODO: add CLI option to bypass cache entirely?
+    scan_success = scan_codebase(
+        codebase, scanners, processes, timeout,
+        with_timing=timing, progress_manager=progress_manager)
+
+    codebase.timings[stage] = time() - scan_start
+    scanned_fc, scanned_dc, scanned_sc = codebase.compute_counts()
+
+    codebase.summary[stage + ':scanners'] = scan_names
+    codebase.summary[stage + ':files_count'] = scanned_fc
+    codebase.summary[stage + ':dirs_count'] = scanned_dc
+    codebase.summary[stage + ':size_count'] = scanned_sc
+
+    return scan_success
+
+
 def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
                   with_timing=False, progress_manager=None):
     """
-    Run the `scanners` Scanner object on the `codebase` Codebase. Return True on
-    success or False otherwise.
+    Run the `scanners` Scanner objects on the `codebase` Codebase. Return True
+    on success or False otherwise.
 
-    Run the `scanners` ing multiprocessing with `processes` number of
-    processes allocating one process per scanned `codebase` Resource.
+    Use multiprocessing with `processes` number of processes. Disable
+    multiprocessing  is processes <=0. Disable threading is processes is < 0
 
     Run each scanner function for up to `timeout` seconds and fail it otherwise.
 
-    If `with_timing` is True, per-scanner execution time (as a float in seconds)
-    is added to the `scan_timings` mapping of each Resource as {scanner.key:
-    execution time}.
+    If `with_timing` is True, each Resource is updated with per-scanner
+    execution time (as a float in seconds). This is added to the `scan_timings`
+    mapping of each Resource as {scanner.name: execution time}.
 
     Provide optional progress feedback in the UI using the `progress_manager`
     callable that accepts an iterable of tuple of (location, rid, scan_errors,
     scan_result ) as argument.
     """
 
-    # FIXME: this path computation is super inefficient
-    # tuples of  (absolute location, resource id)
-    # TODO: should we walk topdown or not???
+    # FIXME: this path computation is super inefficient tuples of  (absolute
+    # location, resource id)
 
-    resources = ((r.get_path(absolute=True), r.rid) for r in codebase.walk())
+    # NOTE: we never scan directories
+    resources = ((r.location, r.rid) for r in codebase.walk() if r.is_file)
 
     runner = partial(scan_resource, scanners=scanners,
                      timeout=timeout, with_timing=with_timing,
                      with_threading=processes >= 0)
 
     if TRACE:
-        logger_debug('scan_codebase: scanners:', '\n'.join(repr(s) for s in scanners))
+        logger_debug('scan_codebase: scanners:', ', '.join(s.name for s in scanners))
 
     get_resource = codebase.get_resource
 
@@ -968,14 +1006,16 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
             try:
                 location, rid, scan_errors, scan_time, scan_result, scan_timings = scans.next()
 
-                if TRACE_DEEP: logger_debug(
+                if TRACE_DEEP:
+                    logger_debug(
                     'scan_codebase: location:', location, 'results:', scan_result)
 
                 resource = get_resource(rid)
+
                 if not resource:
                     # this should never happen
                     msg = ('ERROR: Internal error in scan_codebase: Resource '
-                           'at %(location)r is missing from codebase.\n'
+                           'at %(rid)r is missing from codebase.\n'
                            'Scan result not saved:\n%(scan_result)r.' % locals())
                     codebase.errors.append(msg)
                     success = False
@@ -983,23 +1023,19 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
 
                 if scan_errors:
                     success = False
-                    resource.errors.extend(scan_errors)
-
-                # always set info directly on resources
-                infos = scan_result.pop('infos', [])
-                if TRACE: logger_debug('scan_codebase: infos:', infos)
-                if infos:
-                    resource.set_info(infos)
+                    resource.scan_errors.extend(scan_errors)
 
                 if TRACE: logger_debug('scan_codebase: scan_timings:', scan_timings)
                 if with_timing and scan_timings:
-                    if resource.scan_timings:
+                    if scan_timings:
                         resource.scan_timings.update(scan_timings)
-                    else:
-                        resource.scan_timings = scan_timings
 
-                saved_scans = resource.put_scans(scan_result, update=True)
-                if TRACE: logger_debug('scan_codebase: saved_scans:', saved_scans)
+                # NOTE: here we effectively single threaded the saving a
+                # Resource to the cache! .... not sure this is a good or bad
+                # thing for scale. Likely not
+                for key, value in scan_result.items():
+                    setattr(resource, key, value)
+                codebase.save_resource(resource)
 
             except StopIteration:
                 break
@@ -1025,7 +1061,7 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
 def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT,
                   with_timing=False, with_threading=True):
     """
-    Return a tuple of (location, rid, errors, scan_time, scan_results, timings)
+    Return a tuple of (location, rid, scan_errors, scan_time, scan_results, timings)
     by running the `scanners` Scanner objects for the file or directory resource
     with id `rid` at `location` provided as a `location_rid` tuple of (location,
     rid) for up to `timeout` seconds.
@@ -1033,10 +1069,10 @@ def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT,
 
     The returned tuple has these values (:
     - `location` and `rid` are the orginal arguments.
-    - `errors` is a list of error strings.
-    - `scan_results` is a mapping of scan results keyed by scanner.key.
+    - `scan_errors` is a list of error strings.
+    - `scan_results` is a mapping of scan results from all scanners.
     - `scan_time` is the duration in seconds to run all scans for this resource.
-    - `timings` is a mapping of scan {scanner.key: execution time in seconds}
+    - `timings` is a mapping of scan {scanner.name: execution time in seconds}
       tracking the execution duration each each scan individually.
       `timings` is empty unless `with_timing` is True.
 
@@ -1044,75 +1080,109 @@ def scan_resource(location_rid, scanners, timeout=DEFAULT_TIMEOUT,
     processing/threading works.
     """
     scan_time = time()
-
-    timings = None
-    if with_timing:
-        timings = OrderedDict((scanner.key, 0) for scanner in scanners)
+    location, rid = location_rid
+    results = OrderedDict()
+    scan_errors = []
+    timings = OrderedDict() if with_timing else None
 
     if not with_threading:
         interruptor = fake_interruptible
     else:
         interruptor = interruptible
 
-    location, rid = location_rid
-    errors = []
-    results = OrderedDict((scanner.key, []) for scanner in scanners)
-
     # run each scanner in sequence in its own interruptible
-    for scanner, scanner_result in zip(scanners, results.values()):
+    for scanner in scanners:
         if with_timing:
             start = time()
 
         try:
             runner = partial(scanner.function, location)
-            error, value = interruptor(runner, timeout=timeout)
+            error, values_mapping = interruptor(runner, timeout=timeout)
             if error:
-                msg = 'ERROR: for scanner: ' + scanner.key + ':\n' + error
-                errors.append(msg)
-            if value:
-                # a scanner function MUST return a sequence
-                scanner_result.extend(value)
+                msg = 'ERROR: for scanner: ' + scanner.name + ':\n' + error
+                scan_errors.append(msg)
+            # the return value of a scanner fun MUST be a mapping
+            if values_mapping:
+                results.update(values_mapping)
 
         except Exception:
-            msg = 'ERROR: for scanner: ' + scanner.key + ':\n' + traceback.format_exc()
-            errors.append(msg)
+            msg = 'ERROR: for scanner: ' + scanner.name + ':\n' + traceback.format_exc()
+            scan_errors.append(msg)
         finally:
             if with_timing:
-                timings[scanner.key] = time() - start
+                timings[scanner.name] = time() - start
 
     scan_time = time() - scan_time
 
-    return location, rid, errors, scan_time, results, timings
+    return location, rid, scan_errors, scan_time, results, timings
 
 
 def display_summary(codebase, scan_names, processes, verbose):
     """
     Display a scan summary.
     """
-
-    initial_files_count = codebase.summary.get('initial_files_count', 0)
-    initial_dirs_count = codebase.summary.get('initial_dirs_count', 0)
+    initial_files_count = codebase.summary.get('initial:files_count', 0)
+    initial_dirs_count = codebase.summary.get('initial:dirs_count', 0)
     initial_res_count = initial_files_count + initial_dirs_count
-    initial_size_count = codebase.summary.get('initial_size_count', 0)
+    initial_size_count = codebase.summary.get('initial:size_count', 0)
     if initial_size_count:
         initial_size_count = format_size(initial_size_count)
-        initial_size_count = 'for %(initial_size_count)s' % locals()
+        initial_size_count = 'for %(initial:size_count)s' % locals()
     else:
         initial_size_count = ''
 
-    final_files_count = codebase.summary.get('final_files_count', 0)
-    final_dirs_count = codebase.summary.get('final_dirs_count', 0)
+    ######################################################################
+    prescan_scan_time = codebase.timings.get('pre-scan-scan', 0.)
+
+    if prescan_scan_time:
+        prescan_scan_files_count = codebase.summary.get('pre-scan-scan:files_count', 0)
+        prescan_scan_file_speed = round(float(prescan_scan_files_count) / prescan_scan_time , 2)
+
+        prescan_scan_size_count = codebase.summary.get('pre-scan-scan:size_count', 0)
+
+        if prescan_scan_size_count:
+            prescan_scan_size_speed = format_size(prescan_scan_size_count / prescan_scan_time)
+            prescan_scan_size_speed = '%(prescan_scan_size_speed)s/sec.' % locals()
+
+            prescan_scan_size_count = format_size(prescan_scan_size_count)
+            prescan_scan_size_count = 'for %(prescan_scan_size_count)s' % locals()
+        else:
+            prescan_scan_size_count = ''
+            prescan_scan_size_speed = ''
+
+    ######################################################################
+    scan_time = codebase.timings.get('scan', 0.)
+
+    scan_files_count = codebase.summary.get('scan:files_count', 0)
+    scan_file_speed = round(float(scan_files_count) / scan_time , 2)
+
+    scan_size_count = codebase.summary.get('scan:size_count', 0)
+
+    if scan_size_count:
+        scan_size_speed = format_size(scan_size_count / scan_time)
+        scan_size_speed = '%(scan_size_speed)s/sec.' % locals()
+
+        scan_size_count = format_size(scan_size_count)
+        scan_size_count = 'for %(scan_size_count)s' % locals()
+    else:
+        scan_size_count = ''
+        scan_size_speed = ''
+
+    ######################################################################
+    final_files_count = codebase.summary.get('final:files_count', 0)
+    final_dirs_count = codebase.summary.get('final:dirs_count', 0)
     final_res_count = final_files_count + final_dirs_count
-    final_size_count = codebase.summary.get('final_size_count', 0)
+    final_size_count = codebase.summary.get('final:size_count', 0)
     if final_size_count:
         final_size_count = format_size(final_size_count)
         final_size_count = 'for %(final_size_count)s' % locals()
     else:
         final_size_count = ''
+    ######################################################################
 
     top_errors = codebase.errors
-    path_and_errors = [(r.get_path(decode=True, posix=True), r.errors)
-                       for r in codebase.walk() if r.errors]
+    path_and_errors = [(r.path, r.scan_errors)
+                       for r in codebase.walk() if r.scan_errors]
 
     has_errors = top_errors or path_and_errors
 
@@ -1127,26 +1197,19 @@ def display_summary(codebase, scan_names, processes, verbose):
             echo_stderr('Path: ' + errored_path, fg='red')
             if not verbose:
                 continue
+
             for error in errors:
                 for emsg in error.splitlines(False):
                     echo_stderr('  ' + emsg, fg='red')
                 errors_count += 1
 
-    scan_time = codebase.timings.get('scan', 0.)
-
-    scanned_size_count = codebase.summary.get('scanned_size_count', 0)
-    if scanned_size_count:
-        scan_size_speed = format_size(scanned_size_count / scan_time)
-        scan_size_speed = '%(scan_size_speed)s/sec.' % locals()
-    else:
-        scan_size_speed = ''
-
-    scanned_files_count = codebase.summary.get('scanned_files_count', 0)
-    scan_file_speed = round(float(scanned_files_count) / scan_time , 2)
+    ######################################################################
 
     echo_stderr('Summary:        %(scan_names)s with %(processes)d process(es)' % locals())
     echo_stderr('Errors count:   %(errors_count)d' % locals())
     echo_stderr('Scan Speed:     %(scan_file_speed).2f files/sec. %(scan_size_speed)s' % locals())
+    if prescan_scan_time:
+        echo_stderr('Early Scanners Speed:     %(prescan_scan_file_speed).2f files/sec. %(prescan_scan_size_speed)s' % locals())
 
     echo_stderr('Initial counts: %(initial_res_count)d resource(s): '
                                 '%(initial_files_count)d file(s) '
@@ -1159,10 +1222,11 @@ def display_summary(codebase, scan_names, processes, verbose):
                                 '%(final_size_count)s' % locals())
 
     echo_stderr('Timings:')
-    for key, value, in codebase.timings.items():
+    for name, value, in codebase.timings.items():
         if value > 0.1:
-            echo_stderr('  %(key)s: %(value).2fs' % locals())
-    # TODO: if timing was requested display per-scan/per-file stats
+            echo_stderr('  %(name)s: %(value).2fs' % locals())
+
+    # TODO: if timing was requested display top per-scan/per-file stats?
 
 
 def format_size(size):
@@ -1209,7 +1273,7 @@ def format_size(size):
     return '%(size).2f %(symbol)s' % locals()
 
 
-def get_pretty_params(ctx, info=False, generic_paths=False):
+def get_pretty_params(ctx, generic_paths=False):
     """
     Return a sorted mapping of {CLI option: pretty value string} for the
     `ctx` Click.context, putting arguments first then options:
@@ -1226,8 +1290,7 @@ def get_pretty_params(ctx, info=False, generic_paths=False):
     if TRACE:
         logger_debug('get_pretty_params: generic_paths', generic_paths)
     args = []
-    # hack since info option can be changed to True if default
-    options = [('--info', info)] if info else []
+    options = []
 
     param_values = ctx.params
     for param in ctx.command.params:
@@ -1278,4 +1341,3 @@ def get_pretty_params(ctx, info=False, generic_paths=False):
             options.append((cli_opt, value))
 
     return OrderedDict(sorted(args) + sorted(options))
-
diff --git a/src/scancode/plugin_copyright.py b/src/scancode/plugin_copyright.py
index 73a66c646b7..d69edccc9c1 100644
--- a/src/scancode/plugin_copyright.py
+++ b/src/scancode/plugin_copyright.py
@@ -27,6 +27,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import attr
+
 from plugincode.scan import ScanPlugin
 from plugincode.scan import scan_impl
 from scancode import CommandLineOption
@@ -38,6 +40,9 @@ class CopyrightScanner(ScanPlugin):
     """
     Scan a Resource for copyrights.
     """
+
+    attributes = dict(copyrights=attr.ib(default=attr.Factory(list)))
+
     sort_order = 4
 
     options = [
diff --git a/src/scancode/plugin_email.py b/src/scancode/plugin_email.py
index 76000123c2f..9dfea3c8ec0 100644
--- a/src/scancode/plugin_email.py
+++ b/src/scancode/plugin_email.py
@@ -27,6 +27,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import attr
+
 from plugincode.scan import ScanPlugin
 from plugincode.scan import scan_impl
 from scancode import CommandLineOption
@@ -38,6 +40,8 @@ class EmailScanner(ScanPlugin):
     """
     Scan a Resource for emails.
     """
+    attributes = dict(emails=attr.ib(default=attr.Factory(list)))
+
     sort_order = 8
 
     options = [
diff --git a/src/scancode/plugin_ignore.py b/src/scancode/plugin_ignore.py
index 280f5f002f4..ecc7126a8de 100644
--- a/src/scancode/plugin_ignore.py
+++ b/src/scancode/plugin_ignore.py
@@ -64,25 +64,14 @@ def process_codebase(self, codebase, ignore=(), **kwargs):
         }
 
         ignorable = partial(is_ignored, ignores=ignores)
-        resources_to_remove = []
-        resources_to_remove_append = resources_to_remove.append
 
+        remove_resource = codebase.remove_resource
         # first walk top down the codebase and collect ignored resource ids
         for resource in codebase.walk(topdown=True):
-            if ignorable(resource.get_path(absolute=False, posix=True)):
-                resources_to_remove_append(resource)
-
-        # then remove the collected ignored resource ids (that may remove whole
-        # trees at once) in a second step
-        removed_rids = set()
-        removed_rids_update = removed_rids.update
-        remove_resource = codebase.remove_resource
-
-        for resource in resources_to_remove:
-            if resource.rid in removed_rids:
-                continue
-            pruned_rids = remove_resource(resource)
-            removed_rids_update(pruned_rids)
+            if ignorable(resource.path):
+                for child in resource.children(codebase):
+                    remove_resource(child)
+                remove_resource(resource)
 
 
 def is_ignored(location, ignores):
diff --git a/src/scancode/plugin_info.py b/src/scancode/plugin_info.py
new file mode 100644
index 00000000000..ce461d04ddb
--- /dev/null
+++ b/src/scancode/plugin_info.py
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
+# http://nexb.com and https://github.com/nexB/scancode-toolkit/
+# The ScanCode software is licensed under the Apache License version 2.0.
+# Data generated with ScanCode require an acknowledgment.
+# ScanCode is a trademark of nexB Inc.
+#
+# You may not use this software except in compliance with the License.
+# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+# When you publish or redistribute any data created with ScanCode or any ScanCode
+# derivative work, you must accompany this data with the following acknowledgment:
+#
+#  Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
+#  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
+#  ScanCode should be considered or used as legal advice. Consult an Attorney
+#  for any legal advice.
+#  ScanCode is a free software code scanning tool from nexB Inc. and others.
+#  Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from collections import OrderedDict
+
+import attr
+
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
+from scancode import CommandLineOption
+from scancode import OTHER_SCAN_GROUP
+
+
+@scan_impl
+class InfoScanner(ScanPlugin):
+    """
+    Scan a file Resource for miscellaneous information such as mime/filetype and
+    basic checksums.
+    """
+    attributes = OrderedDict([
+        ('date', attr.ib(default=None)),
+        ('sha1', attr.ib(default=None)),
+        ('md5', attr.ib(default=None)),
+        ('mime_type', attr.ib(default=None)),
+        ('file_type', attr.ib(default=None)),
+        ('programming_language', attr.ib(default=None)),
+        ('is_binary', attr.ib(default=False, type=bool)),
+        ('is_text', attr.ib(default=False, type=bool)),
+        ('is_archive', attr.ib(default=False, type=bool)),
+        ('is_media', attr.ib(default=False, type=bool)),
+        ('is_source', attr.ib(default=False, type=bool)),
+        ('is_script', attr.ib(default=False, type=bool)),
+    ])
+
+    sort_order = 0
+
+    options = [
+        CommandLineOption(('-i', '--info'),
+            is_flag=True, default=False,
+            help='Scan <input> for file information (size, type, checksums, etc).',
+            help_group=OTHER_SCAN_GROUP, sort_order=10
+            )
+    ]
+
+    def is_enabled(self, info, **kwargs):
+        return info
+
+    def get_scanner(self, **kwargs):
+        from scancode.api import get_file_info
+        return get_file_info
diff --git a/src/scancode/plugin_license.py b/src/scancode/plugin_license.py
index fb953df8d26..83da619e1a8 100644
--- a/src/scancode/plugin_license.py
+++ b/src/scancode/plugin_license.py
@@ -29,6 +29,8 @@
 
 from functools import partial
 
+import attr
+
 from plugincode.scan import ScanPlugin
 from plugincode.scan import scan_impl
 from scancode import CommandLineOption
@@ -56,6 +58,9 @@ class LicenseScanner(ScanPlugin):
     """
     Scan a Resource for licenses.
     """
+
+    attributes = dict(licenses=attr.ib(default=attr.Factory(list)))
+
     sort_order = 2
 
     options = [
diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index f22e25f3e62..2a9faf3e071 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -27,6 +27,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import attr
+
 from plugincode.post_scan import PostScanPlugin
 from plugincode.post_scan import post_scan_impl
 from scancode import CommandLineOption
@@ -41,19 +43,22 @@ class MarkSource(PostScanPlugin):
     Has no effect unless the --info scan is requested.
     """
 
-    needs_info = True
+    attributes = dict(source_count=attr.ib(default=0, type=int))
+
+    sort_order = 8
 
     options = [
         CommandLineOption(('--mark-source',),
             is_flag=True, default=False,
+            requires=['info'],
             help='Set the "is_source" to true for directories that contain '
                  'over 90% of source files as children and descendants. '
-                 'Implies running the --info scan.',
+                 'Count the number of source files in a directory as a new source_file_counts attribute',
             help_group=POST_SCAN_GROUP)
     ]
 
-    def is_enabled(self, mark_source, **kwargs):
-        return mark_source
+    def is_enabled(self, mark_source, info, **kwargs):
+        return mark_source and info
 
     def process_codebase(self, codebase, mark_source, **kwargs):
         """
@@ -63,12 +68,27 @@ def process_codebase(self, codebase, mark_source, **kwargs):
         if not mark_source:
             return
 
-        # TODO: these two nested walk() calls are not super efficient
+        # FIXME: TODO: these two nested walk() calls are not super efficient
         for resource in codebase.walk(topdown=False):
             if resource.is_file:
                 continue
-            src_count = sum(1 for c in resource.walk(topdown=True) if c.is_file and c.is_source)
-            resource.is_source = is_source_directory(src_count, resource.files_count)
+
+            children = resource.children(codebase)
+            if not children:
+                continue
+
+            src_count = sum(1 for c in children
+                            if c.is_file and c.is_source)
+
+            src_count += sum(c.source_count for c in children
+                             if not c.is_file)
+
+            is_source = is_source_directory(src_count, resource.files_count)
+
+            if src_count and is_source:
+                resource.is_source = is_source
+                resource.source_count = src_count
+                codebase.save_resource(resource)
 
 
 def is_source_directory(src_count, files_count):
diff --git a/src/scancode/plugin_only_findings.py b/src/scancode/plugin_only_findings.py
index 567eb8d725e..9e8d2233b8c 100644
--- a/src/scancode/plugin_only_findings.py
+++ b/src/scancode/plugin_only_findings.py
@@ -48,19 +48,29 @@ class OnlyFindings(OutputFilterPlugin):
     def is_enabled(self, only_findings, **kwargs):
         return only_findings
 
-    def process_codebase(self, codebase, **kwargs):
+    def process_codebase(self, codebase, attributes_by_plugin, **kwargs):
         """
         Set Resource.is_filtered to True for resources from the codebase that do
-        not have findings e.g. if they have no scan data (excluding info) and no
+        not have findings e.g. if they have no scan data (cinfo) and no
         errors.
         """
+        attributes_with_findings = set(['scan_errors'])
+        for plugin_qname, keys in attributes_by_plugin.items():
+            if plugin_qname == 'scan:info':
+                # skip info attributes
+                continue
+            attributes_with_findings.update(keys)
+
         for resource in codebase.walk():
-            if not has_findings(resource):
-                resource.is_filtered = True
+            if has_findings(resource, attributes_with_findings):
+                continue
+            resource.is_filtered = True
+            codebase.save_resource(resource)
 
 
-def has_findings(resource):
+def has_findings(resource, attributes_with_findings):
     """
     Return True if this resource has findings.
     """
-    return bool(resource.errors or any(resource.get_scans().values()))
+    attribs = (getattr(resource, key, None) for key in attributes_with_findings)
+    return bool(any(attribs))
diff --git a/src/scancode/plugin_package.py b/src/scancode/plugin_package.py
index d67a6df0743..2784ccca956 100644
--- a/src/scancode/plugin_package.py
+++ b/src/scancode/plugin_package.py
@@ -27,6 +27,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import attr
+
 from plugincode.scan import ScanPlugin
 from plugincode.scan import scan_impl
 from scancode import CommandLineOption
@@ -38,6 +40,9 @@ class PackageScanner(ScanPlugin):
     """
     Scan a Resource for Package manifests.
     """
+
+    attributes = dict(packages=attr.ib(default=attr.Factory(list)))
+
     sort_order = 6
 
     options = [
diff --git a/src/scancode/plugin_url.py b/src/scancode/plugin_url.py
index d9e1ca2f93a..7e18ef9e687 100644
--- a/src/scancode/plugin_url.py
+++ b/src/scancode/plugin_url.py
@@ -27,6 +27,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import attr
+
 from plugincode.scan import ScanPlugin
 from plugincode.scan import scan_impl
 from scancode import CommandLineOption
@@ -38,6 +40,9 @@ class UrlScanner(ScanPlugin):
     """
     Scan a Resource for URLs.
     """
+
+    attributes = dict(urls=attr.ib(default=attr.Factory(list)))
+
     sort_order = 10
 
     options = [
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index 59df1a1b777..db9f6b1aaa0 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -32,23 +32,26 @@
 from collections import OrderedDict
 from functools import partial
 import json
+import os
 from os import walk as os_walk
 from os.path import abspath
 from os.path import exists
 from os.path import expanduser
 from os.path import join
 from os.path import normpath
+import posixpath
 import traceback
 import sys
 
 import attr
-import yg.lockfile  # NOQA
+from intbitset import intbitset
 
 from scancode_config import scancode_temp_dir
 
 from commoncode.filetype import is_file as filetype_is_file
 from commoncode.filetype import is_special
-
+from commoncode.fileutils import POSIX_PATH_SEP
+from commoncode.fileutils import WIN_PATH_SEP
 from commoncode.fileutils import as_posixpath
 from commoncode.fileutils import create_dir
 from commoncode.fileutils import delete
@@ -56,6 +59,7 @@
 from commoncode.fileutils import fsdecode
 from commoncode.fileutils import fsencode
 from commoncode.fileutils import parent_directory
+from commoncode.fileutils import splitext
 from commoncode import ignore
 from commoncode.system import on_linux
 
@@ -76,9 +80,10 @@
 they are the basic unit of processing.
 
 A Codebase is a tree of Resource. A Resource represents a file or directory and
-holds file information as attributes and scans (optionally cached on-disk). This
-module handles all the details of walking files, path handling and caching
-scans.
+holds essential file information as attributes. At runtime, scan data is added
+as attributes to a Resource. Resource are kept in memory or saved on disk.
+
+This module handles all the details of walking files, path handling and caching.
 """
 
 # Tracing flags
@@ -99,67 +104,16 @@ def logger_debug(*args):
     logger.setLevel(logging.DEBUG)
 
     def logger_debug(*args):
-        return logger.debug(' '.join(isinstance(a, unicode)
-                                     and a or repr(a) for a in args))
-
-# A global cache of codebase objects, keyed by a unique integer ID.
-# We use this weird structure such that a Resource object can reference its
-# parent codebase object without actually storing it as an instance variable.
-# Instead a Resource only has a pointer to a codebase id and can fetch it from
-# this cache with an id lookup.
-# This cache is updated when a new codebase object is created or destroyed
-# TODO: consider using a class variable instead of a module variable?
-_CODEBASES = {}
-
-_cache_lock_file = join(scancode_temp_dir, 'codebases-lockfile')
+        return logger.debug(
+            ' '.join(isinstance(a, unicode) and a or repr(a) for a in args))
 
 
-def add_codebase(codebase, cache_lock_file=_cache_lock_file):
-    """
-    Add codebase to codebase cache in a thread- and multiprocess-safe way.
-    Return the codebase integer id.
-    """
-    try:
-        # acquire lock and wait until timeout to get a lock or die
-        with yg.lockfile.FileLock(cache_lock_file, timeout=10):
-            global _CODEBASES
-            if _CODEBASES:
-                for cid, cached_codebase in _CODEBASES.items():
-                    if codebase is cached_codebase:
-                        return cid
-                # get a new cid
-                new_cid = max(_CODEBASES.viewkeys()) + 1
-            else:
-                # or create a new cid
-                new_cid = 1
-
-            _CODEBASES[new_cid] = codebase
-            return new_cid
-
-    except yg.lockfile.FileLockTimeout:
-        raise
-
-
-def del_codebase(cid, cache_lock_file=_cache_lock_file):
-    """
-    Delete codebase from the codebase cache in a thread- and multiprocess-safe way.
-    Return the deleted codebase object or None.
-    """
-    try:
-        # acquire lock and wait until timeout to get a lock or die
-        with yg.lockfile.FileLock(cache_lock_file, timeout=10):
-            global _CODEBASES
-            return _CODEBASES.pop(cid, None)
-    except yg.lockfile.FileLockTimeout:
-        raise
+class ResourceNotInCache(Exception):
+    pass
 
 
-def get_codebase(cid):
-    """
-    Return a codebase object with a `cid` codebaset id or None.
-    """
-    global _CODEBASES
-    return _CODEBASES.get(cid)
+class UnknownResource(Exception):
+    pass
 
 
 class Codebase(object):
@@ -167,16 +121,30 @@ class Codebase(object):
     Represent a codebase being scanned. A Codebase is a tree of Resources.
     """
 
-    # TODO: add populate progress manager!!!
-
-    def __init__(self, location, use_cache=True, temp_dir=scancode_temp_dir):
+    def __init__(self, location, resource_class=None,
+                 full_root=False, strip_root=False,
+                 temp_dir=scancode_temp_dir,
+                 max_in_memory=10000):
         """
         Initialize a new codebase rooted at the `location` existing file or
         directory.
 
-        If `use_cache` is True, scans will be cached on-disk in a file for each
-        Resource in a new unique directory under `cache_base_dir`. Otherwise,
-        scans are kept as Resource attributes.
+        `resource_class` is a Resource sub-class configured to accept plugin-
+        provided scan attributes.
+
+        `strip_root` and `full_root`: boolean flags: these controls the values
+        of the path attribute of the codebase Resources. These are mutually
+        exclusive.
+        If `strip_root` is True, strip the first `path` segment of a Resource
+        unless the codebase contains a single root Resource.
+        If `full_root` is True the path is an an absolute path.
+
+        `temp_dir` is the base temporary directory to use to cache resources on
+        disk and other temporary files.
+
+        `max_in_memory` is the maximum number of Resource instances to keep in
+        memory. Beyond this number, Resource are saved on disk instead. -1 means
+        no memory is used and 0 means unlimited memory is used.
         """
         self.original_location = location
 
@@ -184,7 +152,9 @@ def __init__(self, location, use_cache=True, temp_dir=scancode_temp_dir):
             location = fsencode(location)
         else:
             location = fsdecode(location)
+
         location = abspath(normpath(expanduser(location)))
+        location = location.rstrip(POSIX_PATH_SEP).rstrip(WIN_PATH_SEP)
 
         # TODO: we should also accept to create "virtual" codebase without a
         # backing filesystem location
@@ -192,228 +162,401 @@ def __init__(self, location, use_cache=True, temp_dir=scancode_temp_dir):
 
         # FIXME: what if is_special(location)???
         self.location = location
-        self.base_location = parent_directory(location)
 
         self.is_file = filetype_is_file(location)
 
-        # list of resources in topdown order where the position is the index of
-        # the resource. The first index, 0, is also the root
-        self.resources = []
+        # True if this codebase root is a file or an empty directory.
+        self.has_single_resource = bool(self.is_file or not os.listdir(location))
+
+        self.resource_class = resource_class or Resource
+
+        # maximmum number of Resource objects kept in memory cached in this
+        # Codebase. When the number of in-memory Resources exceed this number,
+        # the next Resource instances are saved to disk instead and re-loaded
+        # from disk when used/needed.
+        self.max_in_memory = max_in_memory
+        # use only memory
+        self.all_in_memory = max_in_memory == 0
+        # use only disk
+        self.all_on_disk = max_in_memory == -1
+
+        # set index of existing resource ids ints, initially allocated with
+        # 10000 positions (this will grow as needed)
+        self.resource_ids = intbitset(10000)
+
+        # root resource, never cached on disk
         self.root = None
 
+        # map of {rid: resource} for resources that are kept in memory
+        self.resources = {}
+
         # list of errors from collecting the codebase details (such as
-        # unreadable file, etc)
+        # unreadable file, etc).
         self.errors = []
 
         # mapping of scan summary data and statistics at the codebase level such
         # as ScanCode version, notice, command options, etc.
-        # This is populated automatically as the scan progresses.
-        self.summary = OrderedDict()
-
-        # total processing time from start to finish, across all stages.
         # This is populated automatically.
-        self.total_time = 0
+        self.summary = OrderedDict()
 
         # mapping of timings for scan stage as {stage: time in seconds as float}
         # This is populated automatically.
         self.timings = OrderedDict()
 
         # setup cache
-        self.use_cache = use_cache
         self.temp_dir = temp_dir
-        self.cache_dir = None
-        if use_cache:
-            # this is unique to this run and valid for the lifetime of this codebase
-            self.cache_dir = get_results_cache_dir(temp_dir=temp_dir)
-
-        # this updates the global cache using a file lock
-        self.cid = add_codebase(self)
-
-        self.populate()
 
-        # Flag set to True if file information was requested for results output
-        self.with_info = False
+        # this is unique to this codebase instance
+        self.cache_dir = get_codebase_cache_dir(temp_dir=temp_dir)
 
-        # set of resource rid to exclude from outputs
-        # This is populated automatically.
-        self.filtered_rids = set()
+        self.full_root = full_root
+        self.strip_root = strip_root
+        self._populate()
 
     def _get_next_rid(self):
         """
         Return the next available resource id.
         """
-        return len(self.resources)
+        return len(self.resource_ids)
 
-    def populate(self):
+    def _get_resource_cache_location(self, rid, create=False):
+        """
+        Return the location where to get/put a Resource in the cache given a
+        Resource `rid`. Create the directories if requested.
+        """
+        resid = (b'%08x'if on_linux else '%08x') % rid
+        cache_sub_dir, cache_file_name = resid[-2:], resid
+        parent = join(self.cache_dir, cache_sub_dir)
+        if create and not exists(parent):
+            create_dir(parent)
+        return join(parent, cache_file_name)
+
+    # TODO: add populate progress manager!!!
+    def _populate(self):
         """
         Populate this codebase with Resource objects.
 
-        The codebase must be populated by walking its `location` topdown,
-        breadth-first, creating files first then directories both in in sorted
-        case-insensitive name order.
+        Population is done by walking its `location` topdown, breadth-first,
+        first creating first file then directory Resources both sorted in case-
+        insensitive name order.
 
         Special files, links and VCS files are ignored.
         """
-        # clear things
-        self.resources = []
-        resources = self.resources
-
-        resources_append = resources.append
 
-        cid = self.cid
-        rloc = self.location
-        rid = 0
-        self.root = root = Resource(
-            name=file_name(rloc), rid=rid, pid=None, cid=cid,
-            is_file=self.is_file, use_cache=self.use_cache)
-        resources_append(root)
-        if TRACE: logger_debug('Codebase.collect: root:', root)
-
-        if self.is_file:
-            # there is nothing else to do
+        def err(_error):
+            """os.walk error handler"""
+            self.errors.append(
+                ('ERROR: cannot populate codeasbe: %(_error)r\n' % _error)
+                + traceback.format_exc())
+
+        def skip_ignored(_loc):
+            """Always ignore VCS and some special filetypes."""
+            ignored = partial(ignore.is_ignored, ignores=ignore.ignores_VCS)
+
+            if TRACE_DEEP:
+                logger_debug('Codebase.populate: walk: ignored loc:', _loc,
+                             'ignored:', ignored(_loc),
+                             'is_special:', is_special(_loc))
+
+            return is_special(_loc) or ignored(_loc)
+
+        def create_resources(_seq, _top, _parent, _is_file):
+            """Create Resources of parent from a seq of files or directories."""
+            _seq.sort(key=lambda p: (p.lower(), p))
+            for name in _seq:
+                location = join(_top, name)
+                if skip_ignored(location):
+                    continue
+                res = self.create_resource(name, parent=_parent, is_file=_is_file)
+                if not _is_file:
+                    # on the plain, bare FS, files cannot be parents
+                    parent_by_loc[location] = res
+                if TRACE: logger_debug('Codebase.populate:', res)
+
+        root = self.create_root_resource()
+        if TRACE: logger_debug('Codebase.populate: root:', root)
+
+        if self.has_single_resource:
+            # there is nothing else to do for a single file or a single
+            # childless directory
             return
 
-        res_by_loc = {rloc: root}
+        # track resources parents by location during construction.
+        # NOTE: this cannot exhaust memory on a large codebase, because we do
+        # not keep parents already walked and we walk topdown.
+        parent_by_loc = {root.location: root}
 
-        def err(_error):
-            self.errors.append(
-                'ERROR: cannot collect files: %(error)s\n' % dict(error=_error)
-                + traceback.format_exc()
-            )
+        # walk proper
+        for top, dirs, files in os_walk(root.location, topdown=True, onerror=err):
+            if skip_ignored(top):
+                continue
+            # the parent reference is needed only once in a top-doan walk, hence
+            # the pop
+            parent = parent_by_loc.pop(top)
+            create_resources(files, top, parent, _is_file=True)
+            create_resources(dirs, top, parent, _is_file=False)
 
-        # we always ignore VCS and some filetypes.
-        ignored = partial(ignore.is_ignored, ignores=ignore.ignores_VCS)
+    def create_root_resource(self):
+        """
+        Create and return the root Resource of this codebase.
+        """
+        # we cannot recreate a root if it exists!!
+        if self.root:
+            raise TypeError('Root resource already exists and cannot be recreated')
 
-        sorter = lambda p: (p.lower(), p)
+        location = self.location
+        name = file_name(location)
 
-        # TODO: this is where we would plug archive walking??
-        for top, dirs, files in os_walk(rloc, topdown=True, onerror=err):
+        # do not strip root for codebase with a single Resource.
+        if self.strip_root:
+            if self.has_single_resource:
+                path = fsdecode(name)
+            else:
+                # NOTE: this may seem weird but the root path will be an empty
+                # string for a codebase root with strip_root=True if not
+                # single_resource
+                path = ''
+        else:
+            path = get_path(location, location, full_root=self.full_root,
+                            strip_root=self.strip_root)
+        if TRACE:
+            logger_debug('Codebase.create_resource: root:', path)
+            logger_debug()
 
-            if is_special(top) or ignored(top):
-                # note: by design the root location is NEVER ignored
-                if TRACE: logger_debug(
-                    'Codebase.collect: walk: top ignored:', top, 'ignored:',
-                    ignored(top), 'is_special:', is_special(top))
-                continue
+        root = self.resource_class(name=name, location=location, path=path,
+                                   rid=0, pid=None, is_file=self.is_file)
 
-            parent = res_by_loc[top]
+        self.resource_ids.add(0)
+        self.resources[0] = root
+        self.root = root
+        return root
 
-            if TRACE: logger_debug('Codebase.collect: parent:', parent)
+    def create_resource(self, name, parent, is_file=False):
+        """
+        Create and return a new Resource in this codebase with `name` as a child
+        of the `parent` Resource.
+        `name` is always in native OS-preferred encoding (e.g. byte on Linux,
+        unicode elsewhere).
+        """
+        if parent is None:
+            raise TypeError('Cannot create resource without parent.')
 
-            files.sort(key=sorter)
-            for name in sorted(files):
-                loc = join(top, name)
+        rid = self._get_next_rid()
 
-                if is_special(loc) or ignored(loc):
-                    if TRACE: logger_debug(
-                        'Codebase.collect: walk: file ignored:', loc, 'ignored:',
-                        ignored(loc), 'is_special:', is_special(loc))
-                    continue
+        if self._must_use_disk_cache(rid):
+            cache_location = self._get_resource_cache_location(rid, create=True)
+        else:
+            cache_location = None
 
-                rid += 1
-                res = parent._add_child(name, rid, is_file=True)
-                res_by_loc[loc] = res
-                resources_append(res)
-                if TRACE: logger_debug(' Codebase.collect: file:', res)
+        location = join(parent.location, name)
+        path = posixpath.join(parent.path, fsdecode(name))
+        if TRACE:
+            logger_debug('Codebase.create_resource: non-root: parent.path', parent.path)
+            logger_debug('Codebase.create_resource: non-root: path', path)
+            logger_debug()
 
-            dirs.sort(key=sorter)
-            for name in dirs:
-                loc = join(top, name)
+        child = self.resource_class(
+            name=name,
+            location=location,
+            path=path,
+            cache_location=cache_location,
+            rid=rid,
+            pid=parent.rid,
+            is_file=is_file
+        )
+
+        self.resource_ids.add(rid)
+        parent.children_rids.append(rid)
+        # TODO: fixme, this is not great to save also the parent :|
+        self.save_resource(parent)
+        self.save_resource(child)
+        return child
 
-                if is_special(loc) or ignored(loc):
-                    if TRACE: logger_debug(
-                        'Codebase.collect: walk: dir ignored:', loc, 'ignored:',
-                        ignored(loc), 'is_special:', is_special(loc))
-                    continue
+    def exists(self, resource):
+        """
+        Return True if the Resource with `rid` exists in the codebase.
+        """
+        return resource.rid in self.resource_ids
 
-                rid += 1
-                res = parent._add_child(name, rid, is_file=False)
-                res_by_loc[loc] = res
-                resources_append(res)
-                if TRACE: logger_debug(' Codebase.collect: dir:', res)
+    def _must_use_disk_cache(self, rid):
+        """
+        Return True if Resource `rid` should be cached in on disk or False if it
+        should be cached in memory.
+        """
+        if rid == 0:
+            return False
+        if self.all_on_disk:
+            return True
+        if self.all_in_memory:
+            return False
+        # mixed case where some are in memory and some on disk
+        if  rid < self.max_in_memory:
+            return False
 
-    def walk(self, topdown=True, skip_root=False, skip_filtered=False):
+    def _exists_in_memory(self, rid):
         """
-        Yield all resources for this Codebase walking its resource tree.
-        Walk the tree top-down, depth-first if `topdown` is True, otherwise walk
-        bottom-up.
+        Return True if Resource `rid` exists in the codebase memory cache.
+        """
+        return rid in self.resources
 
-        Each level is sorted by children sort order (e.g. without-children, then
-        with-children and each group by case-insensitive name)
+    def _exists_on_disk(self, rid):
+        """
+        Return True if Resource `rid` exists in the codebase disk cache.
+        """
+        cache_location = self._get_resource_cache_location(rid)
+        return exists(cache_location)
 
-        If `skip_root` is True, the root resource is not returned.
-        If `skip_filtered` is True, resources with `is_filtered` set to True are
-        not returned.
+    def get_resource(self, rid):
         """
-        root = self.root
+        Return the Resource with `rid` or None if it does not exists.
+        """
+        if rid == 0:
+            return self.root
 
-        # do not skip root if has no children (e.g, single root resource)
-        without_root = (skip_filtered and root.is_filtered) or (skip_root and root.has_children())
+        if not rid or rid not in self.resource_ids:
+            return
 
-        if topdown and not without_root:
-            yield root
+        if self.all_on_disk:
+            return self._load_resource(rid)
 
-        for res in root.walk(topdown):
-            if skip_filtered and res.is_filtered:
-                continue
-            yield res
+        if self.all_in_memory or rid < self.max_in_memory:
+            return self.resources.get(rid)
 
-        if not topdown and not without_root:
-            yield root
+        return self._load_resource(rid)
 
-    def get_resource(self, rid):
+    def save_resource(self, resource):
         """
-        Return the Resource with `rid` or None if it does not exists.
+        Save the `resource` Resource to cache (in memory or disk).
         """
-        if rid is not None:
-            try:
-                res = self.resources[rid]
-                if res:
-                    return res
-            except IndexError:
-                pass
+        if not resource:
+            return
+
+        rid = resource.rid
+        if rid not in self.resource_ids:
+            raise UnknownResource('Not part of codebase: %(resource)r' % resource)
 
-    def get_resources(self, rids=None):
+        if resource.is_root:
+            # we dot nothing for the root at all
+            return
+
+        if self._must_use_disk_cache(rid):
+            self._dump_resource(resource)
+        else:
+            self.resources[rid] = resource
+
+    def _dump_resource(self, resource):
         """
-        Return a list of Resource with their rid the in the list `rids`.
-        if `rids` is None, return all resources
+        Dump a Resource to the disk cache.
         """
-        if rids is None:
-            return self.resources[:]
+        cache_location = resource.cache_location
 
-        rids = set(rids)
-        return [res for res in self.resources if res.rid in rids]
+        if not cache_location:
+            raise TypeError('Resource cannot be dumped to disk and is used only'
+                            'in memory: %(resource)r' % resource)
 
-    def add_resource(self, name, parent, is_file=False):
+        # TODO: consider messagepack or protobuf for compact/faster processing?
+        with codecs.open(cache_location , 'wb', encoding='utf-8') as cached:
+            json.dump(resource.serialize(), cached, check_circular=False)
+
+    # TODO: consider adding a small LRU cache in frint of this for perf?
+    def _load_resource(self, rid):
         """
-        Create and return a new Resource object as a child of the
-        `parent` resource.
+        Return a Resource with `rid` loaded from the disk cache.
         """
-        return parent.add_child(name, is_file)
+        cache_location = self._get_resource_cache_location(rid, create=False)
+
+        if not exists(cache_location):
+            raise ResourceNotInCache(
+                'Failed to load Resource: %(rid)d from %(cache_location)r' % locals())
+
+        # TODO: consider messagepack or protobuf for compact/faster processing
+        with codecs.open(cache_location, 'r', encoding='utf-8') as cached:
+            data = json.load(cached, object_pairs_hook=OrderedDict)
+            return self.resource_class(**data)
+
+    def _remove_resource(self, resource):
+        """
+        Remove the `resource` Resource object from the resource tree.
+        Does not remove children.
+        """
+        if resource.is_root:
+            raise TypeError('Cannot remove the root resource from '
+                            'codebase:', repr(resource))
+        rid = resource.rid
+        # remove from index.
+        self.resource_ids.discard(rid)
+        # remove from in-memory cache. The disk cache is cleared on exit.
+        self.resources.pop(rid, None)
+        if TRACE:
+            logger_debug('Codebase._remove_resource:', resource)
 
     def remove_resource(self, resource):
         """
         Remove the `resource` Resource object and all its children from the
-        resource tree. Return a list of the removed Resource ids.
-        """
-        if resource.pid is None:
-            raise Exception(
-                'Cannot remove the root resource from codebase:', repr(resource))
-        rids = [res.rid for res in resource.walk(topdown=True)]
-        resources = self.resources
-        for rid in rids:
-            resources[rid] = None
-
-        parent = resource.parent()
-        if parent:
-            try:
-                parent.children_rids.remove(resource.rid)
-            except ValueError:
-                if TRACE:
-                    logger_debug(
-                        'Codebase.remove_resource() failed for Resource:', resource,
-                        'at location:', resource.get_path(absolute=True, decode=True))
-        return rids
+        resource tree.
+        """
+        if TRACE:
+            logger_debug('Codebase.remove_resource')
+            logger_debug('  resource', resource)
+
+        if resource.is_root:
+            raise TypeError('Cannot remove the root resource from '
+                            'codebase:', repr(resource))
+
+        removed_rids = set ()
+
+        # remove all descendants bottom up to avoid out-of-order access to
+        # removed resources
+        for descendant in resource.walk(self, topdown=False):
+            self._remove_resource(descendant)
+            removed_rids.add(descendant.rid)
+
+        # remove resource from parent
+        parent = resource.parent(self)
+        if TRACE: logger_debug('    parent', parent)
+        parent.children_rids.remove(resource.rid)
+
+        # remove resource proper
+        self._remove_resource(resource)
+        removed_rids.add(resource.rid)
+
+        return removed_rids
+
+    def walk(self, topdown=True, skip_root=False):
+        """
+        Yield all resources for this Codebase walking its resource tree.
+        Walk the tree top-down, depth-first if `topdown` is True, otherwise walk
+        bottom-up.
+
+        Each level is sorted by children sort order (e.g. without-children, then
+        with-children and each group by case-insensitive name)
+
+        If `skip_root` is True, the root resource is not returned unless this is
+        a codebase with a single resource.
+        """
+        root = self.root
+        # include root if no children (e.g. codebase with a single resource)
+        if skip_root and not root.has_children():
+            skip_root = False
+
+        if topdown and not skip_root:
+            yield root
+
+        for res in root.walk(self, topdown):
+            yield res
+
+        if not topdown and not skip_root:
+            yield root
+
+    def walk_filtered(self, topdown=True, skip_root=False):
+        """
+        Walk this Codebase as with walk() but doe not return Resources with
+        `is_filtered` flag set to True.
+        """
+        for resource in self.walk(topdown, skip_root):
+            if resource.is_filtered:
+                continue
+            yield resource
 
     def compute_counts(self, skip_root=False, skip_filtered=False):
         """
@@ -421,6 +564,7 @@ def compute_counts(self, skip_root=False, skip_filtered=False):
         Return a tuple of top level counters (files_count, dirs_count,
         size_count) for this codebase.
 
+        The counts are computed differently based on these falsg:
         - If `skip_root` is True, the root resource is not included in counts.
         - If `skip_filtered` is True, resources with `is_filtered` set to True
           are not included in counts.
@@ -452,20 +596,38 @@ def update_counts(self, skip_filtered=False):
         not included in counts.
         """
         # note: we walk bottom up to update things in the proper order
-        # and the walk MUST MNOT skip filtered, only the compute
-        for resource in self.walk(topdown=False, skip_filtered=False):
-            resource._compute_children_counts(skip_filtered)
+        # and the walk MUST NOT skip filtered, only the compute
+        for resource in self.walk(topdown=False):
+            resource._compute_children_counts(self, skip_filtered)
 
     def clear(self):
         """
-        Purge the codebase cache(s) by deleting the corresponding cached data
-        files and in-memory data.
+        Purge the codebase cache(s).
         """
         delete(self.cache_dir)
-        del_codebase(self.cid)
 
 
-@attr.attributes(slots=True)
+def to_native_path(path):
+    """
+    Return `path` using the preferred OS encoding (bytes on Linux,
+    Unicode elsewhere) given a unicode or bytes path string.
+    """
+    if not path:
+        return path
+    if on_linux:
+        return fsencode(path)
+    else:
+        return fsdecode(path)
+
+
+def to_decoded_posix_path(path):
+    """
+    Return `path` as a Unicode POSIX path given a unicode or bytes path string.
+    """
+    return fsdecode(as_posixpath(path))
+
+
+@attr.attributes
 class Resource(object):
     """
     A resource represent a file or directory with essential "file information"
@@ -483,56 +645,47 @@ class Resource(object):
     """
     # the file or directory name in the OS preferred representation (either
     # bytes on Linux and Unicode elsewhere)
-    name = attr.ib()
-
-    # a integer resource id
-    rid = attr.ib(type=int)
-
+    name = attr.attrib(converter=to_native_path)
+
+    # the file or directory absolute location in the OS preferred representation
+    # (either bytes on Linux and Unicode elsewhere) using the OS native path
+    # separators.
+    location = attr.attrib(converter=to_native_path, repr=False)
+
+    # the file or directory POSIX path decoded as unicode using the filesystem
+    # encoding. This is the path that will be reported in output and can be
+    # either one of these:
+    # - if the codebase was created with strip_root==True, this is a path
+    #   relative to the root, stripped from its root segment unless the codebase
+    #   contains a single file.
+    # - if the codebase was created with full_root==True, this is an absolute
+    #   path
+    path = attr.attrib(converter=to_decoded_posix_path)
+
+    # resource id as an integer
+    # the root of a Resource tree has a pid==0 by convention
+    rid = attr.ib()
+
+    # parent resource id of this resource as an integer
     # the root of a Resource tree has a pid==None by convention
-    pid = attr.ib(type=int)
+    pid = attr.ib()
 
-    # a integer codebase id
-    cid = attr.ib(default=None, type=int, repr=False)
+    # location of the file where this resource can be chached on disk in the OS
+    # preferred representation (either bytes on Linux and Unicode elsewhere)
+    cache_location = attr.attrib(default=None, converter=to_native_path, repr=False)
 
     # True for file, False for directory
-    is_file = attr.ib(default=False, type=bool)
+    is_file = attr.ib(default=False)
 
     # True if this Resource should be filtered out, e.g. skipped from the
     # returned list of resources
-    is_filtered = attr.ib(default=False, type=bool)
+    is_filtered = attr.ib(default=False)
 
     # a list of rids
-    children_rids = attr.ib(default=attr.Factory(list), repr=False)
-
-    errors = attr.ib(default=attr.Factory(list), repr=False)
-
-    # a mapping of scan result. Used when scan result is not cached
-    _scans = attr.ib(default=attr.Factory(OrderedDict), repr=False)
-
-    # True is the cache is used. Set at creation time from the codebase settings
-    use_cache = attr.ib(default=None, type=bool, repr=False)
-
-    # FIXME: this may not need to be saved??
-    # tuple of cache keys: dir and file name
-    cache_keys = attr.ib(default=None, repr=False)
+    children_rids = attr.ib(default=attr.Factory(list), repr=TRACE)
 
     # external data to serialize
-    type = attr.ib(default=None, repr=False)
-    base_name = attr.ib(default=None, repr=False)
-    extension = attr.ib(default=None, repr=False)
-    date = attr.ib(default=None, repr=False)
-    size = attr.ib(default=0, type=int)
-    sha1 = attr.ib(default=None, repr=False)
-    md5 = attr.ib(default=None, repr=False)
-    mime_type = attr.ib(default=None, repr=False)
-    file_type = attr.ib(default=None, repr=False)
-    programming_language = attr.ib(default=None, repr=False)
-    is_binary = attr.ib(default=False, type=bool, repr=False)
-    is_text = attr.ib(default=False, type=bool, repr=False)
-    is_archive = attr.ib(default=False, type=bool, repr=False)
-    is_media = attr.ib(default=False, type=bool, repr=False)
-    is_source = attr.ib(default=False, type=bool, repr=False)
-    is_script = attr.ib(default=False, type=bool, repr=False)
+    size = attr.ib(default=0, type=int, repr=TRACE)
 
     # These attributes are re/computed for directories and files with children
     # they represent are the for the full descendants of a Resource
@@ -540,28 +693,38 @@ class Resource(object):
     files_count = attr.ib(default=0, type=int, repr=False)
     dirs_count = attr.ib(default=0, type=int, repr=False)
 
+    # list of scan error strinsg
+    scan_errors = attr.ib(default=attr.Factory(list), repr=False)
+
     # Duration in seconds as float to run all scans for this resource
     scan_time = attr.ib(default=0, repr=False)
 
     # mapping of timings for each scan as {scan_key: duration in seconds as a float}
-    scan_timings = attr.ib(default=None, repr=False)
-
-    def __attrs_post_init__(self):
-        # TODO: compute rather than store
-        # build simple cache keys for this resource based on the hex
-        # representation of the resource id: they are guaranteed to be unique
-        # within a codebase.
-        if self.use_cache is None and hasattr(self.codebase, 'use_cache'):
-            self.use_cache = self.codebase.use_cache
-        hx = '%08x' % self.rid
-        if on_linux:
-            hx = fsencode(hx)
-        self.cache_keys = hx[-2:], hx
+    scan_timings = attr.ib(default=attr.Factory(OrderedDict), repr=False)
 
+    @property
     def is_root(self):
-        return self.pid is None
+        return self.rid == 0
 
-    def _compute_children_counts(self, skip_filtered=False):
+    @property
+    def type(self):
+        return 'file' if self.is_file else 'directory'
+
+    @property
+    def base_name(self):
+        if not self.is_file:
+            return self.name
+        base_name, _extension = splitext(self.name)
+        return base_name
+
+    @property
+    def extension(self):
+        if not self.is_file:
+            return b'' if on_linux else ''
+        _base_name, extension = splitext(self.name)
+        return extension
+
+    def _compute_children_counts(self, codebase, skip_filtered=False):
         """
         Compute counts and update self with these counts from direct children.
         Return a tuple of counters (files_count, dirs_count, size_count) for the
@@ -575,7 +738,7 @@ def _compute_children_counts(self, skip_filtered=False):
         of its files (including the count of files inside archives).
         """
         files_count = dirs_count = size_count = 0
-        for child in self.children():
+        for child in self.children(codebase):
             files_count += child.files_count
             dirs_count += child.dirs_count
             size_count += child.size_count
@@ -594,92 +757,7 @@ def _compute_children_counts(self, skip_filtered=False):
         self.size_count = size_count
         return files_count, dirs_count, size_count
 
-    @property
-    def codebase(self):
-        """
-        Return this Resource codebase from the global cache.
-        """
-        return get_codebase(self.cid)
-
-    def _get_cached_path(self, create=False):
-        """
-        Return the path where to get/put a data in the cache given a path.
-        Create the directories if requested.
-        Will fail with an Exception if the codebase `use_cache` is False.
-        """
-        if self.use_cache:
-            cache_sub_dir, cache_file_name = self.cache_keys
-            parent = join(self.codebase.cache_dir, cache_sub_dir)
-            if create and not exists(parent):
-                create_dir(parent)
-            return join(parent, cache_file_name)
-
-    def get_scans(self, _cached_path=None):
-        """
-        Return a `scans` mapping. Fetch from the cache if the codebase
-        `use_cache` is True.
-        """
-        if not self.use_cache:
-            return self._scans
-
-        if not _cached_path:
-            _cached_path = self._get_cached_path(create=False)
-
-        if not exists(_cached_path):
-            return OrderedDict()
-
-        # TODO: consider messagepack or protobuf for compact/faster processing
-        with codecs.open(_cached_path, 'r', encoding='utf-8') as cached:
-            return json.load(cached, object_pairs_hook=OrderedDict)
-
-    def put_scans(self, scans, update=True):
-        """
-        Save the `scans` mapping of scan results for this resource. Does nothing
-        if `scans` is empty or None.
-        Return the saved mapping of `scans`, possibly updated or empty.
-        If `update` is True, existing scans are updated with `scans`.
-        If `update` is False, `scans` overwrites existing scans.
-        If `self.use_cache` is True, `scans` are saved in the cache.
-        Otherwise they are saved in this resource object.
-        """
-        if TRACE:
-            logger_debug('put_scans: scans:', scans, 'update:', update,
-                         'use_cache:', self.use_cache)
-
-        if not scans:
-            return OrderedDict()
-
-        if not self.use_cache:
-            if update:
-                self._scans.update(scans)
-            else:
-                self._scans.clear()
-                self._scans.update(scans)
-
-            if TRACE: logger_debug('put_scans: merged:', self._scans)
-            return self._scans
-
-        # from here on we use_cache!
-        self._scans.clear()
-        cached_path = self._get_cached_path(create=True)
-        if update:
-            existing = self.get_scans(cached_path)
-            if TRACE: logger_debug(
-                'put_scans: cached_path:', cached_path, 'existing:', existing)
-
-            existing.update(scans)
-
-            if TRACE: logger_debug('put_scans: merged:', existing)
-        else:
-            existing = scans
-
-        # TODO: consider messagepack or protobuf for compact/faster processing
-        with codecs.open(cached_path, 'wb', encoding='utf-8') as cached_file:
-            json.dump(existing, cached_file, check_circular=False)
-
-        return existing
-
-    def walk(self, topdown=True):
+    def walk(self, codebase, topdown=True,):
         """
         Yield all descendant Resources of this Resource. Does not include self.
 
@@ -690,41 +768,21 @@ def walk(self, topdown=True):
         with-children and each group by case-insensitive name)
         """
 
-        for child in self.children():
+        for child in self.children(codebase):
             if topdown:
                 yield child
-            for subchild in child.walk(topdown):
+            for subchild in child.walk(codebase, topdown):
                 yield subchild
             if not topdown:
                 yield child
 
-    def add_child(self, name, is_file=False):
-        """
-        Create and return a child Resource. Add this child to the codebase
-        resources and to this Resource children.
-        """
-        rid = self.codebase._get_next_rid()
-        child = self._add_child(name, rid, is_file)
-        self.codebase.resources.append(child)
-        return child
-
-    def _add_child(self, name, rid, is_file=False):
-        """
-        Create a child Resource with `name` and a `rid` Resource id and add its
-        id to this Resource children. Return the created child.
-        """
-        res = Resource(name=name, rid=rid, pid=self.rid, cid=self.cid,
-                       is_file=is_file, use_cache=self.use_cache)
-        self.children_rids.append(rid)
-        return res
-
     def has_children(self):
         """
         Return True is this Resource has children.
         """
         return bool(self.children_rids)
 
-    def children(self):
+    def children(self, codebase):
         """
         Return a sorted sequence of direct children Resource objects for this Resource
         or an empty sequence.
@@ -732,155 +790,136 @@ def children(self):
         (e.g. directories or files with children), then case-insentive name.
         """
         _sorter = lambda r: (r.has_children(), r.name.lower(), r.name)
-        resources = self.codebase.resources
-        return sorted((resources[rid] for rid in self.children_rids), key=_sorter)
+        get_resource = codebase.get_resource
+        return sorted((get_resource(rid) for rid in self.children_rids), key=_sorter)
 
     def has_parent(self):
         """
         Return True is this Resource has children.
         """
-        return not self.is_root()
+        return not self.is_root
 
-    def parent(self):
+    def parent(self, codebase):
         """
         Return the parent Resource object for this Resource or None.
         """
-        return self.codebase.get_resource(self.pid)
+        return codebase.get_resource(self.pid)
 
-    def has_siblings(self):
+    def has_siblings(self, codebase):
         """
         Return True is this Resource has siblings.
         """
-        return self.has_parent() and self.parent().has_children()
+        return self.has_parent() and self.parent(codebase).has_children()
 
-    def siblings(self):
+    def siblings(self, codebase):
         """
         Return a sequence of sibling Resource objects for this Resource
         or an empty sequence.
         """
         if self.has_parent():
-            return self.parent().children()
+            return self.parent(codebase).children(codebase)
         return []
 
-    def ancestors(self):
+    def ancestors(self, codebase):
         """
-        Return a sequence of ancestor Resource objects from root to self.
+        Return a sequence of ancestor Resource objects from self to root
+        (includes self).
         """
-        if self.pid is None:
+        if self.is_root:
             return [self]
-        resources = self.codebase.resources
+
         ancestors = deque()
-        ancestors_append = ancestors.appendleft
         current = self
-        # walk up the tree parent tree: only the root as a pid==None
-        while current.pid is not None:
-            ancestors_append(current)
-            current = resources[current.pid]
-        ancestors_append(current)
+        # walk up the tree parent tree up to the root
+        while not current.is_root:
+            ancestors.appendleft(current)
+            current = codebase.get_resource(current.pid)
+        # append root too
+        ancestors.appendleft(current)
         return list(ancestors)
 
-    def get_path(self, absolute=False, strip_root=False, decode=False, posix=False):
+    def to_dict(self, with_timing=False, with_info=False):
         """
-        Return a path to self using the preferred OS encoding (bytes on Linux,
-        Unicode elsewhere) or Unicode if `decode`=True.
-
-        - If `absolute` is True, return an absolute path. Otherwise return a
-          relative path where the first segment is the root name.
-
-        - If `strip_root` is True, return a relative path without the first root
-          segment. Ignored if `absolute` is True.
-
-        - If `decode` is True, return a Unicode path decoded using the filesytem
-          encoding.
-
-        - If `posix` is True, ensure that the path uses POSIX slash as
-        separators, otherwise use the native path separators.
+        Return a mapping of representing this Resource and its scans.
         """
-        ancestors = self.ancestors()
-        segments = [a.name for a in ancestors]
-        if absolute:
-            base_location = self.codebase.base_location
-            if posix:
-                base_location = as_posixpath(base_location)
-            segments.insert(0, base_location)
+        res = OrderedDict()
+        res['path'] = self.path
 
-        elif strip_root:
-            if len(segments) > 1:
-                # we cannot ever strip the root from the root when there is only
-                # one resource!
-                segments = segments[1:]
+        if with_info:
+            res['type'] = self.type
+            res['name'] = fsdecode(self.name)
+            res['base_name'] = fsdecode(self.base_name)
+            res['extension'] = fsdecode(self.extension)
+            res['size'] = self.size
 
-        path = join(*segments)
-        if posix:
-            path = as_posixpath(path)
+        self_fields_filter = attr.filters.exclude(*attr.fields(Resource))
 
-        if decode:
-            path = fsdecode(path)
-        return path
+        other_data = attr.asdict(
+            self, filter=self_fields_filter, dict_factory=OrderedDict)
 
-    def set_info(self, info):
-        """
-        Set each mapping attribute from the `info` list of mappings of file
-        information as attributes of this Resource.
-        """
-        if TRACE:
-            from pprint import pformat
-            logger_debug()
-            logger_debug('Resource.set_info:', self, '\n  info:', pformat(info))
+        res.update(other_data)
 
-        if not info:
-            return
-
-        for inf in info:
-            for key, value in inf.items():
-                setattr(self, key, value)
-
-        if TRACE:
-            logger_debug('Resource.set_info: to_dict():', pformat(info))
+        if with_timing:
+            res['scan_time'] = self.scan_time or 0
+            res['scan_timings'] = self.scan_timings or {}
 
-    def to_dict(self, full_root=False, strip_root=False,
-                with_info=False, with_timing=False):
-        """
-        Return a mapping of representing this Resource and its scans.
-        """
-        res = OrderedDict()
-        res['path'] = fsdecode(self.get_path(
-            absolute=full_root, strip_root=strip_root, decode=True, posix=True))
         if with_info:
-            res['type'] = self.type
-            res['name'] = self.name and fsdecode(self.name) or ''
-            res['base_name'] = self.base_name and fsdecode(self.base_name) or ''
-            res['extension'] = self.extension and fsdecode(self.extension)  or ''
-            res['date'] = self.date
-            res['size'] = self.size
-            res['sha1'] = self.sha1
-            res['md5'] = self.md5
             res['files_count'] = self.files_count
             res['dirs_count'] = self.dirs_count
             res['size_count'] = self.size_count
-            res['mime_type'] = self.mime_type
-            res['file_type'] = self.file_type
-            res['programming_language'] = self.programming_language
-            res['is_binary'] = self.is_binary
-            res['is_text'] = self.is_text
-            res['is_archive'] = self.is_archive
-            res['is_media'] = self.is_media
-            res['is_source'] = self.is_source
-            res['is_script'] = self.is_script
-        if with_timing:
-            res['scan_timings'] = self.scan_timings or {}
 
-        res['scan_errors'] = self.errors
-        res.update(self.get_scans())
+        res['scan_errors'] = self.scan_errors
         if TRACE:
             logger_debug('Resource.to_dict:', res)
         return res
 
+    def serialize(self):
+        """
+        Return a mapping of representing this Resource and its scans in a form
+        that is fully serializable and can be used to reconstruct a Resource.
+        All path-derived OS-native strings are decoded to Unicode for JSON
+        serialization.
+        """
+        saveable = attr.asdict(self, dict_factory=OrderedDict)
+        saveable['name'] = fsdecode(self.name)
+        saveable['location'] = fsdecode(self.location)
+        if self.cache_location:
+            saveable['cache_location'] = fsdecode(self.cache_location)
+        return saveable
+
+
+def get_path(root_location, location, full_root=False, strip_root=False):
+    """
+    Return a Unicode POSIX `path` (using "/"  separators) derived from
+    `root_location` and `location` (both absolute native locations
+    respectively the root location of the codebase and to the Resource).
+
+    - If `full_root` is True, return an absolute path. Otherwise return a
+      relative path where the first segment is the root name.
+
+    - If `strip_root` is True, return a relative path without the first root
+      segment. Ignored if `full_root` is True.
+    """
+
+    posix_loc = fsdecode(as_posixpath(location))
+    if full_root:
+        return posix_loc
+
+    if not strip_root:
+        # keep the root directory name by default
+        root_loc = parent_directory(root_location)
+    else:
+        root_loc = root_location
+
+    posix_root_loc = fsdecode(as_posixpath(root_loc)).rstrip('/') + '/'
+
+    return posix_loc.replace(posix_root_loc, '', 1)
+
 
-def get_results_cache_dir(temp_dir=scancode_temp_dir):
+def get_codebase_cache_dir(temp_dir=scancode_temp_dir):
     """
     Return a new, created and unique per-run cache storage directory path rooted
-    at the `temp_dir` base temp directory in the OS- preferred representation
+    at the `temp_dir` base temp directory in the OS-preferred representation
     (either bytes on Linux and Unicode elsewhere).
     """
     from commoncode.fileutils import get_temp_dir
diff --git a/src/scancode/utils.py b/src/scancode/utils.py
index b9e76b79eec..c513ef5e3c6 100644
--- a/src/scancode/utils.py
+++ b/src/scancode/utils.py
@@ -34,11 +34,9 @@
 from click._termui_impl import ProgressBar
 
 from commoncode.fileutils import file_name
-from commoncode.fileutils import fsdecode
 from commoncode.fileutils import splitext
 from commoncode.text import toascii
 
-
 # Python 2 and 3 support
 try:
     # Python 2
diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv
index bbf4af81230..e38066deeab 100644
--- a/tests/formattedcode/data/csv/livescan/expected.csv
+++ b/tests/formattedcode/data/csv/livescan/expected.csv
@@ -1,16 +1,16 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,dirs_count,size_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
-/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1014,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,0,0,0,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Resource,type,name,base_name,extension,size,date,sha1,md5,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,files_count,dirs_count,size_count,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+/json2csv.rb,file,json2csv.rb,json2csv,.rb,1014,2017-10-03,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,0,0,0,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
-/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,0,0,0,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,file,license,license,,679,2017-10-03,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,text/plain,ASCII text,,False,True,False,False,False,False,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,['gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+/package.json,file,package.json,package,.json,2200,2017-10-03,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,['mit'],,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
diff --git a/tests/formattedcode/data/json/simple-expected.json b/tests/formattedcode/data/json/simple-expected.json
index aaeae70f17e..9b273013432 100644
--- a/tests/formattedcode/data/json/simple-expected.json
+++ b/tests/formattedcode/data/json/simple-expected.json
@@ -19,9 +19,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 1,
-      "dirs_count": 0,
-      "size_count": 55,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -31,10 +28,13 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
-      "packages": []
+      "packages": [],
+      "files_count": 1,
+      "dirs_count": 0,
+      "size_count": 55,
+      "scan_errors": []
     },
     {
       "path": "simple/copyright_acme_c-c.c",
@@ -45,9 +45,6 @@
       "size": 55,
       "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
@@ -57,7 +54,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -72,7 +68,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index 2d6420943a1..c643a3ffdd4 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -21,9 +21,6 @@
         "size": 0,
         "sha1": null,
         "md5": null,
-        "files_count": 1,
-        "dirs_count": 0,
-        "size_count": 55,
         "mime_type": null,
         "file_type": null,
         "programming_language": null,
@@ -33,6 +30,9 @@
         "is_media": false,
         "is_source": false,
         "is_script": false,
+        "files_count": 1,
+        "dirs_count": 0,
+        "size_count": 55,
         "scan_errors": []
       }
     ]
@@ -48,9 +48,6 @@
         "size": 55,
         "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
         "md5": "bdf7c572beb4094c2059508fa73c05a4",
-        "files_count": 0,
-        "dirs_count": 0,
-        "size_count": 0,
         "mime_type": "text/plain",
         "file_type": "UTF-8 Unicode text, with no line terminators",
         "programming_language": "C",
@@ -60,6 +57,9 @@
         "is_media": false,
         "is_source": true,
         "is_script": false,
+        "files_count": 0,
+        "dirs_count": 0,
+        "size_count": 0,
         "scan_errors": []
       }
     ]
diff --git a/tests/formattedcode/data/json/simple-expected.jsonpp b/tests/formattedcode/data/json/simple-expected.jsonpp
index 75e606fe7e3..b542ca37de6 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonpp
+++ b/tests/formattedcode/data/json/simple-expected.jsonpp
@@ -19,9 +19,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 1,
-      "dirs_count": 0,
-      "size_count": 55,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -31,10 +28,13 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
-      "packages": []
+      "packages": [],
+      "files_count": 1,
+      "dirs_count": 0,
+      "size_count": 55,
+      "scan_errors": []
     },
     {
       "path": "simple/copyright_acme_c-c.c",
@@ -45,9 +45,6 @@
       "size": 55,
       "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
@@ -57,7 +54,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -72,7 +68,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/formattedcode/data/json/tree/expected.json b/tests/formattedcode/data/json/tree/expected.json
index c9a2259e987..235cef0a411 100644
--- a/tests/formattedcode/data/json/tree/expected.json
+++ b/tests/formattedcode/data/json/tree/expected.json
@@ -20,9 +20,6 @@
       "size": 91,
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -32,7 +29,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -47,7 +43,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "copy2.c",
@@ -58,9 +58,6 @@
       "size": 91,
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -70,7 +67,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -85,7 +81,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "copy3.c",
@@ -96,9 +96,6 @@
       "size": 91,
       "sha1": "c91811eb5fdc7ab440355f9f8d1580e1518b0c2f",
       "md5": "e999e21c9d7de4d0f943aefbb6f21b99",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -108,7 +105,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -123,7 +119,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "subdir",
@@ -134,9 +134,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 4,
-      "dirs_count": 0,
-      "size_count": 361,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -146,10 +143,13 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
-      "packages": []
+      "packages": [],
+      "files_count": 4,
+      "dirs_count": 0,
+      "size_count": 361,
+      "scan_errors": []
     },
     {
       "path": "subdir/copy1.c",
@@ -160,9 +160,6 @@
       "size": 91,
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -172,7 +169,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -187,7 +183,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "subdir/copy2.c",
@@ -198,9 +198,6 @@
       "size": 91,
       "sha1": "3922760d8492eb8f853c10a627f5a73f9eaec6ff",
       "md5": "fc7f53659b7a9db8b6dff0638641778e",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -210,7 +207,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -225,7 +221,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "subdir/copy3.c",
@@ -236,9 +236,6 @@
       "size": 84,
       "sha1": "389af7e629a9853056e42b262d5e30bf4579a74f",
       "md5": "290627a1387288ef77ae7e07946f3ecf",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -248,7 +245,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -263,7 +259,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "subdir/copy4.c",
@@ -274,9 +274,6 @@
       "size": 95,
       "sha1": "58748872d25374160692f1ed7075d0fe80a544b1",
       "md5": "88e46475db9b1a68f415f6a3544eeb16",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text",
       "programming_language": "C",
@@ -286,7 +283,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [
         {
@@ -301,7 +297,11 @@
           "end_line": 1
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/formattedcode/test_output_jsonlines.py b/tests/formattedcode/test_output_jsonlines.py
index 78ae7202497..9c01cdefcd9 100644
--- a/tests/formattedcode/test_output_jsonlines.py
+++ b/tests/formattedcode/test_output_jsonlines.py
@@ -107,7 +107,14 @@ def test_jsonlines_with_timing():
             first_line = False
             continue
         scan_timings = res['files'][0]['scan_timings']
+
+        if not res['files'][0]['type'] == 'file':
+            # should be an empty dict for dirs
+            assert not scan_timings
+            continue
+
         assert scan_timings
+
         for scanner, timing in scan_timings.items():
-            assert scanner in ('infos',)
+            assert scanner in ('info',)
             assert timing
diff --git a/tests/formattedcode/test_output_templated.py b/tests/formattedcode/test_output_templated.py
index 824bbaad508..75b03f61210 100644
--- a/tests/formattedcode/test_output_templated.py
+++ b/tests/formattedcode/test_output_templated.py
@@ -114,7 +114,7 @@ def test_scan_html_output_does_not_truncate_copyright_html():
 def test_custom_format_with_custom_filename_fails_for_directory():
     test_dir = test_env.get_temp_dir('html')
     result_file = test_env.get_temp_file('html')
-    args = ['--custom-template', test_dir, '--output-custom', result_file, test_dir]
+    args = ['--info', '--custom-template', test_dir, '--output-custom', result_file, test_dir]
     result = run_scan_click(args, expected_rc=2)
     assert 'Invalid value for "--custom-template": Path' in result.output
 
@@ -123,7 +123,7 @@ def test_custom_format_with_custom_filename():
     test_dir = test_env.get_test_loc('templated/simple')
     custom_template = test_env.get_test_loc('templated/sample-template.html')
     result_file = test_env.get_temp_file('html')
-    args = ['--custom-template', custom_template, '--output-custom', result_file, test_dir]
+    args = ['--info', '--custom-template', custom_template, '--output-custom', result_file, test_dir]
     run_scan_click(args)
     results = open(result_file).read()
     assert 'Custom Template' in results
diff --git a/tests/scancode/data/altpath/copyright.expected.json b/tests/scancode/data/altpath/copyright.expected.json
index 77c1c876a4d..baf21fed85b 100644
--- a/tests/scancode/data/altpath/copyright.expected.json
+++ b/tests/scancode/data/altpath/copyright.expected.json
@@ -18,9 +18,6 @@
       "size": 55,
       "sha1": "e2466d5b764d27fb301ceb439ffb5da22e43ab1d",
       "md5": "bdf7c572beb4094c2059508fa73c05a4",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "UTF-8 Unicode text, with no line terminators",
       "programming_language": "C",
@@ -30,7 +27,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "copyrights": [
         {
           "statements": [
@@ -43,7 +39,11 @@
           "start_line": 1,
           "end_line": 1
         }
-      ]
+      ],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index cf4d348dfe6..126dbc1d7d1 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -9,7 +9,6 @@
   "files": [
     {
       "path": "composer.json",
-      "scan_errors": [],
       "packages": [
         {
           "type": "phpcomposer",
@@ -119,7 +118,8 @@
           },
           "related_packages": []
         }
-      ]
+      ],
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/failing/patchelf.expected.json b/tests/scancode/data/failing/patchelf.expected.json
index 3666b1f8f92..68f8b43fa6b 100644
--- a/tests/scancode/data/failing/patchelf.expected.json
+++ b/tests/scancode/data/failing/patchelf.expected.json
@@ -10,10 +10,10 @@
   "files": [
     {
       "path": "patchelf.pdf",
+      "copyrights": [],
       "scan_errors": [
         "ERROR: for scanner: copyrights:\nerror: unpack requires a string argument of length 8\n"
-      ],
-      "copyrights": []
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/help/help.txt b/tests/scancode/data/help/help.txt
index b3502ac1afb..8030e231f4d 100644
--- a/tests/scancode/data/help/help.txt
+++ b/tests/scancode/data/help/help.txt
@@ -39,10 +39,8 @@ Options:
                             Jinja template file.
     --custom-template FILE  Use this Jinja template FILE as a custom template.
     --output-html-app FILE  Write scan output as a mini HTML application to FILE.
-    --output-spdx-rdf FILE  Write scan output as SPDX RDF to FILE. Implies running
-                            the --info scan.
-    --output-spdx-tv FILE   Write scan output as SPDX Tag/Value to FILE. Implies
-                            running the --info scan.
+    --output-spdx-rdf FILE  Write scan output as SPDX RDF to FILE.
+    --output-spdx-tv FILE   Write scan output as SPDX Tag/Value to FILE.
 
   output filters:
     --only-findings  Only return files or directories with findings for the
@@ -62,33 +60,38 @@ Options:
 
   post-scan:
     --mark-source  Set the "is_source" to true for directories that contain over
-                   90% of source files as children and descendants. Implies
-                   running the --info scan.
+                   90% of source files as children and descendants. Count the
+                   number of source files in a directory as a new
+                   source_file_counts attribute
 
   core:
-    --timeout <secs>     Stop an unfinished file scan after a timeout in seconds.
-                         [default: 120 seconds]
-    -n, --processes INT  Set the number of parallel processes to use. Disable
-                         parallel processing if 0. Also disable threading if -1.
-                         [default: 1]
-    --quiet              Do not print summary or progress.
-    --verbose            Print progress  as file-by-file path instead of a
-                         progress bar. Print a verbose scan summary.
-    --cache-dir DIR      Set the path to an existing directory where ScanCode can
-                         cache files available across runs.If not set, the value
-                         of the `SCANCODE_CACHE` environment variable is used if
-                         available. If `SCANCODE_CACHE` is not set, a default sub-
-                         directory in the user home directory is used instead.
-                         [default: ~/.cache/scancode-tk/version]
-    --temp-dir DIR       Set the path to an existing directory where ScanCode can
-                         create temporary files. If not set, the value of the
-                         `SCANCODE_TMP` environment variable is used if available.
-                         If `SCANCODE_TMP` is not set, a default sub-directory in
-                         the system temp directory is used instead.  [default: TMP
-                         /scancode-tk-<key>]
-    --timing             Collect scan timing for each scan/scanned file.
-    --on-disk-results    Save intermediate scan results in temporary files. Uses
-                         less memory.  [default: True]
+    --timeout <secs>         Stop an unfinished file scan after a timeout in
+                             seconds.  [default: 120 seconds]
+    -n, --processes INT      Set the number of parallel processes to use. Disable
+                             parallel processing if 0. Also disable threading if
+                             -1. [default: 1]
+    --quiet                  Do not print summary or progress.
+    --verbose                Print progress  as file-by-file path instead of a
+                             progress bar. Print a verbose scan summary.
+    --cache-dir DIR          Set the path to an existing directory where ScanCode
+                             can cache files available across runs.If not set, the
+                             value of the `SCANCODE_CACHE` environment variable is
+                             used if available. If `SCANCODE_CACHE` is not set, a
+                             default sub-directory in the user home directory is
+                             used instead. [default: ~/.cache/scancode-tk/version]
+    --temp-dir DIR           Set the path to an existing directory where ScanCode
+                             can create temporary files. If not set, the value of
+                             the `SCANCODE_TMP` environment variable is used if
+                             available. If `SCANCODE_TMP` is not set, a default
+                             sub-directory in the system temp directory is used
+                             instead.  [default: TMP/scancode-tk-<key>]
+    --timing                 Collect scan timing for each scan/scanned file.
+    --max-in-memory INTEGER  Maximum number of files and directories scan details
+                             kept in memory during a scan. Additional files and
+                             directories scan details above this number are cached
+                             on-disk rather than in memory. Use 0 to use unlimited
+                             memory and disable on-disk caching. Use -1 to use
+                             only on-disk caching.  [default: 10000]
 
   miscellaneous:
     --reindex-licenses  Check the license index cache and reindex if needed and
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index ab9f38c9a44..dc7b27cb980 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -16,13 +16,10 @@
       "name": "basic",
       "base_name": "basic",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 6,
-      "dirs_count": 4,
-      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -32,9 +29,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 6,
+      "dirs_count": 4,
+      "size_count": 57066,
+      "scan_errors": []
     },
     {
       "path": "basic/dbase.fdt",
@@ -42,13 +42,10 @@
       "name": "dbase.fdt",
       "base_name": "dbase",
       "extension": ".fdt",
-      "date": "2015-06-19",
       "size": 183,
+      "date": "2015-06-19",
       "sha1": "94f059d6478d5f460e79b6b948a7fa9849d4dfdc",
       "md5": "15240737ec72b9e88b485a663bd045f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -58,9 +55,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/dir",
@@ -68,13 +68,10 @@
       "name": "dir",
       "base_name": "dir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 1,
-      "size_count": 18486,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -84,9 +81,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 2,
+      "dirs_count": 1,
+      "size_count": 18486,
+      "scan_errors": []
     },
     {
       "path": "basic/dir/e.tar",
@@ -94,13 +94,10 @@
       "name": "e.tar",
       "base_name": "e",
       "extension": ".tar",
-      "date": "2015-06-19",
       "size": 10240,
+      "date": "2015-06-19",
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -110,9 +107,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/dir/subdir",
@@ -120,13 +120,10 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 1,
-      "dirs_count": 0,
-      "size_count": 8246,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -136,9 +133,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 1,
+      "dirs_count": 0,
+      "size_count": 8246,
+      "scan_errors": []
     },
     {
       "path": "basic/dir/subdir/a.aif",
@@ -146,13 +146,10 @@
       "name": "a.aif",
       "base_name": "a",
       "extension": ".aif",
-      "date": "2015-06-19",
       "size": 8246,
+      "date": "2015-06-19",
       "sha1": "03cfd28bb49d1dab105dcce1663630be1ddd821a",
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -162,9 +159,12 @@
       "is_media": true,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/dir2",
@@ -172,13 +172,10 @@
       "name": "dir2",
       "base_name": "dir2",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 1,
-      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -188,9 +185,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 2,
+      "dirs_count": 1,
+      "size_count": 36457,
+      "scan_errors": []
     },
     {
       "path": "basic/dir2/subdir",
@@ -198,13 +198,10 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 0,
-      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -214,9 +211,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 2,
+      "dirs_count": 0,
+      "size_count": 36457,
+      "scan_errors": []
     },
     {
       "path": "basic/dir2/subdir/bcopy.s",
@@ -224,13 +224,10 @@
       "name": "bcopy.s",
       "base_name": "bcopy",
       "extension": ".s",
-      "date": "2015-06-19",
       "size": 32452,
+      "date": "2015-06-19",
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -240,7 +237,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [
         {
           "key": "bsd-original-uc",
@@ -285,7 +281,11 @@
           "start_line": 34,
           "end_line": 37
         }
-      ]
+      ],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/dir2/subdir/config.conf",
@@ -293,13 +293,10 @@
       "name": "config.conf",
       "base_name": "config",
       "extension": ".conf",
-      "date": "2015-06-19",
       "size": 4005,
+      "date": "2015-06-19",
       "sha1": "4d567dc15d2117445389edfb64ced872329bceaa",
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -309,9 +306,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/main.c",
@@ -319,13 +319,10 @@
       "name": "main.c",
       "base_name": "main",
       "extension": ".c",
-      "date": "2015-06-19",
       "size": 1940,
+      "date": "2015-06-19",
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
@@ -335,7 +332,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [
         {
           "key": "gpl-2.0",
@@ -394,7 +390,11 @@
           "start_line": 2,
           "end_line": 3
         }
-      ]
+      ],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index d4ab5003188..0552a6bfe29 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -12,79 +12,78 @@
   "files": [
     {
       "path": "basic.tgz",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dbase.fdt",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir/e.tar",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir/subdir",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir/subdir/a.aif",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir2",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir2/subdir",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir2/subdir/bcopy.s",
-      "scan_errors": [],
       "licenses": [
         {
           "key": "bsd-original-uc",
@@ -143,11 +142,11 @@
           "start_line": 17,
           "end_line": 17
         }
-      ]
+      ],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir2/subdir/config.conf",
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "emails": [],
@@ -157,11 +156,11 @@
           "start_line": 2,
           "end_line": 2
         }
-      ]
+      ],
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/main.c",
-      "scan_errors": [],
       "licenses": [
         {
           "key": "gpl-2.0",
@@ -228,7 +227,8 @@
           "end_line": 3
         }
       ],
-      "urls": []
+      "urls": [],
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/info/basic.expected.json b/tests/scancode/data/info/basic.expected.json
index a226ed9ca2d..bc955859f59 100644
--- a/tests/scancode/data/info/basic.expected.json
+++ b/tests/scancode/data/info/basic.expected.json
@@ -14,13 +14,10 @@
       "name": "basic",
       "base_name": "basic",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 6,
-      "dirs_count": 4,
-      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -30,6 +27,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 6,
+      "dirs_count": 4,
+      "size_count": 57066,
       "scan_errors": []
     },
     {
@@ -38,13 +38,10 @@
       "name": "dbase.fdt",
       "base_name": "dbase",
       "extension": ".fdt",
-      "date": "2015-06-19",
       "size": 183,
+      "date": "2015-06-19",
       "sha1": "94f059d6478d5f460e79b6b948a7fa9849d4dfdc",
       "md5": "15240737ec72b9e88b485a663bd045f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -54,6 +51,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -62,13 +62,10 @@
       "name": "dir",
       "base_name": "dir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 1,
-      "size_count": 18486,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -78,6 +75,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 2,
+      "dirs_count": 1,
+      "size_count": 18486,
       "scan_errors": []
     },
     {
@@ -86,13 +86,10 @@
       "name": "e.tar",
       "base_name": "e",
       "extension": ".tar",
-      "date": "2015-06-19",
       "size": 10240,
+      "date": "2015-06-19",
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -102,6 +99,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -110,13 +110,10 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 1,
-      "dirs_count": 0,
-      "size_count": 8246,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -126,6 +123,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 1,
+      "dirs_count": 0,
+      "size_count": 8246,
       "scan_errors": []
     },
     {
@@ -134,13 +134,10 @@
       "name": "a.aif",
       "base_name": "a",
       "extension": ".aif",
-      "date": "2015-06-19",
       "size": 8246,
+      "date": "2015-06-19",
       "sha1": "03cfd28bb49d1dab105dcce1663630be1ddd821a",
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -150,6 +147,9 @@
       "is_media": true,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -158,13 +158,10 @@
       "name": "dir2",
       "base_name": "dir2",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 1,
-      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -174,6 +171,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 2,
+      "dirs_count": 1,
+      "size_count": 36457,
       "scan_errors": []
     },
     {
@@ -182,13 +182,10 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 0,
-      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -198,6 +195,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 2,
+      "dirs_count": 0,
+      "size_count": 36457,
       "scan_errors": []
     },
     {
@@ -206,13 +206,10 @@
       "name": "bcopy.s",
       "base_name": "bcopy",
       "extension": ".s",
-      "date": "2015-06-19",
       "size": 32452,
+      "date": "2015-06-19",
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -222,6 +219,9 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -230,13 +230,10 @@
       "name": "config.conf",
       "base_name": "config",
       "extension": ".conf",
-      "date": "2015-06-19",
       "size": 4005,
+      "date": "2015-06-19",
       "sha1": "4d567dc15d2117445389edfb64ced872329bceaa",
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -246,6 +243,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -254,13 +254,10 @@
       "name": "main.c",
       "base_name": "main",
       "extension": ".c",
-      "date": "2015-06-19",
       "size": 1940,
+      "date": "2015-06-19",
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
@@ -270,6 +267,9 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     }
   ]
diff --git a/tests/scancode/data/info/basic.rooted.expected.json b/tests/scancode/data/info/basic.rooted.expected.json
index da3feca0ee1..cbb8333b1d3 100644
--- a/tests/scancode/data/info/basic.rooted.expected.json
+++ b/tests/scancode/data/info/basic.rooted.expected.json
@@ -13,13 +13,10 @@
       "name": "basic.tgz",
       "base_name": "basic.tgz",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 6,
-      "dirs_count": 5,
-      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -29,6 +26,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 6,
+      "dirs_count": 5,
+      "size_count": 57066,
       "scan_errors": []
     },
     {
@@ -37,13 +37,10 @@
       "name": "basic",
       "base_name": "basic",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 6,
-      "dirs_count": 4,
-      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -53,6 +50,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 6,
+      "dirs_count": 4,
+      "size_count": 57066,
       "scan_errors": []
     },
     {
@@ -61,13 +61,10 @@
       "name": "dbase.fdt",
       "base_name": "dbase",
       "extension": ".fdt",
-      "date": "2015-06-19",
       "size": 183,
+      "date": "2015-06-19",
       "sha1": "94f059d6478d5f460e79b6b948a7fa9849d4dfdc",
       "md5": "15240737ec72b9e88b485a663bd045f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -77,6 +74,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -85,13 +85,10 @@
       "name": "dir",
       "base_name": "dir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 1,
-      "size_count": 18486,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -101,6 +98,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 2,
+      "dirs_count": 1,
+      "size_count": 18486,
       "scan_errors": []
     },
     {
@@ -109,13 +109,10 @@
       "name": "e.tar",
       "base_name": "e",
       "extension": ".tar",
-      "date": "2015-06-19",
       "size": 10240,
+      "date": "2015-06-19",
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -125,6 +122,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -133,13 +133,10 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 1,
-      "dirs_count": 0,
-      "size_count": 8246,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -149,6 +146,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 1,
+      "dirs_count": 0,
+      "size_count": 8246,
       "scan_errors": []
     },
     {
@@ -157,13 +157,10 @@
       "name": "a.aif",
       "base_name": "a",
       "extension": ".aif",
-      "date": "2015-06-19",
       "size": 8246,
+      "date": "2015-06-19",
       "sha1": "03cfd28bb49d1dab105dcce1663630be1ddd821a",
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -173,6 +170,9 @@
       "is_media": true,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -181,13 +181,10 @@
       "name": "dir2",
       "base_name": "dir2",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 1,
-      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -197,6 +194,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 2,
+      "dirs_count": 1,
+      "size_count": 36457,
       "scan_errors": []
     },
     {
@@ -205,13 +205,10 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 0,
-      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -221,6 +218,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 2,
+      "dirs_count": 0,
+      "size_count": 36457,
       "scan_errors": []
     },
     {
@@ -229,13 +229,10 @@
       "name": "bcopy.s",
       "base_name": "bcopy",
       "extension": ".s",
-      "date": "2015-06-19",
       "size": 32452,
+      "date": "2015-06-19",
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -245,6 +242,9 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -253,13 +253,10 @@
       "name": "config.conf",
       "base_name": "config",
       "extension": ".conf",
-      "date": "2015-06-19",
       "size": 4005,
+      "date": "2015-06-19",
       "sha1": "4d567dc15d2117445389edfb64ced872329bceaa",
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -269,6 +266,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -277,13 +277,10 @@
       "name": "main.c",
       "base_name": "main",
       "extension": ".c",
-      "date": "2015-06-19",
       "size": 1940,
+      "date": "2015-06-19",
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
@@ -293,6 +290,9 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     }
   ]
diff --git a/tests/scancode/data/info/email_url_info.expected.json b/tests/scancode/data/info/email_url_info.expected.json
index cf9340c1f28..bbc1ac28045 100644
--- a/tests/scancode/data/info/email_url_info.expected.json
+++ b/tests/scancode/data/info/email_url_info.expected.json
@@ -16,13 +16,10 @@
       "name": "basic",
       "base_name": "basic",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 6,
-      "dirs_count": 4,
-      "size_count": 57066,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -32,9 +29,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 6,
+      "dirs_count": 4,
+      "size_count": 57066,
+      "scan_errors": []
     },
     {
       "path": "basic/dbase.fdt",
@@ -42,13 +42,10 @@
       "name": "dbase.fdt",
       "base_name": "dbase",
       "extension": ".fdt",
-      "date": "2015-06-19",
       "size": 183,
+      "date": "2015-06-19",
       "sha1": "94f059d6478d5f460e79b6b948a7fa9849d4dfdc",
       "md5": "15240737ec72b9e88b485a663bd045f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/octet-stream",
       "file_type": "data",
       "programming_language": null,
@@ -58,9 +55,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/dir",
@@ -68,13 +68,10 @@
       "name": "dir",
       "base_name": "dir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 1,
-      "size_count": 18486,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -84,9 +81,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 2,
+      "dirs_count": 1,
+      "size_count": 18486,
+      "scan_errors": []
     },
     {
       "path": "basic/dir/e.tar",
@@ -94,13 +94,10 @@
       "name": "e.tar",
       "base_name": "e",
       "extension": ".tar",
-      "date": "2015-06-19",
       "size": 10240,
+      "date": "2015-06-19",
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -110,9 +107,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/dir/subdir",
@@ -120,13 +120,10 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 1,
-      "dirs_count": 0,
-      "size_count": 8246,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -136,9 +133,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 1,
+      "dirs_count": 0,
+      "size_count": 8246,
+      "scan_errors": []
     },
     {
       "path": "basic/dir/subdir/a.aif",
@@ -146,13 +146,10 @@
       "name": "a.aif",
       "base_name": "a",
       "extension": ".aif",
-      "date": "2015-06-19",
       "size": 8246,
+      "date": "2015-06-19",
       "sha1": "03cfd28bb49d1dab105dcce1663630be1ddd821a",
       "md5": "b2b073a64e4d568ce7b641c1857a7116",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "audio/x-aiff",
       "file_type": "IFF data, AIFF audio",
       "programming_language": null,
@@ -162,9 +159,12 @@
       "is_media": true,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/dir2",
@@ -172,13 +172,10 @@
       "name": "dir2",
       "base_name": "dir2",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 1,
-      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -188,9 +185,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 2,
+      "dirs_count": 1,
+      "size_count": 36457,
+      "scan_errors": []
     },
     {
       "path": "basic/dir2/subdir",
@@ -198,13 +198,10 @@
       "name": "subdir",
       "base_name": "subdir",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 2,
-      "dirs_count": 0,
-      "size_count": 36457,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -214,9 +211,12 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 2,
+      "dirs_count": 0,
+      "size_count": 36457,
+      "scan_errors": []
     },
     {
       "path": "basic/dir2/subdir/bcopy.s",
@@ -224,13 +224,10 @@
       "name": "bcopy.s",
       "base_name": "bcopy",
       "extension": ".s",
-      "date": "2015-06-19",
       "size": 32452,
+      "date": "2015-06-19",
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -240,7 +237,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "emails": [
         {
           "email": "ws@tools.de",
@@ -254,7 +250,11 @@
           "start_line": 17,
           "end_line": 17
         }
-      ]
+      ],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/dir2/subdir/config.conf",
@@ -262,13 +262,10 @@
       "name": "config.conf",
       "base_name": "config",
       "extension": ".conf",
-      "date": "2015-06-19",
       "size": 4005,
+      "date": "2015-06-19",
       "sha1": "4d567dc15d2117445389edfb64ced872329bceaa",
       "md5": "107dd38273ab10ce12058a3c8977e4ee",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -278,7 +275,6 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "emails": [],
       "urls": [
         {
@@ -286,7 +282,11 @@
           "start_line": 2,
           "end_line": 2
         }
-      ]
+      ],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic/main.c",
@@ -294,13 +294,10 @@
       "name": "main.c",
       "base_name": "main",
       "extension": ".c",
-      "date": "2015-06-19",
       "size": 1940,
+      "date": "2015-06-19",
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
@@ -310,7 +307,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "emails": [
         {
           "email": "j@w1.fi",
@@ -318,7 +314,11 @@
           "end_line": 3
         }
       ],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index b1411758535..12eda46c42e 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -11,7 +11,6 @@
   "files": [
     {
       "path": "test.txt",
-      "scan_errors": [],
       "licenses": [
         {
           "key": "lgpl-2.1",
@@ -35,7 +34,8 @@
           },
           "matched_text": "license: LGPL-2.1"
         }
-      ]
+      ],
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/non_utf8/expected-linux.json b/tests/scancode/data/non_utf8/expected-linux.json
index 505c1e8cb9c..1c936f53042 100644
--- a/tests/scancode/data/non_utf8/expected-linux.json
+++ b/tests/scancode/data/non_utf8/expected-linux.json
@@ -14,13 +14,10 @@
       "name": "non_unicode",
       "base_name": "non_unicode",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 18,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -30,6 +27,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 18,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -38,13 +38,10 @@
       "name": "foo\udcb1bar",
       "base_name": "foo\udcb1bar",
       "extension": "",
-      "date": "2017-07-14",
       "size": 0,
+      "date": "2017-07-14",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -54,6 +51,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -62,13 +62,10 @@
       "name": "non_ascii_-\u00e0\u00f2\u0258\u0141\u011f",
       "base_name": "non_ascii_-\u00e0\u00f2\u0258\u0141\u011f",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -78,6 +75,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -86,13 +86,10 @@
       "name": "non_ascii_10_\u0e01",
       "base_name": "non_ascii_10_\u0e01",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -102,6 +99,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -110,13 +110,10 @@
       "name": "non_ascii_11_\u00a0",
       "base_name": "non_ascii_11_\u00a0",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -126,6 +123,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -134,13 +134,10 @@
       "name": "non_ascii_12_\u20ac",
       "base_name": "non_ascii_12_\u20ac",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -150,6 +147,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -158,13 +158,10 @@
       "name": "non_ascii_2_\u00e6",
       "base_name": "non_ascii_2_\u00e6",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -174,6 +171,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -182,13 +182,10 @@
       "name": "non_ascii_3_\u0130",
       "base_name": "non_ascii_3_\u0130",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -198,6 +195,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -206,13 +206,10 @@
       "name": "non_ascii_4_\u0141",
       "base_name": "non_ascii_4_\u0141",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -222,6 +219,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -230,13 +230,10 @@
       "name": "non_ascii_5_\u03c6",
       "base_name": "non_ascii_5_\u03c6",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -246,6 +243,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -254,13 +254,10 @@
       "name": "non_ascii_6_\u041a",
       "base_name": "non_ascii_6_\u041a",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -270,6 +267,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -278,13 +278,10 @@
       "name": "non_ascii_7_\u05d0",
       "base_name": "non_ascii_7_\u05d0",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -294,6 +291,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -302,13 +302,10 @@
       "name": "non_ascii_8_\u060c",
       "base_name": "non_ascii_8_\u060c",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -318,6 +315,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -326,13 +326,10 @@
       "name": "non_ascii_9_\u062a",
       "base_name": "non_ascii_9_\u062a",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -342,6 +339,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -350,13 +350,10 @@
       "name": "non_cp12_decodable_\udc81\udc98",
       "base_name": "non_cp12_decodable_\udc81\udc98",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -366,6 +363,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -374,13 +374,10 @@
       "name": "non_cp932_decodable_\udce7w\udcf0",
       "base_name": "non_cp932_decodable_\udce7w\udcf0",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -390,6 +387,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -398,13 +398,10 @@
       "name": "non_utf8_decodable_2_\udced\udcb2\udc80",
       "base_name": "non_utf8_decodable_2_\udced\udcb2\udc80",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -414,6 +411,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -422,13 +422,10 @@
       "name": "non_utf8_decodable_3_\udced\udcb4\udc80",
       "base_name": "non_utf8_decodable_3_\udced\udcb4\udc80",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -438,6 +435,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -446,13 +446,10 @@
       "name": "non_utf8_decodable_\udcff",
       "base_name": "non_utf8_decodable_\udcff",
       "extension": "",
-      "date": "2017-08-27",
       "size": 0,
+      "date": "2017-08-27",
       "sha1": null,
       "md5": null,
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "inode/x-empty",
       "file_type": "empty",
       "programming_language": null,
@@ -462,6 +459,9 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     }
   ]
diff --git a/tests/scancode/data/plugin_license/license_url.expected.json b/tests/scancode/data/plugin_license/license_url.expected.json
index b61b7e94328..8d8dcf7366d 100644
--- a/tests/scancode/data/plugin_license/license_url.expected.json
+++ b/tests/scancode/data/plugin_license/license_url.expected.json
@@ -10,12 +10,11 @@
   "files": [
     {
       "path": "license_url",
-      "scan_errors": [],
-      "licenses": []
+      "licenses": [],
+      "scan_errors": []
     },
     {
       "path": "license_url/apache-1.0.txt",
-      "scan_errors": [],
       "licenses": [
         {
           "key": "apache-1.0",
@@ -61,7 +60,8 @@
             ]
           }
         }
-      ]
+      ],
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/plugin_mark_source/with_info.expected.json b/tests/scancode/data/plugin_mark_source/with_info.expected.json
index a3a002ba4d3..ab0b6745412 100644
--- a/tests/scancode/data/plugin_mark_source/with_info.expected.json
+++ b/tests/scancode/data/plugin_mark_source/with_info.expected.json
@@ -14,13 +14,10 @@
       "name": "JGroups.tgz",
       "base_name": "JGroups.tgz",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 12,
-      "dirs_count": 3,
-      "size_count": 206642,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -30,6 +27,10 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 12,
+      "dirs_count": 3,
+      "size_count": 206642,
       "scan_errors": []
     },
     {
@@ -38,13 +39,10 @@
       "name": "JGroups",
       "base_name": "JGroups",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 12,
-      "dirs_count": 2,
-      "size_count": 206642,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -54,6 +52,10 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 12,
+      "dirs_count": 2,
+      "size_count": 206642,
       "scan_errors": []
     },
     {
@@ -62,13 +64,10 @@
       "name": "licenses",
       "base_name": "licenses",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 5,
-      "dirs_count": 0,
-      "size_count": 54552,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -78,6 +77,10 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 5,
+      "dirs_count": 0,
+      "size_count": 54552,
       "scan_errors": []
     },
     {
@@ -86,13 +89,10 @@
       "name": "apache-1.1.txt",
       "base_name": "apache-1.1",
       "extension": ".txt",
-      "date": "2017-08-05",
       "size": 2885,
+      "date": "2017-08-05",
       "sha1": "6b5608d35c3e304532af43db8bbfc5947bef46a6",
       "md5": "276982197c941f4cbf3d218546e17ae2",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -102,6 +102,10 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -110,13 +114,10 @@
       "name": "apache-2.0.txt",
       "base_name": "apache-2.0",
       "extension": ".txt",
-      "date": "2017-08-05",
       "size": 11560,
+      "date": "2017-08-05",
       "sha1": "47b573e3824cd5e02a1a3ae99e2735b49e0256e4",
       "md5": "d273d63619c9aeaf15cdaf76422c4f87",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -126,6 +127,10 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -134,13 +139,10 @@
       "name": "bouncycastle.txt",
       "base_name": "bouncycastle",
       "extension": ".txt",
-      "date": "2017-08-05",
       "size": 1186,
+      "date": "2017-08-05",
       "sha1": "74facb0e9a734479f9cd893b5be3fe1bf651b760",
       "md5": "9fffd8de865a5705969f62b128381f85",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -150,6 +152,10 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -158,13 +164,10 @@
       "name": "cpl-1.0.txt",
       "base_name": "cpl-1.0",
       "extension": ".txt",
-      "date": "2017-08-05",
       "size": 11987,
+      "date": "2017-08-05",
       "sha1": "681cf776bcd79752543d42490ec7ed22a29fd888",
       "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -174,6 +177,10 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -182,13 +189,10 @@
       "name": "lgpl.txt",
       "base_name": "lgpl",
       "extension": ".txt",
-      "date": "2017-08-05",
       "size": 26934,
+      "date": "2017-08-05",
       "sha1": "8f1a637d2e2ed1bdb9eb01a7dccb5c12cc0557e1",
       "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with CRLF line terminators",
       "programming_language": null,
@@ -198,6 +202,10 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -206,13 +214,10 @@
       "name": "src",
       "base_name": "src",
       "extension": "",
-      "date": null,
       "size": 0,
+      "date": null,
       "sha1": null,
       "md5": null,
-      "files_count": 7,
-      "dirs_count": 0,
-      "size_count": 152090,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -222,6 +227,10 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "source_count": 7,
+      "files_count": 7,
+      "dirs_count": 0,
+      "size_count": 152090,
       "scan_errors": []
     },
     {
@@ -230,13 +239,10 @@
       "name": "FixedMembershipToken.java",
       "base_name": "FixedMembershipToken",
       "extension": ".java",
-      "date": "2017-08-05",
       "size": 5144,
+      "date": "2017-08-05",
       "sha1": "5901f73dcc78155a1a2c7b5663a3a11fba400b19",
       "md5": "aca9640ec8beee21b098bcf8ecc91442",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -246,6 +252,10 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -254,13 +264,10 @@
       "name": "GuardedBy.java",
       "base_name": "GuardedBy",
       "extension": ".java",
-      "date": "2017-08-05",
       "size": 813,
+      "date": "2017-08-05",
       "sha1": "981d67087e65e9a44957c026d4b10817cf77d966",
       "md5": "c5064400f759d3e81771005051d17dc1",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -270,6 +277,10 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -278,13 +289,10 @@
       "name": "ImmutableReference.java",
       "base_name": "ImmutableReference",
       "extension": ".java",
-      "date": "2017-08-05",
       "size": 1838,
+      "date": "2017-08-05",
       "sha1": "30f56b876d5576d9869e2c5c509b08db57110592",
       "md5": "48ca3c72fb9a65c771a321222f118b88",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -294,6 +302,10 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -302,13 +314,10 @@
       "name": "RATE_LIMITER.java",
       "base_name": "RATE_LIMITER",
       "extension": ".java",
-      "date": "2017-08-05",
       "size": 3692,
+      "date": "2017-08-05",
       "sha1": "a8087e5d50da3273536ebda9b87b77aa4ff55deb",
       "md5": "4626bdbc48871b55513e1a12991c61a8",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -318,6 +327,10 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -326,13 +339,10 @@
       "name": "RouterStub.java",
       "base_name": "RouterStub",
       "extension": ".java",
-      "date": "2017-08-05",
       "size": 9913,
+      "date": "2017-08-05",
       "sha1": "c1f6818f8ee7bddcc9f444bc94c099729d716d52",
       "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -342,6 +352,10 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -350,13 +364,10 @@
       "name": "RouterStubManager.java",
       "base_name": "RouterStubManager",
       "extension": ".java",
-      "date": "2017-08-05",
       "size": 8162,
+      "date": "2017-08-05",
       "sha1": "eb419dc94cfe11ca318a3e743a7f9f080e70c751",
       "md5": "20bee9631b7c82a45c250e095352aec7",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -366,6 +377,10 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     },
     {
@@ -374,13 +389,10 @@
       "name": "S3_PING.java",
       "base_name": "S3_PING",
       "extension": ".java",
-      "date": "2017-08-05",
       "size": 122528,
+      "date": "2017-08-05",
       "sha1": "08dba9986f69719970ead3592dc565465164df0d",
       "md5": "83d8324f37d0e3f120bc89865cf0bd39",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "Java",
@@ -390,6 +402,10 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "source_count": 0,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     }
   ]
diff --git a/tests/scancode/data/plugin_mark_source/without_info.expected.json b/tests/scancode/data/plugin_mark_source/without_info.expected.json
deleted file mode 100644
index a3a002ba4d3..00000000000
--- a/tests/scancode/data/plugin_mark_source/without_info.expected.json
+++ /dev/null
@@ -1,396 +0,0 @@
-{
-  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
-  "scancode_options": {
-    "input": "<path>",
-    "--info": true,
-    "--json": "<file>",
-    "--mark-source": true
-  },
-  "files_count": 12,
-  "files": [
-    {
-      "path": "JGroups.tgz",
-      "type": "directory",
-      "name": "JGroups.tgz",
-      "base_name": "JGroups.tgz",
-      "extension": "",
-      "date": null,
-      "size": 0,
-      "sha1": null,
-      "md5": null,
-      "files_count": 12,
-      "dirs_count": 3,
-      "size_count": 206642,
-      "mime_type": null,
-      "file_type": null,
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": false,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": false,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups",
-      "type": "directory",
-      "name": "JGroups",
-      "base_name": "JGroups",
-      "extension": "",
-      "date": null,
-      "size": 0,
-      "sha1": null,
-      "md5": null,
-      "files_count": 12,
-      "dirs_count": 2,
-      "size_count": 206642,
-      "mime_type": null,
-      "file_type": null,
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": false,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": false,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/licenses",
-      "type": "directory",
-      "name": "licenses",
-      "base_name": "licenses",
-      "extension": "",
-      "date": null,
-      "size": 0,
-      "sha1": null,
-      "md5": null,
-      "files_count": 5,
-      "dirs_count": 0,
-      "size_count": 54552,
-      "mime_type": null,
-      "file_type": null,
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": false,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": false,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/licenses/apache-1.1.txt",
-      "type": "file",
-      "name": "apache-1.1.txt",
-      "base_name": "apache-1.1",
-      "extension": ".txt",
-      "date": "2017-08-05",
-      "size": 2885,
-      "sha1": "6b5608d35c3e304532af43db8bbfc5947bef46a6",
-      "md5": "276982197c941f4cbf3d218546e17ae2",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text, with CRLF line terminators",
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": false,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/licenses/apache-2.0.txt",
-      "type": "file",
-      "name": "apache-2.0.txt",
-      "base_name": "apache-2.0",
-      "extension": ".txt",
-      "date": "2017-08-05",
-      "size": 11560,
-      "sha1": "47b573e3824cd5e02a1a3ae99e2735b49e0256e4",
-      "md5": "d273d63619c9aeaf15cdaf76422c4f87",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text, with CRLF line terminators",
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": false,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/licenses/bouncycastle.txt",
-      "type": "file",
-      "name": "bouncycastle.txt",
-      "base_name": "bouncycastle",
-      "extension": ".txt",
-      "date": "2017-08-05",
-      "size": 1186,
-      "sha1": "74facb0e9a734479f9cd893b5be3fe1bf651b760",
-      "md5": "9fffd8de865a5705969f62b128381f85",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": false,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/licenses/cpl-1.0.txt",
-      "type": "file",
-      "name": "cpl-1.0.txt",
-      "base_name": "cpl-1.0",
-      "extension": ".txt",
-      "date": "2017-08-05",
-      "size": 11987,
-      "sha1": "681cf776bcd79752543d42490ec7ed22a29fd888",
-      "md5": "9a6d2c9ae73d59eb3dd38e3909750d14",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text, with CRLF line terminators",
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": false,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/licenses/lgpl.txt",
-      "type": "file",
-      "name": "lgpl.txt",
-      "base_name": "lgpl",
-      "extension": ".txt",
-      "date": "2017-08-05",
-      "size": 26934,
-      "sha1": "8f1a637d2e2ed1bdb9eb01a7dccb5c12cc0557e1",
-      "md5": "f14599a2f089f6ff8c97e2baa4e3d575",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text, with CRLF line terminators",
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": false,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/src",
-      "type": "directory",
-      "name": "src",
-      "base_name": "src",
-      "extension": "",
-      "date": null,
-      "size": 0,
-      "sha1": null,
-      "md5": null,
-      "files_count": 7,
-      "dirs_count": 0,
-      "size_count": 152090,
-      "mime_type": null,
-      "file_type": null,
-      "programming_language": null,
-      "is_binary": false,
-      "is_text": false,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": true,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/src/FixedMembershipToken.java",
-      "type": "file",
-      "name": "FixedMembershipToken.java",
-      "base_name": "FixedMembershipToken",
-      "extension": ".java",
-      "date": "2017-08-05",
-      "size": 5144,
-      "sha1": "5901f73dcc78155a1a2c7b5663a3a11fba400b19",
-      "md5": "aca9640ec8beee21b098bcf8ecc91442",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
-      "programming_language": "Java",
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": true,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/src/GuardedBy.java",
-      "type": "file",
-      "name": "GuardedBy.java",
-      "base_name": "GuardedBy",
-      "extension": ".java",
-      "date": "2017-08-05",
-      "size": 813,
-      "sha1": "981d67087e65e9a44957c026d4b10817cf77d966",
-      "md5": "c5064400f759d3e81771005051d17dc1",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
-      "programming_language": "Java",
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": true,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/src/ImmutableReference.java",
-      "type": "file",
-      "name": "ImmutableReference.java",
-      "base_name": "ImmutableReference",
-      "extension": ".java",
-      "date": "2017-08-05",
-      "size": 1838,
-      "sha1": "30f56b876d5576d9869e2c5c509b08db57110592",
-      "md5": "48ca3c72fb9a65c771a321222f118b88",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
-      "programming_language": "Java",
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": true,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/src/RATE_LIMITER.java",
-      "type": "file",
-      "name": "RATE_LIMITER.java",
-      "base_name": "RATE_LIMITER",
-      "extension": ".java",
-      "date": "2017-08-05",
-      "size": 3692,
-      "sha1": "a8087e5d50da3273536ebda9b87b77aa4ff55deb",
-      "md5": "4626bdbc48871b55513e1a12991c61a8",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
-      "programming_language": "Java",
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": true,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/src/RouterStub.java",
-      "type": "file",
-      "name": "RouterStub.java",
-      "base_name": "RouterStub",
-      "extension": ".java",
-      "date": "2017-08-05",
-      "size": 9913,
-      "sha1": "c1f6818f8ee7bddcc9f444bc94c099729d716d52",
-      "md5": "eecfe23494acbcd8088c93bc1e83c7f2",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
-      "programming_language": "Java",
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": true,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/src/RouterStubManager.java",
-      "type": "file",
-      "name": "RouterStubManager.java",
-      "base_name": "RouterStubManager",
-      "extension": ".java",
-      "date": "2017-08-05",
-      "size": 8162,
-      "sha1": "eb419dc94cfe11ca318a3e743a7f9f080e70c751",
-      "md5": "20bee9631b7c82a45c250e095352aec7",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
-      "programming_language": "Java",
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": true,
-      "is_script": false,
-      "scan_errors": []
-    },
-    {
-      "path": "JGroups.tgz/JGroups/src/S3_PING.java",
-      "type": "file",
-      "name": "S3_PING.java",
-      "base_name": "S3_PING",
-      "extension": ".java",
-      "date": "2017-08-05",
-      "size": 122528,
-      "sha1": "08dba9986f69719970ead3592dc565465164df0d",
-      "md5": "83d8324f37d0e3f120bc89865cf0bd39",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
-      "mime_type": "text/plain",
-      "file_type": "ASCII text",
-      "programming_language": "Java",
-      "is_binary": false,
-      "is_text": true,
-      "is_archive": false,
-      "is_media": false,
-      "is_source": true,
-      "is_script": false,
-      "scan_errors": []
-    }
-  ]
-}
\ No newline at end of file
diff --git a/tests/scancode/data/plugin_only_findings/errors.expected.json b/tests/scancode/data/plugin_only_findings/errors.expected.json
new file mode 100644
index 00000000000..224f1684a03
--- /dev/null
+++ b/tests/scancode/data/plugin_only_findings/errors.expected.json
@@ -0,0 +1,39 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--info": true,
+    "--json-pp": "<file>",
+    "--only-findings": true,
+    "--package": true
+  },
+  "files_count": 1,
+  "files": [
+    {
+      "path": "errors/package.json",
+      "type": "file",
+      "name": "package.json",
+      "base_name": "package",
+      "extension": ".json",
+      "size": 2264,
+      "sha1": "a749017a2d1b53aeb780dc0f66292e37bb6c0d25",
+      "md5": "ed579407b7aa99bcf4b12e1a6ea1c4ae",
+      "mime_type": "text/plain",
+      "file_type": "ASCII text",
+      "programming_language": "JSON",
+      "is_binary": false,
+      "is_text": true,
+      "is_archive": false,
+      "is_media": false,
+      "is_source": true,
+      "is_script": false,
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": [
+        "ERROR: for scanner: packages:\nValueError: Expecting ':' delimiter: line 5 column 12 (char 143)\n"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/scancode/data/plugin_only_findings/errors/illegal.pom.xml b/tests/scancode/data/plugin_only_findings/errors/illegal.pom.xml
new file mode 100644
index 00000000000..c9ad800ffce
--- /dev/null
+++ b/tests/scancode/data/plugin_only_findings/errors/illegal.pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy-maven-plugin</artifactId>
+                <configuration>
+                    <transformations>
+                        <transformation>
+                            <plugin>net.bytebuddy.test.IllegalTransformPlugin</plugin>
+                        </transformation>
+                    </transformations>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tests/scancode/data/plugin_only_findings/errors/origin.ABOUT b/tests/scancode/data/plugin_only_findings/errors/origin.ABOUT
new file mode 100644
index 00000000000..a583e2a11c5
--- /dev/null
+++ b/tests/scancode/data/plugin_only_findings/errors/origin.ABOUT
@@ -0,0 +1,3 @@
+date: 2017-05-24
+notes: malformed test Maven POMs from byte-buddy/byte-buddy-maven-plugin/src/test/resources/net/bytebuddy/test/
+download_url: https://github.com/raphw/byte-buddy/archive/838148dd9b735651720094e59f7ce10c1fe7880f.zip
diff --git a/tests/scancode/data/plugin_only_findings/errors/package.json b/tests/scancode/data/plugin_only_findings/errors/package.json
new file mode 100644
index 00000000000..fa4a53965a6
--- /dev/null
+++ b/tests/scancode/data/plugin_only_findings/errors/package.json
@@ -0,0 +1,96 @@
+{
+  "name": "async",
+  "description": "Higher-order functions and common patterns for asynchronous code",
+  "main": "lib/async.js",
+  "author" {
+    "name": "Caolan McMahon"
+  },
+  "version": "1.2.1",
+  "keywords": [
+    "async",
+    "callback",
+    "utility",
+    "module"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/caolan/async.git"
+  },
+  "bugs": {
+    "url": "https://github.com/caolan/async/issues"
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "benchmark": "github:bestiejs/benchmark.js",
+    "coveralls": "^2.11.2",
+    "jshint": "~2.7.0",
+    "lodash": ">=2.4.1",
+    "mkdirp": "~0.5.1",
+    "nodeunit": ">0.0.0",
+    "nyc": "^2.1.0",
+    "uglify-js": "1.2.x",
+    "yargs": "~3.9.1"
+  },
+  "jam": {
+    "main": "lib/async.js",
+    "include": [
+      "lib/async.js",
+      "README.md",
+      "LICENSE"
+    ],
+    "categories": [
+      "Utilities"
+    ]
+  },
+  "scripts": {
+    "test": "npm run-script lint && nodeunit test/test-async.js",
+    "lint": "jshint lib/*.js test/*.js perf/*.js",
+    "coverage": "nyc npm test && nyc report",
+    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
+  },
+  "spm": {
+    "main": "lib/async.js"
+  },
+  "volo": {
+    "main": "lib/async.js",
+    "ignore": [
+      "**/.*",
+      "node_modules",
+      "bower_components",
+      "test",
+      "tests"
+    ]
+  },
+  "gitHead": "b66e85d1cca8c8056313253f22d18f571e7001d2",
+  "homepage": "https://github.com/caolan/async#readme",
+  "_id": "async@1.2.1",
+  "_shasum": "a4816a17cd5ff516dfa2c7698a453369b9790de0",
+  "_from": "async@*",
+  "_npmVersion": "2.9.0",
+  "_nodeVersion": "2.0.2",
+  "_npmUser": {
+    "name": "aearly",
+    "email": "alexander.early@gmail.com"
+  },
+  "maintainers": [
+    {
+      "name": "caolan",
+      "email": "caolan.mcmahon@gmail.com"
+    },
+    {
+      "name": "beaugunderson",
+      "email": "beau@beaugunderson.com"
+    },
+    {
+      "name": "aearly",
+      "email": "alexander.early@gmail.com"
+    }
+  ],
+  "dist": {
+    "shasum": "a4816a17cd5ff516dfa2c7698a453369b9790de0",
+    "tarball": "http://registry.npmjs.org/async/-/async-1.2.1.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/async/-/async-1.2.1.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/tests/scancode/data/plugin_only_findings/expected.json b/tests/scancode/data/plugin_only_findings/expected.json
index cccddcda568..3b9bbcdc4b9 100644
--- a/tests/scancode/data/plugin_only_findings/expected.json
+++ b/tests/scancode/data/plugin_only_findings/expected.json
@@ -20,9 +20,6 @@
       "size": 10240,
       "sha1": "b655d4fc48e19910b9ab7a7102a8c051a39818f1",
       "md5": "393e789f4e4b2be93a46d0619380b445",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/x-tar",
       "file_type": "POSIX tar archive (GNU)",
       "programming_language": null,
@@ -32,7 +29,6 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [
@@ -80,7 +76,11 @@
           "dependencies": {},
           "related_packages": []
         }
-      ]
+      ],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/dir2/subdir/bcopy.s",
@@ -91,9 +91,6 @@
       "size": 32452,
       "sha1": "99f20eafc7b7e1c8e21bced55c8cdd05339bec77",
       "md5": "e1c66adaf6b8aa90e348668ac4869a61",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text, with CRLF line terminators",
       "programming_language": "GAS",
@@ -103,7 +100,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [
         {
           "key": "bsd-original-uc",
@@ -149,7 +145,11 @@
           "end_line": 37
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "basic.tgz/basic/main.c",
@@ -160,9 +160,6 @@
       "size": 1940,
       "sha1": "35017ed9762bdc9d16054a40ceefdda8b362083a",
       "md5": "8d0a3b3fe1c96a49af2a66040193291b",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-c",
       "file_type": "C source, ASCII text",
       "programming_language": "C",
@@ -172,7 +169,6 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [
         {
           "key": "gpl-2.0",
@@ -232,7 +228,11 @@
           "end_line": 3
         }
       ],
-      "packages": []
+      "packages": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/plugin_only_findings/info.expected.json b/tests/scancode/data/plugin_only_findings/info.expected.json
new file mode 100644
index 00000000000..2072a2ada24
--- /dev/null
+++ b/tests/scancode/data/plugin_only_findings/info.expected.json
@@ -0,0 +1,11 @@
+{
+  "scancode_notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
+  "scancode_options": {
+    "input": "<path>",
+    "--info": true,
+    "--json": "<file>",
+    "--only-findings": true
+  },
+  "files_count": 0,
+  "files": []
+}
\ No newline at end of file
diff --git a/tests/scancode/data/resource/samples/JGroups/EULA b/tests/scancode/data/resource/samples/JGroups/EULA
new file mode 100644
index 00000000000..0dcb788ede5
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/EULA
@@ -0,0 +1,109 @@
+// $Id: EULA,v 1.1 2006/11/02 08:04:26 belaban Exp $
+
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software 
+Packages, regardless of the delivery mechanism.  Each Software Package is a collective work 
+under U.S. Copyright Law.  Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to 
+the user ("Client") a license to the applicable collective work(s) pursuant to the 
+GNU Lesser General Public License v. 2.1 except for the following Software Packages: 
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the 
+GNU General Public License v.2; 
+
+(b) JBoss Rules, which is licensed pursuant to the Apache  License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the 
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database, 
+it may purchase a license from Sleepycat Software); 
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, 
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various 
+royalty-free patent licenses.  
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1.  The Software.  "Software Packages" refer to the various software modules that are created and made available 
+for distribution by the JBoss.org open source community at http://www.jboss.org.   Each of the Software Packages 
+may be comprised of hundreds of software components.  The end user license agreement for each component is located in 
+the component's source code.  With the exception of certain image files identified in Section 2 below, 
+the license terms for the components permit Client to copy, modify, and redistribute the component, 
+in both source code and binary code forms.  This agreement does not limit Client's rights under, 
+or grant Client rights that supersede, the license terms of any particular component.
+
+2.  Intellectual Property Rights.  The Software Packages are owned by Red Hat and others and are protected under copyright 
+and other laws.  Title to the Software Packages and any component, or to any copy, modification, or merged portion shall 
+remain with the aforementioned, subject to the applicable license.  The "JBoss" trademark, "Red Hat" trademark, the 
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates 
+in the U.S. and other countries.  This agreement permits Client to distribute unmodified copies of the Software Packages 
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's 
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/.  Client must abide by 
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. 
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at 
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.  
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.  
+
+3.  Limited Warranty.  Except as specifically stated in this Paragraph 3 or a license for a particular 
+component, to the maximum extent permitted under applicable law, the Software Packages and the 
+components are provided and licensed "as is" without warranty of any kind, expressed or implied, 
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.  
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in 
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.  
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements 
+or that the operation of the Software Packages will be entirely error free or appear precisely as described 
+in the accompanying documentation. This warranty extends only to the party that purchases the Services 
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. 
+
+4.  Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies 
+described below are accepted by Client as its only remedies.  Red Hat's entire liability, and Client's 
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of 
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or 
+refund the money paid by Client for the Software.  To the maximum extent permitted by applicable law, 
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential 
+damages, including lost profits or lost savings arising out of the use or inability to use the Software, 
+even if Red Hat or such dealer has been advised of the possibility of such damages.  In no event shall 
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this 
+Agreement during the twelve months preceding the action.
+
+5.  Export Control.  As required by U.S. law, Client represents and warrants that it: 
+(a) understands that the Software Packages are subject to export controls under the 
+U.S. Commerce Department's Export Administration Regulations ("EAR"); 
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations 
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); 
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, 
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; 
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or 
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by 
+regulation or specific license; 
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software 
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual 
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and 
+address (including country) of each transferee; 
+
+and (f) understands that countries other than the United States may restrict the import, use, or 
+export of encryption products and that it shall be solely responsible for compliance with any such 
+import, use, or export restrictions.
+
+6.  Third Party Programs. Red Hat may distribute third party software programs with the Software Packages 
+that are not part of the Software Packages and which Client must install separately.  These third party 
+programs are subject to their own license terms.  The license terms either accompany the programs or 
+can be viewed at http://www.redhat.com/licenses/.  If Client does not agree to abide by the applicable 
+license terms for such programs, then Client may not install them.  If Client wishes to install the programs 
+on more than one system or transfer the programs to another party, then Client must contact the licensor 
+of the programs.
+
+7.  General.  If any provision of this agreement is held to be unenforceable, that shall not affect the 
+enforceability of the remaining provisions.  This License Agreement shall be governed by the laws of the 
+State of North Carolina and of the United States, without regard to any conflict of laws provisions, 
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc.  All rights reserved.  
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.  
+All other trademarks are the property of their respective owners. 
+
+	Page 1 of 1	18 October 2006
+
diff --git a/tests/scancode/data/resource/samples/JGroups/LICENSE b/tests/scancode/data/resource/samples/JGroups/LICENSE
new file mode 100644
index 00000000000..b1e3f5a2638
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/LICENSE
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/tests/scancode/data/resource/samples/JGroups/licenses/apache-1.1.txt b/tests/scancode/data/resource/samples/JGroups/licenses/apache-1.1.txt
new file mode 100644
index 00000000000..dae2270c2c0
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/licenses/apache-1.1.txt
@@ -0,0 +1,58 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
diff --git a/tests/scancode/data/resource/samples/JGroups/licenses/apache-2.0.txt b/tests/scancode/data/resource/samples/JGroups/licenses/apache-2.0.txt
new file mode 100644
index 00000000000..75b52484ea4
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/licenses/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tests/scancode/data/resource/samples/JGroups/licenses/bouncycastle.txt b/tests/scancode/data/resource/samples/JGroups/licenses/bouncycastle.txt
new file mode 100644
index 00000000000..3cf73c2f032
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/licenses/bouncycastle.txt
@@ -0,0 +1,18 @@
+// $Id: bouncycastle.txt,v 1.1 2006/07/07 16:09:48 belaban Exp $
+
+License
+
+Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/tests/scancode/data/resource/samples/JGroups/licenses/cpl-1.0.txt b/tests/scancode/data/resource/samples/JGroups/licenses/cpl-1.0.txt
new file mode 100644
index 00000000000..2243be15b29
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/licenses/cpl-1.0.txt
@@ -0,0 +1,213 @@
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+    a) in the case of the initial Contributor, the initial code and documentation
+    distributed under this Agreement, and
+
+    b) in the case of each subsequent Contributor:
+
+    i) changes to the Program, and
+
+    ii) additions to the Program;
+
+    where such changes and/or additions to the Program originate from and are
+    distributed by that particular Contributor. A Contribution 'originates' from
+    a Contributor if it was added to the Program by such Contributor itself or
+    anyone acting on such Contributor's behalf. Contributions do not include
+    additions to the Program which: (i) are separate modules of software
+    distributed in conjunction with the Program under their own license
+    agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including
+all Contributors.
+
+2. GRANT OF RIGHTS
+
+    a) Subject to the terms of this Agreement, each Contributor hereby grants
+    Recipient a non-exclusive, worldwide, royalty-free copyright license to
+    reproduce, prepare derivative works of, publicly display, publicly perform,
+    distribute and sublicense the Contribution of such Contributor, if any, and
+    such derivative works, in source code and object code form.
+
+    b) Subject to the terms of this Agreement, each Contributor hereby grants
+    Recipient a non-exclusive, worldwide, royalty-free patent license under
+    Licensed Patents to make, use, sell, offer to sell, import and otherwise
+    transfer the Contribution of such Contributor, if any, in source code and
+    object code form. This patent license shall apply to the combination of the
+    Contribution and the Program if, at the time the Contribution is added by
+    the Contributor, such addition of the Contribution causes such combination
+    to be covered by the Licensed Patents. The patent license shall not apply to
+    any other combinations which include the Contribution. No hardware per se is
+    licensed hereunder.
+
+    c) Recipient understands that although each Contributor grants the licenses
+    to its Contributions set forth herein, no assurances are provided by any
+    Contributor that the Program does not infringe the patent or other
+    intellectual property rights of any other entity. Each Contributor disclaims
+    any liability to Recipient for claims brought by any other entity based on
+    infringement of intellectual property rights or otherwise. As a condition to
+    exercising the rights and licenses granted hereunder, each Recipient hereby
+    assumes sole responsibility to secure any other intellectual property rights
+    needed, if any. For example, if a third party patent license is required to
+    allow Recipient to distribute the Program, it is Recipient's responsibility
+    to acquire that license before distributing the Program.
+
+    d) Each Contributor represents that to its knowledge it has sufficient
+    copyright rights in its Contribution, if any, to grant the copyright license
+    set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+    a) it complies with the terms and conditions of this Agreement; and
+
+    b) its license agreement:
+
+    i) effectively disclaims on behalf of all Contributors all warranties and
+    conditions, express and implied, including warranties or conditions of title
+    and non-infringement, and implied warranties or conditions of merchantability
+    and fitness for a particular purpose;
+
+    ii) effectively excludes on behalf of all Contributors all liability for
+    damages, including direct, indirect, special, incidental and consequential
+    damages, such as lost profits;
+
+    iii) states that any provisions which differ from this Agreement are offered
+    by that Contributor alone and not by any other party; and
+
+    iv) states that source code for the Program is available from such Contributor,
+    and informs licensees how to obtain it in a reasonable manner on or through
+    a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+    a) it must be made available under this Agreement; and
+
+    b) a copy of this Agreement must be included with each copy of the Program. 
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product offering.
+The obligations in this section do not apply to any claims or Losses relating to
+any actual or alleged intellectual property infringement. In order to qualify,
+an Indemnified Contributor must: a) promptly notify the Commercial Contributor 
+n writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any related
+settlement negotiations. The Indemnified Contributor may participate in any such
+claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such Commercial
+Contributor's responsibility alone. Under this section, the Commercial
+Contributor would have to defend claims against the other Contributors related
+to those performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its exercise
+of rights under this Agreement, including but not limited to the risks and costs
+of program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such Recipient
+under this Agreement shall terminate as of the date such litigation is filed.
+In addition, if Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply
+with any of the material terms or conditions of this Agreement and does not cure
+such failure in a reasonable period of time after becoming aware of such
+noncompliance. If all Recipient's rights under this Agreement terminate, Recipient
+agrees to cease use and distribution of the Program as soon as reasonably
+practicable. However, Recipient's obligations under this Agreement and any
+licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be modified
+in the following manner. The Agreement Steward reserves the right to publish new
+versions (including revisions) of this Agreement from time to time. No one other
+than the Agreement Steward has the right to modify this Agreement. IBM is the
+initial Agreement Steward. IBM may assign the responsibility to serve as the
+Agreement Steward to a suitable separate entity. Each new version of the Agreement
+will be given a distinguishing version number. The Program (including Contributions)
+may always be distributed subject to the version of the Agreement under which it
+was received. In addition, after a new version of the Agreement is published,
+Contributor may elect to distribute the Program (including its Contributions)
+under the new version. Except as expressly stated in Sections 2(a) and 2(b) above,
+Recipient receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this Agreement
+are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year after
+the cause of action arose. Each party waives its rights to a jury trial in any
+resulting litigation.
+
diff --git a/tests/scancode/data/resource/samples/JGroups/licenses/lgpl.txt b/tests/scancode/data/resource/samples/JGroups/licenses/lgpl.txt
new file mode 100644
index 00000000000..cbee875ba6d
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/licenses/lgpl.txt
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/tests/scancode/data/resource/samples/JGroups/src/FixedMembershipToken.java b/tests/scancode/data/resource/samples/JGroups/src/FixedMembershipToken.java
new file mode 100644
index 00000000000..46cf578d6de
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/src/FixedMembershipToken.java
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jgroups.auth;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.jgroups.Event;
+import org.jgroups.Message;
+import org.jgroups.PhysicalAddress;
+import org.jgroups.annotations.Property;
+import org.jgroups.util.Util;
+
+/**
+ * <p>
+ * The FixedMemberShipToken object predefines a list of IP addresses and ports that can join the
+ * group.
+ * </p>
+ * <p>
+ * Configuration parameters for this example are shown below:
+ * </p>
+ * <ul>
+ * <li>fixed_members_value (required) = List of IP addresses & ports (optionally) - ports must be
+ * seperated by a '/' e.g. 127.0.0.1/1010*127.0.0.1/4567</li>
+ * <li>fixed_members_seperator (required) = The seperator used between IP addresses - e.g. *</li>
+ * </ul>
+ * 
+ * @author Chris Mills (millsy@jboss.com)
+ */
+public class FixedMembershipToken extends AuthToken {
+    private List<String> memberList = null;
+    private String token = "emptyToken";
+
+    @Property
+    private String fixed_members_seperator = ",";
+    private static final long serialVersionUID = 4717069536900221681L;
+
+    public FixedMembershipToken() {
+    }
+
+    public String getName() {
+        return "org.jgroups.auth.FixedMembershipToken";
+    }
+
+    @Property
+    public void setFixedMembersSeparator(String value) {
+        fixed_members_seperator = value;
+    }
+
+    public boolean authenticate(AuthToken token, Message msg) {
+        if ((token != null) && (token instanceof FixedMembershipToken) && (this.memberList != null)) {
+            PhysicalAddress src = (PhysicalAddress) auth.down(new Event(Event.GET_PHYSICAL_ADDRESS,
+                            msg.getSrc()));
+            if (src == null) {
+                if (log.isErrorEnabled())
+                    log.error("didn't find physical address for " + msg.getSrc());
+                return false;
+            }
+
+            String sourceAddressWithPort = src.toString();
+            String sourceAddressWithoutPort = sourceAddressWithPort.substring(0,
+                            sourceAddressWithPort.indexOf(":"));
+
+            if (log.isDebugEnabled()) {
+                log.debug("AUTHToken received from " + sourceAddressWithPort);
+            }
+
+            for (String member : memberList) {
+                if (hasPort(member)) {
+                    if (member.equals(sourceAddressWithPort))
+                        return true;
+                } else {
+                    if (member.equals(sourceAddressWithoutPort))
+                        return true;
+                }
+            }
+            return false;
+        }
+
+        if (log.isWarnEnabled()) {
+            log.warn("Invalid AuthToken instance - wrong type or null");
+        }
+        return false;
+    }
+
+    private static boolean hasPort(String member) {
+        return member.contains(":");
+    }
+
+    @Property(name = "fixed_members_value")
+    public void setMemberList(String list) {
+        memberList = new ArrayList<String>();
+        StringTokenizer memberListTokenizer = new StringTokenizer(list, fixed_members_seperator);
+        while (memberListTokenizer.hasMoreTokens()) {
+            memberList.add(memberListTokenizer.nextToken().replace('/', ':'));
+        }
+    }
+
+    /**
+     * Required to serialize the object to pass across the wire
+     * 
+     * @param out
+     * @throws java.io.IOException
+     */
+    public void writeTo(DataOutputStream out) throws IOException {
+        if (log.isDebugEnabled()) {
+            log.debug("SimpleToken writeTo()");
+        }
+        Util.writeString(this.token, out);
+    }
+
+    /**
+     * Required to deserialize the object when read in from the wire
+     * 
+     * @param in
+     * @throws IOException
+     * @throws IllegalAccessException
+     * @throws InstantiationException
+     */
+    public void readFrom(DataInputStream in) throws IOException, IllegalAccessException,
+                    InstantiationException {
+        if (log.isDebugEnabled()) {
+            log.debug("SimpleToken readFrom()");
+        }
+        this.token = Util.readString(in);
+    }
+}
diff --git a/tests/scancode/data/resource/samples/JGroups/src/GuardedBy.java b/tests/scancode/data/resource/samples/JGroups/src/GuardedBy.java
new file mode 100644
index 00000000000..6d9a9ec4a3f
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/src/GuardedBy.java
@@ -0,0 +1,23 @@
+package org.jgroups.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Copyright (c) 2005 Brian Goetz and Tim Peierls
+ * Released under the Creative Commons Attribution License
+ * (http://creativecommons.org/licenses/by/2.5)
+ * Official home: http://www.jcip.net
+ *
+ * Adopted from Java Concurrency in Practice. This annotation defines the monitor that protects the variable
+ * annotated by @GuardedBy, e.g. @GuardedBy("lock") or @GuardedBy("this")
+ * @author Bela Ban
+ * @version $Id: GuardedBy.java,v 1.3 2007/02/27 14:49:40 belaban Exp $
+ */
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.SOURCE)
+public @interface GuardedBy {
+    String value();
+}
diff --git a/tests/scancode/data/resource/samples/JGroups/src/ImmutableReference.java b/tests/scancode/data/resource/samples/JGroups/src/ImmutableReference.java
new file mode 100644
index 00000000000..50c720e0bf0
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/src/ImmutableReference.java
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jgroups.util;
+
+/**
+ * Simple class that holds an immutable reference to another object (or to
+ * <code>null</code>).
+ *
+ * @author Brian Stansberry
+ * 
+ * @version $Id: ImmutableReference.java,v 1.1 2010/06/19 02:24:46 bstansberry Exp $
+ */
+public class ImmutableReference<T> {
+
+    private final T referent;
+    
+    /** 
+     * Create a new ImmutableReference.
+     * 
+     * @param referent the object to refer to, or <code>null</code>
+     */
+    public ImmutableReference(T referent) {
+        this.referent = referent;
+    }
+    
+    /**
+     * Gets the wrapped object, if there is one.
+     * 
+     * @return the object passed to the constructor, or <code>null</code> if
+     *         <code>null</code> was passed to the constructor
+     */
+    public T get() {
+        return referent;
+    }
+}
diff --git a/tests/scancode/data/resource/samples/JGroups/src/RATE_LIMITER.java b/tests/scancode/data/resource/samples/JGroups/src/RATE_LIMITER.java
new file mode 100644
index 00000000000..d0765aa5f29
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/src/RATE_LIMITER.java
@@ -0,0 +1,120 @@
+package org.jgroups.protocols;
+
+import org.jgroups.Event;
+import org.jgroups.Message;
+import org.jgroups.annotations.*;
+import org.jgroups.stack.Protocol;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Protocol which sends at most max_bytes in time_period milliseconds. Can be used instead of a flow control protocol,
+ * e.g. FC or SFC (same position in the stack)
+ * @author Bela Ban
+ * @version $Id: RATE_LIMITER.java,v 1.3 2009/12/11 13:08:03 belaban Exp $
+ */
+@Experimental @Unsupported
+public class RATE_LIMITER extends Protocol {
+
+    @Property(description="Max number of bytes to be sent in time_period ms. Blocks the sender if exceeded until a new " +
+            "time period has started")
+    protected long max_bytes=500000;
+
+    @Property(description="Number of milliseconds during which max_bytes bytes can be sent")
+    protected long time_period=1000L;
+
+
+    /** Keeps track of the number of bytes sent in the current time period */
+    @GuardedBy("lock")
+    @ManagedAttribute
+    protected long num_bytes_sent=0L;
+
+    @GuardedBy("lock")
+    protected long end_of_current_period=0L;
+
+    protected final Lock lock=new ReentrantLock();
+    protected final Condition block=lock.newCondition();
+
+    @ManagedAttribute
+    protected int num_blockings=0;
+
+    @ManagedAttribute
+    protected long total_block_time=0L;
+
+
+
+    public Object down(Event evt) {
+        if(evt.getType() == Event.MSG) {
+            Message msg=(Message)evt.getArg();
+            int len=msg.getLength();
+
+            lock.lock();
+            try {
+                if(len > max_bytes) {
+                    log.error("message length (" + len + " bytes) exceeded max_bytes (" + max_bytes + "); " +
+                            "adjusting max_bytes to " + len);
+                    max_bytes=len;
+                }
+
+                while(true) {
+                    boolean size_exceeded=num_bytes_sent + len >= max_bytes,
+                            time_exceeded=System.currentTimeMillis() > end_of_current_period;
+                    if(!size_exceeded && !time_exceeded)
+                        break;
+
+                    if(time_exceeded) {
+                        reset();
+                    }
+                    else { // size exceeded
+                        long block_time=end_of_current_period - System.currentTimeMillis();
+                        if(block_time > 0) {
+                            try {
+                                block.await(block_time, TimeUnit.MILLISECONDS);
+                                num_blockings++;
+                                total_block_time+=block_time;
+                            }
+                            catch(InterruptedException e) {
+                            }
+                        }
+                    }
+                }
+            }
+            finally {
+                num_bytes_sent+=len;
+                lock.unlock();
+            }
+
+            return down_prot.down(evt);
+        }
+
+        return down_prot.down(evt);
+    }
+    
+
+    public void init() throws Exception {
+        super.init();
+        if(time_period <= 0)
+            throw new IllegalArgumentException("time_period needs to be positive");
+    }
+
+    public void stop() {
+        super.stop();
+        reset();
+    }
+
+    protected void reset() {
+        lock.lock();
+        try {
+            // blocking=false;
+            num_bytes_sent=0L;
+            end_of_current_period=System.currentTimeMillis() + time_period;
+            block.signalAll();
+        }
+        finally {
+            lock.unlock();
+        }
+    }
+}
diff --git a/tests/scancode/data/resource/samples/JGroups/src/RouterStub.java b/tests/scancode/data/resource/samples/JGroups/src/RouterStub.java
new file mode 100644
index 00000000000..1e0b9f9ef4c
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/src/RouterStub.java
@@ -0,0 +1,295 @@
+package org.jgroups.stack;
+
+import org.jgroups.Address;
+import org.jgroups.PhysicalAddress;
+import org.jgroups.logging.Log;
+import org.jgroups.logging.LogFactory;
+import org.jgroups.protocols.PingData;
+import org.jgroups.protocols.TUNNEL.StubReceiver;
+import org.jgroups.util.Util;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Client stub that talks to a remote GossipRouter
+ * @author Bela Ban
+ * @version $Id: RouterStub.java,v 1.62 2010/06/09 14:22:00 belaban Exp $
+ */
+public class RouterStub {
+
+    public static enum ConnectionStatus {INITIAL, CONNECTION_BROKEN, CONNECTION_ESTABLISHED, CONNECTED,DISCONNECTED};
+
+    private final String router_host; // name of the router host
+
+    private final int router_port; // port on which router listens on
+
+    private Socket sock=null; // socket connecting to the router
+
+    private DataOutputStream output=null;
+
+    private DataInputStream input=null;
+
+    private volatile ConnectionStatus connectionState=ConnectionStatus.INITIAL;
+
+    private static final Log log=LogFactory.getLog(RouterStub.class);
+
+    private final ConnectionListener conn_listener;
+
+    private final InetAddress bind_addr;
+
+    private int sock_conn_timeout=3000; // max number of ms to wait for socket establishment to
+    // GossipRouter
+
+    private int sock_read_timeout=3000; // max number of ms to wait for socket reads (0 means block
+    // forever, or until the sock is closed)
+
+    private boolean tcp_nodelay=true;
+    
+    private StubReceiver receiver;
+
+    public interface ConnectionListener {
+        void connectionStatusChange(RouterStub stub, ConnectionStatus state);
+    }
+
+    /**
+     * Creates a stub for a remote Router object.
+     * @param routerHost The name of the router's host
+     * @param routerPort The router's port
+     * @throws SocketException
+     */
+    public RouterStub(String routerHost, int routerPort, InetAddress bindAddress, ConnectionListener l) {
+        router_host=routerHost != null? routerHost : "localhost";
+        router_port=routerPort;
+        bind_addr=bindAddress;
+        conn_listener=l;        
+    }
+    
+    public synchronized void setReceiver(StubReceiver receiver) {
+        this.receiver = receiver;
+    }
+    
+    public synchronized StubReceiver  getReceiver() {
+        return receiver;
+    }
+
+    public boolean isTcpNoDelay() {
+        return tcp_nodelay;
+    }
+
+    public void setTcpNoDelay(boolean tcp_nodelay) {
+        this.tcp_nodelay=tcp_nodelay;
+    }
+
+    public synchronized void interrupt() {
+        if(receiver != null) {
+            Thread thread = receiver.getThread();
+            if(thread != null)
+                thread.interrupt();
+        }
+    }
+    
+    public synchronized void join(long wait) throws InterruptedException {
+        if(receiver != null) {
+            Thread thread = receiver.getThread();
+            if(thread != null)
+                thread.join(wait);
+        }
+    }
+
+
+    public int getSocketConnectionTimeout() {
+        return sock_conn_timeout;
+    }
+
+    public void setSocketConnectionTimeout(int sock_conn_timeout) {
+        this.sock_conn_timeout=sock_conn_timeout;
+    }
+
+    public int getSocketReadTimeout() {
+        return sock_read_timeout;
+    }
+
+    public void setSocketReadTimeout(int sock_read_timeout) {
+        this.sock_read_timeout=sock_read_timeout;
+    }
+
+    public boolean isConnected() {
+        return !(connectionState == ConnectionStatus.CONNECTION_BROKEN || connectionState == ConnectionStatus.INITIAL);
+    }
+
+    public ConnectionStatus getConnectionStatus() {
+        return connectionState;
+    }
+
+
+    /**
+     * Register this process with the router under <code>group</code>.
+     * @param group The name of the group under which to register
+     */
+    public synchronized void connect(String group, Address addr, String logical_name, List<PhysicalAddress> phys_addrs) throws Exception {
+        doConnect();
+        GossipData request=new GossipData(GossipRouter.CONNECT, group, addr, logical_name, phys_addrs);
+        request.writeTo(output);
+        output.flush();
+        byte result = input.readByte();
+        if(result == GossipRouter.CONNECT_OK) {
+            connectionStateChanged(ConnectionStatus.CONNECTED);   
+        } else {
+            connectionStateChanged(ConnectionStatus.DISCONNECTED);
+            throw new Exception("Connect failed received from GR " + getGossipRouterAddress());
+        }
+    }
+
+    public synchronized void doConnect() throws Exception {
+        if(!isConnected()) {
+            try {
+                sock=new Socket();
+                sock.bind(new InetSocketAddress(bind_addr, 0));
+                sock.setSoTimeout(sock_read_timeout);
+                sock.setSoLinger(true, 2);
+                sock.setTcpNoDelay(tcp_nodelay);
+                sock.setKeepAlive(true);
+                Util.connect(sock, new InetSocketAddress(router_host, router_port), sock_conn_timeout);
+                output=new DataOutputStream(sock.getOutputStream());
+                input=new DataInputStream(sock.getInputStream());                
+                connectionStateChanged(ConnectionStatus.CONNECTION_ESTABLISHED);
+            }
+            catch(Exception e) {                
+                Util.close(sock);
+                Util.close(input);
+                Util.close(output);
+                connectionStateChanged(ConnectionStatus.CONNECTION_BROKEN);
+                throw new Exception("Could not connect to " + getGossipRouterAddress() , e);
+            }
+        }
+    }
+
+    /**
+     * Checks whether the connection is open
+     * @return
+     */
+    public synchronized void checkConnection() {
+        GossipData request=new GossipData(GossipRouter.PING);
+        try {
+            request.writeTo(output);
+            output.flush();
+        }
+        catch(IOException e) {
+            connectionStateChanged(ConnectionStatus.CONNECTION_BROKEN);
+        }
+    }
+
+
+    public synchronized void disconnect(String group, Address addr) {
+        try {
+            GossipData request=new GossipData(GossipRouter.DISCONNECT, group, addr);
+            request.writeTo(output);
+            output.flush();
+        }
+        catch(Exception e) {
+        } finally {
+            connectionStateChanged(ConnectionStatus.DISCONNECTED);
+        }
+    }
+
+    public synchronized void destroy() {
+        try {
+            GossipData request = new GossipData(GossipRouter.CLOSE);
+            request.writeTo(output);
+            output.flush();
+        } catch (Exception e) {
+        } finally {
+            Util.close(output);
+            Util.close(input);
+            Util.close(sock);
+        }
+    }
+    
+    
+    /*
+     * Used only in testing, never access socket directly
+     * 
+     */
+    public Socket getSocket() {
+        return sock;
+    }
+
+
+    public synchronized List<PingData> getMembers(final String group) throws Exception {
+        List<PingData> retval=new ArrayList<PingData>();
+        try {
+
+            if(!isConnected() || input == null) throw new Exception ("not connected");
+            // we might get a spurious SUSPECT message from the router, just ignore it
+            if(input.available() > 0) // fixes https://jira.jboss.org/jira/browse/JGRP-1151
+                input.skipBytes(input.available());
+
+            GossipData request=new GossipData(GossipRouter.GOSSIP_GET, group, null);
+            request.writeTo(output);
+            output.flush();
+
+            short num_rsps=input.readShort();
+            for(int i=0; i < num_rsps; i++) {
+                PingData rsp=new PingData();
+                rsp.readFrom(input);
+                retval.add(rsp);
+            }
+        }       
+        catch(Exception e) {           
+            connectionStateChanged(ConnectionStatus.CONNECTION_BROKEN);
+            throw new Exception("Connection to " + getGossipRouterAddress() + " broken. Could not send GOSSIP_GET request", e);
+        }
+        return retval;
+    }
+
+    public InetSocketAddress getGossipRouterAddress() {
+        return new InetSocketAddress(router_host, router_port);
+    }
+    
+    public String toString() {
+        return "RouterStub[localsocket=" + ((sock != null) ? sock.getLocalSocketAddress().toString()
+                        : "null")+ ",router_host=" + router_host + "::" + router_port
+                                        + ",connected=" + isConnected() + "]";
+    }
+
+    public void sendToAllMembers(String group, byte[] data, int offset, int length) throws Exception {
+        sendToMember(group, null, data, offset, length); // null destination represents mcast
+    }
+
+    public synchronized void sendToMember(String group, Address dest, byte[] data, int offset, int length) throws Exception {
+        try {
+            GossipData request = new GossipData(GossipRouter.MESSAGE, group, dest, data, offset, length);
+            request.writeTo(output);
+            output.flush();
+        } catch (Exception e) {
+            connectionStateChanged(ConnectionStatus.CONNECTION_BROKEN);
+            throw new Exception("Connection to " + getGossipRouterAddress()
+                            + " broken. Could not send message to " + dest, e);
+        }
+    }
+
+    public DataInputStream getInputStream() {
+        return input;
+    }
+
+    private void connectionStateChanged(ConnectionStatus newState) {
+        boolean notify=connectionState != newState;
+        connectionState=newState;
+        if(notify && conn_listener != null) {
+            try {
+                conn_listener.connectionStatusChange(this, newState);
+            }
+            catch(Throwable t) {
+                log.error("failed notifying ConnectionListener " + conn_listener, t);
+            }
+        }
+    }
+}
diff --git a/tests/scancode/data/resource/samples/JGroups/src/RouterStubManager.java b/tests/scancode/data/resource/samples/JGroups/src/RouterStubManager.java
new file mode 100644
index 00000000000..47153252434
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/src/RouterStubManager.java
@@ -0,0 +1,213 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jgroups.stack;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.jgroups.Address;
+import org.jgroups.Event;
+import org.jgroups.PhysicalAddress;
+import org.jgroups.annotations.GuardedBy;
+import org.jgroups.logging.Log;
+import org.jgroups.logging.LogFactory;
+import org.jgroups.util.TimeScheduler;
+
+public class RouterStubManager implements RouterStub.ConnectionListener {
+
+    @GuardedBy("reconnectorLock")
+    private final Map<InetSocketAddress, Future<?>> futures = new HashMap<InetSocketAddress, Future<?>>();
+    private final Lock reconnectorLock = new ReentrantLock();    
+    private final List<RouterStub> stubs;
+    
+    private final Protocol owner;
+    private final TimeScheduler timer;
+    private final String channelName;
+    private final Address logicalAddress;
+    private final long interval;
+
+    protected final Log log;
+
+    public RouterStubManager(Protocol owner, String channelName, Address logicalAddress, long interval) {
+        this.owner = owner;
+        this.stubs = new CopyOnWriteArrayList<RouterStub>();             
+        this.log = LogFactory.getLog(owner.getClass());     
+        this.timer = owner.getTransport().getTimer();
+        this.channelName = channelName;
+        this.logicalAddress = logicalAddress;
+        this.interval = interval;
+    }
+    
+    private RouterStubManager(Protocol p) {
+       this(p,null,null,0L);
+    }
+    
+    public List<RouterStub> getStubs(){
+        return stubs;
+    }
+    
+    public RouterStub createAndRegisterStub(String routerHost, int routerPort, InetAddress bindAddress) {
+        RouterStub s = new RouterStub(routerHost,routerPort,bindAddress,this);
+        unregisterAndDestroyStub(s.getGossipRouterAddress());       
+        stubs.add(s);   
+        return s;
+    }
+    
+    public void registerStub(RouterStub s) {        
+        unregisterAndDestroyStub(s.getGossipRouterAddress());        
+        stubs.add(s);           
+    }
+    
+    public boolean unregisterStub(final RouterStub s) {
+        return stubs.remove(s);
+    }
+    
+    public RouterStub unregisterStub(final InetSocketAddress address) {
+        if(address == null) 
+            throw new IllegalArgumentException("Cannot remove null address");
+        for (RouterStub s : stubs) {
+            if (s.getGossipRouterAddress().equals(address)) {
+                stubs.remove(address);
+                return s;
+            }
+        }
+        return null;
+    }
+    
+    public boolean unregisterAndDestroyStub(final InetSocketAddress address) {
+        RouterStub unregisteredStub = unregisterStub(address);
+        if(unregisteredStub !=null) {
+            unregisteredStub.destroy();
+            return true;
+        }
+        return false;
+    }
+    
+    public void disconnectStubs() {
+        for (RouterStub stub : stubs) {
+            try {
+                stub.disconnect(channelName, logicalAddress);                
+            } catch (Exception e) {
+            }
+        }       
+    }
+    
+    public void destroyStubs() {
+        for (RouterStub s : stubs) {
+            stopReconnecting(s);
+            s.destroy();            
+        }
+        stubs.clear();
+    }
+
+    public void startReconnecting(final RouterStub stub) {
+        reconnectorLock.lock();
+        try {
+            InetSocketAddress routerAddress = stub.getGossipRouterAddress();
+            Future<?> f = futures.get(routerAddress);
+            if (f != null) {
+                f.cancel(true);
+                futures.remove(routerAddress);
+            }
+
+            final Runnable reconnector = new Runnable() {
+                public void run() {
+                    try {
+                        if (log.isTraceEnabled()) log.trace("Reconnecting " + stub);                        
+                        String logical_name = org.jgroups.util.UUID.get(logicalAddress);
+                        PhysicalAddress physical_addr = (PhysicalAddress) owner.down(new Event(
+                                        Event.GET_PHYSICAL_ADDRESS, logicalAddress));
+                        List<PhysicalAddress> physical_addrs = Arrays.asList(physical_addr);
+                        stub.connect(channelName, logicalAddress, logical_name, physical_addrs);
+                        if (log.isTraceEnabled()) log.trace("Reconnected " + stub);                        
+                    } catch (Throwable ex) {
+                        if (log.isWarnEnabled())
+                            log.warn("failed reconnecting stub to GR at "+ stub.getGossipRouterAddress() + ": " + ex);
+                    }
+                }
+            };
+            f = timer.scheduleWithFixedDelay(reconnector, 0, interval, TimeUnit.MILLISECONDS);
+            futures.put(stub.getGossipRouterAddress(), f);
+        } finally {
+            reconnectorLock.unlock();
+        }
+    }
+
+    public void stopReconnecting(final RouterStub stub) {
+        reconnectorLock.lock();
+        try {
+            InetSocketAddress routerAddress = stub.getGossipRouterAddress();
+            Future<?> f = futures.get(stub.getGossipRouterAddress());
+            if (f != null) {
+                f.cancel(true);
+                futures.remove(routerAddress);
+            }
+
+            final Runnable pinger = new Runnable() {
+                public void run() {
+                    try {
+                        if(log.isTraceEnabled()) log.trace("Pinging " + stub);                        
+                        stub.checkConnection();
+                        if(log.isTraceEnabled()) log.trace("Pinged " + stub);                        
+                    } catch (Throwable ex) {
+                        if (log.isWarnEnabled())
+                            log.warn("failed pinging stub, GR at " + stub.getGossipRouterAddress()+ ": " + ex);
+                    }
+                }
+            };
+            f = timer.scheduleWithFixedDelay(pinger, 0, interval, TimeUnit.MILLISECONDS);
+            futures.put(stub.getGossipRouterAddress(), f);
+        } finally {
+            reconnectorLock.unlock();
+        }
+    }
+   
+
+    public void connectionStatusChange(RouterStub stub, RouterStub.ConnectionStatus newState) {
+        if (newState == RouterStub.ConnectionStatus.CONNECTION_BROKEN) {
+            stub.interrupt();
+            stub.destroy();
+            startReconnecting(stub);
+        } else if (newState == RouterStub.ConnectionStatus.CONNECTED) {
+            stopReconnecting(stub);
+        } else if (newState == RouterStub.ConnectionStatus.DISCONNECTED) {
+            // wait for disconnect ack;
+            try {
+                stub.join(interval);
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+    
+    public static RouterStubManager emptyGossipClientStubManager(Protocol p) {
+        return new RouterStubManager(p);
+    }
+}
diff --git a/tests/scancode/data/resource/samples/JGroups/src/S3_PING.java b/tests/scancode/data/resource/samples/JGroups/src/S3_PING.java
new file mode 100644
index 00000000000..2f93ec6cc9c
--- /dev/null
+++ b/tests/scancode/data/resource/samples/JGroups/src/S3_PING.java
@@ -0,0 +1,3025 @@
+package org.jgroups.protocols;
+
+import org.jgroups.Address;
+import org.jgroups.annotations.Experimental;
+import org.jgroups.annotations.Property;
+import org.jgroups.annotations.Unsupported;
+import org.jgroups.util.Util;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static java.lang.String.valueOf;
+
+
+/**
+ * Discovery protocol using Amazon's S3 storage. The S3 access code reuses the example shipped by Amazon.
+ * This protocol is unsupported and experimental !
+ * @author Bela Ban
+ * @version $Id: S3_PING.java,v 1.11 2010/06/18 04:39:08 belaban Exp $
+ */
+@Experimental
+public class S3_PING extends FILE_PING {
+
+    @Property(description="The access key to AWS (S3)")
+    protected String access_key=null;
+
+    @Property(description="The secret access key to AWS (S3)")
+    protected String secret_access_key=null;
+
+    @Property(description="When non-null, we set location to prefix-UUID")
+    protected String prefix=null;
+
+    protected AWSAuthConnection conn=null;
+
+
+  
+    public void init() throws Exception {
+        super.init();
+        if(access_key == null || secret_access_key == null)
+            throw new IllegalArgumentException("access_key and secret_access_key must be non-null");
+
+        conn=new AWSAuthConnection(access_key, secret_access_key);
+
+        if(prefix != null && prefix.length() > 0) {
+            ListAllMyBucketsResponse bucket_list=conn.listAllMyBuckets(null);
+            List buckets=bucket_list.entries;
+            if(buckets != null) {
+                boolean found=false;
+                for(Object tmp: buckets) {
+                    if(tmp instanceof Bucket) {
+                        Bucket bucket=(Bucket)tmp;
+                        if(bucket.name.startsWith(prefix)) {
+                            location=bucket.name;
+                            found=true;
+                        }
+                    }
+                }
+                if(!found) {
+                    location=prefix + "-" + java.util.UUID.randomUUID().toString();
+                }
+            }
+        }
+
+
+        if(!conn.checkBucketExists(location)) {
+            conn.createBucket(location, AWSAuthConnection.LOCATION_DEFAULT, null).connection.getResponseMessage();
+        }
+
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            public void run() {
+                remove(group_addr, local_addr);
+            }
+        });
+    }
+
+    protected void createRootDir() {
+        ; // do *not* create root file system (don't remove !)
+    }
+
+    protected List<PingData> readAll(String clustername) {
+        if(clustername == null)
+            return null;
+
+        List<PingData> retval=new ArrayList<PingData>();
+        try {
+            ListBucketResponse rsp=conn.listBucket(location, clustername, null, null, null);
+            if(rsp.entries != null) {
+                for(Iterator<ListEntry> it=rsp.entries.iterator(); it.hasNext();) {
+                    ListEntry key=it.next();
+                    GetResponse val=conn.get(location, key.key, null);
+                    if(val.object != null) {
+                        byte[] buf=val.object.data;
+                        if(buf != null) {
+                            try {
+                                PingData data=(PingData)Util.objectFromByteBuffer(buf);
+                                retval.add(data);
+                            }
+                            catch(Exception e) {
+                                log.error("failed marshalling buffer to address", e);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return retval;
+        }
+        catch(IOException ex) {
+            log.error("failed reading addresses", ex);
+            return retval;
+        }
+    }
+
+
+    protected void writeToFile(PingData data, String clustername) {
+        if(clustername == null || data == null)
+            return;
+        String filename=local_addr instanceof org.jgroups.util.UUID? ((org.jgroups.util.UUID)local_addr).toStringLong() : local_addr.toString();
+        String key=clustername + "/" + filename;
+        try {
+            Map headers=new TreeMap();
+            headers.put("Content-Type", Arrays.asList("text/plain"));
+            byte[] buf=Util.objectToByteBuffer(data);
+            S3Object val=new S3Object(buf, null);
+            conn.put(location, key, val, headers).connection.getResponseMessage();
+        }
+        catch(Exception e) {
+            log.error("failed marshalling " + data + " to buffer", e);
+        }
+    }
+
+
+    protected void remove(String clustername, Address addr) {
+        if(clustername == null || addr == null)
+            return;
+        String filename=addr instanceof org.jgroups.util.UUID? ((org.jgroups.util.UUID)addr).toStringLong() : addr.toString();
+        String key=clustername + "/" + filename;
+        try {
+            Map headers=new TreeMap();
+            headers.put("Content-Type", Arrays.asList("text/plain"));
+            conn.delete(location, key, headers).connection.getResponseMessage();
+            if(log.isTraceEnabled())
+                log.trace("removing " + location + "/" + key);
+        }
+        catch(Exception e) {
+            log.error("failure removing data", e);
+        }
+    }
+
+
+
+
+    
+
+
+    /**
+     * The following classes have been copied from Amazon's sample code
+     */
+    static class AWSAuthConnection {
+        public static final String LOCATION_DEFAULT=null;
+        public static final String LOCATION_EU="EU";
+
+        private String awsAccessKeyId;
+        private String awsSecretAccessKey;
+        private boolean isSecure;
+        private String server;
+        private int port;
+        private CallingFormat callingFormat;
+
+        public AWSAuthConnection(String awsAccessKeyId, String awsSecretAccessKey) {
+            this(awsAccessKeyId, awsSecretAccessKey, true);
+        }
+
+        public AWSAuthConnection(String awsAccessKeyId, String awsSecretAccessKey, boolean isSecure) {
+            this(awsAccessKeyId, awsSecretAccessKey, isSecure, Utils.DEFAULT_HOST);
+        }
+
+        public AWSAuthConnection(String awsAccessKeyId, String awsSecretAccessKey, boolean isSecure,
+                                 String server) {
+            this(awsAccessKeyId, awsSecretAccessKey, isSecure, server,
+                 isSecure? Utils.SECURE_PORT : Utils.INSECURE_PORT);
+        }
+
+        public AWSAuthConnection(String awsAccessKeyId, String awsSecretAccessKey, boolean isSecure,
+                                 String server, int port) {
+            this(awsAccessKeyId, awsSecretAccessKey, isSecure, server, port, CallingFormat.getSubdomainCallingFormat());
+
+        }
+
+        public AWSAuthConnection(String awsAccessKeyId, String awsSecretAccessKey, boolean isSecure,
+                                 String server, CallingFormat format) {
+            this(awsAccessKeyId, awsSecretAccessKey, isSecure, server,
+                 isSecure? Utils.SECURE_PORT : Utils.INSECURE_PORT,
+                 format);
+        }
+
+        /**
+         * Create a new interface to interact with S3 with the given credential and connection
+         * parameters
+         * @param awsAccessKeyId     Your user key into AWS
+         * @param awsSecretAccessKey The secret string used to generate signatures for authentication.
+         * @param isSecure           use SSL encryption
+         * @param server             Which host to connect to.  Usually, this will be s3.amazonaws.com
+         * @param port               Which port to use.
+         * @param format             Type of request Regular/Vanity or Pure Vanity domain
+         */
+        public AWSAuthConnection(String awsAccessKeyId, String awsSecretAccessKey, boolean isSecure,
+                                 String server, int port, CallingFormat format) {
+            this.awsAccessKeyId=awsAccessKeyId;
+            this.awsSecretAccessKey=awsSecretAccessKey;
+            this.isSecure=isSecure;
+            this.server=server;
+            this.port=port;
+            this.callingFormat=format;
+        }
+
+        /**
+         * Creates a new bucket.
+         * @param bucket   The name of the bucket to create.
+         * @param headers  A Map of String to List of Strings representing the http headers to pass (can be null).
+         */
+        public Response createBucket(String bucket, Map headers) throws IOException {
+            return createBucket(bucket, null, headers);
+        }
+
+        /**
+         * Creates a new bucket.
+         * @param bucket   The name of the bucket to create.
+         * @param location Desired location ("EU") (or null for default).
+         * @param headers  A Map of String to List of Strings representing the http
+         *                 headers to pass (can be null).
+         * @throws IllegalArgumentException on invalid location
+         */
+        public Response createBucket(String bucket, String location, Map headers) throws IOException {
+            String body;
+            if(location == null) {
+                body=null;
+            }
+            else if(LOCATION_EU.equals(location)) {
+                if(!callingFormat.supportsLocatedBuckets())
+                    throw new IllegalArgumentException("Creating location-constrained bucket with unsupported calling-format");
+                body="<CreateBucketConstraint><LocationConstraint>" + location + "</LocationConstraint></CreateBucketConstraint>";
+            }
+            else
+                throw new IllegalArgumentException("Invalid Location: " + location);
+
+            // validate bucket name
+            if(!Utils.validateBucketName(bucket, callingFormat))
+                throw new IllegalArgumentException("Invalid Bucket Name: " + bucket);
+
+            HttpURLConnection request=makeRequest("PUT", bucket, "", null, headers);
+            if(body != null) {
+                request.setDoOutput(true);
+                request.getOutputStream().write(body.getBytes("UTF-8"));
+            }
+            return new Response(request);
+        }
+
+        /**
+         * Check if the specified bucket exists (via a HEAD request)
+         * @param bucket The name of the bucket to check
+         * @return true if HEAD access returned success
+         */
+        public boolean checkBucketExists(String bucket) throws IOException {
+            HttpURLConnection response=makeRequest("HEAD", bucket, "", null, null);
+            int httpCode=response.getResponseCode();
+
+            if(httpCode >= 200 && httpCode < 300)
+                return true;
+            if(httpCode == HttpURLConnection.HTTP_NOT_FOUND) // bucket doesn't exist
+                return false;
+            throw new IOException("bucket '" + bucket + "' could not be accessed (rsp=" +
+                    httpCode + " (" + response.getResponseMessage() + "). Maybe the bucket is owned by somebody else or " +
+                    "the authentication failed");
+
+        }
+
+        /**
+         * Lists the contents of a bucket.
+         * @param bucket  The name of the bucket to create.
+         * @param prefix  All returned keys will start with this string (can be null).
+         * @param marker  All returned keys will be lexographically greater than
+         *                this string (can be null).
+         * @param maxKeys The maximum number of keys to return (can be null).
+         * @param headers A Map of String to List of Strings representing the http
+         *                headers to pass (can be null).
+         */
+        public ListBucketResponse listBucket(String bucket, String prefix, String marker,
+                                             Integer maxKeys, Map headers) throws IOException {
+            return listBucket(bucket, prefix, marker, maxKeys, null, headers);
+        }
+
+        /**
+         * Lists the contents of a bucket.
+         * @param bucket    The name of the bucket to list.
+         * @param prefix    All returned keys will start with this string (can be null).
+         * @param marker    All returned keys will be lexographically greater than
+         *                  this string (can be null).
+         * @param maxKeys   The maximum number of keys to return (can be null).
+         * @param delimiter Keys that contain a string between the prefix and the first
+         *                  occurrence of the delimiter will be rolled up into a single element.
+         * @param headers   A Map of String to List of Strings representing the http
+         *                  headers to pass (can be null).
+         */
+        public ListBucketResponse listBucket(String bucket, String prefix, String marker,
+                                             Integer maxKeys, String delimiter, Map headers) throws IOException {
+
+            Map pathArgs=Utils.paramsForListOptions(prefix, marker, maxKeys, delimiter);
+            return new ListBucketResponse(makeRequest("GET", bucket, "", pathArgs, headers));
+        }
+
+        /**
+         * Deletes a bucket.
+         * @param bucket  The name of the bucket to delete.
+         * @param headers A Map of String to List of Strings representing the http headers to pass (can be null).
+         */
+        public Response deleteBucket(String bucket, Map headers) throws IOException {
+            return new Response(makeRequest("DELETE", bucket, "", null, headers));
+        }
+
+        /**
+         * Writes an object to S3.
+         * @param bucket  The name of the bucket to which the object will be added.
+         * @param key     The name of the key to use.
+         * @param object  An S3Object containing the data to write.
+         * @param headers A Map of String to List of Strings representing the http
+         *                headers to pass (can be null).
+         */
+        public Response put(String bucket, String key, S3Object object, Map headers) throws IOException {
+            HttpURLConnection request=
+                    makeRequest("PUT", bucket, Utils.urlencode(key), null, headers, object);
+
+            request.setDoOutput(true);
+            request.getOutputStream().write(object.data == null? new byte[]{} : object.data);
+
+            return new Response(request);
+        }
+
+        /**
+         * Creates a copy of an existing S3 Object.  In this signature, we will copy the
+         * existing metadata.  The default access control policy is private; if you want
+         * to override it, please use x-amz-acl in the headers.
+         * @param sourceBucket      The name of the bucket where the source object lives.
+         * @param sourceKey         The name of the key to copy.
+         * @param destinationBucket The name of the bucket to which the object will be added.
+         * @param destinationKey    The name of the key to use.
+         * @param headers           A Map of String to List of Strings representing the http
+         *                          headers to pass (can be null).  You may wish to set the x-amz-acl header appropriately.
+         */
+        public Response copy(String sourceBucket, String sourceKey, String destinationBucket, String destinationKey, Map headers)
+                throws IOException {
+            S3Object object=new S3Object(new byte[]{}, new HashMap());
+            headers=headers == null? new HashMap() : new HashMap(headers);
+            headers.put("x-amz-copy-source", Arrays.asList(sourceBucket + "/" + sourceKey));
+            headers.put("x-amz-metadata-directive", Arrays.asList("COPY"));
+            return verifyCopy(put(destinationBucket, destinationKey, object, headers));
+        }
+
+        /**
+         * Creates a copy of an existing S3 Object.  In this signature, we will replace the
+         * existing metadata.  The default access control policy is private; if you want
+         * to override it, please use x-amz-acl in the headers.
+         * @param sourceBucket      The name of the bucket where the source object lives.
+         * @param sourceKey         The name of the key to copy.
+         * @param destinationBucket The name of the bucket to which the object will be added.
+         * @param destinationKey    The name of the key to use.
+         * @param metadata          A Map of String to List of Strings representing the S3 metadata
+         *                          for the new object.
+         * @param headers           A Map of String to List of Strings representing the http
+         *                          headers to pass (can be null).  You may wish to set the x-amz-acl header appropriately.
+         */
+        public Response copy(String sourceBucket, String sourceKey, String destinationBucket, String destinationKey, Map metadata, Map headers)
+                throws IOException {
+            S3Object object=new S3Object(new byte[]{}, metadata);
+            headers=headers == null? new HashMap() : new HashMap(headers);
+            headers.put("x-amz-copy-source", Arrays.asList(sourceBucket + "/" + sourceKey));
+            headers.put("x-amz-metadata-directive", Arrays.asList("REPLACE"));
+            return verifyCopy(put(destinationBucket, destinationKey, object, headers));
+        }
+
+        /**
+         * Copy sometimes returns a successful response and starts to send whitespace
+         * characters to us.  This method processes those whitespace characters and
+         * will throw an exception if the response is either unknown or an error.
+         * @param response Response object from the PUT request.
+         * @return The response with the input stream drained.
+         * @throws IOException If anything goes wrong.
+         */
+        private static Response verifyCopy(Response response) throws IOException {
+            if(response.connection.getResponseCode() < 400) {
+                byte[] body=GetResponse.slurpInputStream(response.connection.getInputStream());
+                String message=new String(body);
+                if(message.contains("<Error")) {
+                    throw new IOException(message.substring(message.indexOf("<Error")));
+                }
+                else if(message.contains("</CopyObjectResult>")) {
+                    // It worked!
+                }
+                else {
+                    throw new IOException("Unexpected response: " + message);
+                }
+            }
+            return response;
+        }
+
+        /**
+         * Reads an object from S3.
+         * @param bucket  The name of the bucket where the object lives.
+         * @param key     The name of the key to use.
+         * @param headers A Map of String to List of Strings representing the http
+         *                headers to pass (can be null).
+         */
+        public GetResponse get(String bucket, String key, Map headers) throws IOException {
+            return new GetResponse(makeRequest("GET", bucket, Utils.urlencode(key), null, headers));
+        }
+
+        /**
+         * Deletes an object from S3.
+         * @param bucket  The name of the bucket where the object lives.
+         * @param key     The name of the key to use.
+         * @param headers A Map of String to List of Strings representing the http
+         *                headers to pass (can be null).
+         */
+        public Response delete(String bucket, String key, Map headers) throws IOException {
+            return new Response(makeRequest("DELETE", bucket, Utils.urlencode(key), null, headers));
+        }
+
+        /**
+         * Get the requestPayment xml document for a given bucket
+         * @param bucket  The name of the bucket
+         * @param headers A Map of String to List of Strings representing the http
+         *                headers to pass (can be null).
+         */
+        public GetResponse getBucketRequestPayment(String bucket, Map headers) throws IOException {
+            Map pathArgs=new HashMap();
+            pathArgs.put("requestPayment", null);
+            return new GetResponse(makeRequest("GET", bucket, "", pathArgs, headers));
+        }
+
+        /**
+         * Write a new requestPayment xml document for a given bucket
+         * @param bucket        The name of the bucket
+         * @param requestPaymentXMLDoc
+         * @param headers       A Map of String to List of Strings representing the http
+         *                      headers to pass (can be null).
+         */
+        public Response putBucketRequestPayment(String bucket, String requestPaymentXMLDoc, Map headers)
+                throws IOException {
+            Map pathArgs=new HashMap();
+            pathArgs.put("requestPayment", null);
+            S3Object object=new S3Object(requestPaymentXMLDoc.getBytes(), null);
+            HttpURLConnection request=makeRequest("PUT", bucket, "", pathArgs, headers, object);
+
+            request.setDoOutput(true);
+            request.getOutputStream().write(object.data == null? new byte[]{} : object.data);
+
+            return new Response(request);
+        }
+
+        /**
+         * Get the logging xml document for a given bucket
+         * @param bucket  The name of the bucket
+         * @param headers A Map of String to List of Strings representing the http headers to pass (can be null).
+         */
+        public GetResponse getBucketLogging(String bucket, Map headers) throws IOException {
+            Map pathArgs=new HashMap();
+            pathArgs.put("logging", null);
+            return new GetResponse(makeRequest("GET", bucket, "", pathArgs, headers));
+        }
+
+        /**
+         * Write a new logging xml document for a given bucket
+         * @param loggingXMLDoc The xml representation of the logging configuration as a String
+         * @param bucket        The name of the bucket
+         * @param headers       A Map of String to List of Strings representing the http
+         *                      headers to pass (can be null).
+         */
+        public Response putBucketLogging(String bucket, String loggingXMLDoc, Map headers) throws IOException {
+            Map pathArgs=new HashMap();
+            pathArgs.put("logging", null);
+            S3Object object=new S3Object(loggingXMLDoc.getBytes(), null);
+            HttpURLConnection request=makeRequest("PUT", bucket, "", pathArgs, headers, object);
+
+            request.setDoOutput(true);
+            request.getOutputStream().write(object.data == null? new byte[]{} : object.data);
+
+            return new Response(request);
+        }
+
+        /**
+         * Get the ACL for a given bucket
+         * @param bucket  The name of the bucket where the object lives.
+         * @param headers A Map of String to List of Strings representing the http
+         *                headers to pass (can be null).
+         */
+        public GetResponse getBucketACL(String bucket, Map headers) throws IOException {
+            return getACL(bucket, "", headers);
+        }
+
+        /**
+         * Get the ACL for a given object (or bucket, if key is null).
+         * @param bucket  The name of the bucket where the object lives.
+         * @param key     The name of the key to use.
+         * @param headers A Map of String to List of Strings representing the http
+         *                headers to pass (can be null).
+         */
+        public GetResponse getACL(String bucket, String key, Map headers) throws IOException {
+            if(key == null) key="";
+
+            Map pathArgs=new HashMap();
+            pathArgs.put("acl", null);
+
+            return new GetResponse(
+                    makeRequest("GET", bucket, Utils.urlencode(key), pathArgs, headers)
+            );
+        }
+
+        /**
+         * Write a new ACL for a given bucket
+         * @param aclXMLDoc The xml representation of the ACL as a String
+         * @param bucket    The name of the bucket where the object lives.
+         * @param headers   A Map of String to List of Strings representing the http headers to pass (can be null).
+         */
+        public Response putBucketACL(String bucket, String aclXMLDoc, Map headers) throws IOException {
+            return putACL(bucket, "", aclXMLDoc, headers);
+        }
+
+        /**
+         * Write a new ACL for a given object
+         * @param aclXMLDoc The xml representation of the ACL as a String
+         * @param bucket    The name of the bucket where the object lives.
+         * @param key       The name of the key to use.
+         * @param headers   A Map of String to List of Strings representing the http
+         *                  headers to pass (can be null).
+         */
+        public Response putACL(String bucket, String key, String aclXMLDoc, Map headers)
+                throws IOException {
+            S3Object object=new S3Object(aclXMLDoc.getBytes(), null);
+
+            Map pathArgs=new HashMap();
+            pathArgs.put("acl", null);
+
+            HttpURLConnection request=
+                    makeRequest("PUT", bucket, Utils.urlencode(key), pathArgs, headers, object);
+
+            request.setDoOutput(true);
+            request.getOutputStream().write(object.data == null? new byte[]{} : object.data);
+
+            return new Response(request);
+        }
+
+        public LocationResponse getBucketLocation(String bucket)
+                throws IOException {
+            Map pathArgs=new HashMap();
+            pathArgs.put("location", null);
+            return new LocationResponse(makeRequest("GET", bucket, "", pathArgs, null));
+        }
+
+
+        /**
+         * List all the buckets created by this account.
+         * @param headers A Map of String to List of Strings representing the http
+         *                headers to pass (can be null).
+         */
+        public ListAllMyBucketsResponse listAllMyBuckets(Map headers)
+                throws IOException {
+            return new ListAllMyBucketsResponse(makeRequest("GET", "", "", null, headers));
+        }
+
+
+        /**
+         * Make a new HttpURLConnection without passing an S3Object parameter.
+         * Use this method for key operations that do require arguments
+         * @param method     The method to invoke
+         * @param bucketName the bucket this request is for
+         * @param key        the key this request is for
+         * @param pathArgs   the
+         * @param headers
+         * @return
+         * @throws MalformedURLException
+         * @throws IOException
+         */
+        private HttpURLConnection makeRequest(String method, String bucketName, String key, Map pathArgs, Map headers)
+                throws IOException {
+            return makeRequest(method, bucketName, key, pathArgs, headers, null);
+        }
+
+
+        /**
+         * Make a new HttpURLConnection.
+         * @param method     The HTTP method to use (GET, PUT, DELETE)
+         * @param bucket     The bucket name this request affects
+         * @param key        The key this request is for
+         * @param pathArgs   parameters if any to be sent along this request
+         * @param headers    A Map of String to List of Strings representing the http
+         *                   headers to pass (can be null).
+         * @param object     The S3Object that is to be written (can be null).
+         */
+        private HttpURLConnection makeRequest(String method, String bucket, String key, Map pathArgs, Map headers,
+                                              S3Object object)
+                throws IOException {
+            CallingFormat format=Utils.getCallingFormatForBucket(this.callingFormat, bucket);
+            if(isSecure && format != CallingFormat.getPathCallingFormat() && bucket.contains(".")) {
+                System.err.println("You are making an SSL connection, however, the bucket contains periods and the wildcard certificate will not match by default.  Please consider using HTTP.");
+            }
+
+            // build the domain based on the calling format
+            URL url=format.getURL(isSecure, server, this.port, bucket, key, pathArgs);
+
+            HttpURLConnection connection=(HttpURLConnection)url.openConnection();
+            connection.setRequestMethod(method);
+
+            // subdomain-style urls may encounter http redirects.
+            // Ensure that redirects are supported.
+            if(!connection.getInstanceFollowRedirects()
+                    && format.supportsLocatedBuckets())
+                throw new RuntimeException("HTTP redirect support required.");
+
+            addHeaders(connection, headers);
+            if(object != null) addMetadataHeaders(connection, object.metadata);
+            addAuthHeader(connection, method, bucket, key, pathArgs);
+
+            return connection;
+        }
+
+        /**
+         * Add the given headers to the HttpURLConnection.
+         * @param connection The HttpURLConnection to which the headers will be added.
+         * @param headers    A Map of String to List of Strings representing the http
+         *                   headers to pass (can be null).
+         */
+        private static void addHeaders(HttpURLConnection connection, Map headers) {
+            addHeaders(connection, headers, "");
+        }
+
+        /**
+         * Add the given metadata fields to the HttpURLConnection.
+         * @param connection The HttpURLConnection to which the headers will be added.
+         * @param metadata   A Map of String to List of Strings representing the s3
+         *                   metadata for this resource.
+         */
+        private static void addMetadataHeaders(HttpURLConnection connection, Map metadata) {
+            addHeaders(connection, metadata, Utils.METADATA_PREFIX);
+        }
+
+        /**
+         * Add the given headers to the HttpURLConnection with a prefix before the keys.
+         * @param connection The HttpURLConnection to which the headers will be added.
+         * @param headers    A Map of String to List of Strings representing the http
+         *                   headers to pass (can be null).
+         * @param prefix     The string to prepend to each key before adding it to the connection.
+         */
+        private static void addHeaders(HttpURLConnection connection, Map headers, String prefix) {
+            if(headers != null) {
+                for(Iterator i=headers.keySet().iterator(); i.hasNext();) {
+                    String key=(String)i.next();
+                    for(Iterator j=((List)headers.get(key)).iterator(); j.hasNext();) {
+                        String value=(String)j.next();
+                        connection.addRequestProperty(prefix + key, value);
+                    }
+                }
+            }
+        }
+
+        /**
+         * Add the appropriate Authorization header to the HttpURLConnection.
+         * @param connection The HttpURLConnection to which the header will be added.
+         * @param method     The HTTP method to use (GET, PUT, DELETE)
+         * @param bucket     the bucket name this request is for
+         * @param key        the key this request is for
+         * @param pathArgs   path arguments which are part of this request
+         */
+        private void addAuthHeader(HttpURLConnection connection, String method, String bucket, String key, Map pathArgs) {
+            if(connection.getRequestProperty("Date") == null) {
+                connection.setRequestProperty("Date", httpDate());
+            }
+            if(connection.getRequestProperty("Content-Type") == null) {
+                connection.setRequestProperty("Content-Type", "");
+            }
+
+            String canonicalString=
+                    Utils.makeCanonicalString(method, bucket, key, pathArgs, connection.getRequestProperties());
+            String encodedCanonical=Utils.encode(this.awsSecretAccessKey, canonicalString, false);
+            connection.setRequestProperty("Authorization",
+                                          "AWS " + this.awsAccessKeyId + ":" + encodedCanonical);
+        }
+
+
+        /**
+         * Generate an rfc822 date for use in the Date HTTP header.
+         */
+        public static String httpDate() {
+            final String DateFormat="EEE, dd MMM yyyy HH:mm:ss ";
+            SimpleDateFormat format=new SimpleDateFormat(DateFormat, Locale.US);
+            format.setTimeZone(TimeZone.getTimeZone("GMT"));
+            return format.format(new Date()) + "GMT";
+        }
+    }
+
+    static class ListEntry {
+        /**
+         * The name of the object
+         */
+        public String key;
+
+        /**
+         * The date at which the object was last modified.
+         */
+        public Date lastModified;
+
+        /**
+         * The object's ETag, which can be used for conditional GETs.
+         */
+        public String eTag;
+
+        /**
+         * The size of the object in bytes.
+         */
+        public long size;
+
+        /**
+         * The object's storage class
+         */
+        public String storageClass;
+
+        /**
+         * The object's owner
+         */
+        public Owner owner;
+
+        public String toString() {
+            return key;
+        }
+    }
+
+    static class Owner {
+        public String id;
+        public String displayName;
+    }
+
+
+    static class Response {
+        public HttpURLConnection connection;
+
+        public Response(HttpURLConnection connection) throws IOException {
+            this.connection=connection;
+        }
+    }
+
+
+    static class GetResponse extends Response {
+        public S3Object object;
+
+        /**
+         * Pulls a representation of an S3Object out of the HttpURLConnection response.
+         */
+        public GetResponse(HttpURLConnection connection) throws IOException {
+            super(connection);
+            if(connection.getResponseCode() < 400) {
+                Map metadata=extractMetadata(connection);
+                byte[] body=slurpInputStream(connection.getInputStream());
+                this.object=new S3Object(body, metadata);
+            }
+        }
+
+        /**
+         * Examines the response's header fields and returns a Map from String to List of Strings
+         * representing the object's metadata.
+         */
+        private static Map extractMetadata(HttpURLConnection connection) {
+            TreeMap metadata=new TreeMap();
+            Map headers=connection.getHeaderFields();
+            for(Iterator i=headers.keySet().iterator(); i.hasNext();) {
+                String key=(String)i.next();
+                if(key == null) continue;
+                if(key.startsWith(Utils.METADATA_PREFIX)) {
+                    metadata.put(key.substring(Utils.METADATA_PREFIX.length()), headers.get(key));
+                }
+            }
+
+            return metadata;
+        }
+
+        /**
+         * Read the input stream and dump it all into a big byte array
+         */
+        static byte[] slurpInputStream(InputStream stream) throws IOException {
+            final int chunkSize=2048;
+            byte[] buf=new byte[chunkSize];
+            ByteArrayOutputStream byteStream=new ByteArrayOutputStream(chunkSize);
+            int count;
+
+            while((count=stream.read(buf)) != -1) byteStream.write(buf, 0, count);
+
+            return byteStream.toByteArray();
+        }
+    }
+
+    static class LocationResponse extends Response {
+        String location;
+
+        /**
+         * Parse the response to a ?location query.
+         */
+        public LocationResponse(HttpURLConnection connection) throws IOException {
+            super(connection);
+            if(connection.getResponseCode() < 400) {
+                try {
+                    XMLReader xr=Utils.createXMLReader();
+                    ;
+                    LocationResponseHandler handler=new LocationResponseHandler();
+                    xr.setContentHandler(handler);
+                    xr.setErrorHandler(handler);
+
+                    xr.parse(new InputSource(connection.getInputStream()));
+                    this.location=handler.loc;
+                }
+                catch(SAXException e) {
+                    throw new RuntimeException("Unexpected error parsing ListAllMyBuckets xml", e);
+                }
+            }
+            else {
+                this.location="<error>";
+            }
+        }
+
+        /**
+         * Report the location-constraint for a bucket.
+         * A value of null indicates an error;
+         * the empty string indicates no constraint;
+         * and any other value is an actual location constraint value.
+         */
+        public String getLocation() {
+            return location;
+        }
+
+        /**
+         * Helper class to parse LocationConstraint response XML
+         */
+        static class LocationResponseHandler extends DefaultHandler {
+            String loc=null;
+            private StringBuffer currText=null;
+
+            public void startDocument() {
+            }
+
+            public void startElement(String uri, String name, String qName, Attributes attrs) {
+                if(name.equals("LocationConstraint")) {
+                    this.currText=new StringBuffer();
+                }
+            }
+
+            public void endElement(String uri, String name, String qName) {
+                if(name.equals("LocationConstraint")) {
+                    loc=this.currText.toString();
+                    this.currText=null;
+                }
+            }
+
+            public void characters(char ch[], int start, int length) {
+                if(currText != null)
+                    this.currText.append(ch, start, length);
+            }
+        }
+    }
+
+
+    static class Bucket {
+        /**
+         * The name of the bucket.
+         */
+        public String name;
+
+        /**
+         * The bucket's creation date.
+         */
+        public Date creationDate;
+
+        public Bucket() {
+            this.name=null;
+            this.creationDate=null;
+        }
+
+        public Bucket(String name, Date creationDate) {
+            this.name=name;
+            this.creationDate=creationDate;
+        }
+
+        public String toString() {
+            return this.name;
+        }
+    }
+
+    static class ListBucketResponse extends Response {
+
+        /**
+         * The name of the bucket being listed.  Null if request fails.
+         */
+        public String name=null;
+
+        /**
+         * The prefix echoed back from the request.  Null if request fails.
+         */
+        public String prefix=null;
+
+        /**
+         * The marker echoed back from the request.  Null if request fails.
+         */
+        public String marker=null;
+
+        /**
+         * The delimiter echoed back from the request.  Null if not specified in
+         * the request, or if it fails.
+         */
+        public String delimiter=null;
+
+        /**
+         * The maxKeys echoed back from the request if specified.  0 if request fails.
+         */
+        public int maxKeys=0;
+
+        /**
+         * Indicates if there are more results to the list.  True if the current
+         * list results have been truncated.  false if request fails.
+         */
+        public boolean isTruncated=false;
+
+        /**
+         * Indicates what to use as a marker for subsequent list requests in the event
+         * that the results are truncated.  Present only when a delimiter is specified.
+         * Null if request fails.
+         */
+        public String nextMarker=null;
+
+        /**
+         * A List of ListEntry objects representing the objects in the given bucket.
+         * Null if the request fails.
+         */
+        public List entries=null;
+
+        /**
+         * A List of CommonPrefixEntry objects representing the common prefixes of the
+         * keys that matched up to the delimiter.  Null if the request fails.
+         */
+        public List commonPrefixEntries=null;
+
+        public ListBucketResponse(HttpURLConnection connection) throws IOException {
+            super(connection);
+            if(connection.getResponseCode() < 400) {
+                try {
+                    XMLReader xr=Utils.createXMLReader();
+                    ListBucketHandler handler=new ListBucketHandler();
+                    xr.setContentHandler(handler);
+                    xr.setErrorHandler(handler);
+
+                    xr.parse(new InputSource(connection.getInputStream()));
+
+                    this.name=handler.getName();
+                    this.prefix=handler.getPrefix();
+                    this.marker=handler.getMarker();
+                    this.delimiter=handler.getDelimiter();
+                    this.maxKeys=handler.getMaxKeys();
+                    this.isTruncated=handler.getIsTruncated();
+                    this.nextMarker=handler.getNextMarker();
+                    this.entries=handler.getKeyEntries();
+                    this.commonPrefixEntries=handler.getCommonPrefixEntries();
+
+                }
+                catch(SAXException e) {
+                    throw new RuntimeException("Unexpected error parsing ListBucket xml", e);
+                }
+            }
+        }
+
+        static class ListBucketHandler extends DefaultHandler {
+
+            private String name=null;
+            private String prefix=null;
+            private String marker=null;
+            private String delimiter=null;
+            private int maxKeys=0;
+            private boolean isTruncated=false;
+            private String nextMarker=null;
+            private boolean isEchoedPrefix=false;
+            private List keyEntries=null;
+            private ListEntry keyEntry=null;
+            private List commonPrefixEntries=null;
+            private CommonPrefixEntry commonPrefixEntry=null;
+            private StringBuffer currText=null;
+            private SimpleDateFormat iso8601Parser=null;
+
+            public ListBucketHandler() {
+                super();
+                keyEntries=new ArrayList();
+                commonPrefixEntries=new ArrayList();
+                this.iso8601Parser=new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                this.iso8601Parser.setTimeZone(new SimpleTimeZone(0, "GMT"));
+                this.currText=new StringBuffer();
+            }
+
+            public void startDocument() {
+                this.isEchoedPrefix=true;
+            }
+
+            public void endDocument() {
+                // ignore
+            }
+
+            public void startElement(String uri, String name, String qName, Attributes attrs) {
+                if(name.equals("Contents")) {
+                    this.keyEntry=new ListEntry();
+                }
+                else if(name.equals("Owner")) {
+                    this.keyEntry.owner=new Owner();
+                }
+                else if(name.equals("CommonPrefixes")) {
+                    this.commonPrefixEntry=new CommonPrefixEntry();
+                }
+            }
+
+            public void endElement(String uri, String name, String qName) {
+                if(name.equals("Name")) {
+                    this.name=this.currText.toString();
+                }
+                // this prefix is the one we echo back from the request
+                else if(name.equals("Prefix") && this.isEchoedPrefix) {
+                    this.prefix=this.currText.toString();
+                    this.isEchoedPrefix=false;
+                }
+                else if(name.equals("Marker")) {
+                    this.marker=this.currText.toString();
+                }
+                else if(name.equals("MaxKeys")) {
+                    this.maxKeys=Integer.parseInt(this.currText.toString());
+                }
+                else if(name.equals("Delimiter")) {
+                    this.delimiter=this.currText.toString();
+                }
+                else if(name.equals("IsTruncated")) {
+                    this.isTruncated=Boolean.valueOf(this.currText.toString());
+                }
+                else if(name.equals("NextMarker")) {
+                    this.nextMarker=this.currText.toString();
+                }
+                else if(name.equals("Contents")) {
+                    this.keyEntries.add(this.keyEntry);
+                }
+                else if(name.equals("Key")) {
+                    this.keyEntry.key=this.currText.toString();
+                }
+                else if(name.equals("LastModified")) {
+                    try {
+                        this.keyEntry.lastModified=this.iso8601Parser.parse(this.currText.toString());
+                    }
+                    catch(ParseException e) {
+                        throw new RuntimeException("Unexpected date format in list bucket output", e);
+                    }
+                }
+                else if(name.equals("ETag")) {
+                    this.keyEntry.eTag=this.currText.toString();
+                }
+                else if(name.equals("Size")) {
+                    this.keyEntry.size=Long.parseLong(this.currText.toString());
+                }
+                else if(name.equals("StorageClass")) {
+                    this.keyEntry.storageClass=this.currText.toString();
+                }
+                else if(name.equals("ID")) {
+                    this.keyEntry.owner.id=this.currText.toString();
+                }
+                else if(name.equals("DisplayName")) {
+                    this.keyEntry.owner.displayName=this.currText.toString();
+                }
+                else if(name.equals("CommonPrefixes")) {
+                    this.commonPrefixEntries.add(this.commonPrefixEntry);
+                }
+                // this is the common prefix for keys that match up to the delimiter
+                else if(name.equals("Prefix")) {
+                    this.commonPrefixEntry.prefix=this.currText.toString();
+                }
+                if(this.currText.length() != 0)
+                    this.currText=new StringBuffer();
+            }
+
+            public void characters(char ch[], int start, int length) {
+                this.currText.append(ch, start, length);
+            }
+
+            public String getName() {
+                return this.name;
+            }
+
+            public String getPrefix() {
+                return this.prefix;
+            }
+
+            public String getMarker() {
+                return this.marker;
+            }
+
+            public String getDelimiter() {
+                return this.delimiter;
+            }
+
+            public int getMaxKeys() {
+                return this.maxKeys;
+            }
+
+            public boolean getIsTruncated() {
+                return this.isTruncated;
+            }
+
+            public String getNextMarker() {
+                return this.nextMarker;
+            }
+
+            public List getKeyEntries() {
+                return this.keyEntries;
+            }
+
+            public List getCommonPrefixEntries() {
+                return this.commonPrefixEntries;
+            }
+        }
+    }
+
+
+    static class CommonPrefixEntry {
+        /**
+         * The prefix common to the delimited keys it represents
+         */
+        public String prefix;
+    }
+
+
+    static class ListAllMyBucketsResponse extends Response {
+        /**
+         * A list of Bucket objects, one for each of this account's buckets.  Will be null if
+         * the request fails.
+         */
+        public List entries;
+
+        public ListAllMyBucketsResponse(HttpURLConnection connection) throws IOException {
+            super(connection);
+            if(connection.getResponseCode() < 400) {
+                try {
+                    XMLReader xr=Utils.createXMLReader();
+                    ;
+                    ListAllMyBucketsHandler handler=new ListAllMyBucketsHandler();
+                    xr.setContentHandler(handler);
+                    xr.setErrorHandler(handler);
+
+                    xr.parse(new InputSource(connection.getInputStream()));
+                    this.entries=handler.getEntries();
+                }
+                catch(SAXException e) {
+                    throw new RuntimeException("Unexpected error parsing ListAllMyBuckets xml", e);
+                }
+            }
+        }
+
+        static class ListAllMyBucketsHandler extends DefaultHandler {
+
+            private List entries=null;
+            private Bucket currBucket=null;
+            private StringBuffer currText=null;
+            private SimpleDateFormat iso8601Parser=null;
+
+            public ListAllMyBucketsHandler() {
+                super();
+                entries=new ArrayList();
+                this.iso8601Parser=new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                this.iso8601Parser.setTimeZone(new SimpleTimeZone(0, "GMT"));
+                this.currText=new StringBuffer();
+            }
+
+            public void startDocument() {
+                // ignore
+            }
+
+            public void endDocument() {
+                // ignore
+            }
+
+            public void startElement(String uri, String name, String qName, Attributes attrs) {
+                if(name.equals("Bucket")) {
+                    this.currBucket=new Bucket();
+                }
+            }
+
+            public void endElement(String uri, String name, String qName) {
+                if(name.equals("Bucket")) {
+                    this.entries.add(this.currBucket);
+                }
+                else if(name.equals("Name")) {
+                    this.currBucket.name=this.currText.toString();
+                }
+                else if(name.equals("CreationDate")) {
+                    try {
+                        this.currBucket.creationDate=this.iso8601Parser.parse(this.currText.toString());
+                    }
+                    catch(ParseException e) {
+                        throw new RuntimeException("Unexpected date format in list bucket output", e);
+                    }
+                }
+                this.currText=new StringBuffer();
+            }
+
+            public void characters(char ch[], int start, int length) {
+                this.currText.append(ch, start, length);
+            }
+
+            public List getEntries() {
+                return this.entries;
+            }
+        }
+    }
+
+
+    static class S3Object {
+
+        public byte[] data;
+
+        /**
+         * A Map from String to List of Strings representing the object's metadata
+         */
+        public Map metadata;
+
+        public S3Object(byte[] data, Map metadata) {
+            this.data=data;
+            this.metadata=metadata;
+        }
+    }
+
+
+    abstract static class CallingFormat {
+
+        protected static CallingFormat pathCallingFormat=new PathCallingFormat();
+        protected static CallingFormat subdomainCallingFormat=new SubdomainCallingFormat();
+        protected static CallingFormat vanityCallingFormat=new VanityCallingFormat();
+
+        public abstract boolean supportsLocatedBuckets();
+
+        public abstract String getEndpoint(String server, int port, String bucket);
+
+        public abstract String getPathBase(String bucket, String key);
+
+        public abstract URL getURL(boolean isSecure, String server, int port, String bucket, String key, Map pathArgs)
+                throws MalformedURLException;
+
+        public static CallingFormat getPathCallingFormat() {
+            return pathCallingFormat;
+        }
+
+        public static CallingFormat getSubdomainCallingFormat() {
+            return subdomainCallingFormat;
+        }
+
+        public static CallingFormat getVanityCallingFormat() {
+            return vanityCallingFormat;
+        }
+
+        private static class PathCallingFormat extends CallingFormat {
+            public boolean supportsLocatedBuckets() {
+                return false;
+            }
+
+            public String getPathBase(String bucket, String key) {
+                return isBucketSpecified(bucket)? "/" + bucket + "/" + key : "/";
+            }
+
+            public String getEndpoint(String server, int port, String bucket) {
+                return server + ":" + port;
+            }
+
+            public URL getURL(boolean isSecure, String server, int port, String bucket, String key, Map pathArgs)
+                    throws MalformedURLException {
+                String pathBase=isBucketSpecified(bucket)? "/" + bucket + "/" + key : "/";
+                String pathArguments=Utils.convertPathArgsHashToString(pathArgs);
+                return new URL(isSecure? "https" : "http", server, port, pathBase + pathArguments);
+            }
+
+            private static boolean isBucketSpecified(String bucket) {
+                return bucket != null && bucket.length() != 0;
+            }
+        }
+
+        private static class SubdomainCallingFormat extends CallingFormat {
+            public boolean supportsLocatedBuckets() {
+                return true;
+            }
+
+            public String getServer(String server, String bucket) {
+                return bucket + "." + server;
+            }
+
+            public String getEndpoint(String server, int port, String bucket) {
+                return getServer(server, bucket) + ":" + port;
+            }
+
+            public String getPathBase(String bucket, String key) {
+                return "/" + key;
+            }
+
+            public URL getURL(boolean isSecure, String server, int port, String bucket, String key, Map pathArgs)
+                    throws MalformedURLException {
+                if(bucket == null || bucket.length() == 0) {
+                    //The bucket is null, this is listAllBuckets request
+                    String pathArguments=Utils.convertPathArgsHashToString(pathArgs);
+                    return new URL(isSecure? "https" : "http", server, port, "/" + pathArguments);
+                }
+                else {
+                    String serverToUse=getServer(server, bucket);
+                    String pathBase=getPathBase(bucket, key);
+                    String pathArguments=Utils.convertPathArgsHashToString(pathArgs);
+                    return new URL(isSecure? "https" : "http", serverToUse, port, pathBase + pathArguments);
+                }
+            }
+        }
+
+        private static class VanityCallingFormat extends SubdomainCallingFormat {
+            public String getServer(String server, String bucket) {
+                return bucket;
+            }
+        }
+    }
+
+    static class Utils {
+        static final String METADATA_PREFIX="x-amz-meta-";
+        static final String AMAZON_HEADER_PREFIX="x-amz-";
+        static final String ALTERNATIVE_DATE_HEADER="x-amz-date";
+        public static final String DEFAULT_HOST="s3.amazonaws.com";
+
+        public static final int SECURE_PORT=443;
+        public static final int INSECURE_PORT=80;
+
+
+        /**
+         * HMAC/SHA1 Algorithm per RFC 2104.
+         */
+        private static final String HMAC_SHA1_ALGORITHM="HmacSHA1";
+
+        static String makeCanonicalString(String method, String bucket, String key, Map pathArgs, Map headers) {
+            return makeCanonicalString(method, bucket, key, pathArgs, headers, null);
+        }
+
+        /**
+         * Calculate the canonical string.  When expires is non-null, it will be
+         * used instead of the Date header.
+         */
+        static String makeCanonicalString(String method, String bucketName, String key, Map pathArgs,
+                                          Map headers, String expires) {
+            StringBuilder buf=new StringBuilder();
+            buf.append(method + "\n");
+
+            // Add all interesting headers to a list, then sort them.  "Interesting"
+            // is defined as Content-MD5, Content-Type, Date, and x-amz-
+            SortedMap interestingHeaders=new TreeMap();
+            if(headers != null) {
+                for(Iterator i=headers.keySet().iterator(); i.hasNext();) {
+                    String hashKey=(String)i.next();
+                    if(hashKey == null) continue;
+                    String lk=hashKey.toLowerCase();
+
+                    // Ignore any headers that are not particularly interesting.
+                    if(lk.equals("content-type") || lk.equals("content-md5") || lk.equals("date") ||
+                            lk.startsWith(AMAZON_HEADER_PREFIX)) {
+                        List s=(List)headers.get(hashKey);
+                        interestingHeaders.put(lk, concatenateList(s));
+                    }
+                }
+            }
+
+            if(interestingHeaders.containsKey(ALTERNATIVE_DATE_HEADER)) {
+                interestingHeaders.put("date", "");
+            }
+
+            // if the expires is non-null, use that for the date field.  this
+            // trumps the x-amz-date behavior.
+            if(expires != null) {
+                interestingHeaders.put("date", expires);
+            }
+
+            // these headers require that we still put a new line in after them,
+            // even if they don't exist.
+            if(!interestingHeaders.containsKey("content-type")) {
+                interestingHeaders.put("content-type", "");
+            }
+            if(!interestingHeaders.containsKey("content-md5")) {
+                interestingHeaders.put("content-md5", "");
+            }
+
+            // Finally, add all the interesting headers (i.e.: all that startwith x-amz- ;-))
+            for(Iterator i=interestingHeaders.keySet().iterator(); i.hasNext();) {
+                String headerKey=(String)i.next();
+                if(headerKey.startsWith(AMAZON_HEADER_PREFIX)) {
+                    buf.append(headerKey).append(':').append(interestingHeaders.get(headerKey));
+                }
+                else {
+                    buf.append(interestingHeaders.get(headerKey));
+                }
+                buf.append("\n");
+            }
+
+            // build the path using the bucket and key
+            if(bucketName != null && bucketName.length() != 0) {
+                buf.append("/" + bucketName);
+            }
+
+            // append the key (it might be an empty string)
+            // append a slash regardless
+            buf.append("/");
+            if(key != null) {
+                buf.append(key);
+            }
+
+            // if there is an acl, logging or torrent parameter
+            // add them to the string
+            if(pathArgs != null) {
+                if(pathArgs.containsKey("acl")) {
+                    buf.append("?acl");
+                }
+                else if(pathArgs.containsKey("torrent")) {
+                    buf.append("?torrent");
+                }
+                else if(pathArgs.containsKey("logging")) {
+                    buf.append("?logging");
+                }
+                else if(pathArgs.containsKey("location")) {
+                    buf.append("?location");
+                }
+            }
+
+            return buf.toString();
+
+        }
+
+        /**
+         * Calculate the HMAC/SHA1 on a string.
+         * @return Signature
+         * @throws java.security.NoSuchAlgorithmException
+         *          If the algorithm does not exist.  Unlikely
+         * @throws java.security.InvalidKeyException
+         *          If the key is invalid.
+         */
+        static String encode(String awsSecretAccessKey, String canonicalString,
+                             boolean urlencode) {
+            // The following HMAC/SHA1 code for the signature is taken from the
+            // AWS Platform's implementation of RFC2104 (amazon.webservices.common.Signature)
+            //
+            // Acquire an HMAC/SHA1 from the raw key bytes.
+            SecretKeySpec signingKey=
+                    new SecretKeySpec(awsSecretAccessKey.getBytes(), HMAC_SHA1_ALGORITHM);
+
+            // Acquire the MAC instance and initialize with the signing key.
+            Mac mac=null;
+            try {
+                mac=Mac.getInstance(HMAC_SHA1_ALGORITHM);
+            }
+            catch(NoSuchAlgorithmException e) {
+                // should not happen
+                throw new RuntimeException("Could not find sha1 algorithm", e);
+            }
+            try {
+                mac.init(signingKey);
+            }
+            catch(InvalidKeyException e) {
+                // also should not happen
+                throw new RuntimeException("Could not initialize the MAC algorithm", e);
+            }
+
+            // Compute the HMAC on the digest, and set it.
+            String b64=Base64.encodeBytes(mac.doFinal(canonicalString.getBytes()));
+
+            if(urlencode) {
+                return urlencode(b64);
+            }
+            else {
+                return b64;
+            }
+        }
+
+        static Map paramsForListOptions(String prefix, String marker, Integer maxKeys) {
+            return paramsForListOptions(prefix, marker, maxKeys, null);
+        }
+
+        static Map paramsForListOptions(String prefix, String marker, Integer maxKeys, String delimiter) {
+
+            Map argParams=new HashMap();
+            // these three params must be url encoded
+            if(prefix != null)
+                argParams.put("prefix", urlencode(prefix));
+            if(marker != null)
+                argParams.put("marker", urlencode(marker));
+            if(delimiter != null)
+                argParams.put("delimiter", urlencode(delimiter));
+
+            if(maxKeys != null)
+                argParams.put("max-keys", Integer.toString(maxKeys.intValue()));
+
+            return argParams;
+
+        }
+
+        /**
+         * Converts the Path Arguments from a map to String which can be used in url construction
+         * @param pathArgs a map of arguments
+         * @return a string representation of pathArgs
+         */
+        public static String convertPathArgsHashToString(Map pathArgs) {
+            StringBuilder pathArgsString=new StringBuilder();
+            String argumentValue;
+            boolean firstRun=true;
+            if(pathArgs != null) {
+                for(Iterator argumentIterator=pathArgs.keySet().iterator(); argumentIterator.hasNext();) {
+                    String argument=(String)argumentIterator.next();
+                    if(firstRun) {
+                        firstRun=false;
+                        pathArgsString.append("?");
+                    }
+                    else {
+                        pathArgsString.append("&");
+                    }
+
+                    argumentValue=(String)pathArgs.get(argument);
+                    pathArgsString.append(argument);
+                    if(argumentValue != null) {
+                        pathArgsString.append("=");
+                        pathArgsString.append(argumentValue);
+                    }
+                }
+            }
+
+            return pathArgsString.toString();
+        }
+
+
+        static String urlencode(String unencoded) {
+            try {
+                return URLEncoder.encode(unencoded, "UTF-8");
+            }
+            catch(UnsupportedEncodingException e) {
+                // should never happen
+                throw new RuntimeException("Could not url encode to UTF-8", e);
+            }
+        }
+
+        static XMLReader createXMLReader() {
+            try {
+                return XMLReaderFactory.createXMLReader();
+            }
+            catch(SAXException e) {
+                // oops, lets try doing this (needed in 1.4)
+                System.setProperty("org.xml.sax.driver", "org.apache.crimson.parser.XMLReaderImpl");
+            }
+            try {
+                // try once more
+                return XMLReaderFactory.createXMLReader();
+            }
+            catch(SAXException e) {
+                throw new RuntimeException("Couldn't initialize a sax driver for the XMLReader");
+            }
+        }
+
+        /**
+         * Concatenates a bunch of header values, seperating them with a comma.
+         * @param values List of header values.
+         * @return String of all headers, with commas.
+         */
+        private static String concatenateList(List values) {
+            StringBuilder buf=new StringBuilder();
+            for(int i=0, size=values.size(); i < size; ++i) {
+                buf.append(((String)values.get(i)).replaceAll("\n", "").trim());
+                if(i != (size - 1)) {
+                    buf.append(",");
+                }
+            }
+            return buf.toString();
+        }
+
+        /**
+         * Validate bucket-name
+         */
+        static boolean validateBucketName(String bucketName, CallingFormat callingFormat) {
+            if(callingFormat == CallingFormat.getPathCallingFormat()) {
+                final int MIN_BUCKET_LENGTH=3;
+                final int MAX_BUCKET_LENGTH=255;
+                final String BUCKET_NAME_REGEX="^[0-9A-Za-z\\.\\-_]*$";
+
+                return null != bucketName &&
+                        bucketName.length() >= MIN_BUCKET_LENGTH &&
+                        bucketName.length() <= MAX_BUCKET_LENGTH &&
+                        bucketName.matches(BUCKET_NAME_REGEX);
+            }
+            else {
+                return isValidSubdomainBucketName(bucketName);
+            }
+        }
+
+        static boolean isValidSubdomainBucketName(String bucketName) {
+            final int MIN_BUCKET_LENGTH=3;
+            final int MAX_BUCKET_LENGTH=63;
+            // don't allow names that look like 127.0.0.1
+            final String IPv4_REGEX="^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$";
+            // dns sub-name restrictions
+            final String BUCKET_NAME_REGEX="^[a-z0-9]([a-z0-9\\-\\_]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-\\_]*[a-z0-9])?)*$";
+
+            // If there wasn't a location-constraint, then the current actual
+            // restriction is just that no 'part' of the name (i.e. sequence
+            // of characters between any 2 '.'s has to be 63) but the recommendation
+            // is to keep the entire bucket name under 63.
+            return null != bucketName &&
+                    bucketName.length() >= MIN_BUCKET_LENGTH &&
+                    bucketName.length() <= MAX_BUCKET_LENGTH &&
+                    !bucketName.matches(IPv4_REGEX) &&
+                    bucketName.matches(BUCKET_NAME_REGEX);
+        }
+
+        static CallingFormat getCallingFormatForBucket(CallingFormat desiredFormat, String bucketName) {
+            CallingFormat callingFormat=desiredFormat;
+            if(callingFormat == CallingFormat.getSubdomainCallingFormat() && !Utils.isValidSubdomainBucketName(bucketName)) {
+                callingFormat=CallingFormat.getPathCallingFormat();
+            }
+            return callingFormat;
+        }
+    }
+
+
+//
+//  NOTE: The following source code is the iHarder.net public domain
+//  Base64 library and is provided here as a convenience.  For updates,
+//  problems, questions, etc. regarding this code, please visit:
+//  http://iharder.sourceforge.net/current/java/base64/
+//
+
+
+    /**
+     * Encodes and decodes to and from Base64 notation.
+     * <p/>
+     * <p>
+     * Change Log:
+     * </p>
+     * <ul>
+     * <li>v2.1 - Cleaned up javadoc comments and unused variables and methods. Added
+     * some convenience methods for reading and writing to and from files.</li>
+     * <li>v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems
+     * with other encodings (like EBCDIC).</li>
+     * <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
+     * encoded data was a single byte.</li>
+     * <li>v2.0 - I got rid of methods that used booleans to set options.
+     * Now everything is more consolidated and cleaner. The code now detects
+     * when data that's being decoded is gzip-compressed and will decompress it
+     * automatically. Generally things are cleaner. You'll probably have to
+     * change some method calls that you were making to support the new
+     * options format (<tt>int</tt>s that you "OR" together).</li>
+     * <li>v1.5.1 - Fixed bug when decompressing and decoding to a
+     * byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
+     * Added the ability to "suspend" encoding in the Output Stream so
+     * you can turn on and off the encoding if you need to embed base64
+     * data in an otherwise "normal" stream (like an XML file).</li>
+     * <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself.
+     * This helps when using GZIP streams.
+     * Added the ability to GZip-compress objects before encoding them.</li>
+     * <li>v1.4 - Added helper methods to read/write files.</li>
+     * <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
+     * <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
+     * where last buffer being read, if not completely full, was not returned.</li>
+     * <li>v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.</li>
+     * <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
+     * </ul>
+     * <p/>
+     * <p>
+     * I am placing this code in the Public Domain. Do with it as you will.
+     * This software comes with no guarantees or warranties but with
+     * plenty of well-wishing instead!
+     * Please visit <a href="http://iharder.net/base64">http://iharder.net/base64</a>
+     * periodically to check for updates or to contribute improvements.
+     * </p>
+     * @author Robert Harder
+     * @author rob@iharder.net
+     * @version 2.1
+     */
+    static class Base64 {
+
+/* ********  P U B L I C   F I E L D S  ******** */
+
+
+        /**
+         * No options specified. Value is zero.
+         */
+        public final static int NO_OPTIONS=0;
+
+        /**
+         * Specify encoding.
+         */
+        public final static int ENCODE=1;
+
+
+        /**
+         * Specify decoding.
+         */
+        public final static int DECODE=0;
+
+
+        /**
+         * Specify that data should be gzip-compressed.
+         */
+        public final static int GZIP=2;
+
+
+        /**
+         * Don't break lines when encoding (violates strict Base64 specification)
+         */
+        public final static int DONT_BREAK_LINES=8;
+
+
+/* ********  P R I V A T E   F I E L D S  ******** */
+
+
+        /**
+         * Maximum line length (76) of Base64 output.
+         */
+        private final static int MAX_LINE_LENGTH=76;
+
+
+        /**
+         * The equals sign (=) as a byte.
+         */
+        private final static byte EQUALS_SIGN=(byte)'=';
+
+
+        /**
+         * The new line character (\n) as a byte.
+         */
+        private final static byte NEW_LINE=(byte)'\n';
+
+
+        /**
+         * Preferred encoding.
+         */
+        private final static String PREFERRED_ENCODING="UTF-8";
+
+
+        /**
+         * The 64 valid Base64 values.
+         */
+        private static final byte[] ALPHABET;
+        private static final byte[] _NATIVE_ALPHABET= /* May be something funny like EBCDIC */
+                {
+                        (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
+                        (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
+                        (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
+                        (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
+                        (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
+                        (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
+                        (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
+                        (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
+                        (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
+                        (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
+                };
+
+        /** Determine which ALPHABET to use. */
+        static {
+            byte[] __bytes;
+            try {
+                __bytes="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".getBytes(PREFERRED_ENCODING);
+            }   // end try
+            catch(java.io.UnsupportedEncodingException use) {
+                __bytes=_NATIVE_ALPHABET; // Fall back to native encoding
+            }   // end catch
+            ALPHABET=__bytes;
+        }   // end static
+
+
+        /**
+         * Translates a Base64 value to either its 6-bit reconstruction value
+         * or a negative number indicating some other meaning.
+         */
+        private final static byte[] DECODABET=
+                {
+                        -9, -9, -9, -9, -9, -9, -9, -9, -9,                 // Decimal  0 -  8
+                        -5, -5,                                      // Whitespace: Tab and Linefeed
+                        -9, -9,                                      // Decimal 11 - 12
+                        -5,                                         // Whitespace: Carriage Return
+                        -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,     // Decimal 14 - 26
+                        -9, -9, -9, -9, -9,                             // Decimal 27 - 31
+                        -5,                                         // Whitespace: Space
+                        -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,              // Decimal 33 - 42
+                        62,                                         // Plus sign at decimal 43
+                        -9, -9, -9,                                   // Decimal 44 - 46
+                        63,                                         // Slash at decimal 47
+                        52, 53, 54, 55, 56, 57, 58, 59, 60, 61,              // Numbers zero through nine
+                        -9, -9, -9,                                   // Decimal 58 - 60
+                        -1,                                         // Equals sign at decimal 61
+                        -9, -9, -9,                                      // Decimal 62 - 64
+                        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,            // Letters 'A' through 'N'
+                        14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,        // Letters 'O' through 'Z'
+                        -9, -9, -9, -9, -9, -9,                          // Decimal 91 - 96
+                        26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,     // Letters 'a' through 'm'
+                        39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,     // Letters 'n' through 'z'
+                        -9, -9, -9, -9                                 // Decimal 123 - 126
+                        /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 127 - 139
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
+          -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
+                };
+
+        // I think I end up not using the BAD_ENCODING indicator.
+        //private final static byte BAD_ENCODING    = -9; // Indicates error in encoding
+        private final static byte WHITE_SPACE_ENC=-5; // Indicates white space in encoding
+        private final static byte EQUALS_SIGN_ENC=-1; // Indicates equals sign in encoding
+
+
+        /**
+         * Defeats instantiation.
+         */
+        private Base64() {
+        }
+
+
+/* ********  E N C O D I N G   M E T H O D S  ******** */
+
+
+        /**
+         * Encodes up to the first three bytes of array <var>threeBytes</var>
+         * and returns a four-byte array in Base64 notation.
+         * The actual number of significant bytes in your array is
+         * given by <var>numSigBytes</var>.
+         * The array <var>threeBytes</var> needs only be as big as
+         * <var>numSigBytes</var>.
+         * Code can reuse a byte array by passing a four-byte array as <var>b4</var>.
+         * @param b4          A reusable byte array to reduce array instantiation
+         * @param threeBytes  the array to convert
+         * @param numSigBytes the number of significant bytes in your array
+         * @return four byte array in Base64 notation.
+         * @since 1.5.1
+         */
+        private static byte[] encode3to4(byte[] b4, byte[] threeBytes, int numSigBytes) {
+            encode3to4(threeBytes, 0, numSigBytes, b4, 0);
+            return b4;
+        }   // end encode3to4
+
+
+        /**
+         * Encodes up to three bytes of the array <var>source</var>
+         * and writes the resulting four Base64 bytes to <var>destination</var>.
+         * The source and destination arrays can be manipulated
+         * anywhere along their length by specifying
+         * <var>srcOffset</var> and <var>destOffset</var>.
+         * This method does not check to make sure your arrays
+         * are large enough to accomodate <var>srcOffset</var> + 3 for
+         * the <var>source</var> array or <var>destOffset</var> + 4 for
+         * the <var>destination</var> array.
+         * The actual number of significant bytes in your array is
+         * given by <var>numSigBytes</var>.
+         * @param source      the array to convert
+         * @param srcOffset   the index where conversion begins
+         * @param numSigBytes the number of significant bytes in your array
+         * @param destination the array to hold the conversion
+         * @param destOffset  the index where output will be put
+         * @return the <var>destination</var> array
+         * @since 1.3
+         */
+        private static byte[] encode3to4(
+                byte[] source, int srcOffset, int numSigBytes,
+                byte[] destination, int destOffset) {
+            //           1         2         3
+            // 01234567890123456789012345678901 Bit position
+            // --------000000001111111122222222 Array position from threeBytes
+            // --------|    ||    ||    ||    | Six bit groups to index ALPHABET
+            //          >>18  >>12  >> 6  >> 0  Right shift necessary
+            //                0x3f  0x3f  0x3f  Additional AND
+
+            // Create buffer with zero-padding if there are only one or two
+            // significant bytes passed in the array.
+            // We have to shift left 24 in order to flush out the 1's that appear
+            // when Java treats a value as negative that is cast from a byte to an int.
+            int inBuff=(numSigBytes > 0? ((source[srcOffset] << 24) >>> 8) : 0)
+                    | (numSigBytes > 1? ((source[srcOffset + 1] << 24) >>> 16) : 0)
+                    | (numSigBytes > 2? ((source[srcOffset + 2] << 24) >>> 24) : 0);
+
+            switch(numSigBytes) {
+                case 3:
+                    destination[destOffset]=ALPHABET[(inBuff >>> 18)];
+                    destination[destOffset + 1]=ALPHABET[(inBuff >>> 12) & 0x3f];
+                    destination[destOffset + 2]=ALPHABET[(inBuff >>> 6) & 0x3f];
+                    destination[destOffset + 3]=ALPHABET[(inBuff) & 0x3f];
+                    return destination;
+
+                case 2:
+                    destination[destOffset]=ALPHABET[(inBuff >>> 18)];
+                    destination[destOffset + 1]=ALPHABET[(inBuff >>> 12) & 0x3f];
+                    destination[destOffset + 2]=ALPHABET[(inBuff >>> 6) & 0x3f];
+                    destination[destOffset + 3]=EQUALS_SIGN;
+                    return destination;
+
+                case 1:
+                    destination[destOffset]=ALPHABET[(inBuff >>> 18)];
+                    destination[destOffset + 1]=ALPHABET[(inBuff >>> 12) & 0x3f];
+                    destination[destOffset + 2]=EQUALS_SIGN;
+                    destination[destOffset + 3]=EQUALS_SIGN;
+                    return destination;
+
+                default:
+                    return destination;
+            }   // end switch
+        }   // end encode3to4
+
+
+        /**
+         * Serializes an object and returns the Base64-encoded
+         * version of that serialized object. If the object
+         * cannot be serialized or there is another error,
+         * the method will return <tt>null</tt>.
+         * The object is not GZip-compressed before being encoded.
+         * @param serializableObject The object to encode
+         * @return The Base64-encoded object
+         * @since 1.4
+         */
+        public static String encodeObject(java.io.Serializable serializableObject) {
+            return encodeObject(serializableObject, NO_OPTIONS);
+        }   // end encodeObject
+
+
+        /**
+         * Serializes an object and returns the Base64-encoded
+         * version of that serialized object. If the object
+         * cannot be serialized or there is another error,
+         * the method will return <tt>null</tt>.
+         * <p/>
+         * Valid options:<pre>
+         *   GZIP: gzip-compresses object before encoding it.
+         *   DONT_BREAK_LINES: don't break lines at 76 characters
+         *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+         * </pre>
+         * <p/>
+         * Example: <code>encodeObject( myObj, Base64.GZIP )</code> or
+         * <p/>
+         * Example: <code>encodeObject( myObj, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+         * @param serializableObject The object to encode
+         * @param options            Specified options
+         * @return The Base64-encoded object
+         * @see Base64#GZIP
+         * @see Base64#DONT_BREAK_LINES
+         * @since 2.0
+         */
+        public static String encodeObject(java.io.Serializable serializableObject, int options) {
+            // Streams
+            java.io.ByteArrayOutputStream baos=null;
+            java.io.OutputStream b64os=null;
+            java.io.ObjectOutputStream oos=null;
+            java.util.zip.GZIPOutputStream gzos=null;
+
+            // Isolate options
+            int gzip=(options & GZIP);
+            int dontBreakLines=(options & DONT_BREAK_LINES);
+
+            try {
+                // ObjectOutputStream -> (GZIP) -> Base64 -> ByteArrayOutputStream
+                baos=new java.io.ByteArrayOutputStream();
+                b64os=new Base64.OutputStream(baos, ENCODE | dontBreakLines);
+
+                // GZip?
+                if(gzip == GZIP) {
+                    gzos=new java.util.zip.GZIPOutputStream(b64os);
+                    oos=new java.io.ObjectOutputStream(gzos);
+                }   // end if: gzip
+                else
+                    oos=new java.io.ObjectOutputStream(b64os);
+
+                oos.writeObject(serializableObject);
+            }   // end try
+            catch(java.io.IOException e) {
+                e.printStackTrace();
+                return null;
+            }   // end catch
+            finally {
+                try {
+                    oos.close();
+                }
+                catch(Exception e) {
+                }
+                try {
+                    gzos.close();
+                }
+                catch(Exception e) {
+                }
+                try {
+                    b64os.close();
+                }
+                catch(Exception e) {
+                }
+                try {
+                    baos.close();
+                }
+                catch(Exception e) {
+                }
+            }   // end finally
+
+            // Return value according to relevant encoding.
+            try {
+                return new String(baos.toByteArray(), PREFERRED_ENCODING);
+            }   // end try
+            catch(java.io.UnsupportedEncodingException uue) {
+                return new String(baos.toByteArray());
+            }   // end catch
+
+        }   // end encode
+
+
+        /**
+         * Encodes a byte array into Base64 notation.
+         * Does not GZip-compress data.
+         * @param source The data to convert
+         * @since 1.4
+         */
+        public static String encodeBytes(byte[] source) {
+            return encodeBytes(source, 0, source.length, NO_OPTIONS);
+        }   // end encodeBytes
+
+
+        /**
+         * Encodes a byte array into Base64 notation.
+         * <p/>
+         * Valid options:<pre>
+         *   GZIP: gzip-compresses object before encoding it.
+         *   DONT_BREAK_LINES: don't break lines at 76 characters
+         *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+         * </pre>
+         * <p/>
+         * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
+         * <p/>
+         * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+         * @param source  The data to convert
+         * @param options Specified options
+         * @see Base64#GZIP
+         * @see Base64#DONT_BREAK_LINES
+         * @since 2.0
+         */
+        public static String encodeBytes(byte[] source, int options) {
+            return encodeBytes(source, 0, source.length, options);
+        }   // end encodeBytes
+
+
+        /**
+         * Encodes a byte array into Base64 notation.
+         * Does not GZip-compress data.
+         * @param source The data to convert
+         * @param off    Offset in array where conversion should begin
+         * @param len    Length of data to convert
+         * @since 1.4
+         */
+        public static String encodeBytes(byte[] source, int off, int len) {
+            return encodeBytes(source, off, len, NO_OPTIONS);
+        }   // end encodeBytes
+
+
+        /**
+         * Encodes a byte array into Base64 notation.
+         * <p/>
+         * Valid options:<pre>
+         *   GZIP: gzip-compresses object before encoding it.
+         *   DONT_BREAK_LINES: don't break lines at 76 characters
+         *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+         * </pre>
+         * <p/>
+         * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
+         * <p/>
+         * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+         * @param source  The data to convert
+         * @param off     Offset in array where conversion should begin
+         * @param len     Length of data to convert
+         * @param options Specified options
+         * @see Base64#GZIP
+         * @see Base64#DONT_BREAK_LINES
+         * @since 2.0
+         */
+        public static String encodeBytes(byte[] source, int off, int len, int options) {
+            // Isolate options
+            int dontBreakLines=(options & DONT_BREAK_LINES);
+            int gzip=(options & GZIP);
+
+            // Compress?
+            if(gzip == GZIP) {
+                java.io.ByteArrayOutputStream baos=null;
+                java.util.zip.GZIPOutputStream gzos=null;
+                Base64.OutputStream b64os=null;
+
+
+                try {
+                    // GZip -> Base64 -> ByteArray
+                    baos=new java.io.ByteArrayOutputStream();
+                    b64os=new Base64.OutputStream(baos, ENCODE | dontBreakLines);
+                    gzos=new java.util.zip.GZIPOutputStream(b64os);
+
+                    gzos.write(source, off, len);
+                    gzos.close();
+                }   // end try
+                catch(java.io.IOException e) {
+                    e.printStackTrace();
+                    return null;
+                }   // end catch
+                finally {
+                    try {
+                        gzos.close();
+                    }
+                    catch(Exception e) {
+                    }
+                    try {
+                        b64os.close();
+                    }
+                    catch(Exception e) {
+                    }
+                    try {
+                        baos.close();
+                    }
+                    catch(Exception e) {
+                    }
+                }   // end finally
+
+                // Return value according to relevant encoding.
+                try {
+                    return new String(baos.toByteArray(), PREFERRED_ENCODING);
+                }   // end try
+                catch(java.io.UnsupportedEncodingException uue) {
+                    return new String(baos.toByteArray());
+                }   // end catch
+            }   // end if: compress
+
+            // Else, don't compress. Better not to use streams at all then.
+            else {
+                // Convert option to boolean in way that code likes it.
+                boolean breakLines=dontBreakLines == 0;
+
+                int len43=len * 4 / 3;
+                byte[] outBuff=new byte[(len43)                      // Main 4:3
+                        + ((len % 3) > 0? 4 : 0)      // Account for padding
+                        + (breakLines? (len43 / MAX_LINE_LENGTH) : 0)]; // New lines
+                int d=0;
+                int e=0;
+                int len2=len - 2;
+                int lineLength=0;
+                for(; d < len2; d+=3, e+=4) {
+                    encode3to4(source, d + off, 3, outBuff, e);
+
+                    lineLength+=4;
+                    if(breakLines && lineLength == MAX_LINE_LENGTH) {
+                        outBuff[e + 4]=NEW_LINE;
+                        e++;
+                        lineLength=0;
+                    }   // end if: end of line
+                }   // en dfor: each piece of array
+
+                if(d < len) {
+                    encode3to4(source, d + off, len - d, outBuff, e);
+                    e+=4;
+                }   // end if: some padding needed
+
+
+                // Return value according to relevant encoding.
+                try {
+                    return new String(outBuff, 0, e, PREFERRED_ENCODING);
+                }   // end try
+                catch(java.io.UnsupportedEncodingException uue) {
+                    return new String(outBuff, 0, e);
+                }   // end catch
+
+            }   // end else: don't compress
+
+        }   // end encodeBytes
+
+
+/* ********  D E C O D I N G   M E T H O D S  ******** */
+
+
+        /**
+         * Decodes four bytes from array <var>source</var>
+         * and writes the resulting bytes (up to three of them)
+         * to <var>destination</var>.
+         * The source and destination arrays can be manipulated
+         * anywhere along their length by specifying
+         * <var>srcOffset</var> and <var>destOffset</var>.
+         * This method does not check to make sure your arrays
+         * are large enough to accomodate <var>srcOffset</var> + 4 for
+         * the <var>source</var> array or <var>destOffset</var> + 3 for
+         * the <var>destination</var> array.
+         * This method returns the actual number of bytes that
+         * were converted from the Base64 encoding.
+         * @param source      the array to convert
+         * @param srcOffset   the index where conversion begins
+         * @param destination the array to hold the conversion
+         * @param destOffset  the index where output will be put
+         * @return the number of decoded bytes converted
+         * @since 1.3
+         */
+        private static int decode4to3(byte[] source, int srcOffset, byte[] destination, int destOffset) {
+            // Example: Dk==
+            if(source[srcOffset + 2] == EQUALS_SIGN) {
+                // Two ways to do the same thing. Don't know which way I like best.
+                //int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] << 24 ) >>>  6 )
+                //              | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
+                int outBuff=((DECODABET[source[srcOffset]] & 0xFF) << 18)
+                        | ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12);
+
+                destination[destOffset]=(byte)(outBuff >>> 16);
+                return 1;
+            }
+
+            // Example: DkL=
+            else if(source[srcOffset + 3] == EQUALS_SIGN) {
+                // Two ways to do the same thing. Don't know which way I like best.
+                //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
+                //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+                //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 );
+                int outBuff=((DECODABET[source[srcOffset]] & 0xFF) << 18)
+                        | ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12)
+                        | ((DECODABET[source[srcOffset + 2]] & 0xFF) << 6);
+
+                destination[destOffset]=(byte)(outBuff >>> 16);
+                destination[destOffset + 1]=(byte)(outBuff >>> 8);
+                return 2;
+            }
+
+            // Example: DkLE
+            else {
+                try {
+                    // Two ways to do the same thing. Don't know which way I like best.
+                    //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
+                    //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+                    //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 )
+                    //              | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 );
+                    int outBuff=((DECODABET[source[srcOffset]] & 0xFF) << 18)
+                            | ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12)
+                            | ((DECODABET[source[srcOffset + 2]] & 0xFF) << 6)
+                            | ((DECODABET[source[srcOffset + 3]] & 0xFF));
+
+
+                    destination[destOffset]=(byte)(outBuff >> 16);
+                    destination[destOffset + 1]=(byte)(outBuff >> 8);
+                    destination[destOffset + 2]=(byte)(outBuff);
+
+                    return 3;
+                }
+                catch(Exception e) {
+                    System.out.println(valueOf(source[srcOffset]) + ": " + (DECODABET[source[srcOffset]]));
+                    System.out.println(valueOf(source[srcOffset + 1]) + ": " + (DECODABET[source[srcOffset + 1]]));
+                    System.out.println(valueOf(source[srcOffset + 2]) + ": " + (DECODABET[source[srcOffset + 2]]));
+                    System.out.println(String.valueOf(source[srcOffset + 3]) + ": " + (DECODABET[source[srcOffset + 3]]));
+                    return -1;
+                }   //e nd catch
+            }
+        }   // end decodeToBytes
+
+
+        /**
+         * Very low-level access to decoding ASCII characters in
+         * the form of a byte array. Does not support automatically
+         * gunzipping or any other "fancy" features.
+         * @param source The Base64 encoded data
+         * @param off    The offset of where to begin decoding
+         * @param len    The length of characters to decode
+         * @return decoded data
+         * @since 1.3
+         */
+        public static byte[] decode(byte[] source, int off, int len) {
+            int len34=len * 3 / 4;
+            byte[] outBuff=new byte[len34]; // Upper limit on size of output
+            int outBuffPosn=0;
+
+            byte[] b4=new byte[4];
+            int b4Posn=0;
+            int i=0;
+            byte sbiCrop=0;
+            byte sbiDecode=0;
+            for(i=off; i < off + len; i++) {
+                sbiCrop=(byte)(source[i] & 0x7f); // Only the low seven bits
+                sbiDecode=DECODABET[sbiCrop];
+
+                if(sbiDecode >= WHITE_SPACE_ENC) // White space, Equals sign or better
+                {
+                    if(sbiDecode >= EQUALS_SIGN_ENC) {
+                        b4[b4Posn++]=sbiCrop;
+                        if(b4Posn > 3) {
+                            outBuffPosn+=decode4to3(b4, 0, outBuff, outBuffPosn);
+                            b4Posn=0;
+
+                            // If that was the equals sign, break out of 'for' loop
+                            if(sbiCrop == EQUALS_SIGN)
+                                break;
+                        }   // end if: quartet built
+
+                    }   // end if: equals sign or better
+
+                }   // end if: white space, equals sign or better
+                else {
+                    System.err.println("Bad Base64 input character at " + i + ": " + source[i] + "(decimal)");
+                    return null;
+                }   // end else:
+            }   // each input character
+
+            byte[] out=new byte[outBuffPosn];
+            System.arraycopy(outBuff, 0, out, 0, outBuffPosn);
+            return out;
+        }   // end decode
+
+
+        /**
+         * Decodes data from Base64 notation, automatically
+         * detecting gzip-compressed data and decompressing it.
+         * @param s the string to decode
+         * @return the decoded data
+         * @since 1.4
+         */
+        public static byte[] decode(String s) {
+            byte[] bytes;
+            try {
+                bytes=s.getBytes(PREFERRED_ENCODING);
+            }   // end try
+            catch(java.io.UnsupportedEncodingException uee) {
+                bytes=s.getBytes();
+            }   // end catch
+            //</change>
+
+            // Decode
+            bytes=decode(bytes, 0, bytes.length);
+
+
+            // Check to see if it's gzip-compressed
+            // GZIP Magic Two-Byte Number: 0x8b1f (35615)
+            if(bytes != null && bytes.length >= 4) {
+
+                int head=((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
+                if(java.util.zip.GZIPInputStream.GZIP_MAGIC == head) {
+                    java.io.ByteArrayInputStream bais=null;
+                    java.util.zip.GZIPInputStream gzis=null;
+                    java.io.ByteArrayOutputStream baos=null;
+                    byte[] buffer=new byte[2048];
+                    int length=0;
+
+                    try {
+                        baos=new java.io.ByteArrayOutputStream();
+                        bais=new java.io.ByteArrayInputStream(bytes);
+                        gzis=new java.util.zip.GZIPInputStream(bais);
+
+                        while((length=gzis.read(buffer)) >= 0) {
+                            baos.write(buffer, 0, length);
+                        }   // end while: reading input
+
+                        // No error? Get new bytes.
+                        bytes=baos.toByteArray();
+
+                    }   // end try
+                    catch(java.io.IOException e) {
+                        // Just return originally-decoded bytes
+                    }   // end catch
+                    finally {
+                        try {
+                            baos.close();
+                        }
+                        catch(Exception e) {
+                        }
+                        try {
+                            gzis.close();
+                        }
+                        catch(Exception e) {
+                        }
+                        try {
+                            bais.close();
+                        }
+                        catch(Exception e) {
+                        }
+                    }   // end finally
+
+                }   // end if: gzipped
+            }   // end if: bytes.length >= 2
+
+            return bytes;
+        }   // end decode
+
+
+        /**
+         * Attempts to decode Base64 data and deserialize a Java
+         * Object within. Returns <tt>null</tt> if there was an error.
+         * @param encodedObject The Base64 data to decode
+         * @return The decoded and deserialized object
+         * @since 1.5
+         */
+        public static Object decodeToObject(String encodedObject) {
+            // Decode and gunzip if necessary
+            byte[] objBytes=decode(encodedObject);
+
+            java.io.ByteArrayInputStream bais=null;
+            java.io.ObjectInputStream ois=null;
+            Object obj=null;
+
+            try {
+                bais=new java.io.ByteArrayInputStream(objBytes);
+                ois=new java.io.ObjectInputStream(bais);
+
+                obj=ois.readObject();
+            }   // end try
+            catch(java.io.IOException e) {
+                e.printStackTrace();
+                obj=null;
+            }   // end catch
+            catch(java.lang.ClassNotFoundException e) {
+                e.printStackTrace();
+                obj=null;
+            }   // end catch
+            finally {
+                try {
+                    if(bais != null)
+                        bais.close();
+                }
+                catch(Exception e) {
+                }
+                try {
+                    if(ois != null)
+                        ois.close();
+                }
+                catch(Exception e) {
+                }
+            }   // end finally
+
+            return obj;
+        }   // end decodeObject
+
+
+        /**
+         * Convenience method for encoding data to a file.
+         * @param dataToEncode byte array of data to encode in base64 form
+         * @param filename     Filename for saving encoded data
+         * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
+         * @since 2.1
+         */
+        public static boolean encodeToFile(byte[] dataToEncode, String filename) {
+            boolean success=false;
+            Base64.OutputStream bos=null;
+            try {
+                bos=new Base64.OutputStream(
+                        new java.io.FileOutputStream(filename), Base64.ENCODE);
+                bos.write(dataToEncode);
+                success=true;
+            }   // end try
+            catch(java.io.IOException e) {
+
+                success=false;
+            }   // end catch: IOException
+            finally {
+                try {
+                    if(bos != null)
+                        bos.close();
+                }
+                catch(Exception e) {
+                }
+            }   // end finally
+
+            return success;
+        }   // end encodeToFile
+
+
+        /**
+         * Convenience method for decoding data to a file.
+         * @param dataToDecode Base64-encoded data as a string
+         * @param filename     Filename for saving decoded data
+         * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
+         * @since 2.1
+         */
+        public static boolean decodeToFile(String dataToDecode, String filename) {
+            boolean success=false;
+            Base64.OutputStream bos=null;
+            try {
+                bos=new Base64.OutputStream(
+                        new java.io.FileOutputStream(filename), Base64.DECODE);
+                bos.write(dataToDecode.getBytes(PREFERRED_ENCODING));
+                success=true;
+            }   // end try
+            catch(java.io.IOException e) {
+                success=false;
+            }   // end catch: IOException
+            finally {
+                try {
+                    if(bos != null)
+                        bos.close();
+                }
+                catch(Exception e) {
+                }
+            }   // end finally
+
+            return success;
+        }   // end decodeToFile
+
+
+        /**
+         * Convenience method for reading a base64-encoded
+         * file and decoding it.
+         * @param filename Filename for reading encoded data
+         * @return decoded byte array or null if unsuccessful
+         * @since 2.1
+         */
+        public static byte[] decodeFromFile(String filename) {
+            byte[] decodedData=null;
+            Base64.InputStream bis=null;
+            try {
+                // Set up some useful variables
+                java.io.File file=new java.io.File(filename);
+                byte[] buffer=null;
+                int length=0;
+                int numBytes=0;
+
+                // Check for size of file
+                if(file.length() > Integer.MAX_VALUE) {
+                    System.err.println("File is too big for this convenience method (" + file.length() + " bytes).");
+                    return null;
+                }   // end if: file too big for int index
+                buffer=new byte[(int)file.length()];
+
+                // Open a stream
+                bis=new Base64.InputStream(
+                        new java.io.BufferedInputStream(
+                                new java.io.FileInputStream(file)), Base64.DECODE);
+
+                // Read until done
+                while((numBytes=bis.read(buffer, length, 4096)) >= 0)
+                    length+=numBytes;
+
+                // Save in a variable to return
+                decodedData=new byte[length];
+                System.arraycopy(buffer, 0, decodedData, 0, length);
+
+            }   // end try
+            catch(java.io.IOException e) {
+                System.err.println("Error decoding from file " + filename);
+            }   // end catch: IOException
+            finally {
+                try {
+                    if(bis != null)
+                        bis.close();
+                }
+                catch(Exception e) {
+                }
+            }   // end finally
+
+            return decodedData;
+        }   // end decodeFromFile
+
+
+        /**
+         * Convenience method for reading a binary file
+         * and base64-encoding it.
+         * @param filename Filename for reading binary data
+         * @return base64-encoded string or null if unsuccessful
+         * @since 2.1
+         */
+        public static String encodeFromFile(String filename) {
+            String encodedData=null;
+            Base64.InputStream bis=null;
+            try {
+                // Set up some useful variables
+                java.io.File file=new java.io.File(filename);
+                byte[] buffer=new byte[(int)(file.length() * 1.4)];
+                int length=0;
+                int numBytes=0;
+
+                // Open a stream
+                bis=new Base64.InputStream(
+                        new java.io.BufferedInputStream(
+                                new java.io.FileInputStream(file)), Base64.ENCODE);
+
+                // Read until done
+                while((numBytes=bis.read(buffer, length, 4096)) >= 0)
+                    length+=numBytes;
+
+                // Save in a variable to return
+                encodedData=new String(buffer, 0, length, Base64.PREFERRED_ENCODING);
+
+            }   // end try
+            catch(java.io.IOException e) {
+                System.err.println("Error encoding from file " + filename);
+            }   // end catch: IOException
+            finally {
+                try {
+                    if(bis != null)
+                        bis.close();
+                }
+                catch(Exception e) {
+                }
+            }   // end finally
+
+            return encodedData;
+        }   // end encodeFromFile
+
+
+        /* ********  I N N E R   C L A S S   I N P U T S T R E A M  ******** */
+
+
+        /**
+         * A {@link Base64.InputStream} will read data from another
+         * <tt>java.io.InputStream</tt>, given in the constructor,
+         * and encode/decode to/from Base64 notation on the fly.
+         * @see Base64
+         * @since 1.3
+         */
+        public static class InputStream extends java.io.FilterInputStream {
+            private boolean encode;         // Encoding or decoding
+            private int position;       // Current position in the buffer
+            private byte[] buffer;         // Small buffer holding converted data
+            private int bufferLength;   // Length of buffer (3 or 4)
+            private int numSigBytes;    // Number of meaningful bytes in the buffer
+            private int lineLength;
+            private boolean breakLines;     // Break lines at less than 80 characters
+
+
+            /**
+             * Constructs a {@link Base64.InputStream} in DECODE mode.
+             * @param in the <tt>java.io.InputStream</tt> from which to read data.
+             * @since 1.3
+             */
+            public InputStream(java.io.InputStream in) {
+                this(in, DECODE);
+            }   // end constructor
+
+
+            /**
+             * Constructs a {@link Base64.InputStream} in
+             * either ENCODE or DECODE mode.
+             * <p/>
+             * Valid options:<pre>
+             *   ENCODE or DECODE: Encode or Decode as data is read.
+             *   DONT_BREAK_LINES: don't break lines at 76 characters
+             *     (only meaningful when encoding)
+             *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+             * </pre>
+             * <p/>
+             * Example: <code>new Base64.InputStream( in, Base64.DECODE )</code>
+             * @param in      the <tt>java.io.InputStream</tt> from which to read data.
+             * @param options Specified options
+             * @see Base64#ENCODE
+             * @see Base64#DECODE
+             * @see Base64#DONT_BREAK_LINES
+             * @since 2.0
+             */
+            public InputStream(java.io.InputStream in, int options) {
+                super(in);
+                this.breakLines=(options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
+                this.encode=(options & ENCODE) == ENCODE;
+                this.bufferLength=encode? 4 : 3;
+                this.buffer=new byte[bufferLength];
+                this.position=-1;
+                this.lineLength=0;
+            }   // end constructor
+
+            /**
+             * Reads enough of the input stream to convert
+             * to/from Base64 and returns the next byte.
+             * @return next byte
+             * @since 1.3
+             */
+            public int read() throws java.io.IOException {
+                // Do we need to get data?
+                if(position < 0) {
+                    if(encode) {
+                        byte[] b3=new byte[3];
+                        int numBinaryBytes=0;
+                        for(int i=0; i < 3; i++) {
+                            try {
+                                int b=in.read();
+
+                                // If end of stream, b is -1.
+                                if(b >= 0) {
+                                    b3[i]=(byte)b;
+                                    numBinaryBytes++;
+                                }   // end if: not end of stream
+
+                            }   // end try: read
+                            catch(java.io.IOException e) {
+                                // Only a problem if we got no data at all.
+                                if(i == 0)
+                                    throw e;
+
+                            }   // end catch
+                        }   // end for: each needed input byte
+
+                        if(numBinaryBytes > 0) {
+                            encode3to4(b3, 0, numBinaryBytes, buffer, 0);
+                            position=0;
+                            numSigBytes=4;
+                        }   // end if: got data
+                        else {
+                            return -1;
+                        }   // end else
+                    }   // end if: encoding
+
+                    // Else decoding
+                    else {
+                        byte[] b4=new byte[4];
+                        int i=0;
+                        for(i=0; i < 4; i++) {
+                            // Read four "meaningful" bytes:
+                            int b=0;
+                            do {
+                                b=in.read();
+                            }
+                            while(b >= 0 && DECODABET[b & 0x7f] <= WHITE_SPACE_ENC);
+
+                            if(b < 0)
+                                break; // Reads a -1 if end of stream
+
+                            b4[i]=(byte)b;
+                        }   // end for: each needed input byte
+
+                        if(i == 4) {
+                            numSigBytes=decode4to3(b4, 0, buffer, 0);
+                            position=0;
+                        }   // end if: got four characters
+                        else if(i == 0) {
+                            return -1;
+                        }   // end else if: also padded correctly
+                        else {
+                            // Must have broken out from above.
+                            throw new java.io.IOException("Improperly padded Base64 input.");
+                        }   // end
+
+                    }   // end else: decode
+                }   // end else: get data
+
+                // Got data?
+                if(position >= 0) {
+                    // End of relevant data?
+                    if( /*!encode &&*/ position >= numSigBytes)
+                        return -1;
+
+                    if(encode && breakLines && lineLength >= MAX_LINE_LENGTH) {
+                        lineLength=0;
+                        return '\n';
+                    }   // end if
+                    else {
+                        lineLength++;   // This isn't important when decoding
+                        // but throwing an extra "if" seems
+                        // just as wasteful.
+
+                        int b=buffer[position++];
+
+                        if(position >= bufferLength)
+                            position=-1;
+
+                        return b & 0xFF; // This is how you "cast" a byte that's
+                        // intended to be unsigned.
+                    }   // end else
+                }   // end if: position >= 0
+
+                // Else error
+                else {
+                    // When JDK1.4 is more accepted, use an assertion here.
+                    throw new java.io.IOException("Error in Base64 code reading stream.");
+                }   // end else
+            }   // end read
+
+
+            /**
+             * Calls {@link #read()} repeatedly until the end of stream
+             * is reached or <var>len</var> bytes are read.
+             * Returns number of bytes read into array or -1 if
+             * end of stream is encountered.
+             * @param dest array to hold values
+             * @param off  offset for array
+             * @param len  max number of bytes to read into array
+             * @return bytes read into array or -1 if end of stream is encountered.
+             * @since 1.3
+             */
+            public int read(byte[] dest, int off, int len) throws java.io.IOException {
+                int i;
+                int b;
+                for(i=0; i < len; i++) {
+                    b=read();
+
+                    //if( b < 0 && i == 0 )
+                    //    return -1;
+
+                    if(b >= 0)
+                        dest[off + i]=(byte)b;
+                    else if(i == 0)
+                        return -1;
+                    else
+                        break; // Out of 'for' loop
+                }   // end for: each byte read
+                return i;
+            }   // end read
+
+        }   // end inner class InputStream
+
+
+        /* ********  I N N E R   C L A S S   O U T P U T S T R E A M  ******** */
+
+
+        /**
+         * A {@link Base64.OutputStream} will write data to another
+         * <tt>java.io.OutputStream</tt>, given in the constructor,
+         * and encode/decode to/from Base64 notation on the fly.
+         * @see Base64
+         * @since 1.3
+         */
+        public static class OutputStream extends java.io.FilterOutputStream {
+            private boolean encode;
+            private int position;
+            private byte[] buffer;
+            private int bufferLength;
+            private int lineLength;
+            private boolean breakLines;
+            private byte[] b4; // Scratch used in a few places
+            private boolean suspendEncoding;
+
+            /**
+             * Constructs a {@link Base64.OutputStream} in ENCODE mode.
+             * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
+             * @since 1.3
+             */
+            public OutputStream(java.io.OutputStream out) {
+                this(out, ENCODE);
+            }   // end constructor
+
+
+            /**
+             * Constructs a {@link Base64.OutputStream} in
+             * either ENCODE or DECODE mode.
+             * <p/>
+             * Valid options:<pre>
+             *   ENCODE or DECODE: Encode or Decode as data is read.
+             *   DONT_BREAK_LINES: don't break lines at 76 characters
+             *     (only meaningful when encoding)
+             *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+             * </pre>
+             * <p/>
+             * Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code>
+             * @param out     the <tt>java.io.OutputStream</tt> to which data will be written.
+             * @param options Specified options.
+             * @see Base64#ENCODE
+             * @see Base64#DECODE
+             * @see Base64#DONT_BREAK_LINES
+             * @since 1.3
+             */
+            public OutputStream(java.io.OutputStream out, int options) {
+                super(out);
+                this.breakLines=(options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
+                this.encode=(options & ENCODE) == ENCODE;
+                this.bufferLength=encode? 3 : 4;
+                this.buffer=new byte[bufferLength];
+                this.position=0;
+                this.lineLength=0;
+                this.suspendEncoding=false;
+                this.b4=new byte[4];
+            }   // end constructor
+
+
+            /**
+             * Writes the byte to the output stream after
+             * converting to/from Base64 notation.
+             * When encoding, bytes are buffered three
+             * at a time before the output stream actually
+             * gets a write() call.
+             * When decoding, bytes are buffered four
+             * at a time.
+             * @param theByte the byte to write
+             * @since 1.3
+             */
+            public void write(int theByte) throws java.io.IOException {
+                // Encoding suspended?
+                if(suspendEncoding) {
+                    super.out.write(theByte);
+                    return;
+                }   // end if: supsended
+
+                // Encode?
+                if(encode) {
+                    buffer[position++]=(byte)theByte;
+                    if(position >= bufferLength)  // Enough to encode.
+                    {
+                        out.write(encode3to4(b4, buffer, bufferLength));
+
+                        lineLength+=4;
+                        if(breakLines && lineLength >= MAX_LINE_LENGTH) {
+                            out.write(NEW_LINE);
+                            lineLength=0;
+                        }   // end if: end of line
+
+                        position=0;
+                    }   // end if: enough to output
+                }   // end if: encoding
+
+                // Else, Decoding
+                else {
+                    // Meaningful Base64 character?
+                    if(DECODABET[theByte & 0x7f] > WHITE_SPACE_ENC) {
+                        buffer[position++]=(byte)theByte;
+                        if(position >= bufferLength)  // Enough to output.
+                        {
+                            int len=Base64.decode4to3(buffer, 0, b4, 0);
+                            out.write(b4, 0, len);
+                            //out.write( Base64.decode4to3( buffer ) );
+                            position=0;
+                        }   // end if: enough to output
+                    }   // end if: meaningful base64 character
+                    else if(DECODABET[theByte & 0x7f] != WHITE_SPACE_ENC) {
+                        throw new java.io.IOException("Invalid character in Base64 data.");
+                    }   // end else: not white space either
+                }   // end else: decoding
+            }   // end write
+
+
+            /**
+             * Calls {@link #write(int)} repeatedly until <var>len</var>
+             * bytes are written.
+             * @param theBytes array from which to read bytes
+             * @param off      offset for array
+             * @param len      max number of bytes to read into array
+             * @since 1.3
+             */
+            public void write(byte[] theBytes, int off, int len) throws java.io.IOException {
+                // Encoding suspended?
+                if(suspendEncoding) {
+                    super.out.write(theBytes, off, len);
+                    return;
+                }   // end if: supsended
+
+                for(int i=0; i < len; i++) {
+                    write(theBytes[off + i]);
+                }   // end for: each byte written
+
+            }   // end write
+
+
+            /**
+             * Method added by PHIL. [Thanks, PHIL. -Rob]
+             * This pads the buffer without closing the stream.
+             */
+            public void flushBase64() throws java.io.IOException {
+                if(position > 0) {
+                    if(encode) {
+                        out.write(encode3to4(b4, buffer, position));
+                        position=0;
+                    }   // end if: encoding
+                    else {
+                        throw new java.io.IOException("Base64 input not properly padded.");
+                    }   // end else: decoding
+                }   // end if: buffer partially full
+
+            }   // end flush
+
+
+            /**
+             * Flushes and closes (I think, in the superclass) the stream.
+             * @since 1.3
+             */
+            public void close() throws java.io.IOException {
+                // 1. Ensure that pending characters are written
+                flushBase64();
+
+                // 2. Actually close the stream
+                // Base class both flushes and closes.
+                super.close();
+
+                buffer=null;
+                out=null;
+            }   // end close
+
+
+            /**
+             * Suspends encoding of the stream.
+             * May be helpful if you need to embed a piece of
+             * base640-encoded data in a stream.
+             * @since 1.5.1
+             */
+            public void suspendEncoding() throws java.io.IOException {
+                flushBase64();
+                this.suspendEncoding=true;
+            }   // end suspendEncoding
+
+
+            /**
+             * Resumes encoding of the stream.
+             * May be helpful if you need to embed a piece of
+             * base640-encoded data in a stream.
+             * @since 1.5.1
+             */
+            public void resumeEncoding() {
+                this.suspendEncoding=false;
+            }   // end resumeEncoding
+
+
+        }   // end inner class OutputStream
+
+
+    }   // end class Base64
+
+}
+
+
+
+
+
diff --git a/tests/scancode/data/resource/samples/README b/tests/scancode/data/resource/samples/README
new file mode 100644
index 00000000000..1d61df81ffb
--- /dev/null
+++ b/tests/scancode/data/resource/samples/README
@@ -0,0 +1,4 @@
+This directory contains a few sample files extracted from these two archives:
+
+download_url: http://zlib.net/zlib-1.2.8.tar.gz
+download_url: http://master.dl.sourceforge.net/project/javagroups/JGroups/2.10.0.GA/JGroups-2.10.0.GA.src.zip
\ No newline at end of file
diff --git a/tests/scancode/data/resource/samples/arch/zlib.tar.gz b/tests/scancode/data/resource/samples/arch/zlib.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b57920bb555f6881693d57da741cd1cce9cf2847
GIT binary patch
literal 28103
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

literal 0
HcmV?d00001

diff --git a/tests/scancode/data/resource/samples/screenshot.png b/tests/scancode/data/resource/samples/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..97155e4a9b903a58abf29d62925d8db01c748a2e
GIT binary patch
literal 622754
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%0A;4mCQzcl
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%0DOu|)Tc40POAf_-MT+}*HJN*_
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%0D)#bjXp`azp#*C*9Ui3RfoRKs7G3_j$
z1_<)8aV4QzdgD$UrxWVYR&y0#r3ZnQe|AtOkmz<OYAM(z`?ydCQB!X`$okC&g)_;@
zxb(%JnQ4$5^F|?<Kf<k?g$bVBHP!qHlQVQ#s5cB8N47Nm5w>A(W}0X=_@OFHV?hdl
z!efT!UvwvhM9uyO50k#`%8VJtm8R@9s(&?)1I;6ZMM~8DiCb!P$m`j_f&#^wcmJ>v
zU1OnXAW=Y15==~&)Z8AE(>0@P7JS>Ii5>KkV2S+e?8oG%8>DI+LGnufwe+WOhEXxg
zs!0WpoeCmN=(bcuMH699rgX(774;u`F7A^N<+8k*KhN*8PT#!jLl*oP?qZ-u)!;5#
zA>g)$P0H<a_<cb<IQw%g_0=TH5(D(raH+Qr&7YT0*Lfc&emCZxmf}qU)5$HtY`<k6
z`i7cN^xOG{lY_obCG)qH2^&bI=XkS#T5$0BlDc#^==3fbj2H83pfHZA8`pvfqw(YN
zoQsm^qv!ZjlNYyn|DFN>xe-0Y8uC<^8yQ^JNZ+fPJ^S*}-tog-%~_EXB&+J9*SGhV
zo;+Utd*?NYs+UgNILw560BI|OldRRxFDK9x`^?)-*KI2oYa`&yn~%s<wC=3L<B@tD
zCx`QPC5@vBW_;UNw1t3gWoC-irk*B!s!BcXs%ZIoyC4=UkE$jM&yvHc!GZ(zpBZ7s
z9Rl<Ilr2gum2R3OBR-Jgh~Q<1lX;_qhcccL5rTuFT;gg>50k!=9}$O{1afsNkdh74
z+jLQnl;)RG<x;HBX1hJaPr=J`H7x}jB21wZ<+s36q4~C*nB~GsFiS$Ibgm<r5A34p
zt@{zjf9Q7j{C`6Ym&w8BsMiR2toRLy<fn6J=oox8sWhDc_*>Di;!~XEv0)C|fUIS9
z>%Qdu?4DT>{D~`OFU~%Ecl0b6WBgpO4XZJ2CjJ&zp5l*FiSy(LOKRSqb!nJP6F1-B
z+yG(OT=$<Uu{1VIn!#P_a<=9y2Dlw@>s*LADOiEbWN2*aF`9tRbi}D{SW_)FpX#DL
zQrBl$qA)ySrY|rN8y+*sTHHUVqIJnwD2y=*hY8S*5M&dpimJ~vV!?MqN1N34y6VBP
zzTJpQAY(q4JyI4C7>Nx8pVh~ezN~C0vn?8b)Gr+5Ard0kCSF3C*6Mz&R4%hl6UeoR
zTRe<%0$Cj&JATe^5}`N|_x?b%v4T{-59w&@WjJopcr=On`dQ~0nhSMAi$Gjj4+l)q
zALcD~D<5m=WHD$2T^6TOzS}9LgLYXVf$_Tn^<a54GustkP*5SN>9=@Vzf>5XA4`6h
zBi{GHNC`z0iEjX8L`Q}_G??wyU7pmxjQV+RM@3q_U|cO}4ei%iDI*NVQHi}}*&2pE
zn5?}$mb!4(^lNBoubSX@dzmEX7<44N3NYR2_A?>6Dy-XBG1;2K^;xakmC-)k=mn~3
zw)n3Fq6&9Gb27X8O-;-9qb~oAg-a~?Jf(-{BX^Uu*WHiJ)w85toiQPgvCle?D&XBu
z!<(#$rQu4(%!ose$VI=ptwWDpUh;ddZq>WoDW9d5^TvfF=8-k}6N(03!`()xY*?j*
zfi(i~J=1R{dOnwvv`OWID+oO0gb`EJ=Zk$22o{vvG7Fq7Rf=U?rkb5{D6|S{aS&M*
zc2wJk4zJv-5m|4Exdi+-9<=HEGR2bgf`c88s=CA1DPF@KtGC}zF&pL{<((qt{v2+)
zUwRHg*X66&cRcDz89Rfz>YfRj{PO?tpcO-1c}3{X7Hsg%GJ5T!Y6NM1X;<@eYJ^tM
z_yAh5jH#<Kz<~cr_BDu84N!=Fr!`gD=J-J84Ui}%#^+r?btWbERI|7zBkL$IKCe$u
z^(Vt9TQ5rYSDvADtiF#rMm=MC&K|=AHY1tlz_Va#1h)Zr;`GtkBn)wB>zbiFy;?+5
z1g^4oBA9bhsfcl@ShZbBF&k?i&@o7rr=&=%7q)1tZ6jzo2BG}w=}Czwv}GB{@xmN~
zGElm8t3Qb4InXWWE5z^}H;|Ip7N#jg-<C!2h|Uzb&lN_qLp67;^|tL)Rvn>dl8Z~a
zAtdqW>f3l{Og>i%G8{f1Q6Yl!8{||BJ1*SZIkG>Rv*ojkPjWC4e=PL1D)2=eaf(zj
zemk#s%0?22U-Z)hid92<?Fq5jg<KOI5qgbEc+q=9d-1n<sebNj;sKVn*X8hNJJ5>#
z#^Zf0t8(2;HwweDs6*FJdbS1<OdkKv@pQ*CH=&PP6eEtSw+Z<*2ls|@Rw~B7iEhMO
zParqESPMeIOi65C-2T}fCmo{dVpzPk$Ou#^^t)WB3HN($o~yD|_8!V$P-28T5q+o+
zHwKPe_0DIlbPICb0UzA-2V%vq$mi5dCgxp0f=P3!gYPxjL)(Ev!ioGzxx0EhUWOyd
z!u}eUyZzO}+*vMKpB~V~6KsyQQP-{~2N|M61^q8{{e9?l#CJrgmwj0;k97<@Ux}fp
zxEjPX>y%s!!yCy4<?R|#Vjr8S!R<Cnhc`Yd0%;e|lI#$7)=OD2aEwDjdoP6J{*nIY
z<=n}I4RVppL7Rke13{lVT07bn9fZ@@^EUqxl;j>jLYA9Rw9llU6O2R`i~1EM0wH}3
z*2j|Tyn7fGnTq*`G7oSlbC{GVK^czLRtqm{&9oW*E2CZZF)eJcaxYQFF4321@8w(H
zxr3QiBhTmdmeK$NraDRFvMToq2O|f63HP}ZtdB>SP9qg7WRVSg8R4r(K(9s3bLW*-
z$PlPZ5Ck$d1q%3m^7#q<nq7#zA4@4zEh&84zTUc`ed4(yk>RxT3wu7@pp9=TK&j3<
zwY~A#W>3px_7h0j$>9^emxJT=tZr-Jf|wY&BSicm+4_;f$G|kBbpgB!Eg-5q>+T}o
z5OrDsd(NM_9oEeuS9vMb-5WUh-rl4@pu;451=-oFRp=ZB>XPA2EY6c5JL^kW5|hFW
ze2c|a>18e*sWP*0s|OV|&~e^E4Z+|qqwFI$+%>-{1s{FG4Njpy7J7Mg8M~G;H&{P@
zk|?vIuI6v>u`7B`w!Y-@cX=EeFKI7dkO*Iyoo76oUHVT+UII%mzE@C5!dJgL1ib5j
zV>1r7hU?$M1-m_0T7jq4tGlx{RoKSoP$>;7Hz&uO5O1YA{~JerebWq?*&jCS$nCuw
z?2wVJCQ82oH%GhQYD0WFn}OWl%MsgW44@0KzI1j(2JUAXq#s+D+Zj3C++sDX*jzd*
zo}Y!aZD|1<M{XAUw5KFYp-*s9`H_8O$LwL_29yi%*Q@i#YOAPGS*vLJPf2H=8lP|X
zppxA7K7ajuVGYSHn>%Uh#K(5}cKQT4cz)a(-bLOE?+@q~mFxk5M14uadtsjfeFFq2
zH<|w4wS>1mQKD9ZT*~Aa^EHB!UT#)j7GFwYRv#)>>Fy4yUJm}bThAT{fN{%bHYoW}
zG!ftVabSn(RMAV>4VGAg@Z1QkKe~~jth0G-DDaw`N%_+@C?gdd6BI1HnW9?xcPQ9a
z89>NO_HHm-2*^64`xoU++A^G|Y|%uh8vN2aMBV`3Mx>1ec&j-%Pqr-14a;-c(Q|%q
zYV*vVpZ<;l)1VeZwoZngEU`&T$?XvH@fdUG3d;)Fy8pL>W7mz^aBkD$ndXJg)Lkrk
z^P_AyK`L2gj}qZo89DXyp8RtKzvLOb<XLSLlCY5nS;EcYM-a(_n%@Tg?_a-Glkb|V
z9!1)S+_4_Y&k_MFpT)Vecd;R7*uIQF+z7BQvRW9ydZ3Vz6SWZUZ4;kUAA7b#1Fr<c
zWEG<JQU$s<dD(>=GXWp)fos&H4;?y?3h<@mb1bCGbM<n}t94L(taZ`N&e*D|?(gp3
z<B&1X(=g<rOY&M2c$SR~99z9NSgnC9q}R2q6pM1-PJ`HO{7y0;S|`IxyOUz>bB_<8
z*XeFYfGnQYCvJAx&4>QaWA%%qpvN7_B+*xu)RwQ?U!bz1#{4fqgIQ^hhUvv8J|+;i
zV~^h5_ItJM(P4j%5rAh~6{N{SbklA1so2$KM<QjXq-A9eV%U;(-sJQGXySDPDP2w*
zogM-!mq+iG1R*6$X-#8=-UpSp*OGIN|2k^<`ae-DoafsBT{<N1kRcsvA&?7`m!aRO
z)Eu{fBVI|*o8Y5>aa9cEzt}Cp@Yb+&Dx;@9b1i3#`f6GS4T6f;ry4r(YVt$BimCPd
z;LNj+<1lzz{(KK-W9ZPGaW9Y9N*>VFYmBsbz0C<r4P$Nt6fDfAS~8(xC$en_W^oxy
zx^Jag<K%h&(hWK1-MIC?ZHNTkg#&*YSulRhWZ$$Tq#|YY$^WWIU*<W9Q0RP{UTR$M
z>+T}4Vyv{uxRHaons~@>aa0jD8+1FM7BC4+4aaL~6;jjwsMvAX7jV?~#6UrP-!K2N
zVe%CDeUTrT47sX|eOK{3zLYNjSLUikY#6+y#36Zl^A%?bW`Gax40oRsz7jkr!?nt;
zpO|TK7iw}h0D4k@APufQ`U1!1Qg?<Y`T=jSzJ>Slrb`bwD2*L?$X)&=lE4tDTO=L%
zb5mbv;~|>w{TZDaDQn?4YRB~P?<8+a)<o;?Q0(AQXlJ)-|Ihnr%cHi&i=E-`UpouW
zxBtExcC_KE`n=wi^V*r>lZk<kbpvnu-0w59@z>5+zpL2AUuSSIxZ~P;?ToxQmz@1N
zLp{46$(Ps8!N>n^sS{9pbmvlMvUVpA*`vN+zj(cEvS%#C;9be*+p(;&6Hp2MW0RY?
zk6n7T=EnVitK{4X@<Q{|-Qrl)_w^TZq+@5%EBwzwKxPm|2CHHQ5AMQFV1jWyU(pvI
zOz~gCW9@a<L!?s@<o4%Zt~;Ma5Ys-_i&m)QD-yvEE7k>a1luni>tCHrkl00kz6JxY
zHX-|xkmA$FlOajEbz(((GpS@R3Kr6>NXKY|cs_cE%wHbyjV%-_pE2sA*0vY7<387t
zD2`%wUS(j1uiEU<)!FYK<ty#?K)^nn{a82(ZrI;So+)WoZ$7W?=y1IBfbWQ3jOZY#
zC@T|EV_44SUy@XPvj<Ea1p-ceS0i1hd0?=2<9OH@aqJ4PfMhVJj{<kQkS7rD)9baj
zm*BSeu5QdV;i8TnOt~`?+{{<g0M8P>n%t!|q_3?btwB8Bd+Dm!^B=q1&k!43f3>67
zjF+p*SECd2Pv{f=XPC<rXvO{2qKcg^gu?%6b9|U;`A5{13e~RjYg?ZR&}Z(|G_%_W
zHYxsTYur~m{bw6Y33_LCy|z&aKJOd-vmqWBW8H*a4S2IivhDD7Vzt#R7p#BU{soni
z7rK(ZO#z-ntux-Z?FO(M6P+tMOL}Hg9~T!Fq?r)p>=W~AnK48^|N5)e5npeki|X;P
zFOXwoQJAM0rT5&QU5>eFqW}Y}X~{mOj-BX?!!FWmjuQzS^V{L&<F?zlg?lN&+|tV6
ziR2#pDmghMgxSn-y+N!J755uE4%k-sUHA>YnPk!&+%4nB9>+fX(_eTzMS6CLdv?vP
zj`zd#1;2jVN2aAJ<Y(yeGjhv0Wy>kgeVTVHcg_D2<@_+O?AxX}$cMlgV9?2hiFWjt
z@GS!+-X*`uB|ns>EZqH}OsM&{JshK1;14tUuRA3y!d|$iIvjrAD5Vco*f56`earMp
zDi!;wpC_p6Cw2U1bo@631M+b>smTh2)~rUX<pfN1sC%b)*36#M4s<cS8XYX*sb)_P
zeqqed^sU#BomG$ZBZ-x-&e)Mwm&JBj@UNMH;xWB+!DUlC(2?PN_8nak^yFvN0XoH2
z9hDMTu`_|;{&E6Pd6lX|fkyrmRAsQ(k5QjGx*m+Ol3`mOgv7MrscuLY0>iIcMA+dy
zu3fy!k;IO8YhkeuJ>B(@jt(}@po+}f{9BQKKau}tBXG)3|BJo%ifSrq{|0GN6i`4)
zD1tyJ(h0pQMF;^jH0d1-9jVe0r3WbiLPsGWp-Gnx(lNBqdsB*Z>Cz^?@A~F{F*7%_
zX05sT*2>*;PR==dKl}IW{d?MoG@qi%p2H+V9;*vSc9(h)D^BTypOyV~nCTbBn?dMZ
zzLalG^1u&_fO29SPRWjngM9Fq<$^9d@mt1%0X_?+5F_Wm3CH2RAULnSz%rZk141x6
z)VTP!-POs-D}1w0F1#YOmRC1Q5cpuDn8g_x!*fL^!v1NQS)qF&iy>$6Lf>BT+R<`Z
zLWPVb3@DOOMUV5+WEu&G5*d{C?dBIq2-S;!9y}Bgn+1^^FtnsJYOifFMP{Wqa<)r}
zF(}C<d>r?B33k6=l0pC<#y_+Vd(XlSQ7X9D!*$TX<&lrI{cA8e`Z4%ew(Uq(=yOwM
zy(^{qR;?ev3T=*ZHvtQ2n%;7y7uLI)u~)%Oip$<iGh%ubPAheSe(MG|{Jd<ty}aHP
z)757jh8e;iJ_ktQ8VWD8%Ga-xw*^ToDtv`{1hk@q1NIho8^j&XcdHLiVMnW{f%?~{
z^DT3pPD2NC4r{w(>)pE-=)b!S0reY`Su6F!J#$5av2#cICv%=>uES;0oo>1CdYw%A
z`i+v`^&5K&IVPSFOA1VGxe`LI!-f-X!wXIS=ObOr=W{C1OF2!x0j`69;7jM`pxNec
z@)r7S^1l10^BJJ4(;2_Znz#S^#s1eM{qGU`|3t@Ffg4-<lx%z4tNPnP=Nm&O@gIH6
z)D?&Jil!+()PwNVV7ADf#}4fF!mYV&lA0Pqa+D|$Yen0s6oHT;^BnKmvhj}#{d%gl
zW>AOAl1Dyyob4Z_=Zih+B_-$5ldPun2HX*AA7LduFEa?HJ|D;Xo?nO2x2@)>v`z77
zeJt|LsOqlm`bY>|WZTu2t6~YwF(x~uOfSfy=Zct14Nbc5(bfi?s`*GZD8{~)i0~_(
zvSGT7mryc$@7uPWSo}q1&B1UPR}iC5@fz1&`Cp?g#e=Z>f!9+ZEj<!UdG!-V7}lA`
zdkX2X_(K<8;`P}i<vOIc-+5opR$R{x<66W9;yBl<fBoQN3t#vcD>ZYNUvX;zFL0bo
zz4?#0Z>X6-4s-I>LspX8mn?x1OMgu=2HoV7B`=3Hi7EF%6W0;S1STOk-m0uZz8)vj
z1&=MoklZHz&$To#101<lgc#Zk=;#O$BgtK<zris;Cc{4mZ;q0}IxivKZ7T`wlS^3V
z;BBYjU7QSoJ+5Ev2(kU2YgIBPaBswm0{u02KVTi~a5yh(L(N=Gg5Fl&Hrp;ADCjP@
zNpXHX!98i|@2qDNj&wtbU6=VCu+IF?wTbrLIHC-^71v77eD&P(01&+G29szzfh_JQ
z3IU{=hxN{wD9N0!|9yMw>AWjULWfr?gzwSSbD#gYw!mls>zo6X$=|<2ay!cWzlY=m
z^8fdcuvUSC<H;{?FVb2s7xqu{fBO9mCf?=#5$wF{u=^Q%H4jjH_t@w{#7prb7w$j_
zD72az{#Ff6Fc;Dx2sf_yLiJUt3K}<N%}~^Eh-q@Wv6be?-g;-EOuK9$7JJ`xr?50>
zWdj*d+kExwL3GL=5^Jw+L=4ny=9F=l_c!#nOqxlVMfaD=1r^ljZQAWl<aye)!^9ze
z0@$cld2RNA8lxkhRJ(<E7_y8SsC8Md^HcwF6~8kR7N*uY+uiQ`POJtxz^joBO*}$a
zo>g_CXtuwhO`pzxbb3V1@jY}cm-iyo?IQJG8RXk@*4s7TmTfbOixdl^;@*Kl=bv)*
zf|ysM?b<h><ElRk6$W^=hO6DrQy0Ip*E5UVl!TmA-1IA6aO0{Q2K?JLEGXuD_By<F
z+rq&4?N+e2sdRy{W{W$wboY-X(w3TU=dRk_tZvt@msZ0T*Z*Xmg=Dgx3+&(oCUPTl
zrol%yZbyV|AFgqNSQ7utA8w1cF2T$7Uqf($LnSv)Ts~48uB<EFDNZ2pXwyZo?d@&-
zMcC5!8=Rn<ux0R<<o>OM;(^KZKY?FfeZv**S?eUh_bzdQ|NECXY7J40J`LXrx!u3L
z=2pDWXbPE03rd&L#Zye7OS}$b9{GhA9LhKJv5xF7zFf<gPCHpv@E0v<__b6MD?W|p
z*qQF1m#a?w&$IO06wfE03Eg?sp{>ZwO<JSmDvU3pBxE078S(>ThoXF%(?!YUP!ROS
z2>@;pQ_b=7_{cL@^kslsCoyF0H+3S>kT4`eGwyc(+O<FA?V(Qph}bhjCTns>x=N?L
zls~M6O}<XHmw0oZf>c_nY4b`XckX^JCjx+LrReU75lBed31H?5)D84AG&mAkI)9yM
zMTvGlsb(vSdk$V}x__09J1h!aquP#pL#}$;{_wT^;ZXd;5pv{qGpKmGaT}OiMLkzL
zCqdhfPppEBc-v$^TU&!A9xJKL|Dl+&S}%#?$AWh>TYqY{Ze_M^HMMRxA+E}#tYx?F
zMje#ofD{~X6z)7I=RXt`$jK?^$5GrcU~qAlJXmn}pVYx;F=OM8+?uCawXbY=?tjJU
z+4buUa>M6YqdN;j%l{R7+HaJ-{qH>i^`P_rinC_k{_ns1e>s-ZW5dO_ogwG<Z}*n2
zo0hHym#$WYZmhQ=6^=h$yp_)F9L^?VSiOAtW&rv1mA;K45zZq;B3i1tQzJY-d~-P?
zBTqu2KB<GztYw2I%hXz)^PMOk1!GypqWnZ*nRvBK@2#X1fjV5>CH6yMk9szPE?9&C
z1|M{B)stZf*25DOy0#Mr)h64#>9Jltkw<zB7bGfg_Ts_b_>^IeyVjl#tPp|$TlkN=
z`NqZ5_a5pKcG-|}IJlS@0T9kUcxY`m*p<|{pto^Eo5|*Pyu||+P?f+$*4BHCZgey%
zbZPNCXaC~S64}45^LyX#8h!j<wEzrxuI7L@0<_H<waL<qEI;jHPnr~A2!d*hU4-u4
zolyou)YXK=^+fJ@bgtiUz~T}8&3B6fU$=8ZJp{9-C+YsNamXPR`4Ur;I{dTOT4i^q
zfTF@ls`*}E%e}#l<UHuWq0j<N#iQJ7YOX$9<5*Cl0@RskBo<Emtu`=2aAK(Y9HaWK
zgQzuLjbR*cRMzjgk4N*cX;g)?WVXSMZ_p@1sf#%)GW|3>&u1e3$;h{tJ>T>ULF&a@
zR)_A60MX9$JIt+jccou)z{e0XoSn8di|e~;#ZEe`<dA#qoWJH#yjq-5ZTuecwc#YW
zhjPvnQGse8PD?8TN}U$eIYVX8?`)Tn$<JORJ2gEb&Rys34EUkB<_yVs-%7l#?5#2s
zn0%Oq4~OAzEe>5K%&gVumO+;_kX1F|rD}Vguh-lQ9LF-qQ1#S{70?W+(|C^kdg|Wj
zN|wHp3PGW;TPjjx%jerv^_EFQ;_1y=;S}Iex!CaZ)TVnc22|kteXRRIb=#y?2T7N!
z%uAT|4GN?>TWT;sLda~dbvfx=50C-tuL?qGX_SUG$*VI`H7tndENbQFSl8`U0u7xE
z6i$W=;5mc$tCLvNU4vH8F+&iDobP--AJr238X3<n@7^%(O#8^kIG@Sx(IUiPSC^yo
zrR<34>L;LNrCk>@S3DllJjdPouxfSV#)DHUq^$Y8C--z0U_fC18r<R{zFrQhVyq?d
zaYhZ24|x)ydftYtTW2n_Am6l7fME4s(S*b6Akw~16v<jC(NC&+n7azo3Lj?*E-$B(
z<<RcD=T;j!-qqodcWwo=%+!&Y#tavg90E!X;*ATe!~GrnFe!{+i6Nz8w608DeudZ;
zDM91<(S2su#()hO{M}1Oo02<<mw39On!oY1<s_v<H=GW0rt-OwpA3uW4GzdZcn*0M
z-bY3oXCNJrJBw$%CeA{kFqM6YoAx@E;46puoq4C@L2q{_>y~<Ru0e8kCy~*P`is`7
zs1tilX<bLE`$L(Za-W7ZW+0(EiQLv%{vfy4@6gv)Zw|&qhg0~IJ(^Bj*XG3?OmSs>
z*NLDLokLp=^96)r>yxsb0vLhLv?W%HA4uo+gwC);S7=jgtl#Jsi;tThs7qO!!#=b6
zyQzQ>Ymse$)i>_X(M9Riy}uxZ#`6<>>9kU$J#;UqndC(}N~gemc#jryOD2^J7=sjK
zA4%|LBXyj<I(F6Uo9jQ{`g#<l@9C6&P`ib_volN^@wR1a#h5*It)ahVq7QF3KDF<#
zUbwJ);Zii&`SfSR*4=dVL>sI>NQ7;O1`f4x0J(FhJkKYbhY8(E{{<(zYP}*8mO)8<
zd)k>SUf%O#=fpKJy7R0@qWI-J$LvpQ|6jGk+jjbH(`?*>9W+L~K*{1)jojw^<!Abi
zG9!j7Rb6J9aCVOZQk&4u-1fdwb905<b05JThed^OveS)$Zz4+>ouwi~qH=LgxAQ8I
z{0^@SE6e9&I>mypqvKy@D;W}Q`2lMSjTz>s!pL41C4ppnsp`;9!%y8@js+eWqM5cx
zXUtsl0+09ZR(Kc;A6byqB!-G6I!ptW7x^44gK{Fv7!!wIM-cI223CseAF^`P>9kb4
zOc*05GqNY8BH#?HlpJ^mWA|*RANtk`V)!9r4xO%R(l-qv`+TisjhdJ~f<XJ+RE>Gk
z^?*t8J9W1O0q@O8Xdd*7Dh6^fS;1$=F!NY>nXGC@xO)4;^+9S7?*iqSzeLavVeDea
z{IN`DXUaO@l96Q(iHn-l_G@IYKAmdhJrAAM;(jvN-{w`Qo;d-&ung@ig)L?5N+>@s
z2G6UatqJ-7*;WQ)qFX;KFH7niE<5MrqV^pJ2Z|PF(4*BCRt8ms{bfR?`lIR5(Hrpr
zUcgloTRD7`eD`$&6yDXT?c|k@>CEg$2RXhMcO)@ZldJj3RTqcs?4rUO`$414Z*Fik
zuNYsjRgpr!bUxN9-wAFf*D9_r>zVgfGssVEk1wl9?|2)ZH!ih5Z0bzYOsG3lZ^gAs
zXW+d&6G)6NU1L>MEc#M)5*a>yj1{vTyTdF8>ZpE~ebCjH-g*ryh#Zv6mz<Lb(>%QJ
z5?8RHU3?j<=lo)y{9^-DxxWX%qwfvw^*OdUR<$_B8PGuikOdc;og&ASt7)72NSahw
zd1cUr=ftsG?}PprtDB|_eIR3GguqB0oGl-=q84>gZ^DZY@YtnD8sdU$W{K7}JhY=J
zLVXhdo<>_?@xi!R|6W|MvqNWN^H1Tf{tR(LCD9`8*PqLkZdB`!y?b<JYMBLr-LV0z
z#e#A9PflxdJTB%UA<>qyY-D=d`d}S8Hl;e~F1)YEd_rVv^<>p)Bb0u_{A>Q~yyhj&
z>W3Kaef1HGg6^y88Hco@u?(3(yHmksZBgqVZ#F*$Z>0rm{N1>j&n@9xpNaYEQ|&}=
zl>wcQw&fMdH1`#t9@oDcf~z@pS)BW~7#GtN6zsib(sp8UJJ@z1DVCPgRIX$gS{p}Z
zI?FHjLVVs;y$XCDd*baf9j&8LSd&7OSlf=sPn3a*pcbL`9JDPoN?($b981Ut83ZO+
z-=u6l2jq70M0WA$*G3Cj#9F;(ju_Jav)U$*&}b|hmO5(czjxF1bjTn6CF7MB_0I}M
zPaKq6JQlb1q3szq-I|wdfo4SGB@;&{`%ro0e1^*YEJUo7CKB3NPgsT0ZOfAtig5^A
zMF_C9WVAfs?hCB9adciW?&3<t$}$XC)9<S>RN?CU$&6KhC+w!`Ehvp`@AqMhB#Wvh
z+j$`~_Te#)sBeWBT%Ajs<AK^FQgjZ@@kQiK#Bat{?txF`(TVw8o&Fc?={uhe`>DNH
zM3OAs>$G|$os`b7DGr`v@5P^ZN1^=ux#a}B?bLJGgi-TvHph^mQb!uSbRgx#!{~1G
zm<cUl1Q`*6aRx3_s{x9CkALteC>7SuAwvk$95tW?_s6WUR7F{-j~)l<QcK2n3VL+P
z25H7u^`O~Xc@a#UV@&CyAp`Ax);(Xv-(;o`yXPa;m%P5=)+*m&Ww_#PBz_%JnDRV9
z=-6!S7vd)!4R+8e($KO<2h?mPiayuR4|evweJyJx3jbX?lreu{-Myt<AyF5*dEn8f
z0>qo~KUv=zNJ$#i8~mgOEY{VCqso3vW^JF0^}Cd$dVBbH{tRPV&I@GNkO%5`2&TNM
zpnI7?oRG9@1jhP1L6(LnK6vV)TWUU~J5(KhgENdpQ=tML(2y7r*%L*WGXmP^b+c>G
zsY)oU%cC44=`)s5gMj(E&t76Oe$Su$&X$@m;vW<vu&VShT(y>sP)b94J$TWIsaKAu
z?mQh&a@n2ZOkW(WzcME@=$4duFoPbu=jE8&5MA^>GQh{xo!n?0=`Nt(-34}cIN;fT
zB4jS^$%%3)()_Ldc5l1LIc!x=0K#v5yq?817mc>b+!5W`0};A2go)`uT*<y^B>y7U
zJ>8(?GP;Q_qH34LA1#(tkk6_P66KsTz>0O_eqFU6O$@9ft3aZ~&@<W<qD0$LVO7rM
z<pBJ+H5r&CO0LtoPD$$4cF^t%f{cx&-dH$&JVgN|^?ZtS)5NC7PIgtvKuwbuA8t+K
z@FIYkoR9<FsS?AWpk$!%hzP`E4zuqdN;ez?<s!~S@EtWwdDXmTS(l>l!6!YMo>349
zhS$KVW2Bg>EjO!_-H%S`E=eA_sz=O5`a3n@Pf(z#Fo%-H%>ZCANGR3wa*T)8=G^pG
z+5^GD^rVMEGKm6QzjTYEdmh_BQ`eV7(E>u+w0Y@eV9y7rF4QcGl>66#YCE+A!Z(@Y
zNS!s~M}(X`AecYieTa|;w;hlw`tja?JEm(MO2=1g<sS!{&=9dz<yhs8e}rVJT`YY$
zTk64-#9eC4>HcT`FP2VSqmVHf8rM}s^*mosA2P#*1BAsqBJr4X62u$r+@$+Z1lNzZ
zh{F^$X->6bwAQ2ZqZoUi$%)zO&Yfrv=uit+84d&x_9PQXr(fM?!A({^w63gjY<5X(
z@^fM|Mc`$~tZG*$<E|1JkDZj$&vwpS!B=Qb)Q)^2M-COzy-E!dAV3s~b?qIW{$3lU
z#gFn8Ms!0|NR){=2@3|%*-B)B@ly76Pf!iW#p`I193*(v8LFS}>EeGVFxF+er<!VM
z+h8_ZZUWEiDct`}>X_9)F(DqPgHSf3;dmY$c~Ym$6|lKua1a0J!t_@}KeyJHxB*LE
z8m3>@yXONA3>Xog=z!D3ci4VBP=A1gx<d8u^>%8nZ=t|5){GAUxvxrPTJ#g~;jo?u
zNS4#mmuil_zrRaC4H&qGiNMI{3se2Hrvh9o9s{r~Dy$^XV@+y@TCy3p)y6WG#Mqeg
zDreaG<J%5g@e)R(h8XII)z(VI@HBV_a|uWKIUOLt0+y=_Me?r;q|B>yUs`INUQ)z)
zx~7kd6IgCry<?0W#K!8#HP-}KEqe^Pcj0wFc;Tb2p5M$ZbNhH<UguJ_pQ%HgTl|l_
zeu4X6qt{>LCyf_#_CyUO5Q$W4z?!c!qniDK_5$ohrx4U}M>$DFQfc5)!&n|ILiPSr
zejuzxywGhU;(G({g!$|U1~lV0uNJq}6@`_LiVo)|01+q)!Q+-<i?xmQHS?fb68DEo
zvo7Obm&m)Cyp&;NY386k(a!qKpK8w-_I3IjpGPH&a-OEX3@MMr`rPBrnWw)k-284Y
zmu`Pq-26Joz1hn3(b@&M3U?%=7V)2!;g`e+kiCBBEv?TdE}ujOP>?L}I!5e{u}XPv
zWBP?t3aP3cY6Ja&5xj@lKCVE5UKNoWuqi>LM8E0&Yo3+j(|dxet*U?1rCMw<HNv}&
z<rd;~Cghs-N%gXE4-KBZZP`&~^<!OJ0zTbJd%!5!H1SLhSA5WZU$-JUo=yaR{>M*{
zKq9OQ-H41-eO}Dnc)l2<kp5E{@3lwIgPvIbg}>;Q*U)uh$-gWR;47%hp2cJ8wUJGs
zRU3cniqpi8fj`Y~AywQ8htavW7rD1nw|^~e;cbVK1v7Qvfh!6u<?y34{3%H=-keq4
zZ$^Vgv|#-o_=eE!`627=;Xel*>(w$z+b@&WU$U)hvd4c7^=6ypx57HsEJKQFPIxpA
zkFg~`-)M0cGJtUX&hf&kDT*2wjvM{LRkoI)5CdprLlkWDlr<uv{a%zi-Xo6zb_J6O
z38B3wadD4JfN!Ahegyk2oeqMf|E8HRW>h1U4HEsw;;iI;kuC!e=CD&T=bRKVHBLGZ
zKrU8X(%g&Zehz&_(}w=%8Qvi7RxE0z{Fn9L_rv<@K{1Vt5muR|Ekd7|2Dy+vQRz&m
zkB|gx5l`nMB85;!?%#Gv&b>tXRw!YSk()3?z=Oh1wGZq0)iiPI>03{!&pxt<S>&tT
zSJ0W=CI$iBSA5sHhGpXg_;6{({WRUO(}AOpu4StbSQl)BHCrW5wv=t2Pv%)SO3qn(
zQd}!*F^I)hlAVEqH3MT6D9btI0CCL4iczX7igcp8PjjgdTu&yxx6y5#GH3ny<ziw|
z+Y1|>k?>^XE-BnOd2P>EWn4!tsGq&Rq@aFoz<7i_PPEQh<u{<8f%G!V>1Q7f|9q3&
z<XeJJ9&qZ7O+7|Zz2>Lz6G3&Zd#f6>V44C_kz(wUTt{3`un68!bg>;>j%3ICjSP~n
z4lbR}P8F!2gZ5Lm^uCwW?NeGp_(O7{$*}%UsU8ME&z`%BV1nY!9cpG?2}a9zz66=M
z@(%S}F>p<OnIJ7s*MT27yba>Mw!Em6(3b=~A|wZM)u$}I4IgUbtTJf`AyosqUhId)
zSaQ(2v?8}#iDG$Hk5b|tBO(-9TpQ!kMI=I`J}nwFN5Jr$ELSwH^vUF6-Z{XSS7)H?
zQ&*7=-J?!ybbIO3HFp|Gols}f=Gb%U=Mr{e4YkUsG<lq^3v;E-Ol^UWE;L@q2+V-P
ztT9~;R7%UXj}#Kd#521RtQ_Nt<qN6pyYR2#GEetv>%q-7X2uz^9?l|SZ`n1aJH1`(
zY(+(mR#RCb44#Qb&YbG!7=fa=Jnpp{Y0Y!N3W4=RtD$d!x}x;ankL0h^~YkR_1=lZ
zf8-&4urHq8FqTs$R)S^mbW+KfaWp6X7T0!p1Du;mtiwzSV`!vT8CKg5BAb@ytlG`L
z0jq)A!@23=`j(g6QJBCr#3AqVT<5)bw@u;DF?5q}>T^+#K7xMgDD1`9vZK#!uAy!G
z)+%H?r|65`tg0|VmnBPi0%0RM=2>ExuWM*|4oP5)P3iIoZW#SmEaA~;pUfai4zHmq
zWCmvzi*eO*ILs4QpCU<&-Flrj-pz$1r_)R^Jvgl9eDPbR{|(Y(kUAi}Y-Ruxkc@yc
zsQtzS^$K(x2qZ)Gg5J_FF4;-fFu=Xm((jOS<!hvZ=3nPM$q5z<rO}N`_uF6BpJR4y
zktiL%A$Qn4cwNvrE?9Q<RhU{?d8A%IZmEr<ydDWMg46iYaz#D<f?LZ3_hijTbQ0bi
z3)PDWI*3G;vY!+JI{gNy+Ce-m*d3Z_IX+mNI={WBADxqH^X7|3azf_YN04gWzuJK)
z%}%o)-N$6PC76ww8EXdPKaN-IUimWx(b0*X`Q!b9e2XnQw?9;BNj@ot(%bCaDBIKx
zX1{8Ag5idcCq(~uJriwp3&iF&sq2qn2%3B`y73ItqSG+1bvcK-JASuR$1IT;3ulc=
zae~Aw!Y$Rf&DZZYE`4oND7jpCh^b?-(aOZe)9XPVy!SJcy|rkHd@V?3;DXzWu=5dH
z%C))29tt*Z{1RZy!k&Zx1A)5RI5yBrUin+&f;mt3fwX!Tmx)J3@(yztSXOC9)l`0Z
zS)b#K=r=v@){slK6%!c72KzkbZA|qmGg}ag=YgJgk7Du<t-ZxEC?#(Ni;ywaMlG*W
zY`GgjnK?ykbRxRHXJn0ynnz+X)p@(|Fx-WyMt+M#G&xR>+H-0ts>@nZPdf<b+U(e$
zYv5T(wh&1j^+5`Ok;XknDHs5sA0Ju4=W0#&g6Y?xWQ%0Z!KYaZ89Wk#m7B-ngAKew
z0fj#&=Mzx~0|GTNhF<1&x8Ye|<_)?@(Fhl9a^e0bI-}8DP8uK#sd-N8^<2SeU{@vM
zR|hHtdQwWHo{FaH0h`s2W0!lD%)r0_;VSg2fbdm^*C;vO`UvV=1tULlO>Tl}VtA((
z^P}@*#S0qF`aN9#z2QHJ=(17Y`iJgnrrr|H2D(XaX)@jdq=w%n06Gfjc4sDed`M>l
zv+xzPDiCDDkM|peZlfRe7L?5rwUt5Fm2-QfntS`71^}t{B)NHLII@3?Z(DtE<6A9%
zq4)9rF`IA@<tk4J_!g6U0rG2W5douSK2b>v50lJ9LH!lbef|#c!UPm&r#p>EyXj+{
zIP*w-*Mps_gME;@d(>F<04FOA6QhQPC5gocqTJhX#q;olxA}x<4`*%+e;2!*fYu4U
zTi`Mw>v_x4Wy{j_!qWA5uVVRe3eEvWVRMHenty#Vdj+b19z^MN$HJXxid#ZX9YRi7
zZ*XKf&Q}(46;p8@vwyv~e?q_Pmp3``9k<sM*X>DAi{|1=pC+|5ep5|em0wauKmk@u
zczhj)Ebn{in3dcnMj<S^yP|%>Q01Q@EG&vI{Np~GXA+f^7E!|2Snkaq?}_xJmy;(_
z91Q5kwiEvjmvUh_V)Z3KLx$n>w`OxEOi$$uE-bT3{lokt`DuF}M-11VV7Jv{<)39j
zG*`j-SyVQvFF1sAF@+;MAM^*=H$kNjtLgK)WO*GXL%Xp4W3gc_49S^aYQ*6WgtDj7
zoQKmjErir~?aX#Z_%Y;g9gfpVeCCX6N(SXbc5@D4+(ullnBz_t*kt5Jnll!#fmN7h
z>?PTcvx0FPpI+#&O-_i0uW5?!i6u!_X*H&a*`es@SjZ_73TvW;LduhhlcLkz@HYC(
zIJ6!xMB<TD&4>0W*+z(<Sx{yD1=Ot`VQ+8Ix*4bVDfXKfpnC@CL0BfkM*zOLO_e%%
z5F;x7A@UoAH}9{6yi|`IvD-l7kF7@152QF4>K`Wq8BG0MT8>lcGO=6>v2kV9x8LGN
zpAqV~2^`XR_R&Z@+q%j%40wNPPup8YWt~R_GZv@u6GReQXx1a?@~Dj{Mcn<1lUIlh
z|9-bHXt?Be$r9k&2#uP$H(nCMyKV$g<8b*a_FF5NkQww2w_^~cwAH?hLamZAN=77e
zF|^kB_+d}G>Z7M0HhZ3%4w|A$*Qr8}Ld;=Bx#FSoD!^iK0t&}DcC8jA*)gd(VXow3
z>7th`e1U5OM>o<C*euCUwxQ9_vm!j9?_ER#tB6`&Rg*&FgR?d=zySMac_qmHPpBtV
zcWOGNYjlcVWdy4&^F{YL`H-!+#Lw_%k&XQMymh#`JWoCLQx10TBcTT+QM+Brc0Y5e
zh$v(-arKNePyo-|dA`7yd5OU0%R{3q6HE>Vl5Svq-C|96>%M{*AfC*K8<<u2k<Yom
zJk>I!9LW~I4sMx=!LlS<Wu!P8JN``0bKI90FuFe?1#1zZU`f^x5y~tX`p(<!OcRUp
z+xVGlXl!q4C=873fwSd39HHg%bbRXX4x6Abu39{{wq#mYCjauph2l-tq5FW+-x*tr
z4ZB=G#){OLYx;;63$MZ(Mdv2*DJlQNl`JS6Of%Q49?eSp#SRVq=Hi*qvm*v^ZZVch
z{?&G7MXQ*9e`~rf`qjPG26nk!Jgo_$+Af_^K0p<di(MQw1^>{~#mffp{0jz4hT<vR
zb`(f{xZ$O8A_t!1Qv!04>fwK%?8zcpWW;+pjX8Gim1b-Googt-W&fHddHZ1a!qke?
zN4!O?pzKstZKm#I)<Py=66k{n1q?nuEVs@`YLikfLJS`htgKId_he=S(}1>5;;^t!
zoKEbEiT1P)68l5Rw;Z}q8?&_1V7TYH8ti~$j4A%-$HygxWQ3B>?qdEB9%zda6h-4v
z`y3JlwIl=`Nc}%8^`#=SHmWY0l>0sXX!<X{eNYc(>vK~Rp_cfXX^xuy8qRXD0f2}B
zkvKt+bAi?;K&c~L*jd)6_GK81?iYqJ;Z+8cuoGTleh20yIEz@Z3NuGDV_M}e0(Rep
zK9^AlTj_21sKq6A$?`_|PuKRKDTKGMzb?8PY?9~1obd=WgxXUr^awl{Vn}_{zPWpp
zt5mAFv-6apIJvZ@@9qqjHEf_`Y;hiKU5vK5fV#$`33*n!F_NJ$J)HS#q+TvrPoO1%
zxhmPRy)j0t{}j?n)|kN991mR@y3jBd{dcjqI0`Wl{~lls?<G=cR<l&cyhg~N+g09)
zjN^93?~HriLK)!~c(r1DBypg39!#P}?>bOZlbUX@N?sRiOW(B2<;QIX0kMPQNoqxr
zNVyf)pCvwjhD+q11yskZO_GX?M2VGUkjc?Q!YfcFkb5tp`6C&mTE_d`!})?%gi1<v
zmY1DT(j+R)i?)dj8RyR3&>Q!$qL+qMg`FZCUu2eq)|A$3KE8SqpXXsC1$(!m=@iNB
zq7#@IrPU!DIXr>UA8>qxFLk?-;`7&tuun@b$(Um#uTB6vey;`uucojO)yVZ^oT&UR
zDJZ<3i);E4q(r&OEP!SSCs3c}>g3iOi4~7!`?cBow!9c&#YNN@lg@06W;aoi%~HNZ
z#Gtkuh+31Pn(fmba1l#gHc5v1JG_;PbAIcgpxNiH@L73BJoJjpKkNK6mOR@-9qgaS
z+eOLuv-_|AY!Q{d=L;geZl|T#Y?Sz459tlqr#Sj1)ghvEy)xh-!amo>Rb_WqX(SKN
z6g}Iq{bBnJ3oKKtgi3zFDjDowO<Vo<c>fyz{6?tdYJnmc$R=vE?p}cOglriM`M1yG
z7}6(?_RJGMhtI5|%3o9<9;Z(ux<1!ro>Ct3ZkLIas+ii`kfU-paur}889g;qv4WB^
zeakk1u#nNf35Q*`g@gOW=aO2uj2m3IXxr_cZ`<X+kb+j64>#wNh`{Kx<Dq3d<w#6=
zG(Lg<IWEg6<N_CxI*vGNJ!|<FbbdX^YH`(VvBT=FA>6hB9T=S7{z7jN3P3+}WpD2I
z^>VLuhCg}EyMjJeD}Xa>!*LfMCgsV|mrOk7!IIZtT}6btq}t0+DCzxHu|Le1$wz_g
zBcfv&@c8khwc9=fNa^#!&Lp<4x1UC*PBYoD6jv$3Aum6+r#NVxF*1EP#mJW>O)<jn
z2?b$6n@kI-SOgehzX{oru?|%R@_Nu+tX231RfaxntH{4I7QyIXkmqOysG|<br%|C6
zGpm&~$WAd%B0nHNXJ@&HgXKg`Y~Llq-0($1mGtfiH!dqFWH~*4?J9t%ea)RfjE%cb
zQw5>ac@7HXFsAM)Ii*CcDTh<RW~<HrYFHKZSf{aXRuN|K>_VaNizxpJ?X*0x@PZ?0
zOk0sUGl)?k{uH29`lOp%H{17z<FS%xUj7~7U-9Rqp-DP7wu9L<-3e;LXX>^Qer8Cn
zc$3WGZ|Mr67O{mqzl6%1_GiGmOKCY=Kr9$ql!~XIq<D{Q%vKag38rhem0eetLM<{%
z`_jX3Y`_`2=E!^_B5SsLuVlR1korQ;F^oAT?PeRsQ}xtE;jhxbq|{Eu`_W%Nv+h??
zW1W^wsMYz6#e=HA-X9{DLO&vwWez580=}}u4TX`}r?Q&h72id&CwcQuS2k$YD&|z>
zBg`|nLehS-5D1KDdD>uI*TT8ycEO;MpqRkl0|ieDHTmFgcN>kdQCow|`vsC_`rrsF
zDJMy7y=-3w(d+Kby%Dh*-h)s%8VUNLYWgoKid)V&?wcurb_6A6{T-hYEl;pK!Uj`O
zAY<3}?m$<6)RW~BrUyhQ@5<Ag`e*x)X?=VsZTn?(rP{Y=WD^(mQu89?UFiqv1kn{<
zih};<0U3~4)~$C${vr*uDa@|CgsXuJ5!~U@2ah+Oa;f%=#bu(Ei+$Ve78j-(lhh_Y
zm+65>PV<bU+$&ps2Ir3jW};HL$DZ}n(N#PZ-Y<;lt<h;YR^oO}mtF0i(nMF*f7Xcb
z00-RVwUb?*V@1y4!}@k0BLbq%ug5&;l7R`cawe+?Z>sSmPZ|gO{k+lQJ1-dRD$?%L
z6m=Jx!ElECHB808Sab$xhVm)Nj({4w(LDD71fCS%6Z&xW{Nb1`WC|IVV;SEN0T%bk
zh9M+ynS2`P42>Isohq<j-FZ1VCtX>Ff)T3mdndP3WzHSl4C=|(FLD<jA08>lQx0qA
z%-g@cnr64cknciIGO+xNfd(e`i~8G|Hrf-US?}4*GQakODG=E*ra1Oase=M@z}nym
zpG>S2o~=KuF^Z+UOlbB{+rL^5Ro(wXAVpNe=qH|+F+U$BSTYj>M`XxmV0vw_E&5Yi
zca1u#bqw1#e<hbbC%u2)FXV5J1{s%&2&cp4S!klI5+6Qbal5W4GpVW~-=~-mGlXY9
zS#Fk<iXbw;ZoUd-3%x(0BP6QDrMsGE%gi-rq+F4Tz^|+a=PDJztO)W!&YuyX+=Jh!
zSW6v?h)xNR>dl?+1?=xL2C)ItK{SNm25;VCI#JE<p;K(g{pS;9_mlBKe5RLlmi}}F
zblmj^i$yHd$NrwOq4!B5ne1}964~L?1Qdh9Nv%ftL|LPqdvgvZHusJj9DxIiBzesB
zC4=3)uu7QWY;K9MiUMUiU2NhmwqSiShd38BGOD^ZuHZRiz0Tn{Y1YekyMHQ}(g}gN
zh_p8+jZ>D1F`1Y9*W&?#EuP=w3hQaG{D(DIwk=hh8k1#||6cfeOsO%J#E^$RWlos4
zzvy#LM0@tt;O-bf6XB`RGxs?dlV+IQvlD>$feB$fkz__()|unD`7zP|aENYE-Z~$#
zRLM9kO$&xj7gwrR{C*|M9IDy$ur#ss%bB&8JQzee>Y6B#&crM3AvRT+d!3~otuHXb
zW)Qf(Q1u-X(J#!>63Xk_6<d*p_y;-Ap9KODKb>EHWKMr<PG1<kCXtEhD*RYV|GM&u
zqKwZDUWS0gQfq+=QVO&M@B>4G3pxI;kmK<m$Z>1|7^fxaHhp=b|9gfnI`By?E^VD!
zilSTW%iwcX^_iT=>lER}tgEBP2G33#95vo`ebyi2F3~geJEu5TCo3nk*li=3>)2#Q
zTH0S!-bp}*^0FJHy<^F2(z{&al?891V1Imz7axxhEQm>R?Mf*4RV|c@RnHdn6_rC6
zZ5wN_$f@!YARM`f!71*TKFXFMqS|LoW#Vn*<1vf4JxVR*OoID;AS=%mxqvY6aq^IX
z|6v2Z5xyCigNu1NZ<Yg(k|Ig%XEGa9pT1P)QoYuOz%$WGYJAZXx6gs4jU1~dDn~G~
zC<Hi=!^=ZSb?%{Xg`Rlud1-R6N*RGQMg0ZWiGu2R^vNbK`&Uv$*@hym{6vw2tnVJ#
zLT%*+zZJ_M{7FpL7lO+8V0r?xU~x~&`xzey>9?JxFj`AV@Yioe1#F$24jGA#T+x1z
z%W=*7Uf)w2ILrfE3K#?UGHe-&YKjt|b%d?gVGS$^5tt#O1@_Je33&$*BZA_=YM{0e
z{Zj#HNe{XMO2%wsJk-lm{|jLcW9QkF(~X$uR5e=^Fxl*nq`UjMV#r#3O~|fcND9TZ
z))RzMi`K*KM)KCbh*i|VO_a5N%obzvC=I5vuDgJ-X-Evr#7$htsXxehOXp(*49qQg
zTmPTQ3s20wRaQJ!Zb{Q_&>awr@b4j7?FRR(T|Y@)S~-t!JC8VP-jKhEPX3o07cBlW
zE#xB2<;c$B)DEG|C-Lq2_n^B3SLV}}(Tb~qigOc5hTs+Y;Fa9#>X6Bbh`<fs;G(1o
zBPYyIdM0f?BPg$C4%n&Q<d=U~_TJfrksHb^S}17U4o~Q!Q%^O|N^<0|FQ=B*iVV%v
zy=!S-@6O2zXCR?lORObKw*b;pENaM!6bgo82A>eS()br?Ir3`VFM3D;+#X1KyB%V?
zjOy|p9g&4LI|2jE@TWCE0lyvbM<2g<wyqJ^71cNC`rxV4h!phD+T%<?db^C%PO!&T
zwbThr<VT`Y_>itXZp99httR`_Q29GDm5c+`c;F4x4%Y*x<K<eF!~j<DTeQ+o(?8!W
zS=Y4@7(+U6U|8USL+MlI7=bx}iiCnuqBL2#MD9^g<jUj?1ucr#2;V>Zr9l}VKV#VF
zy&AkcRS3vHVEBRidZALB;Oapi-n&W5S2msw58f0`O%LtTj46x_B}aplnLgPaM~ln&
zSwlprj8sI6@3Mh<x7nNGjPBpzlTHzJo+vc^m3!2X@l>hB8V+HG9}0i17=~lPCd#Sy
zT~Ka5B~97RU9}l&G40H8C>l&y^pNRE-S1a+=0ZjTcr=0eYk)eukx@zrXXeA#1Ag{>
zPsxfky$-4wOrIo4S2N8YGp^Z0UDUYbsi)rusLg_<h4s3n+&PVKJ(5MNtcySJn(%VT
zS2f{jbBJMU(CS-1)r5CLQ&&0@DH^2~gN)W1CKT55J7gJ)P)6357`Cce2N9eP4TSS&
z*UvVUe(_58t)<pyQL-^>L7pPeDF@znEV;Gn^POJ{H1eb*tQ7-^(-oB11`~?(ekNEo
zdzF8D9wP!Wo<fiwXv4u)9zQVb3~--!>8~_%#y&WA(v6h-#6#{8ctvGjr8EZn6NDp3
z3t4&`^li49P3S8;9=(5q8KWtHfko8lg_TzhD|^WA^q_$#$`*BA2|dJWw#byAmXWs&
z#20tU_%}znou&9Z(poV8oKE#I5~N%5DKkwd#MvLd+YBJMd@*V6tXxH0t3)}I^mt{a
zh|Z%AnSRf9DA}{>coi`VP+l?x`a>cu)y8UcbP-vMhuVfp-#@ES%}5Pk5-BOdlKrgX
z1eIdNqgEKcb#G=%6r;rCv!KpjrqM<z)Ki+Nq7Q`DmF3KoxCeKNEAOa8s=?%{zw<mc
zVQL??b}#lj@jJvHGI9g+dcI>=MdIRp%tRr+A0cd_&JRjvlWXxH)gqO8^a>7{mdvmS
zZ(zH_G+HYfBD{-NxLE24DWq~wiq@*vaBY8$AjQ7!*CPLV$Nqs)(_#PbCxNlU`nwSX
zyY4K0S4T0lI<h0Cb!`e<z$&`~rF(e0rLzXBJAmapRA#)xYRR>OBJP-v7WLZfUY98G
zDjyDe6_-A0J179o2F#KQ<m=eK59jXTq)Ak@ZMu`-!ZV@jlYKN3$^POuF8KY3ZHsJL
z;tru@RCfoN<M3B%^VyS=-;77I{aAIv&&jlTs80vywi8h^1?5<e{P#?=P6^URc7lUX
zP@Av2B#qJaDFk2hgPvDugcXj<My!7y+95l5xWzG-tjxvUA|<Oi_x2HI;g2UNZ=7x;
zBnVvZcJ3kd3wrt(Ic&ZQ%tUm}pYx#Tiwb5*_07tjV7-i?#Sh!XRBfc7XsR{6nCFxK
zQQm0op7DvH<35IOTK}0OJ#RYFvk%(?h#{n}6FlEpk~iHE*y4RhkZy{Esu%sKb`$-6
zoLy7}N0d*-bHAowe2!a7X(Cf3ktYUNT0k;wSUE4%ayDbi_tjJpP6n;mEf@S%2~JW%
z@PAO|<3E%ULc#P!l;uK)-_AP3JSol4f!9K8a^S+gVvSM`<^dx0&JGV|&TUoKIls*|
zze<V@r<!Z~^jQqZr&IwNKzn~s<q-A{qr<C-g7w6Z_y6C(47KY&CB|WxPYxvO-#kf=
za1%4jiEyPy@w2Dv-APDa^G-DDDUE!Wk_86TIqH`G!Erc)Y<cFDYFzO>ehkx78)`6A
z*<($Rb@9J>%3krwcNSs%hs64*Fx?mmS`+V5(TX&FyHK*$(L-_*yv^4nTuEAY#q8uj
zKl9#?17*&Q$OUQpvt}r8?{X;86*w#Lq5u;~&f$V$W<XmrOC|AF_4FZyE62Yh${r>^
znlZyGqGE&@>lb*v;XwK*{Ww_ZBQ|5+Z!JBXcVs;pU1ougVfibAa9X@u&7dXPl8$qe
zo9vny=rv-RjHA(%d6nhnkO1%m_`H$eYjWY-ONkmfGX%KraGW|E!pfFl->3WJO`ov2
z%v3K&Hxf|x&m0t~p}u~zv!{wvlkI?%0*AMr)mh!!)PI8q@x_<v(!K$kDawaE1rv=?
zu2rKey%x)2r=;#blV0B<!-}C8^6w#W`uoZzg1}}X2^wi$fJ0yK;Ska(t+2FFq)_(v
z9b>!^_QGMSNjyYWp_u%zRlyb^rd}f;o=k~LqNT@YkvuGj$4RK}u~E1&TcmS;!oiMi
ztduPVb4PTeU)spu1H2pe$qi>H3zdcQVY5ZNU~RZx5g(h?%ls&3X1jIu$cT2FrBtKO
z>t^h7C!e=I#@T`IrhhL(&U?l7FR?;Ym)8*y1}HCMUQb?D>qst3BJ<Msxq^Ag_NU|1
zI36TlEXT+Skx)jl>>%<@ui3x(9B)HTRx=&v*XSibziPWZyAA$jN=~Taq7v`b-u!)M
z{29vr#b0lD#bsl~Q6}9Dn5J#w5LXlA&qnaxhQdj)&PC9@Tg+WarW%#0Nvy6!CA6*n
zFthC<ll5}C_hv@%(xL5;scp2vHE_E=c-!K-BxHg#<d8VTqPni^o;|@FXM}WNEt3Gd
zem4F}>zi<IX}}Yppc*9ze!{r233Rs%M1>FQ`;qBapy@lJTq{{3AQkUD@W>NV)bj51
z%)drfDa)-1yQh`Cl)){se(+AKU-+M}p#HxuTwnqLFcB&U)kE}RP<keZ)boXw<>&A$
zl2K6ucizHJP;d(*DLM>!EDUe}uBve|DI_T<;mlpNxot5^fi;PQdaM{^y{kqC=wT}i
z=XP=B-4XT>c2}qy<W^vvn8!ji&BQ2oi2ATm@#Z8i?j)V?^V*QcMF`1HDF;@z1`sjJ
z4+;~J<T9r7NFP%sxRA#kvvo00k`tyZ2V!+-)$ybx8fM$hEf~Ok^Ka-ly1N)MpkUZk
zy12C?Ig<y#=ZrL9*w2-6u><4nBO8WTUQSgWm@SGGEgX~{k1c4Z7lCrJwU&Bk^MUJi
zba@<j25UH)?yOrM{v4)N=JFAqYA|kP;1;*5b1B!qJR(svxr6AryD6T)NTNGLOHj)x
zOx5?+mdyUWBSCY%>JyoxI4yt<5IM~i?(o0^-o5pm#v;;mvFMab4Ju>XLM|uErprDj
zAz7JRm1^*tu94LF9Z?MY2e*eO4Me}c{}Z<3d75L3iALNGoqI%B-GJ7;bi(mxWc9Bq
z1q(*?X(04(j{7u7^d>&^!)bww#lTyK3)9Nqf*7mbd9^b(5%%<Hf)z#)#B6{|i!J2?
zWwsBn8Yz7;;m@ayDv^tio$&qYY19)NIy?~xxSAR)OD`1CA0AE#C|q*K)u>UX7?&Dt
zb;38z5h>HF4m?@WQ9E?Ptx0`ti|w_4Ru|sn?;DXabGEGcfUPP&iKtp{Q;ZR4sSI@_
z6r1m|-Zrd`iNaq4b0{*-4B`0eAqC#WU~6ki1j<}#*4x<InF;5v)DV|ps3c)d3h(?>
zL7GM8k+J?=YlaP|1N>`nN0i@1@ad4v=M3^OHgJ2#`)yPl|L^Zpv0+CK6Bn$HlqJ;3
z){Yr#V~>_B#xkMBMNzpP&<Hb$L4IN0!tkxu<FW7fFsmQ$qpcuYft-vn&bzkgbP(r@
z6EpYPwm^(<A_K6u6j3YrP!X3Y_Lw+pF(j4Q+)cM?Vo~KKeUMVhpONzS`+qNN->~>y
z$ngwDC~*Pm?gNd&iFMY_Uwa%-it<ayS51FsPj?)1(#YlBc`pwAjxR8FCjri8<f?A?
z<*sZOz#dqKrv)dH-#;(l-u!ehM1H5BcIofZF8N7Pt<nvJwRr_~)|}mFQ-xHLdDoYo
zBK~d&m{**yN2R?35|G)Y<HiSH1XG4YR_#-ghskoKt{c(IIUs7+n83IyFj*;GiQQj%
z5N|w1d*7?N&O~HZEgV3fM_Vm*C(@+XDC6ymY2GUhdPKrX$RH2i;-8nQ{DH-TzB^3Z
zOP=6YN>>be^>YpLgGQ6->5e*yE$ZIu7x(r3MH-vZ(B*|H-%)-OP)`)ZnzAl^UvPCh
z;YWm0Zf;|rFgsrzppNh<T%D1@o%lVxghlZzCXq`perM#B3=_316bCCh14M}a7&Wih
zU0hcLFhh|!TS;ri<s^|>2?5J0ATn&rb5lN=P&EUiYJm6;sNDX2qs~jl@cqA_(r0Dc
z4tXzq;I+yme;<ob|AugI{f8+TJjB-6PFn~f%2QL~DvmUP3UXOWZ{$c)JRL@XWv57%
z7TML+U<N?eG%`)@%0igQvp%{UMGrq0uNNDG(!&X5@vFo>=TG75h1tq$4loepuV@aR
zJg_L;e}w;B2Snb{QKZHNrfea!Wg_HoyFRo0Yoz3ur4}CQkKfCMCc{m6x{rW$0g^#k
z7tFgWv&O1xBNbu>6#+)BSdr{w2o7Ai6WELRB>lPVcE?l!W9!Vn2QL<T`pBb&oXj?2
zu)AXq2LNEuZeI?SXQkhtjhM$YvdC>y0mVy_V%};O&$8KE#q*gbd13}i6=CC2$T#H=
zz5v7Sgl0WYwN(4U)h=sXkTy}l%D^y#IMjQ07*zh<TA`~Y#G~<mQ3zDN&*4ZPS>V;@
z5AgF*DpVPIs2|8}C*UrsL?5O_O`oW(5WUswfCk5Vfk{}+&?l}y`6`ok05Li0z0l;8
zJa3pW&k9|plNuw7y0BT_C<iyo3w`=RmRB!VvyJr<>4xZBb1$CZ0l4ypt$tARsES6i
zG>2mZ)ViVs9+Xol7cVe!P<GW2Lh`$d9q+0+&pqB^siF%_Da<yH!BFHRe^P95>YeK5
zPG-Mp>~^?)pZF%=$L*u>>8QO4Rh7DPz}*dtVw3iB@Mn)Qs&58@XK((4Em<@3Nnl(r
zJ)4-WNhY<mb5k$hUKP=alIt}^!$4zuL0o9_`nA4I=mjgx44s5TGT9XmqRcid=N3vD
zpRGgTlxjPx%5U6x4%z<;Eo%}uXdw?OApoRGq_J&m>1##69srjuzn?(W=)709yW8K!
z^to1EJZ36*@8J)h?Y`Kr*wQK<*X<gX;_Vd7w5LNp9P9A1@F(fHT44=ZKUzAx*bknP
zwQ}N!79a+t4LyISR2)>ptvkr9ocFtFc{P~Uk{t!6RAw-0dU}{VG>;6lgd?^<Pi6YH
z69N<r(Z_?1VaiQdyYzp4g!hai66wELx0~O1bhc{S!n$TSuI^YI-1!&o|C65oY7p=*
zyX<C5CuG*5Z^ckhs`>VM|8|)~@%+>MpgzTL0^NTh^t{RhA=wcj0l$1h&U~-ydiSq}
z_BX2zWtT3rZ?y+57ta*h9{$l<I@U7yqn5=|jVm%ecUlnx$SG7FS;Kz)(Ea0je~<F`
z7g5de0NI-_niCxyBB<R521y1KI}26a+b9iZlS?r>NeQazrVNEjsuL`T*~3%h;`QSa
z5&0cVl2F@6>g28?>-hs`&v22%`St3sw8<QXwYVy;x}YD!`Z_9YOW@g&#e|D_NoD<j
zRaMli>X;4UHA1CmIMn>zu`RDjuozxpLnvaRIjM#>-ytbNAgEY<GQZf7ej}mw)le79
zyG~a~Rd(i(Yggn6QY`9KKmMPrsOC(cxAN=J4uT}gO>UF|?N4o#!^Dgz47`&X0)BkF
zt+C1SXBwaFfvpJRNIUh>ewt02_FjLA!55h3+Ow%jAM2*>`nMu{jFb%R0Q|TOjh@G$
zm5wykD3bEBw1jWN=2wf)y<KNtjP@r#vVWbb%LvNllPl!y8Rdy?BtTO}P#ZB8vWj|K
zM){3aMt>=hU-?nCx2M`8O)<|l;UkzD^OkGqQ)*)mHyifYfP?ha$?`|;NrLIGivUCP
zolUwfZQrML5n@Wxni3vY(N?0n)l5C3AF@87Pa(<Gzx$SN)2c6LCcK+sWJ~)jf8D2}
zrcSz}E(U9-b${;O;H5NDKm$zt+?SZ7#Q1h`zusWiqqVkPddQi4s`O>P+MsV)%SWc?
zJ~|`*S|L}%0_(zj0tA`?qDmuxCBGqS-vyeVA}Ll1L`r`ji4uR@nxzX@|7JuxRxwcM
zl_=kwWt`+EoA7E@0aj(Ei<Y+iHLJE-XCp(L=w>~HT-4TS=xBwO)P|B@HgFb-Slj42
zE=Z&j4Lt$K@s-RWqcdD$H`7wfDy-<F0n3P$;F2EwHD4GPaK1$Pg$xw6AG4v6)mb{L
zo*(Pwjf?jcW=+8x6Kt=IED0(ZEG!yj9}`~`&qb0S5?cur3C$qrA~ZrVdE0NOe<&X<
zxYb(DR}G>$%U-#B;2UB8CfB|Ff3WwS;c%_t|L+(*goNlxh#DEg=p`buZKAW45yJ>E
zh|$R?L9`%(M2}7qeHelny))V<A(PQ-5WPk(XZF6%@BIJQdG&vFUY+-At?Rzl{XC!N
zS?j*P-)HnsHLU4$VBi|Jpk8ghZtZ-A(OE*zv2v7cYAXWXKMYD$7*Ah=*}upgFA<kA
z=W0GHLvoGR5~0?=oCSHIy$T&n%^$-Yuc>{tvgrF#k_p#aimH45l@azK#i=SVHg*<d
z=O}t-lG0S5)23B6F!=FEt+M-zVEb|aT>@59ua#YHNrsxwtN*jPo0vveXYcEWF=jfo
zAbDj;bSB4~E5SUU&}I^ud^6b!y^FD%n@YZ0q*1>-#k#eI=pWW`8-(3H{lix){P?u#
zflY5L<ZZm_3H$_M@g_jTLkl89O=G#eow{zHRwLeorhJ;vJF78xd`DPRG8ldH*}!wu
zGzh@;ihQ(XLAoiWZ{&z`2qkiv{3t2?4(&NWgh9Zv@A3&kb4onmlnRoTNI6+kF3(kg
zLg*z^%xaY?F;aG_wv}LFGqe}Am+K8ee3qC4j*dz=mPSDeNe<c9_skg}e-&se1oCzt
zcGd%U2Oo7}ovHf;W5JkXO;9FAk}3dlCcKWX4j&5{2UhNS$Tqi1y-d@-5u9~>8P^)3
z+^^bNS4;!9c=}V`QTEE2=R3GgI~NB6g^hBgs-#VjCXI4;mCycmCrQ1E)ta^P^&4}Q
zi=Cj8bjCVOE)o~CES4>#oyqeVK9our?U_TS5b%5Q(Od?jj<(r>9aacLmEVgPzHueE
zq+XrUaVo}+&Z+L_bwZ1o;G72QmPMU+^|CdUIcFYp(#+U3ZoYG~OH9!`Y?Yxg&bzJW
zpvyYp8Al=yR~%1_Px|z>1_{q<n<?5L?$Sbo@`5^Equ(~Bf_(4*>YPR3k7gKAy*nlB
zO&-Z!G3>F>=;lkS_<XT|bqJuKX$gTX&znqH<q@@+#Ks{4$;Pm2Oy+H#!do{EQZP2j
z*(_Y*Ji8Xkq3k!E6jig)Jp@yDMAT%m8n3iUtSD1Gn0f@jv982PoOHwl1r(2|B$l_j
zf5XP4PRn{snu-|YJ`Y>K%BacipOyV~<d(3QtuQmG`Z6C(kx6eIFf@Oo_1y&CdDY?|
z{qp$oVyi3YqUpU`@!GGbNUn*cSFz*UY<C6xgiBJ84|3P7@5jSCSU%_yy4RY+)?Ud{
zL)xZ%xSqP^sZ-fuyj@6)aGS*?8>yUN?a`V(cGeqz26zoJgI%f!79=9wFzDSKIGcIQ
z(&r8JdY8<{lDg$sXU^_ho;s){-9#_fUTZ#&#VD`T<P`J&fel6HR-et|TgF_=YJj}$
zd$v2N7#GQRZ!=6K+W{FP>W3+w$nmXB)fbMRXlG>e)779DmtW)Fy4`$xdIYYoBe$Hx
z4pO1CQX4A?srcMjy<*hlGZqCj0y0!u`cpQU3>)}qzTLW0s=7Xnf?e%wi3jl*o~}iI
zgk(z6&k1b?Ws7()RUrjp#Yc#{RF#;s)Ku@K@eX1$(SCIF<+o|lZ@4XhyPI!nrWwHv
z&MO9Rfk;b&DUr(!v+pbaWzBn@;rB#nEf5^4$RlQzGstER+LxCfl+jFg*Gc2-l+QmD
zir@8P>4t>#)~8Tt;X8Z1Nm8to15nZU-oBk_H`D$ed>IZX;2>~Pp^fMA-U+;|Ys|_0
zXTpf(l|n;$AFE%B23PfMFv<RmI~Bj3Tv?s;VKb!U<^p6cU8R-R(ekc>q-vEJfT|ak
zCv44-;h7GMt6Lf_m1qC@WC7812agt-O6JK<H63JdmtQV5TDI=98C-jOMOt~za{Pz)
zDn6y-+PFdm=;BbLeuTV6Ve}gr4^lI{E-zl+uw-r9v7o(iD?28cm9i(d>xR2f?luGE
zF_WJ00}XU*>%N4$b;xV;8>q6B<{Q|ZtkU@z#e|PRieY7Iv-snGZFzz&SAs4F+}<qC
zj{JV!5@+<=Q{Jv~_l>}ZAnML5p8lM3vMXuV^YielRi@Y7><(PV9R<fl?tb^rKEPwe
zo>losTo2(+v#8uLV|Aqplri1}#~}T)>DN+hpo*-wGPFWWYn`}YZ&zPGU6$i}#tHed
zS5sg7VsRAmmch`(jN<)7E(~q1P=k4ZUgddu3QQ7uz7bF_NB)27-k4(i7vDa|5vylt
zwrcBVz|q;!d&Vl{jb{JemoeMlFgvMKdZzSJgvN977x3j|=zMO5m}P=ygXQ+qo=nep
zPh;D67Hzjx4|k-j0U~-NjrX)X_g;!Rb4=0ctpm$m#sT=m=~r&=<Wpz<CHI$M@bwv=
z)s(+E+)<~C5WIqYe^1f>cmX(nT@z%e?&(4A?|#I$M@u%ls_bB4oV>#`8lJ%qX>3h+
z{8e&%bD!{Za|${&Zgy#GowbIi1(6Ok7a@T$N_M|~Iu7v8P|{nT9DH8b+)Pgpu2HPz
zcKq2RMd>?zD5tQ*F1yvY^T8Rey4eu#VjJY2Ix>x!@A_cwnLB%x9rt-+2=oo+%$Ejg
zbYnB;prJCP94PU>(|ogB)5{`l@ubBDm$j}nZW{f0rITQ@9B3p3E@adUeR1?>qG8j&
z06b6-sdw+}!XU+>5)uL@bz;qPon^xRIrA9ih%&0#H3v(pwhG27sV(bA^TYk*LTN1(
zX}5g7%6vg4Q}vX=JC30;3uheICs?yQH+YQbuk47<jS!eVVotv)o%iZxs#*kgFN9$~
zIkVMkYxMM@cNA}B6JWuOVAwz>j5h<iG+1smu<4oZsvK`}7fP(j;ksmNpl@}IXjCu^
zs<R!U7B|(xKHl4!z)&f&0+zJC;^=axKCf2O3G0kXi|SOi&1gPnX%v+T5Du;ygHa(g
zYul1AAH;V9ITD(iV6g(W!Gzrtz==tQi!C^Sma7)ZFgi;ad*en&mfwQQHe2ZeCDPam
z*_T}EF}4cU423N@mQSF@E%#SP?M5_YE1k+t8mw5&R06AgCmRX~f)SqCs-aS>w<gyv
zbBo<cUvPAze?Aagf)yhlej)OLqTdfZc*NB>hQh`{nhJ|q5z#TC%ookUPbLR&l7UhJ
zKF9_FPLeB|agcVd4*Jb89T-7&ATF+4V?#)W=nXV}T!d)?Y40ZHHcc|+AzUA3-j$2q
zID&9RHZTc8JoPLy?zkc2C(wAqnWy*2ClNbaGPsYta`~I&c#~odIVDa$G)0{PM|C@!
zTq+-G>ym4)0zifoAA5_?JFl_LPX@U~IX1MBIwQpbqjiZ!Wn&$1H>dJcwl<+zcN>$&
z_>$PBFXN@BUPri3Vzk<YHMh#gAa4fGcQ1C^NK37UX+c>+QG{3xX<fi}2%LU`(_may
zNY7QX&u{R72FLx6&~MjY7&QY`s7D=d>dMtn^j+UlbhbzuqLDV=sK@hAonCCyKd>4A
zd#s-VdtF)Jh`z3w+|ACTUf9EvTKl^}z4BAte)}@SYmLtf&sMfv+#XX`vj1Vv6Cok*
zL<ZE0XOMSm_4(86x~{$L&-HrfPG6Q<r?(efDEJB&SwxsG=^8o<Q$y!5b}w%htlvqS
z47Rpu)f^IyQt!eS+R$<27GZ$5*qDp3>ET}MC6(#T9(fX~=6hX(g-(kDB{bbmib7OU
zK^~9qiTtLgx_!;PC8)dyf~J{o_!NUbzPo<yqt>uVGG7Ow-(Y)Uz6H$5RNvb!6jj~-
z=gnJ!D2J%LY(y;^fdauSK}qv(Qu2H&Zic3`d$+|7SBnq7r=bTdB)AV!JcqT4A_S<Y
z$L0b*xoW+lFe`k_WE;~VSE6638XeQ9G*nLEG2g}cT%PwB299BV=_a7q`tMNPI0;w?
zp>erw8&|rE<KU^=rsS}{gpZQdoClI?N%0nivO&Jgg6>PBk?(72oV3%YmgkUp<^uhU
zbEwJ5xg?7pwV;lNl_(1AwgxWtV$(+3ry+vlp?z=2n=AjnB9M>EJCWZ)5SX22Qv{sz
zhU#@0^cLz^qmh5W#qPt(Rm8YAM#Rnx9Fff`9hr8d)mxn@#Yg{sn&h;N+fKvDWZabt
z-#B_~PR<OKH=LDZA5!`Kmd0lHljnlk(|89g0YH%`v&NYA5d8kt(m35+_odslv#}%Z
zN=#Y!YP_#6T6}-E{rm?F(JH<fC0P*X&&^Uri&TscdH4tU=KQM-6W7l^T5*DzCvd3F
zVEstMfX6?4*TpdoTv4uVe+In8qh+`Ol`-u)o2zlkY%ZD{V<%0)Zi;Jh9oLEj0+|b)
z)fum=MASMpu>8^mB#FdM@CSQF7L4+zis=pIiS^R>3j}KI6!h$*0R~?<-Hf|8Ph(uK
zRNr|7*E~H$%6^EUkm_Ec{AKKdi^cBTLCnFxx<Sk`f2lJ1EJxKenN_@JF4FTW7B#EH
z+Z5LD(Ib-!n~)?suYp2?Pg*?09t?JQ`?Ve!@88M9Nta6G?DGTC_mM{{`Yf!V9UeWw
zuS<F;RYS3Sd+QxEs8sBM9QpvU^MXYDtNkFmKtB#FRiJ#ys|dMTYPs-{I9Ysrs<w!6
z(aj<BWKD=K$O(5Owpqp7Gy8z$hHpWf^NfQZpsk*;vyS~BoGG|H?>J7S+MM<dPVP8A
zX)%n?Wf%?yG1Qu|(T%gYzq*rCS`3w<f_NWu$gZ8{3?Gj^z8Gye?{7IMe{p_FYB>xF
zUI_B<Xvy3~KfhRGzMNxzb@9>t*i7bp$n*ClSteL_^)0sL6y0)4{)ORm6)F0kilP7c
z<;WFV|G&@Kxs^+dCe<JIeU1J{l!CVSv`vO#eT1R7ohcSgxgCqC!cHU;dTrSD_k1s3
zf^GOBscagbfRt<mX@Md^fJCiy*sguNqzpw43|3aUx6xM>Uz*;fz*W*?6<;9Us4Sxo
z6>zE6EVGbxf+RSoW;rN$3F<|3VE+9;T0-O>2KWnvz<gU#A^qb#*kHXjz3KS+@F9dh
zHZyA9dGRifBg6w_ttzxwU~zfg;S0pJ+`z`X%rA~!y=Gl2>*NjvRHAm1FieI%Y+8%z
zC*AUY9$r{+IaIQ_bSj*9(cI?VrMqngEPGKa{!E+b_|vvG^MJ-CIfK2`5Oml5j`zi>
zKd}&`3oUVif{_ioorzszI;t)8`I_mlV70{q0Vnqb80+Lhl3+f!Vh)Cef-T3wSW_T1
z6K=!Z%8rt1O^#^>)XisfIam$6A91vmf(xMi3hE-L&YF-FfP=yQKLXiJUic1EJ`ctb
zl-qVMd{evFvr03|cV2`6QB**CA4^8YNvnQ~SuaeGGj>hTxUS2&{AS^b(>MO;5L**Q
z6@ZAb4jbPXrRb*{-nzxtQ>fGo3XoWi*1RNSG@fcgVOMwLjGKaK6U&d+ycb=Vq1x30
zQBmDa1rzx1@tDgO5I?T2JSLkz;;HO2_EmLIlJ1c_JGB9qzftj7rQB`D4HGk${j-GY
z$nOYFRr~dO&0*^#j{NPGZ?{B2jqxvv^q~(}*=z+Q4gU(Lf)fu}9>S0kYcNgO$YAJW
zspMztF79MuvJ|g&A-WA0hm{WsEr9*KJgm?<bh5%1nG_K0u(a;JlfyZ<NGWl)QaCCR
z^Q5l_gs)AwStNt$p?<UJr;U)P1onu~=xfpNQP2)uyD!*`0qw1vTYY!HDD^ukg9L}g
z$F6mwS*v{>n<LPU)~@!SuJ5P6X{I5&m;|(33D6fv5|L0vX9+ZpQszU7TESr<pOId%
zO8wAtYpLkpIt)ivvJoSimHbOVciv^m_`2F6=DxCh#R1jo*n-i}z7h~RWw50vEp-Be
zLsY`ce$Ur|gVAbn(!36W^0jfk+(fpMKS%F<h5fdS7oBW?buJQfKU|8PB&8f3arUT0
zn^SGhK^TwEz`nz!RdS23^Q6Tf^d+09VGQuu57|JQAMJc0^f8@O)|Z`V(f$@9ATYZ6
zwr-1=&fVe{_gAw{YQ7NBj<`p(2w`MlWNT81hbcg0nC^C}3;eYM!qvWR9*v<=X~;3-
z<(<{6(u^6UTfxvsTENYm)=znIQN6F~u>YWTvMSSJ^E&rqwkM7!w@uf{-N<^yzKi-m
zfAc@Boif2{Uk?dDnSQ-!0)=HS><OUg(bJmD;6!J(Q4=PvHTw}P^xiI0CQ)|Ec{0r!
zTG$x<jNC9+G$Ox#?N#iGG{|`KT9N*1?$-{2XwvU}eq&ftmQ`N;U?z>mGS`^Nr3|Ue
zDSK#ZD2NF-E=3Vj#1vSVqoW)VhJ2u+Cfgz8D62B8DYe|msan&-36Ft+(k603Q5K(H
z+z!*dJ!Y+%<)YY|d2S{t@lixD&4Z-MMBnZkCX)pjp$kcT3`vy1E)4M75@=5S)j(+F
zhCOFNw7sN$#DkIC#Qy<IAaC?(D!oY+jQ|(T55EZMry~f3jWxwG(8rsAuS({{j~>rp
zH+SJ2wV6W<kFRQ79z<Mz_yG<Oo<uL{o>!h9M-`e0To-nwX8iZPoS#Ix+%vqu17RA~
zBR{%cQA4KE^(3CX#{LHy>wt9VFejnK)wpGJJK00n;=4vn;$w%_&o_fxJ%pYyl7NB*
z0W?;5uUpDe+8)S*%_3+PDM&V?@)k3iad!I%jJeJG&q`4u(ceB%UaY0?J0c(L=L~H>
z{W;f(Ur}|8Hcm)F{tBp12bu)9>fMXAzB~JgX3$)4x;OatZyg<jsGwMtoJac)Jfh!G
z_HvsKNDs&gj%}NUQRn*nz5{UF&Wv|w^L5NId%QL@tJG>@Af5^rHFfoCM{&HVRE?<n
zqxZjvQ-91(PlMK%A|9sVZ3LLCNXcwBD7yu9b`pZlZSKu|rJ*}i6)1c8AaV-wA-42)
zuL)SNpe;!zb9XIOl}997>-BSiVRk9di}vG%Keq*gzc~e{_Dfo%s{bWd>8gva68f;=
zsLS1Je!bd+#J0srwbw>c_pan#-A4MG3iv^z9Hkf`1gP9>=b!cHk)zpX@BhYMn;l}n
zmxnuic~Si?gk>RPvjkVe1`EDP>kiIKS5xhup%KN-(8ON{3Z*gUj}omdU?dY)JuKbg
zZ>4{ElglQ00w~Wim^X~xKW^>6jGC5+X*)OuZE0)dj{N55AUlub&2IxvI$IMdG+&cZ
z0|73s*YgJrZnFh0msDlqtNsFRhL*WEDn0SP2!LC_^4r{{GlZA9F3(r~8Z6npxcn%y
z^-304RGNJ<^w{a>2$_>4OdiX?stTAsoA>L66m{kQMVqz*QplKA80n4xC2tugmW{Ko
z3}A^hg2K(QuP)UGI)8X$g%UTB>dZqf6qa{FGfxx*>e|9PM~g5$R-OAn<O+k@9`990
zOO66<wu_0*3kc&cTvM>IJTK`5V#J7XrZm0O_gu1T(l>86=fvO6U2z;&lZhieU}3yP
zdHin;B51`+(@;CHv81b=wZ~>;OnN`9*8O07-XHKN%|k>!^uv{7Y%C>V6Db=aTIf`D
zNsOh|Jn;-{mWX4k80!p3S8qO7xlDH&)&%ClgKZ(K)AEVgs)^amabiPU+&|X*54${}
zg(B{<oQb9g6&E*AuAJSbp5uD+I-|987fToFCu67v@z(7F>OKQoL*gcFy=e9>c~@<L
zT>6?0=6RCVFeCcxlZ{}jTvH!~+k^28`^!!3@k3?vI(sV^cemLl9Pp&<Zn)1&ODvu8
z^WgRaa+eTe^Do|@;CWbqm4EYvm1OUG;oLp9^EWA}xD|Vb;h`lZi+e;V&X}|eQN;7$
znA-E60&W9qsC*>N{`V%(3@%TGx(GFoK~g+R=IsFArBn#C=wp%;Zf5i~)3PLD0u(w0
zS@|l<lX{K*jEhRf>)G|NrqN`po#TEvMvKPBv?2{s?*)IC+A^fM@Ba=8<sley*q$BG
zb32<w9Otjm`<3*kd>o(Rw)`|w|3+MBB}(vX)V-IDD4383b!JM+-y{w29RArSmFvTp
zbJKuwIv#^Y0LI-+_R-2-1G}#Zb;E0*jwF%(wezI(J;32jZ6oViw0f54s&qHt;`Qk8
znb;DQrFqw^xu342XzI_ZRn)0sN+BnMF-?iR1p>!*;&ju{6ADM!a=US`#8vISkRjIJ
zeOaMQ3Mq}%T*P!Dx7Bg=B6E^mFIQ7(u!lGI92+^oU&K~k409&&y0bVGA&ZX>Fd+#q
zH)Y0V5@Z?#sq~f%8My=89F`_*%ZDy-RB3`?Aur_b+P}+DZ2dc5a^xeAt6PJmJc#An
zIze=j&7d@VgNV_;Y-J%|VZ*0483pfGHCIkfm}|bHmgX>SnH3Ox2n^s{hRO#SV*!=f
zam}3ItYpy4=kk=0mFPFeZ@jqw214Cmn!!2Can-Tt0&WU^ox9`KC-kRZC37;%t#DE%
zB0W!Kqh&_+g&KpVyooM2O`B!ks(`J?e2+CC7p@;wMUa;r`Kna#P6u0!s6S4r7k;J;
z56h$<`89gWysGy{!Y2e&CcJ!4>!XjgE?{fp-tkN{$B^vg^@-nkPwYR0`0Jm*Lv~r#
z>S3K+_bFM5GE9}*fWxhuMv);JaR)92Dc~s%uL1Yh<JAkSE5f~dM|zCFT^XhejP$qu
z&l_H8o<jI%+OrJ>6ccD_9~ZLw$wM#UQp?3CN4jfY2XDVgd&Inb&pv7wE_x>hWcPZZ
z;D`4-!?1#Lp17n@zD+*S*^ILo{o=mliSf^C2iG%9qx^4O&y}Ma_8J?azR#E)wFc7{
z=5j4}1)4@D2yeXhk&X7SmVM-L5)T#WFU)r-Wic>}z#WXe`MGQNL4INEWxRN)MGStt
zz)X@Vv8@cBR23(Rm2)yfPkynoE8BaS)`#1!0PES=QD;Z3BTjBrGCs<KA7nBNiznCa
z5LX$j5zFo?PM!@4>okOA%FbG#IXxgL@7%6Ox!EIr&$)s$y=|;Hh@gQ-Q^<reQ~K3M
z=(XwNRG%l57WMAzcN*w=x7@p4;ASD)Ly^On?NT-~SRqK|j(ZRrHc#_wc1VY$HA`}*
z=GQ^5KeNFBM0rPZ-rP1TV^0I?k{kw3&fX`ij38Y&;-a=Pw4gMjHIKM92*Z4OZW}%X
z6HtMOs$8-aNGb=n-LT8mVo>c0#W0?!#G=dY12)D+Fbqi3GvFB)n*oC@!dTfxxoz@a
z^o%48%t-k(8M_zrD;`nx-Te@m*yOl8i%D`BN=ybBl#KufNwXlt$A#5bvO23L43vbp
zm=&GN&7%_dQQ`Bu!sg#;P0H}&z!Y!O6X$p^=E4#q-Q*yy#*|w3=Sx5j5?fu2uj#SQ
zzP|j`->lI^YkcKF5GQZ$N^8lvudAL7;3;F}ofo<RT-BEQ|1|8)tKRrnE%|>VXH_yj
z&0)-!+m~r~GNBM$@b>~G`jJfpK%>7_jVpKK9?aYYq6UxI92I$40q0uyR3h@LSlmLz
z-pk1yuDyO*my{`z5F;FsyZh5Ixs%Nu24jJfKdE?Z;iodH4SQz0P5jQvyTICZIPoB}
ze;YP;a%*FaUaZSR<o7q1p|^msr}wo&<}vK3g1n*Iln3j2YTH#wtnPMfK@LljU3u29
zp#swC%CqbjV!B*K=`Qi(&|l^1s=ekYVyt5$TvK%rAN}2A{dI2Jo+WLi9Di&B3%ZG8
zd@Vb;`_|WdTkandPkRb?$t!zhX7m$V!#Ay3<T`8q!e|4H_807^wZG2DM#2r5WHrf`
zJ55>1P9K|8jwV?U35+!Fr+riJy;%mZCgU|9yVf>sdQO*Wc4DLpoz0ZLu~(WkD4kI1
zkgtdck#Q0622<MYnrMffc{AE&+j*h(C?*(oY*H<z&-IAFp4We!zNmf$#rQ@x!)UT4
zPUp`C9B<G+Yx@jG*)&d!$YIivRPV(65MfIqzdzywJeyyS_ZepK@e;*GG>1OzT#^ex
zHRJr@X^R7Ub-XF~Vg|&RIB7s?_J`)jwN!p_;z+{kg2h_8_3o?dp2C`m2F8d1VPhSu
z1oQ8=n)^f^&4fr&)K*2#`Ab+Slbq#WeodrFQ>58aT=JpD>lCdcZ#v{MYUa8^cc~au
zDQk4@&~QH)sd;3MbAL{d?O3(jmtd*A{5X4Vz`MvC^e3k_IpE|>n1+I$jGr3#iG%AW
zwec0HCGD7R;Z}iK<n@uw2&BUMx{Ca&o>qFs78c&SAEV@@Air=o;a)Q+-*zgQ<tqAL
z<L-g}F43n=?jbSY8#5?lxNXWv(saIK4!Z0^kcgUWc=2Hi@$-xGpweUB$>82SG2IBe
zm;Js{4)gP{2UmOO!R!iligPJnE2_kAz`kvmJj-1*;{>Yf!u{7Y@GIV2i<2`}q=tUY
z)1IIAEGC?VsWicW#aomwq4FSE$v8E7V$whgJ7zuI8vcR+q@DOeWEUI`S+AF(r}R}h
zL7!CDD4U+b@cqzW_ty#|Sg?k5A)8H}cs|GwbhUO2J<^r+5@0GV2)N11TNMw=eKN>;
z-z!}?eh?Q~r9FHtK*BS*n_`*0SpVltppw}$pKRmhuZQv5B2twfGyQNSUmFCc-kbFJ
z%I3RT01CxdsNykY;t_47&W?Yk00MRl9Cy7ZYQ-nbg>-U9-s%b2o~1}<=cd3O<chYM
zd#0)hpYOV~jXs1qmH;=jb%Xura}vO9f5^Xi;>ZgyC_l^x)d!if23biyeq#fHqwCsE
zC>4w7cQnM1H{1jt;oF9j1ch0?3YmiJ=@dk3s+%yXVb~u@8r5X+LvTV&v6Em>y8T(9
z#O)5=->oboHFS9SaGPhbX{An85XiVEaL~6kxlX&ByOiN!540otUL7M+fJ$S6shT7^
zW38~#<Lu^SvG*(NUWMj>oP*iZ)T9n-2$4@E1ntpHSA!{8w>=P*W^%|#zFC<9>|xx!
zpi3x5g+KukiyxU83IqOXR9=mr_uHCK&~q~=))}`Z%4!Vo@}<n{rFbztxE^v-n`E!E
zg>;PAEJO1<0(<95Qxd^3v+SWp6lJ+u%dquWN1eeFNM5hphBhRE@WlR|4|lP+h7?Jv
zf!hP~8SRmt&`8MUsN)ZjEKsUzt7lS8qo3oeQg7!ZJw08GkTgw5n)f!Jjtp#6xoQPI
zPyCg`_5?Jsr<*<NjtEhtq(OzSPh0oLmBQYnvdnZx&HDDj$B|e&ILY4BVRCog?AHog
zIMu|nJmhpz+8lhBNh5+d^NzMBn5bd0up1nkdeDhMN15hP_KXwXjq>Zx7PegsXjMGn
zCfVzumNg<AsaY%a4LTIeH`UY=<}LF0J5Xn<tvPRaTdGn0ao~`#3TVuDCQqb}PTfu`
z0kw^+gq_rS8je;2e-7Lj{F!9zsf(*u1kk64^K4Yfq!zIG3g++tyrpRGOaHTIi)byn
zoxl}xC--LUO;ijfkv>~v-O84`lX8i99mv$$Ev9PBGUn&v3ss<RFJYHIb=R`&HK{U}
zU7E0_c*lD*bTsn2z*%|9K*T({M6$l%$4|CgkJ|l><MUS+G4DTHB-HoRA43<bko`CT
zFT;79d_I3pVEHz_0?g&<PJB>S|F~rm!}Alx&0Ly-1nmf=)j5S#CRgO|R;cA-Zw50*
z6o}6`bBtiQUrIPL%-DVsbTBL2s$l<STamA7@glBu%F<RrOczHgxk<E9QBz4xLc*~U
z9g(R)x!j{hecpD!$Brsjo&Vq)^HKT5PQ$W8)Z*EUCuY&K4<WS69b9{&bxy7sYubQ=
z0gB4X>CAC_O}=*d(v)Z(qrXm>RCRbZz+h1fVyOeBk06Y*{zU$fzB;KAuvM?fL<!i0
za;7J|a)FrRAW|wd{Yg(`F$rmX4_F0Ox0Mh&7V-2HMj#M^DUCFsJuMq))>=51Wv|0P
zLg`hA3)zQIO8t7S4!l!~0VP6$R}x#&4g8;bs9XyKFWP}r6&~Ft_u&XsjJ}5$eHvja
zN)AE=H24>!*WILr8aKb&z6vDb8yJk2b@y~}o0tk{_ZoE0KOQ9Y#x;Hofv;K{t*h(;
z4Cp()|Cqk_hF_qJZ&2BS_&t#N<X9ll<=!GODR!s?;{=3vV~Jgm)MRj3HjnCa@;T2o
zg|X|ES;QFyy;c(`oXigE?|pf4TRfICA9nP;>5WWUM{vjAG%u1VFX@j?NDNQ<VDKn<
z*wKheQ0Gq|E*+mHVrXwH!xa3AjGJ8T*5U78x?hzo({Kow3zKOhS7av`2!hB6Mg23G
ze>h5!$=LB9YyhBi*c$God6r_SX@Vqb7auP(aO(Et(|kEGM9BG$WQ^N`D<lB{&j=6c
zeW{=cR9K`i11DR_KI8C?D~sSz^MoF?ba6R89JVqGJBjrAKuB4EO&T$VafV7cWJr(P
z6kdX$r?@*sUJB3(Ox2fQK7KDGh-Gf}uP&NZ=O6Sin(zLT_`d;1X5q%eo*iW$m&}5i
z!XNq06>HpImzi($?+EuR(k4f=(&al<3He}UIu3uD#><2t+@bxw?07eZC&j_gVL`95
zKlo~)l>p8W1dq26r`j@~bmzlZ6Apnir!;u10%@42pr>VJKNM{l-^yv6HDwK_%_UH|
z$Bpyb#H<Tkyy{4Opw;KzP`cHjVwDqQ9a65fH}pQ2&Baf6$W5WLHIpK&UNzda!cG$k
zeymHsz1Zp2_zUBVov6e(Rh3k29`Atm_TT>nbP+Scy7uYrV0>u>I*@Lil!#WOz=K`i
zRt??P<a$BpgAs~f8^}(_n+4mWbC=74V|=krRRv030v*+%^yY<yHkqY|pZR-tz((=&
z^%t+^3|c-upQyL%Nl|rv2EscJ#&+cATl!ir*IVd?9Z6gRTyiMbucsHVxzENjXO=xF
z{FUmA8W3lGQWb)5kt_;#3-?IP-31ou8>`|lE)*{+jT8k(L$f;JRYtMhMNEm$|2+>N
zHo{i;D57gEeDa{SS>GZS5z^7BihUw0Y;j8CXq^}IkJ@xg(e7!@!|b5)PLl<x)<6N}
zrsu#uk<%3)-9|82Ho^2BJVeJHtyHSbBx1`lPWNW^vwFRzLM|?pal4wMHF2rDozQzb
z7?8>n66UO<U<ayB2SPsfuNxGAF$Y2h1<AT(DgF&!N(se~MdY=d+;w+Vl(PwINARd^
z|F-rGnhEt@R{Tot5<xElXKP)C4C{qhg!J|$#XfpE?aRmu&zt3KQCE+3erOJKWp!gH
zI1d(Rou>Xc)dT!JvR@eG%s~!F6fSt%P}K2u6>Jw%M-gwKBm|M4%*rGd7~z15cfT%i
ze(PepuXsI|TIP59{xK(a73|~p{yqmc_40MN4e^#5icgZo{Uy0`qH=zzG20PiVe`T|
zcS3FAL+?*^MoR$t%!yWQku!2PX-)TiiN)Y?-Ta+J`w$sS0<+ipDBOtjZf!>lFeQfW
z(b&=b9S`1PFrcK>w!@vDyj3)e;31);7&)nGDLPUic7Cp$a90>pS_&x6=tvx_=IRSK
zwpgM4oNNH4zuzD%9&ov)`U2kC3*FRar}6wsZW8<WeSPktu(-XIle0*!2=}G@pN-B6
zk8^fe&F4B<TK`OH-uOs(tP=C;{r3?_&1O2_cT?~#uvJ~^os8z_dtDq|&%OUrwL`z?
zZ)Ss;&s?$ZleEG?a`q1HPiN{;{1-}s{W1#9O3U){-lr*|BSUs2NX&rKF<!|qI~!0a
z7G%+WplAq-Un#}#jN>}+KH)r3E8Er!y_WtT-is_MM|NVZ8^wpc144Hd1@3UWI=26;
zYmQICKW81<4jyIOS*cNXS3&5~{TGYTh{8VOVqLg=_B|CyjY#+QrGJ;DTv%&%z^9aZ
zE4#*Pa%d$?G)eZVJp=e7<cz9TFi_X55)zl;0a{MW6&Gp_`z&LGCKn_YYk-t!8W)1H
z-Qu{oL)n)~aGr;9rbPhf>Ma4iF(ot5)?+^bofnM&JjIK!_>(zNhVq}Lw)Hsvj)3+$
zm-w4-T3d)UN3LB1E3`w@v2WG{4vr+GH1W$zfyvvLUvkYT86Ew(+Vpl~?{NR(_lP1U
zL08etvTF|!HhejLupdFuzKtp_u{Wx-L`qFJ@3{>9!p^T;2C5Uhg)xt4U-~nPaPqn`
z=$%kJ4ZfZ7D<PIsqRvT*TQJ9azQckF!DA>okg%i}v%=o8%eWg-m*%<iXuu?Fsm_Km
zUEBKae(d;^ln8oV2~7be?|rgxbFr_&muxH^sP@xOiL}ZL6tp3Jr)P)~loR3dmACKD
zbIFa3_%1UQ_!f|pGNG_?yPD2^;XR3Z!fKF;vk<JxO_IUZx{#>GOPHE$byCNyi}%{3
zMFXVZ2u4Fr;YZ*ccUPNAyaVT~^}YE_X)W_?9-5&6-=}CNgP+vZ3CZNlh&oO%+)!}w
z(3`uqy{Q>(5~-kiBaNlSf#vO}*Vo2u#iHXR{Nx8mbuwJgWiJh7mzoHx7C-pxz$jtS
zN&Pvu!Ap-go@Rp@FxW1d*=rILPYwnB??B~DW6q9Z1H1ekyE^fH&-VE3F5(0Y@dDH4
zQjINZ%)OP?GR$t5377v<d2)5W!pGa7Aa>$(;`64Qye;Q4yhHJW<&dhjyQD(xKbFw`
z$C5G=Nr<5fgv%ZTG2gBJwo-IVV|)CY|Kjo(9IB^|ixz7;&WvXwCnr+cvw`LB8Efic
z>UY;uO5n$Vk>nO#ch&qn4+65QVVUM{*VUxfDQ6!~XomLqwO_t5DYl*LX1Tv)g4u_2
zody?eUlNdyG$cSdO>9jVpKw!SMq)^(X6xtqukF1NpY~rD)VYR7g@hoP9Ulr?SU}t<
zO1H}IFvi;6#v7MNi<Y=5F0MrQ#AHy9)M~2`$_#w8-~uHbRRH&@QhuH`>CaDbMOW?g
z{{s_u26@anf)hgLP8lI-)3-MTsh_I8Ed@5?%in^-BBplg3vh$Xe}QsJSq#1PERWC0
zvD61AmQ5s!G5*pJ9a84~N@_bZFb)s-_w^XMs6YQY7G<+|3`WK^rzj<U!Nv34O$+*W
z3VqGDah;T<81|=Fqz;Zo+;EI5U`unp8K<V|Ld`WZ&x$|7v|Dy44h<yPHagp=EUo@i
zub2V+FBG8x!g{?hli=`Q;&tdzc4a%WXW5VuepIgVBMN=<OWfO4uiR?>A#?J;b%~7K
zz9!EyG~3phSa*1v%>eJm6y?<B3(ws=rXn9Gq$D#n^0v$?P(U=cML2twq7XDU<Q6>_
z(35)OzgWmwTIRxgF}NwK1z5Wpe3-pBdSB;E6Y}VUjMl-$!XGYBlqE;G(`C3kbrIze
zy}Q<FDuz6N<rkp@=_hdQ09rN2Jg8ZiOSc;}4fOg%s$U<z3O)!^x3kb(^i`-ihKz`6
zq*tIY(5aw3jg(GbiWtgH8iD;bV|J@DH2#%~dc?_FuStG^dM3PetGH^vw@7J(@kmlj
zaXp#wV1IR21Pp<(>v0KKf0>fm>LD9mxN+^sh^^P~PR~3?%Te^~)wx7R!TmIa|2I?u
zCE5icBZs<HJa4vU%{raWxJ#UdDD0V>VwnZ*r0-FF0BH6lC|?0-O<b=h{*BRmjO(7W
zyZOwe6J7Zsa=Y-epGyD~NxXimTD^kRVEhwzZgKRtE*}v(2iF_r_2L?-Vutz(lC6mf
zIf(Ig>=r3zqraNJ0Jc})34KV_{P{^CBPSDvO5=xmpPth=vQFuda#KAK<@a+!hyFGq
z#JujB^hhpru|Aek#yegpS5yOfQlvka1d)8gmQxF@6*1;NYkF@+%eba=A-0gC*YfA6
z?^cs`0egm)jn(Mv<xVF<;>fj+`BM(vk3&>~#PK$H(u7|^C&yr^yK0n)bx?RWfC}7K
z1@S^pO6XElzfN~rl+jm4^9$j9@^4dC+cCcq5?I!aa-$aZs9KX78AZ5Geb4ua8{FLT
zAt>ah+qakvX#8}E7vyS=d3-5Fe4u4)io<6#fwt77%!Rz@e((Uu{${UrTCVIFA{Z%S
zy#SVXeEBK~SIgU`JUlBoh1a(IJu%4&K}3}9g68W+VijsBc=fEt?nM=6`k_&~isp8@
z76}pk17lvNq-Z#is#uv{S6q+yz<%9uJ?-jNRk&#P#u3t0rcS6?<vQ;7(-yP(EE@Ao
zve4dyP=;4XZAGHbZn`Hz8KR2WqPmZT-SWf@3LWZ&f0xk6srSCsZA^J#*)M&8sb8XZ
ze#_Ege%Winy_~9|(3)d~ozPrRTpW!Nu}|=m!XeHYHMy}*z@dYh3%=<i^-9l!%Hz6t
zAVz>}SXL(Xwl<p@z^tJiJCfS<(yo%N_s3xO2a*}TaDQ1}9Nz{!7*sin7F{Iek1M^1
zJ{3NTS;`yAY0hyA^QDCzrC>@}d)aH3;gS+z-4sxGNHj<8P3+sKRro5y>^2)sYaU?~
zJ6`tA-0n*kju-T8of8VP1EfIA8Fz7cugbbujUkLekqh5{1ZHgh)6?nlYI^pcR9sRU
zQR^cG?1zG~WEv4Up02H`Ttl<}gr(Ihn<sn35!)A_9T454T=jUGm9~0~=34I3wTHWK
zMM|C@;YUZwXcW`P=eIo0+NhpWV5~8|s2)>5H+PqX7enN`tu^%{_1IzjWUqj%Vyx*Z
zRf{s2M@V8JekH!iV-jKF8<TQH?84tfrDz|=rr5fJN!yoJTsdILNMJ|)h~6mwwD%H0
zF2q%2rj*w_KKp)7klad&-vTj73J_lC1Npb91&vPNiodr4$@$ba%Kc8aZWbi$MW;)1
zL!OEA+lSAr!`B3zDvBimvE{Tfsj7jBkD%^ug&__f^2Yh@Zgv0I04`=>h-q_v{5%9!
zCPIi!>P+dPw)B$_QvI||RlrEztTzJmF5VQeJxzC4ZEhG1(;Pc0&+p6OnR-mSKjdIa
z+P#*n0&*o!&2u<qU`~CBaRhrYCIG2k@MN$=z4R~=!*&2eq3z>o8h~dLFpSGv`jS%5
z4nZ176gZsd?1j(!C-Iw9M%`K`XCv;Iaq@RMrAKX(CZmH{_t5?Q-aRu^Z{|-5EH|%x
zt-;gLB<&r>pf}>W=w0lDZ@Hp8@W_ru#wd%~j(g#S@|l$)B|7#%z}Nqi#PGFriU|GJ
zxhuaT;5mm*q62SkgctV@9ICh}cp3W=vA!MDs<;{yMm23;OM_AYTS~JRBc=;_QSwt!
zZ>iLq?)?6BCA(I4ccGqH=XlT2zCLUUdjHSSwQ(yxT2j-GT3ekEtYyoYe=@UBteP!{
z2M!;95{b2Hk9<|nvaQ~8`19HkB1{uh@LkW4h&naztY+B%Itzl<BNd|u@-$<QE{MLt
zDijugQR}wSK|Qd>B?G-eY>_j3UuFSD^o*c~CDlR(@V^fk7AH&$yq0VmZK(`&zb*k_
zaM5mn%Qz*R)hoBNrrmeJp6HTS*gIAG)q*9@tKsa9w0?2H__k?PJjy~)%b;gmEEcMj
zUV>3~H=Bw?RBA8ZD3T|O7y6@Ck7k|Qoat)@YdgA$A+-Gc=Wdr)*l!+}ekB!*UjGkh
zjE^t#TDzc<fmb+PXLj4Xrq#eWoPhLdx>y0bJ@go+*^MW}cOqho>e&@xGOA?`m&Urx
z#vjJFiBo%dS^<IF&SWRO@>dV9S59|Gx)-Nf#CkwNh|nW}IpH#P7Gn_0$6dV{O?bBc
z&?~)R)9cRf6X?@?!Ckc}4ySNbKkFEs(3`6B#9|qOWT1QS<0d3FzS9d|$Ynqf+($U~
z9{R=0Aj4o(S@E5_GWjSJS)Xw)THZPjpo~>gbW%)u5COn=hdbp<Mt|=^fD($cKHh2h
zvyDD)0?AvPl2?N}DyDE>vM_TkV?#P6QAINF@hlB*gF#1=-KAqCv5AZsuV5Z3ajRgB
zA1uOhTiUZJZ^|J6VIjRx`-TtqI^;3`LS_WTh|V^~mAFcQW1L(!UDUzZF0_!O`ra5a
zWn6BjjS+L#FF&;Jl<FtmWv(t_SN?VrEp3w3N!4kJ2y?;)4th<dK+yzZ(xm=!+Qq7d
zFw;x&BB|QX=DpCsO(j>vu)Pf;k-}zz%B6axbDC8beRFxAF6&y(-yQL-g@(BcN+v?P
zO%xS6VMqsU63+UzwiMe>Zq`;p8jbK_e=fuJkv19<rI&o|e<O^<M{UCAR`=o^M_3*@
zne+E)`PFGq@x|0jSjlO8ykvl#-x~|hL9iFoQ65<^#gumb`>0Q$N!vaT(7~8<V&=pr
zwe+SuRnVfbH&_$c`VQr-7}9;hdpXbh`~5<eYBIknt9^XG!SYbf+W<_I`GS1GGi6G%
z;3<FWLi6uOI*>rP=>zD;)BU5l7pK{|QvYN<`nzUysMj0HiOP8~OW}5?BI29{)!~^<
z2Drhi#--9!Nm%Wa8Pp_om?Vr!)J=b}DY|Y;U&mo=#QQtpd4h^tnQnS`e9{^uH^aFh
zRRIA*rrKBel5NRnd_RtCp4r+n?P#ez?`hTm5tjEi-dyy=41aPDj=8+NtWDWe(w)`7
z3T}o*x%47a#WYX}vO3Bj#n>O$%a@DU?UNNEp%7XK)6|he=&QqD7^24O;_V2TesA4H
z>e2jenS3SIA1<giU96DNCNfW?mZq{K9hKg+oRPjspjAj^Yqmy~%XtQs|0X3MBbEqx
z)v!bR5&7>f2xWONq7e`RTnFkUOAjF%xqGe+Dp!`bjS@kOhj`Aug18HcwuhS9*iBWO
z&%;XTA@8L$`Zg<h$+%_jlZNzbKlsnc-GoZos;E;O*eJR$#5x<XP#k~kA9Jj5F<wY<
z8Z`<r$+$pTwcGa+Dvh$vDPneO%)=56?f?-Qb2XWwC!K}kzEuQNe+wY~z^#=oL9Gv2
zWz60HWvaLdG%Eyf$cJjt|0=-W;H$aw@gMU)ZT)c{Cq|)1=P7b3-^>FZW1UUAk>`LI
z8&gKoT_YN{uYb5NdVXr6fTTOF<SxC5eBsm<CpS^D6NkC(Y+F)f(GvOCchgH6z3_~I
zyh5;us<9l{m)WO@tNQe^2WD^a&xUW>EMNekOBeyflcX<|ZWW+b=Y`1qq7Sljeb}t4
zHvbYfETeO4eA4KpRZGxo<7{w!BXD%2ePp*^CIbovU))^-D>t)kh8l~D4CC!<ltzBk
z=+O?$DyY3^-LU%GBAR8$a{5O`8FWTf#jUD2_~s&l((#l}s&)+*YH(8MRx<Hk-abdY
zW<@uJ2fY-K0rozXE7A4+`QY)0==>&ovV$ORy7xVv-jcZ4=?@#s&J8hMwsyA%l?@2a
zHX>fr2k{-gp*`)}^oma7rVnbLBonak*up83g-z;HAWf{r1nUUNbk}Y9;7!}>OLhvk
z2+X)RXN5#Z8|o6;!SK9diT3sO;c^s*gav9H5UB;^TalqQ?vImxgkPP|Kxxgf=M$u9
zG}_(PcNiUHJwT^(OGC!Q`W7=U>xCOFQg6=A*vDt;-O2L`WqDBun{x-flP*o(-^-Ip
zZLyX_)TQlF`11*8(+u}@W4l>eHBHUBEUy<R57ci#Ucu5oLUG4$gz7)g?yYDT`yy1#
z9rM2(kvEAfDTmiNUo8_pJ6$$8F+YVpid5ldNo;OWdwCm5b4G`fJjTnTmtIY4@)(y~
zZ?=4_Vg@8S50zUad|K+x8BZvkeENGrC-#-BtYyN|ccdA2K(vXlRhe8yAu@inVXp;s
zdEE#|mDZ@ya-r2diE%Ai_tvuO6l?3j47j?Je(pMwJS#^$7eWH=JA`h8Sw;}(u3FiW
z8b!x?2aIw)Wc!}hBPCw{$YE|t&Az9xc}A)6x~G3z6u#sfT~DyPpZuDa(|+)CKErr2
zpyETTGtOMd5ROKy!fW6V&adimd&@F!g39TXz*#mrlj@MGnQTg{zp&=1*+zG0UL|5R
z?H1x3i*3>e7KF?PeZwAU*KE(O5#j?zhFLkcovPcNRfe`myjlVWLbv(8%10Zl!f@-5
zKps<91Q{l=4zjxJUzK{(g|d?~HP#}`_DvY7v@_K}sgz{bHbQdLTJ1=r8P95dGtZ3J
zcq*QuK<A^QHcGf?axF9s`A^;iQPaTvI>J<TUB-VvUUo8#*&PB3X!~L1^6S#-d$|yi
zu|G}A5xX&v=k{f?$JZ6s<4Xag{z;wwz#*IHD;vj_>4$h8R){v^+=!J-A`5ybLw(|s
zkdq<K+ujI=?9D!D*3c%`7kmSodp@#kMe2utj!IBT!D|OD7J2N+lx@nroyG#YN1Wq1
zf!sQ0|EDbJ!b_+MUhqIdGo=Fmf0q1z#uCn}(-DcFt0QTdjLlGrGpXB_D{iulJJc3$
za*tfyvVC_eO>3CkQw0H@`o<6}qvEJ-CdS3&6P4>feag1hzicm$$TuJPr>$1sb#3LA
z#`u{Q{+RxtX@=XO(Wxu#eOZapYjFai1T5b7$^nLGXZR}O%kxrfr_UXa`TY0xQ7X@$
zr0hc-YMTaTc53qbk&0M|89`1ByE*9_Xf51T&{zgX%?Cy{VSd3jg>>qic1_5NBkuSY
zKU5fEH|w#%?L{(77I|c6%BIlUuN@Z;TnZa!1+OOrOX>CcTmNw_p2U|+E{r-m@=!DV
zp1>Xro<AiwNl5w&z*ki0@F4cR%?Z-Wf3~L`Y*ZQr9j!8g_S&jk@>Zr|&%SdGm26Fa
zaA28jFycSDF^%n0t-9&xbzg3OPxmXs_Cp_8{Tz$jrp<|ZO`^#qRoS!PRE%+oO&+>f
zQIIuiGc<pdNabdxTX?gUO?CYJJa+{erFW51Z{5nDzn%YS3Pbh0T>kNZRK*0Tl|#j-
zYs%GsAVKm~;NAU`BRsVF(REr9)>4`jp3%hpf(JFpaBES?Qf<svM32!qC1}xKy~;8B
zclnOR(dq#r+aZ;5w_RTID?^Qw1-k{Pvh88E{q{)vM!jI{#x-5P5cR?2w)|7^;-wzp
ztCT@V0>HMhh7#lReR9Jk?ZP#?eP?{cc@*u7n>@yS**(*;m1^?}u6e!q=$G)1FJc;#
z+g7KV>18}L@4TGMqW5&|r|O2LOhTatMzuTgismAE$NDxn690M(T4wU>?eY2Ofz8qB
zM;eL5sx~Vd$KsbMYiqL=U>CRPKap7bW2)C#O-`Z8+hX(6&6=X?CGhPI$$$mZ?Gd}=
zNqC5XF!K&Bv@-J(@6Uk>b1l!wqabPB=W{ZvJR-t|lc_wJ%gGlf(jRhWh;@?hMChyw
z%KJ;8^Ydkz<2`q(m#jvI4wDxIw6+)0{3O=S1StLcX@aQ4v<Zdd;4H7QrqEns#=trF
zD&Un{KXxa!L;qtsGyeT?L%v||oFk-$NVfS)L2zfwJW{SnjeXg)>B8ahk9l}BER_p)
zf1oELFQ0y|_X$8sm%?>V!z9m@R1@jEJ$aPL{OD?Ops=kBP|#@YR@c|uYR4^+=dq5t
zvMMo!wD$a^AGd<2Y8skNa@9Hwj@s5a(KQsTVo>Crv{|rs^UOx+HRU54F<>}F_YVxs
zN?gW-;~fjq0pMG_J}E)|ub=Pj1&CJHbQ=M!7JGUwq6XYLSpKdaZ6Z;-s>$u!%J>{c
zb=(y~a4xS@|K!+M9$z)y)jUYOzOJ|P=k>n9&lLaZL<ZwI>VCP{;!t8>M_`TJ<e>`!
zc(fD}OPPt%q3%(QQ$tGzrqN8w>YYA%|2f5}^0rA{Uy4fbxMN>3K(0agq$q0Lz9Ape
zHO6NSeUxXO9^2T}ti|m}{l*UnB{&pw&-P3OYZAXTS<@f$ePXpL$*g&Oni2HOC*G(M
zHt6@$Xq>4g%ao^_IYvzG!ez6BL7rg)CDeT@L2L=rWt>G5A`^J^SGy*7G6be-V^Z~h
zGM`uPat>piwzEz?s;ZROlGVzCfj45z#C}a;%fEk_X&7n`@YNb=l)L&B<}j%_RL67l
zRWjRjy5Y`{V6#vD-&^<UosvWB1xA()otKx=G&p8_wvd@BHLCuTSX6vT@i{&08$c3X
zDAu8AX6&UY%rZ%>Gm564!KCU7xPyW#**avc&DPUT!Kk)ib?sRli8?ravz6PMbUSNo
zd5A<n-ut@g!*n6r->1sU``fW)Fa5chFiv&$7zTNN*-p7N9LIe;sy3oxS3jL|OzaAO
z^xl3{`TO(vnyt~*UgaSO?LxR)oCb$02`7ewBEo!>2WIla$5C3`<7}yW!01d+n9d)#
zQGdMNC3*iLNP+itqqW@rQZqg&bvCUWK3|njZlm0FuGw`_Upz|0BSKdIZh!FpJ$gmz
z<}tY0rh|AH3wg#HD?c&pOKF5!ubjGKs<Pkt?(=S*mHO#BS?$i{>OZ;69C1hVyC;RK
z9b12RuUiQ_gf;zN?7d}dT}!tu7>CRpQ_LK5%nUKx+sw?&%$OKrwzrv?nVDl|+J<d!
zGc&W@KKJQKt$xz^ZlwOxtt-{fHENaStU2bYxvEC>Oe;*$&dqh|Yc4@r4v{U#&S0;&
zJm){UL)3d(y<-$W%B_%K!@EDFko*zq#@6?lQUq((pNu&f_{&oDYk^x0r>`bS9bM+r
z>@reW4UFs@V>FMKrg;4ArH+OuvM60rx{1o=J-wPSH8I>~Bkcv5$25InKu90+rOxcF
z*yo!B#1|N~xFp$HO|D%H&rd%}*;DT|U+(uH36|@)!RZ97gy9(Ht^f&O_l%xRsU=hr
z?GOu(xrdt#Bkq(37)-yBQv-)p|DE~j@&=k|jQxVl-2A7P1BxGU!8>+$Qfh_9L$FZN
zZ`Je+6F$2)wTvz>jKeVeO#(Lrt7-J~O;YG((^%aM9_mZJH%k&Zgks}UXx##lLLhUd
zW~=sysw)(*cqB_1;laeV-uQ57E{Z2u%H$-)7b#2{WhQhVUCB1@Vl))8uD9&3Jm0nA
zU>tGi05G@MxELh{t4!Kru1<Z0T_v2EyM4PttX_2i4VmMd`Qx-@%;L}ck{>5+Rvq_E
z8Uq1(-D?D;BaTl-=<jge-=GyC)E>`i;Lr1kuau}TVX*mhLvoz26-6nSn-2fPwSR(H
z4Twb~tMHNjX^z$2d)Bd6zfKj~T{fH0Us@17N0U)VwNeph%l~uvj5#mOgiIYdd$j88
z<NmoH`l@sBS(Q+w&s^KSw(dpd)4kwVTA+<PhoOyLIL-Nc!?gYwsc^&D<vOlDP4);C
z73yXBuYBlUqrNZDgml9K8(u&&)Gm#K2zx^Y*fAG6sTYk$T3Z!Qq?hC62s>@QQBSOX
z7wDv>QHx=BAl--H`DIxX&ZL7GjK>4Uvaf#{<q_v4Kb&$eFI-YKrG(9FQEBldOw(eA
z+t1|_`aYv?Nqs&OE~(Aey*reM(q+#wc~53%oZpe2+Mtq||ATat(~9jij{U~LLOL_c
zB6_EliIjzxZP$X&6}|w|o^+9fITJe;JIczo#=GL~bG=83#o0?zfowEWgvPtCUgec;
zPz&R)r5UN;lZ)UnCq6doeebVF*sSz@FZq?SxBdO8)Qt1Wm2$Zo#>p=;s5z6l(%@U2
z(nngnX%?{OZsr6@e%fvWEdshh{Dcu!SAoafHlr)xRB-$ZsiRLbOvqDHzd`SuZpDhG
zV&`S>jA~9l%<Q`#I=|5NG-2TX)&l4vnH$0sN1lW~yF!96TjmcL>F+UCv|Mc_X1?nn
z)(;}hj2El5B+SbXo3BXq=eyjV(C0JBuc41k{qy^9G-6o^OLy!Ey=<e|+M=s0*Hd>Z
z^v_jJ#n44}qV=yXo|*Zaty+u`0jaeTF3tJU+7@RCCadVKEaaqLmJ9XjdQdm%h2~Td
z%vO{2m5dp%R(6a#ghd_3G-Rd&O*H;X(DJ4^hqIsdhCnND<#!(|q-Gn1WUFqclX5~<
zofSQmzP>kIdDlDmM>(iPH<x7JSyx7O(M=CmJ6+|hyOeRv;+)F2p+uz=H*YoS^Qv?C
zAKMgT9kebO!r@W<@Y33M@ItGtH|aC%InE!t+&AW1@-XUm2-V03ef=}l`0v_N3J|22
z3ZYA^Pr19G%5^-1On@0#x1tmsneShBG96+LWSFD%l>JER4Kf2E>+ZUB`K|yaIwZGi
zq>W0-#>e8@C*!rreht;5U$i&44f);ef<Zo!e(1ivdGiO{&@gyz-3BCq#2wn<pq^gx
zJc(tD3||D}Jdyqw>a=Fi`@&g`{}t+UM2r{53qNhOZM<{ve%G6vco@>M{b(pp;`?ze
zN<C4whmX{cujY)nOs5KJIzdZGY2tAlY{0lm?Q^XY?cwV&(Df!18=2M72k@-@nLrV*
z6fuF{DgE4hS#!U$X@QUa^V2Ut(f@?{|35?h|CR85CG<3XPpIsC^GYK@0Y<42pnwf$
z6u=bstHKd@zoZvpVDTfcB`bm7;u-^k<`v7bl<+!#T9rn*jK(+2Iom8k<D(Fxa=29u
z07jjNQOb`j`c3#70q2R|HKTbKvRL!ueMl$RXFSbwyf*!m)3s;da<rM2NYaARQV^gd
zo=AT%7x~+!I7Y)w*lWbVDtL*LEn6HzKX$u0jBF^<j@W=mA1zChdLQk?ZPrRsGgN$m
zhz9tM3QeFvpi!$(6O<ncBVdQgbQEW_hvux1r&&O}Gz2pzAs;||<QND@T;LF|k-{pT
zp@Wqh5-9p2T9inCk`Ff&o3w{PUlayb_p=#-iKoXJiuJ>07>dRmvTJR^(Ab*ay#d>r
zYLW?KL?*4+rN<YOv04!0lw9g9ps+e{JD-a*;?b|vsF%R#mozOaz<X9}0-XbM!tmL8
z^4So8g<-vVkIN)m#bF0Z4m@Qv9?c{k`ydg&xq7zZK$}1k<v(<D^~@!6<Tyxvfz4!4
zEk!cq`wkKq#1h&YBqK_uu3GvMDr8zUbglRa>p&@UTM0j><`|_Sz+Dd9yn0am0{6TK
zcL;2%(v*%>TJNTxdXf{TAX)*JuGVfy0kA&c-Kv5F)=(|>9H)3mmF_`KXcLA|7MyD}
zJxvYP0UBrlCUJSZpeQel4(4$-C%%vic2eZH><|JtF54y%(6CZjFyglI4`^1!{^DZf
zo1$(quQW}rB%Wkc)JIQ)wLBtfBtJ$@>zK;+PJv9$DgZ1I)E=E+Cl+B9V3HPa4_0{_
zC3F{E8M&AI+b$t(afOv_62|J6MI`eWgm^sS`TYd?DH$Nord5RJ(3cg5ce5la?^CyR
z8oCSw6KU|s;H&J{1L^FBdbAX_$cCKPRdIvtsOyA_thDMJ13dz<u%KGVac)Qg0=@NB
z-Uit8=EL+>HPyOk?73nxiHb0|k>3hxJD3fl>oFuy*+BaB7-}*qljJuWepL^{2`wrj
z@sJ4G4rBo30F4GIJngB}lMofKR5{3~IRz~W-)vau0?Y%>E)reCk@ir8P0_iU2TA~z
zYd&F;a`$|y|83lRQfH(F!2LWlBZ66E^my}GEP!^RUp>fKgj=;pzAg;TH3pLg4g*b3
zcXp#%)iU-F4-GukPc>WI0}7xoH3O_C;;I7+lME?HHE_^~BrMk967fE;PfN*@mR9BM
z<!c_~{Nv|ag<Md9_ON`_cU&VzP!88Vkej+$2BRYO`>ST`JO=v`_Z+M-22)=`bDpNf
zE<LrjO>y90G?{Xd(I!1cgV6g8wD+@upZ9abi@r2!VO=N@V?-t|pWk*iB(?-#vC(_f
z8*YgbOEfNzpl?l&XwQBdFzqY~q{)fN%@I8?u+$)>rIkd(44wT(rXFJ&aV!TPENmbc
z=FIuo#t7%VAO<iG?$%-G;z+v`;Ec*PSC0j+$e>)5PJ@Rwcdz?8D?;Zq5~@Ub>NLXm
zTQu^A+pZ?tAbBf_&L2978dS7Ru6Qdgx2Yw4{cMsRz4@a=kNX5k8~u@48H|>q^a#sx
zdxpoHmM}lLFVuoSjAF9dllHQ~c03H|uAXJVf~FWr{RnE7KH4n0KwTT7C@cS2SeSSx
zd+s5*K*@6Wgmuw_d`;@bvame4!qB2v`wIBfBS4&s`aol7)hMz25TrQ$z{@^;X^7};
z6fiKI%Yuz~C4NH3%Od%c^^L_JOrhB5+p6&C)iVIZ0*yw|^u)c5N*3G2;~(@TE;b-E
zv~mkifuhu8viWB{8q4$t%Oj0SaNI{Ro}APwTMJErUe!GDWJ4VRs0pa~Rikud{lKH&
zroo3w7uXU&I>o?%;yn7PK_;sN+~!0;LZM4bUCWWuN78`6w!IBFSUIftEt%P3k^?->
z_@m#)ij`*oj22_Yk}y9BAbkU=(|y8{MEGIZNa#@@ot!y)7UnET50QI|c%me*YIP`(
z+PX64-AGl1=bHgtu%M=MMA=3(ti)!U6K#wCiRBwWfUql>Kuj%Mee8Eug}~M(nRYGI
zP%YF1^>m{>19&Ck+MCadpR{}6VJGR-*MLSv;}NvICe1OP%|`An$J667ixeT|3=O^7
zR>@8hev*;V2W2wkjkR#saKFf;uvS9DY$W^;9VE1m5?hKk9BA4GgWl>#U7_?YZ=6F$
z^ycimk%aq%Ls}_qrECRZkroZhC7qI5d*ZHxH-iK+sN^XeMt1yM;0u}RYcCszs`{Qt
zE9CsPRZuB_jK*PT^|gmcd5=VbS|TQ`hSjsSC0fmIrJ9twIcD=qM^TS+4e8dK>2lKl
z48k|oa?2}_;$~waB?XEE%#PbD3^~L7GAjD=SzX{RAFj04n7+QpNNm}GVMtNr@aM;(
zz;?SpatT!}K|c-g4Elzy#+)y2K?Bty4s@>9UZ!blf{Dh2T}UrNhFPikgtnv8k*}~&
z%^l~wZ{U1lpiN&Km}{V45!)7RBvRf|MFBp3YB3mL+1v_yU53{s!L}jZ?BSlTUk_=)
z3)msS_=gQ86!_y=3Ug#I<U6YlL&tz(1d(>q{_<gJs$PJ63YY6nb460;DG|^=@jG8K
z*t<8~lA{-(&Nk>GtnCSiK!~NT;pbK;86l=dW>T)BBNL*d9dZW6W27<YC#On;(<4QF
zaR)6R)yE<v8ob$Dy9%?o>JyuIM2>0^yspyvJMkbZV9q1?QB_McrNs0GOtVa*Q-}+2
z3&%8dwy(vB#tQh3-C>A+;eA*&ec~*@Km%)5P(O@VQ3McFFD??$?KAYAdqcCr692zu
zTtnEw?6)P6K;wWMIbtaNRYL~AFy^r((1w#5$<J8?o?Su0KuaO;i@JcOLvEEQMvGf$
zahP9pi%O7(M7l;(4|(gRC{%L0T<%^zCeRe4LUE{lwy54b(cw!EQfV}{r9At-L%>_Q
ze@m52SM@{86&M9NY(3<wH9zQ^)63=e9RPGjv1E&%DluE;R2Gn6e*<9T;BoTaXu1(b
zzaknAIp81iQ}O#><X0R<Uqhu4Kvr+ZAd3S3TjwN4G*ay2&>Ob|EONwKNm~kkgVQf(
zB_0apv9t=-;2={V!z%0hXN(D`j*=Lt2vjvZt)K%1?Eq=#WAY6nXS7_nU}5JTdX1u<
z&{=@~Bwc)&$nmT=mgc5thp{t#VAaSQ^BG(0zA;~#hH&7lx;$<tN|xx&xKAG)s{_1d
zflJ9`A84=%^z{~w;U8KOnId^(UP-1y$VljNDIzeiIZ(=8NeRwUDVxd!%9`rQfz;Co
zK2PQs8o?q}q6QYN(7~*D`>6kzLoQ5^jk@-KWsue?3FqU!9;@i3W<d?5LSVaNy3Ib?
zF_}dBkrK=qT_Twj2HUr_Xfk+3DyL)X3p!X!Z98~ReQvE9p2Ytm7L{z^F&K9?#00|~
zn>L$u7XP}|bRuQUB&?4_@Cb>a3idtGyT53=vVLgP-;jG(SNXqxpPZODeL`%o%m$-#
zeEX4CU0t1@pT8paR~^1RocPs0D=X{e`SFqyZv{*9mcmZ%MpRonea<2uN=_qGrf?J8
zt;Lq73gIut`PS{OgdZBg9=<@_nE(SWv0~gA3MM9~{OuK~T~m{j0;aZ;@2))BD=Sak
zr~SEL{NDXVyCU-kfj|WX6vMk&jvRu5f-MuyohQuRH%IC|j&L>XEyzr?zy78}CqgK$
zil5U2gM9e{awNjHoCp0Mk!lyE>}OIH?QTSG#|ZzjKN=`W&#WzIhwc!Rm90`-bdEok
zdM#8=NuQul-u?HRKLJtJ%>E!erJz%6tBuqehwBO6r{m4d8R_g^+P|>Zn{lt+LCN^6
z3IDcnn2&(P<A1p${p7u9oan5$_Z|N4{K_lf7fZ;2nv=ThZ1`S`T?C=_?<U;j01T0T
zZj|)5pbvlZ;>pK<V7Fs9B%lBL282S{GyE9cH8nu-r5Eb2VBY`09(NE>|7spxF}@dH
z+cQKDUH`lJ%=Zt>+cD_(k9Qvh{@d*V8;Z>Csv5S>?!S+Dd(wmOA6N&c(4W6@oOk#;
zG>(Ub00WM{g0)Az!8}&ehz<T~=JScZgT?c<5@f{tD;PxV4c2Zuj>7mi;UPds>i02{
zk1ZP;>91g?|G*&ZroXZO!fOIqQK$m%#Rya75TO4GcKZ+PG?iKSuZZ}6!tMV^1XuqP
zZvPK1^#A`zxUGR71#L(TQtR`MwkmQ`+A(%gc526Jj5>dG`=}zo;&an_El>WI)5aZc
zZ#mS;-``638T%N;N?5w<59scG=_UCo)`y&ugo29UR?X~Owo{|1!oA`1%i!VAlhx{@
zFC&cF*OF3MO{0m9ZpNu~J}lDDvV3#}LXXG<6<jnDK0ZIzt4Rl<es>rdTz+9#N`uuZ
zIh2g7x#?OeRJB2biObXPblb^B@ZBA>hyG8w&8`^rEuCvwTOSX_Ql_S+1|t&^eEoVr
zu)bJp3IG67Q&LDsNud$HenCN5qyLqV$>h%$+oiwqEWIA9J3rehT~It!Q&>Xf>H3M>
zakQChzq0`60VFi}@Ep03$fknPf~aM|rKvVo*O3+K(cg#cewBD`Ux(@zQ&Es>?CM1%
zCRlrR0o>nY&>_QueYc!J>7U@+dG_cW??UR2!_daUu*Gw%4Rf7PGe(o)*{Nko{hf4w
z`nNRhmjei_R_LK*NW*rk?{*6LkX1qs0^=Y=u4)baKd>3S{QF=e{G}>=At9k(zZobf
zc1-yn)xErU8tdxn%5*zBnwl0YwpZH$iP|pe8X8}R?j8+k1oR$@RUd@k2VY-h>Mq8v
z%${gvjJ&iEdHRkGgo%pQ(|~C{jyn75)HAeJJgeQtDJ`EroqO7**r__$Jx;F>uhT@n
zJHI?cdaPQUhn+;linR30yqs4V*=f{$Zcw>Mq{V!m?dwb?$b)e?H68Kao@k$-A}`5(
zS7w7DT3O_-tBS?_bl|Pa0sQrzxl*EOVXBM&Kcxsi)%R?v$Gyn>w6spoeb48c1M_9-
z%&sTPd3kyL{r#>G_h6*mNsasS0m4SxRUJ7wyTkHEg@)h;`0GqssNM8QosjOD9mM&g
z2z#L(G{o+y=SNmnwi#UI8#71lgAyALcDKu?1s(p2g4oyFz9+hIMa&Z9hs7!=MtvXP
zqJm4Ak9Xj6JUUXcqpi<V`kd)BuLQ?SPx99jj}K6+%z~{&$1(Fya$4ibU-U^eJS}L+
zIbWwuY=z155aMLgr^SePYYI))dhW~(wY9OKwd)=Bz<69fLLCN`xP&3|7vJII{w@EX
z&5-JqE}qYgi%LKitgNr4+YSzzUaW<xFnu1!kWJNod}XrNPzb274y3=*u!QSeyca61
z^tn=2G^9_C5ED~U5ZK7OYMOL;nemWbk4)!hkp!MrN$j5=!#0L}V`rb|_54-O(YV=i
zSOIQvrfJvi%cbI~+suvPYk7TnbmppzH73;lRQ}VChC)U<^vtZVlI_Ci-eYOyHoj88
z+sth%s|Z_&dqUK9ebYRvo!rGU4TBr0J%{rr2`SzB6wa@D*+uQzJjDV-TOXx1ojm)v
z_?PnU2N`*gwiyfVXR+NQM8l_ON?!u*>3f>H*Oa$A-U`l;xo3ZQsQ5Oy&gLpo?0e4P
zk*cAX#rm~C%levt<Bl@MyWD;6RuK$sU-<S3=&L*kK1!uJ;K2&+&+CTNI}?y)!~Gjq
zw5R#i-=wx#8^qQQvfr%Z*jpnOSFdeKyGPzSiYpvc)t!j1Rm~BMgBxOdIPChXwu0^&
zHuk&uSg9}9$ZPTCSqT`ZD(k0S<i)MLq<mRRb8pVr!7jsEW2)g%$h?&iucTs;R*N<H
z5&jBD1G|~Nkf3+Y@-|{JGUE(B=kT@$22LKARhb&^gOg}&?eLD*hg?^=*-wB&-z+FK
zPFFViFd-uJ`vfCcnzL6C;iY2y%rjJ;zYGb@@Sa-5C|7U`B8{#KLYWV=PfL$qp1M4w
zXB|xnUN%8)iARVBw}=QYi=*ebSV)M<fpneERb>M*RB|ghpWl1O3oKj>4MO%xV?AT~
z=j_%Fy@C(pO2vY8^S-TN{wvX}p%JZ-ezMFdTB)uTbv)EzJ%*6iuotO5lB&6`S2TVL
zCU)ax$T=*S5SuyY)=f8Ai1*}s-pggR<kP6#R0{*uRaX8g%}kliK0X!pzCBq<kG`RA
z@qK*(shqYp{cJXIf<#;w6ELbDhnL)}9boa7S%?*3Iq8P4mg)-7?gSl^Y)ef~be2SH
z8oWPkvAzrT<<**iq^8PBOh?0GOUR~JaGgKB)b^|^s}{bnNyny<aK(l4QQV}bezkp4
zbI(=i3whpYI&bH{7snyw`yoJVCoe<Y^i3unb+eWMt;*_Il^}|SdQ)T5{k6B6futwt
z-@g6VD8>DN<YmC?H3-usLS-<*?CFxh18mMZ@u6VP9{I<(PBgr%6F>0n%l7fsrR?n4
z=bOE$Tu2MooXjF_e0;o6&=m;(Nan4^(DSfW_K82rvYtxpqOn243KVoe%FX7hJZxK7
zO)$DB@2r}VZF$3hO6Pp9LjvVYk3dKz{w*M|p>_&GKdF@eiGtEg4VQX!8YM~sK?N{0
zwbZjI9Ul=#HYJO-W{Ou76^0lFZ_OQiv|M~J6D-Su$8B7}>nO8(Sa@0qe>pEA5={2z
zW2++H+o8M~Q@KwcKOGzgrCJ=^5LD3d8pq6Rcs+;96H`^A3JI<#=l`TLK2WV(zc4MR
zk8kgG`%E#g`j{DO%Y{T!ZAH@<e*5$}83d;&-BDazGL9-bE8sniv3`z<zm#jk%8nHW
zN>E}O`S|{+N9Y%@0(;?ywr5&72LJ39p>>f34*<of<E4M$%>G<|32Wo`;)z|Kisy!z
zySll^_I^UGDLH>9)CUrT7{*`0h!F@Dwz{*^aw;Bqb!{87=EH-Rm+)|*ObBd9geC~8
zSm}k|j|im2N=qyT^UK(X$jH7MMcbdr8RoSD07BNxl>uvKMBF<G2Q^PZB44V~@;0%)
zux^D0tiw*N<EOlr=IN>WlBJeFi%9<IKG3+}!NYRH*|9R*rP`cRUO~%i3!2l$z3W5H
z2D+kXe_#`IdCNYT4gg?X>va=hD_{o`rNX*hw5ah_CbJqn#_LzFke1+VXd}xkFsstm
zv0cQxfn}bBC9Rs0vZZ;?s3=q-Q8swy-M*Vhb8abJA*}(Yyo#2VN7+uCp$xPrA`X|A
znwHV;F#AVqF-n>ESQf>jp`649`VafdaFnMcO4VO*OGe=0MNY6-^ajti;!s789p@A*
zsk!8|RNN(XLVsLMBFTtL{&vwsN|{4LvGM(mTOuungcY{yttY%Zi3*W>J2ITz{78sc
zKC|?!%Ymt?*Ut*OL@@jB>t&ykk4KBRH{GWTDlDY*bEMFv=Bs?Ac{36!?yd65=iioZ
zzj`B>12SYT`RI{bD<FZ~OEYGjT+}NW%OU8LZv}wQWZHv%zvbpX;2Ri(OB8Q9>Uij<
z@&@NR-4Z*dbQ@v{;3hB>SJ=Gi#c~Q>SEaT*D3r2HXCSPTzgvle)n7eo{J3wWFquWe
zGn&e2>fK%2ipx_H927{`Zf@ie4h?M#4bah2trmNszH-|Cneal*dI)zcQ|Ek~3g(R8
z0&&j}vZVQJpWa)Rj5pIzM&Lc{rW&#`2oT5g%ewx4w%CUx_rG&xMW%b1>EBy@TC&#)
z$xk+z>lcCpt*n0GyLXP*3_!zz_jsPx4Ilkl!J9Lr-s9ylRv1_rS5%wrgaz<;CbYqE
ztgk4ieJ5e@>|?pUshi<+-SG<z^f1;!y`CLzHk@>Lr0h*}Tdr(5GL~_j({H@uXqqrn
zP))7Y>VE8by1P?~n4+OK+XOyszLb<rDQG`@>F`Krk5bS(YJ<iy{$tsAtO;V!Ofi%#
zlhCbkcv;Imt#Bisi1nGx0~2b#Nn90&3@X;=yDd(~r&Y&x>@i%5-4hPGn~L1H5SOHS
z<x=?fI()nBouA)n&KV{?@3L2ST}@_HX>A@C<%()FUa1iSDGx9C?}zE6@P{5Z#q}K~
zln-uq^<qA6%jPcQbAQnQJ?ooS0RA|;Pw*uSJZoU3BhQh4vj@W#x}+z3;Cxk!Z(kvo
z3U00naDVHWkwif)kp@4NBbCZ^s@5{l;2{TVC+gtO!5&lec%_}YxIv65tvcs~+{4ZA
zd}Ay9g_Q){h{n~bdTvjCLQQ>TM~3E+I6Jywp5$zvdlc>9WSd-`aqq=|n@G&f>yyhM
z|I3p`2Q=@rl)Br5VAMnzsH4zhg6FGD2B5*pfi|fK2c4J9n-g~P^S`IK!XE-FL3Nnc
zbhQQj?hDm%p^e96UvG{O?`LpvQk&0}R*Hj6!lW<Gkzruq4hS*VpM#IsETxr|t%YjG
z1}Hf=mi2yTNq06hK9gB)o>MRKeL}%w8bm=~r&4R&vtlbXx{Pt+vjJJFgeoQ6+V96I
z7Y&FmQr{4?!nRbO0;Um%8XJZ?lM)zk`*LG3w0IX9N33^JN)+qI#@JG2?Zn;03=5z>
zLqmW5oHCYi`*Xo@V8s6ew2Qz3LDig=va)%m@DM*4?XVt<(~e0kD&~*=m68ZhNR%w@
z`<l>|-&*<?5v&6=vTV_jQNDI}0z$&Rr|4kF*R|ryjSNG@=V8{4JNC8V^qtz*ywV^W
zO;zef7H%J^iv45bIY>s=lx%G~xX#FW@$qsqZ3aJWhtx;o;5Bt;HV2Yqnc=nns8y+J
ztl+J^GOet+Gn#S+K7UrG+h4w!Xn1w$Op(vtS117`Z2PWSJYOrb<IIWBLfW@<9gl`O
z6L+X<=raR9<<~;YR@_#<$8=0;Xt(OX?30-2WG{UgBcQRLp|I%)brgQM=i=`I9$(Q^
zo~UoyZ^l})veLb-wfYv4mnY#IcNl0`My}k>ZwN-|6jvATFLqkr4^B>K^7D$Gww<q}
zDnlM7%2ySdUhHN}Z~I)gZ~<ymBkuRjRueebw2IB9E47}(1iJTfX#i>fU}z+YKlAk2
z5~S5^I#=s?aq8pI9cQ*4+0lK|@pxtFeslFvx>RvatK;T=V4UwIag@V(@qr5BOxf7^
z^z;ZJsaSq_F{B*zbth4rb7DGn+1vy?-t**Vzbz#fM^v}m!pgZk7f&7IHp!L|l5fjA
zttW2PM=}Set<nJ6y`@iqai8~==VN+nD>Gr1S4*R{LAHKm?wJ(pIhNTi_I4~zlf|^w
z%<Yd?wbtdoTQ=%xd^&kAU-BLMOJt1(D8}DzC&$fpP1AT26D$>IY3dm&Rofa9>(IFI
zYDlbCX|&n43>xsQer}G3Wd5uNSmwt^8Gl2LAXAA`YCO5^y#1~wrfB?9VoFG*ad-7Z
zQ$JDW>MkZb!TU8uPG+mZ5hcZ`R~g?M!unA3^Z%#;{om`eSMu-ILqv-Qm1rcC!EhEE
z3fdFI(PhS9WVRv0c^t~9Iven={^^*C?oA*6Yx9f|mSay|X3}*jE(Lb_5}D;oVx~`m
z>!kamQli)Ka(K7Sja`|tuJ6OSDzvtiC(FrE3Eyiz2I15K*-+D2NMH)D^3c_GY3aq$
z=WBFAO^07DsSRhk3>Ax%QGL-JXZ|>%j*A7`rHw<4^R!+>$D=eOtF^ds5!3aKV{n}9
zB0vhr`2ym3N%FhZ1Yjk<`)MhOXW_T2{YLtvn61z1S2XcH&ku;WY_$BV;GH0nd4E}7
z-`5d_&Nl5I{KXyvyUn;RDQV=+A+e@o<5GxqjUX(a4uc5qCYwn$%T?$Rekvd(8_)Ae
zu<0MpRE3jKa-^X3edHBJqfM}7Xc|_e&mJrMNfVdg%61Kniyq?a(c{^+EK&__;(m1A
z!-TFzb*w2pkN18rvzxG_ln%f5`+%%@TI9;%L^Uy7@Ij(l9zpL^;Mmt3m)XSU@0RzG
ztgW&cOpXOVm*!-~Tppq(T8(V)v@r<nZ|{EKeC98=xp~k&j4Z9yY35%g_arqJUr1v_
zt=$mn4@rY>eF-CsZy{jNx7BUe8H2ze&P?Dio5{36sG#!?_ELH+e*P}5()eSDr~ey`
z9lz-ALGB<(^CoEaX&6wkh`YJbV}p-wubecqaC`Kv&9?pdQT}km%b^-@6Ex0XxJA_3
z($WIQo6casZs=~B?|2i$X9g0-`8kvMyCk#~l%#aB^p0mvQxeo{WGmcP5RS`EPfiTF
z_h!DIXs=FoXq_D~@pwi}Jc_6au#aV8npR9xZmjg7p3fTxT)Un&y@6sh9>^~C%P5UI
zGd9n|-!zgeZbbEzdh(nUWKdRF90Il%50TuJlzVU0XqN5@Ja2;Le$)~_O6<OMsph#1
zE0Z-m&-?tK0#!2NmJW&?P~)E3V<yU@GtWq+4?gIti%P`m<oGl9iCDSwk$e6KQR5d&
zDXjdsnWK)U$1zmY$x;dj!z=xTnHYG%m}s}NhbsJd(c&gZP^h(kMAf{8y~jXtnwg0r
z|BuCHV(9#frsH(fE(Qj6yn(Ne7D0QPvaGS|2JFF<m{552`Xsw29y{!O_&kL)EUMDK
ztw`Q|^hx>nQ%sg{g8ztqsb&6|vf}zvB%Swjl0<J0&-42>pVcrL70+P^QHC`4eEEZ&
zZbXpP=6q>__f|^#k7v-YREVd$bB3rwF&k!u#!ZRl&FAake%-P22SYpcPT!^)UJEWa
zDQ=F#7z1P1ntgHi+zr4>8NX5&?5CD<L&G|J)6{V@TkV5`N}*$X_flP#5lB{KK^rTB
zueHOtwmoCsawGw-Msdcxse?n!Au4Ick@E5KT0;8|2T+c6Cao`P@NKS8ZV-n{Nvg|9
zC7PyJ=-XLQ`Zwp0?H9_P0o#An@Bs};3)oJ#6SZsEi#m(1N)uP_mO|tQKmx)Rq9rx4
z9hdF(#$VCNISDyx*vY&>`159sF>!mmK1*;eiFUz0cNi8Pkz$L0j_OjdU*d4r!&sC3
z-9aaTieh*fU1iyXuW`E(!i+55SC8$gvpeGF+^dX^JQksabVoT}kRZ?|ozp{KL)eex
ztTiRp_nC-alQYZUejvC~J<dp1X~)+m+b2dlKH;hrXDT~|EO)r4=k;<ORtzGlc#K-h
z0s&LQ<6eQD@?x?h_wUNf-N(3Fb&Bosvddm}?w;1|@uC*Xd`hLHtsJ2>LpqNqPT5a%
zbB7YXvisaACinXfe;c1o)4KlA!I740=h{7BNNN*`I<m9u%SR{IfIB4H>1iv~?mhZ$
zYDLNMBEt2emi0#aC)MN5BRfVF@XJ*&x0q?kX+!pH$(QBV{9kt7L+kVK(0oZ-5m~Y8
zhR_^=GByaf?7NMf<KbUA7ZYj8Q&)Xoo{y0NpOy_qu23aU{e3&~aU$b<9)Zm>oAEM3
z3f_Cqsw!5hGBs+CpogJ}(dt*>4wu~T-y~p@Z&y7x7f=F;IZODW+pUZvH!G!AIxZ48
zbygA3;ybotn$OomWi_u`Fh)Qa+)9q~r%&53*LP3@C`*suAd0l8Y>T2w9-yn)ypO$p
zdfowTZc?1K7Dzk4+r5XLXEysX7~6R^o-r)(vqn8teC>$L`P$b7fi2;U?c&^Xr<vyq
zmWp)cFCB%e9j~{M-+Gx|cB9yl&FU!&?}iZ=oQhtO0lKXP^>g#9je5s3G>*rB?lG!+
z-neJUjFzhWh49wXPIt+s8Zt9t@4I0*dk!(<li@Tf8s>=MJR0n!Bo2wR+rFNTjbz2R
zb}tu<!9dORtM};vW%<ZPA~eB(B(~1yvYqpo56HN#ucWS#%4C>oQnvi}M=pW8<GkDI
z=cH}nQIOt?!Ry={jA;eyMbLbPCf)ecp!#|DA9i2EtDG|H4)LfU<J|`>BvM*$lQirg
zHm3iy8q4`u)?H1td7auY)uA~T`RkgQ;u{sR3jxSmGyd&14T_J1cm0UK`w>?@`G%vb
zq5YYDimxB?c1lR^b-j)G`vieVHV{i0XFNAK;N^`fMW3kK#x+iC#CiwfKv>60(k^*v
z_D*l&{I{<UA@e$^JS;W!pgLw(A^CEvLJM$;Y!Gcm`o@>K4L^rZ2K|KxfMfqJ7|KTd
zecUZp%E6^u)W_Ev`Aa~<2r7x;6R&6FPi^Owgt2=ba384x!r$(C*}`3rt7|O+(H8=w
z2nikf*)3Xj?hsM^#-n)*m((`1)|Q00`5r9@abFJjJ!eiOEpIzPloS*)N#FJ7E3|tw
zu&7Z{QInIC)8%GyrcGr4;jsL<{!($P4@QH)MJk28BJ+M(wuN28+wtjQ_HR7LNM8ZS
zTqeWc?eh|0&%cDwb9#TKOI-sU;OmyHsu~9?UC+5H?<*oA6mMD*8Qk#JB3G_`GJnt;
zi_CW!->G3(1)F5rN=Rn3>-_}RX-u?`=ZZJ<r{r?8z0g#~QA)cWv)HzZXY@NsG!&bX
zX#v;k3FB-7&ab%{Ty-@HS_+O<FaZ2dF9leQTJ>Isg#0u^++HmZZ<(QA*INfG2MoKX
z8Ql9nq~F*VS{UKs*gJP1MD4%=f45gH_2xn{tAbeQmE)gE;8G3{n1NeqGwktF%`p@x
z;@j{|#K?Bg$LptUyXBR#!<f&UCX2hlL1RGYVX54g`$%66OUP1oB(I_9!LYi;&FAFo
zYW^m(;a{KUHo`auW@Epnlt5_Zk-3|18zfxc(v-NE>>fe;g$j9~WPJ~-=8B~*jW1PR
zRwAMFjFD}0!08@U?)*dqriLY3JiPhTUa<kE2DQ$2)cP|5>zmIZj{~y0RUC>>Wt|si
zQ<%Z1BiX*^32o1OhEo^!DMyIv%npBkQYOGi7dx!J>E9IPm;8w___2@M$dIua*Zu=7
zCU@tFLWq~H@6g0kY3IUpr*siFZy!Cm{x0TYD|$1ByGA<Q)Iv;X^39*!_Ol)4%UUMU
zK3r1L-d|?;i^CujESjb2Fda9+*!CY|FQiPEZB^pWiZQoS^DYY7eWh+KcA0!m32|Gw
zgk+NskNe(RqW3_;I2)Kbn@pV(Od<&U#zEY2f|2Egfx-^&%O4(APaz6iPJ<U_2BTsc
ziD8}AmCZ!-{5Lgpj+*aoOF1H8nBdn&vngPi8#!(cev|emhiny&z{Kyn&2KtFh!)>v
zI=v%52a@IUybP@VK0<UCc<FB?NTyU>YJR`_yq-+^=I)T-0crOQhOjwG@uk`q?rRj%
z${Tu6?v&h_?EpHC+jDq~POlL3zy2cWl8xzFRLPvIj*Ym<*6ai;@BHx_UtNo^)pjWP
zVJgpl`Gv}|?}sPJr{~7YMP#~UZc;i3wjoQuY?H@LF0$6?9aUSrFDW3kkQ}#xGw*sx
zU6#*FQ$tcqDxA^0Cp=J=$0g$C6J_Xq34SI`r3Q}2?KC;Nlr(wZU0fZQz{kO*WOJbR
zk?*lYC&u*^FM%r**An?l$S=0CfvBXT@-}kMyGh1uHOGaRPE<bXMejnj3q~#P-XmNl
z=9yT0%G|<LPFv9(ME237EHXbB08sy;T$blMI~_S+KT52iz)8~4Ug<YmQaxo|;I~^6
zYRMy2b5Aa%+w1FeZddwa8)xy9fF4S|t3Mx@De|yah}e%GNp$;nnLSzzztnT%1B4iD
zXcnq74~J$H@D(es++SIiYwlom*ck1LYYE+0Rv1gC?YCKejhFjR&VH(mT}-cc>K$;H
z99UJAahW2Y$T)lf5^-G`uBH^$&DR*q@?MX^I}st6!b-GQV)3OMB;2ff%O#r0R?4ms
zRb;CoXm&dF5cZEy!nt*nC0sw!B=}UBf@&%=v~+d$+Y~jbZ}$j9=vesH38GAS_DD`}
z7|_1cf~k+ddvqWZ5qr>`cvR~}%m?tQnzn~xk3e7K!@f|Z0V=`VPKw6$M<j^{`Qtr>
zax2wh>{cV}i&iQb23I+$hgFZ=L9%VplDqX03$ba@#aoQ0e2MgclZthMPL-d8ZI(^J
zr_vJCV0*VP0~b(P%qH))djJJFU6d-vZ2A&7yHWzI9yVB5w5+&x_aV0l$R8||mV$zj
z8Xb*-i-DUrx*T$x`iJ5A!vI~HDZjN~Df#^K=B^QpWc=gsF%I5X1WBdAa-F=xjvp8U
z6=M^$v-JHm12_JZOFB_jOSI*z$oy1^)n#0<bI8tJP)gUAcAC9^rCl!$(756=Si}iG
zKn0<3-5Q~7{oSZ|?jo-y^-HKzOwiexI=SOnik6Iu?XUwO%2YPch)yT(g`8ph<tE?~
z3mv(8=8t@otoT*Y+fDBauk02|Vl(V5e6Cn#fr<@F&$lKm-jol>xY<B#*IT+1O4+-B
zfg&^=Off4EDUMBH(qPRG(i81C`nVgfm-6Rq3`7EIti!2q;Iu;yQ!<Nw;cIMEWYiqk
z|4=p(@1n-(m)dx)E5YZ+4_*NONOC#e(EWisP2ss5uV^1gNhw<7s&t8iU2OG9qRm{T
zUe!G;kmc&889mLl<3ZPZ*E%KBr?xm{OgF)S&U?Mw-e2R9uekQqp^c%pg<<vCnIP0^
zZ96yEp?yEvO?kMOG&tVpzP5NRx<=WI+iNnWhsozkuRI)}JtPq`o+j@zbxe{C$Ve=<
z2~aTAds0SEuDSjrQN6vFv+Z@byUT71;c17=m=xCLJ+2tP{T1GfV0WQ-72<!az}4E3
z3pyI?Gh6C-<#2}$&)ge~iVnR=Fb~q_Z2{Y>1=?TycEJq$&E|e%Jsw>6v0yB1uzee&
z4FkN-iW1|YsFL$*p*u>)XaAlZ?{U0kE6`Cf@UVeeMdk>V<ZUgbjRqyGYFqNnbH1I*
zM7H|i!F2p<X0kaQ^V|^?*Zp;O3$OIS5Q;|N@=AVlYZPzm*>EN&<bwl!ry4J4J+k;$
zUC+|P-YCr~z$T74L1Q8ixuNh&0Fq9-kzTBb%a_U3{nEi~vx>)E*Wu<@4b7z%NHoDF
zX9NYAU)#bAD@&#Bxg+>#_UoZhd;Q+;2j%Ov(S>)m5B@>W{dn$X{HIEp%&c{iF<1DL
zExUf0>0sCTDooV&F1tIC@kjKC>E;@Tb>1z|`N_Tw($rNZZa&(}G=FPx5hL$dX`TVM
z*}`wN;^pe#j8=zYs?8hsc^Q_V(xaz{8A4B!7Ltj~hK*-2;gRrUs+<!A9Q#W}Uu;(?
z0(VPGGpnj)T%T=bUkM97Qd8#72xrm1i0k95M^{Jz4fcV?QY>7rpOgZwyW=$Vb;Yea
zeMH{)HO+Ci{$LG%g-tPJ(=vLTCyAAONjprlBF*u+g!dGD=nO_qYjW^#N<8ymUM)Y?
z)`Z=~0g9w?iv-o|c=&EhPZnuT=c;f)@(e1<8pVeJLc$+2C}f;mvZs}au#5r~+p6co
z^XiXWL<T9dl^rfIL}g{8JBj(EN~{jSEJqLf1n9;_rNp@=;jtHZvPAjX_2)>W>Q4r|
zU*~ka_r;69x(cO$KhTH;!T*QAk;(FXpWa;^;^I~YZLaDQM5>x&0!D&dP01$fU4@Hd
zy{^T|Dl`N|nJ^Dq*pzWQTkZBc)2F)8IY+XDoP{XzJPD{{vC}EP#%#9JxY&Z0(A#1w
z0C=F)X|>gy=c$sYPFbm>KO2F;k+Q6AA(NCQQaK$;KFETK-7zU&?%#d3+}D3>LWr$J
zqXum!lO3*yic-Zjz*#E?rUhmJ2vBF%70GzAr=oBU(-3|Lc0h$nAkxVWr!<_Mowc5J
zJlgs`YC6_(Kncto=MOL9=88q#OrI7na=6C@w}nkoF$bN1iB5}D@Of=w4ZQMx5A6s2
za=%zUfvCsf?23mJF+c`p%4O3Jj7_Ik%<uMuRTDd2B3V8_msFHNWx_VDs6Wk?iqr^M
zmK%cAGp|!q+fKL+uh#XsApEYv=Jjl>tRXy+-nc4+e0+~ni^cev9Jf<CR|y@!u5Kc4
zCwo=lnOEBss&qz88KpTa{NhCooy-wvlcFj*U$uJAE@0ic|Lm-WGJ~n!LS;0pHP3pD
z{roOF(ImeB+eXu%xwrO6bxQ#uHE!7O;e6|Z@)k>G_S7>sFw9sMJ7#XS49UYi_SE<*
zK)WboCS04pAfkH4GpIiR@F-gqbsEJY*$dmpd2JpIqm64hbXx+e&rspI=xxoKj<$uX
z^H{d#AhFC9mEV0X_ERHFHa#ZK1)U==JGM}gGx8&nI?e5~spD#5PmTgw>_A>P9+y`V
zTe6V7NiipR&4hvi{cVTu0lHCm;j>BM2>-V~y1Dx1<{a9Jip~drs^MmkMWAoLaI+Pr
zJEhsa-weMoLfKVmY-Rh_I`no`#=fe@-TMY50<6t3-NzG+5AEEeo63m{DN)MPTEecd
zl~q%@@nNVX(zVfOz$G>DE3O!cVg(%}^cdOauj_3UJhIE~P)AJBm%8g;TxWml6Ugqv
zPKMPJ;^OYBlg%2|`k}JfBo)r0<nuq2gctD+!vlqD%BK%6-0cY>5`eaE!tH|r;fyi#
zjO+jYul?P}qmNF81qC)5wNVG$4H#opr^A}kp7@mvj8b^}EfW<6v5xFkCW;bMF{H-9
zfG8E^Igdr08iG;>s{=#;Ue1A~MKu*^o;UYgP=ZM?mF3g{#?7%?{X{WnS(w{fr&1qX
zOkAX95%`lS1dZbxpf{rv)yI8fF9yotJ@mFq+<akPfJSNPw$i7EnCqme3UK4iO(fQ@
z+@&SGy(WAh9*fyzrSJ2h%(mUr2399Fw~JL_TL3bn+o%joSY91;a_F@h`EyXljbeoP
z%#}N#yiUON8htF?T!*IF$SOSpK?_A8rwq?JxIt2z#aOz|(b*mmdxtmrdZY9ZZwU7a
zGqCIvdRylQa<8Yitt}pRKPsCcb@!RRt0uri{h1Egi~gv#hYJ@{8&d(S>Q)+XHx}b^
zWNX1}XcG;>)vJ_*N52IXhf?)JSgz*mX?8;Ji}@1Is`#d==>*DjzR;oO2%M}}vTpmc
znPPULA^#E#H#JX|qT}RJNkJKYHsT%4>>2pX;MAhLjBUhJxK8rH|5-@;s^_7xHr$yc
zSlGgRTMB**UaRLPSQP8)x=%~6s5Y?SsB&o<@~%kN>av0E5S{ng_oVXv*)p=+KG;s%
z_{HVHx55h-JAq06z?qqOgLJMA-Z`M!KBMz~>4sWe3fjeXrTI{ADrT4~26rkla*qH7
zXXhNO0^`(-#wz08m=p`^PWQW%gP~Dv*{$-7z+?W*qj4#M7mIVYDEk*!h8spMF>||Y
zCLHAp1G=kD(>U^=d$}E_O(SCqVn0dos+~<b1b1o77w!z5Szg_%Oy5cz_w}n|%I^#h
z7Ax+~h0#rTz{GE?ZVy5xkN;R?d>EJ^#(n&j*sW1lKbrEjFcz-i*!atkV%)r$o1miZ
z-L|IX#UGhwN>rO#7UeKH<-%7JdL=LK^al1ZN*XRb6_5=V7{n&<s^oc;{lB#U7L0Q1
zX87thsLgx2N=TIoEf>zdrT@se`pCtV)0QPD30qFhVRf3FndQm>?~k!Od<JE0h0`R_
zI4{77=Y=E&2y;XASH&NOV6)q#&D${GcOOg`q?14OWkU^LT@kKxREjViQx~&S1WN8q
zuZ$}3S0At5a3_O;1MWCjn^v9N5$^&Jvz~RUeNql_$%Z^-A`=PsKL>qf#(Ggb1kl{A
z@N?fL>UuX{Ru-&~b_8gqWmEt-WEip+$3rR+bqOaJNMcx>Uq}ZK9#<KK_<UR+!;FU+
zk&Oq!%KKyZ#)AKJqbOfY(HfY0+V9UUYdCHsH^MpgB_=6SuE>dpa?jIm>mUf2n>{k`
zgrb<=N+c|5Lx`ktCL7xJta){OW=e7+!Br!USctiCaI9gyFD017M>??B*jzGPEn;AO
zOHPu>{ih`z2?Eh#<@prrS{=7Fqvx_85Jza`?ZIkC9Zf!$nFnXxt!+>7g75R&yXCpB
zlt%O#Jf?9^>4v4$=mSP^zN=)$#hQmD%9X5|*N{$n&#_oam25{19^rMPigqeHw3FqC
z!lCLprQhc+3mV&?Q{0`1tWLx9ey~0kmR8lSkTSFXUA_<`c#DveHsPgsUAb%Kk2}VR
znb^FamLCRW>Rl@dJCTE&=c@xsENZ--88iA(4$oJ_Pq=ZFQJK2DEi^D$|9)!W44rt*
zFfFA-m$Va@XQBDSTgze-^sDXJ+G_I&@$lSMwQNWcW*?n0QW_f#1C{X`t&?7n?SARV
zYVI=3_5r_<TT@*n$mh_#G-qz3?iveQ1n#EXab@z*G~(RWdBwz)%&V^9K~$JZhsXPX
zUKYQEdFWJ>>LFY7g7q9z^6sqLABg<C>s?$TX+ce89)}i*$Fg{hE`~F=A|s0lwzbS(
z?a-a1VPXP0a*XaYutC?>)bvLYu6~*ryVlW}GC);FF%ak5ER<cog2-IdoPu+7$?{n-
zkGI|NxvUKyD|t}5-B;kS&=geX{q7Hym+C2%x65C+&O=IDnaZ;bfr#A4mErP@2ea=y
z6~`_W=K-R6-n(;jwhl=Cd>)&*635#*cdIP?&acd#N0i?uQ6})p`PrG6+|-id4!<*H
z@xqVmjZ$L0*4srD&?ymK)&7Bk{qV~W;h{VG$A|q%-<g<wU&Uz(7NB+o5*`nc5|_H|
zd?f>?jsWL3{6`%N3zWx1pnXvW@}EgQ8*5+A^x~4aNTr)obRNO1+J?&!58WYaSLM<Q
z_!dvAri$lGNM`NlAp0$Rs6BLoM9$ajQ84YC7yvnufSyN9DNdKxL1sbFeta0?M-;zk
z@bMjXkg&vk+6)R?jw4O>_T<HCXTeGkGC~+WvyHHol9G{B9We<B36C)KNb_s+QDnf1
z5EEYz2P33wA$&jgIZX$9n=!Q3^cUKnsdwqUhf_MTtT%Q=OG;^P3bZ5Vg2y%cR0Ilz
z{#q9_Z8cX#A{LL!aMcbpmr<-y`C`*xXGQ|Vnem9o%7UuV5CR>yEjpFDe?OY?^ab`$
zp>*7hw+Jc2QoQf-E!nQl9*}a%91l`qxO(d16j;c2wq{kByH{TE*w=m4YxL;+t@A19
zj%*-eC->=5D1}?%0^`w-m{d`b*Z8yAm`UnZF8nO41m%a}h>5dv(tL$`e8RwBKprWE
zL#xk%-lBn?!B65SCXO<(C_DyUEz4600_$jghUO8y@5|2f+NW)ok&Sqf>a`})N#C<A
z?dMfg)brhLi}{?TBzi&+&{IkL&(YEI(=RlwrCOtw`c+Q3%v`@_xO5LWn<L`A-t@k0
zTXE(ZvRG|-v6xHImxas)uAt4gWmlZHf2`9Y90U;M(FaaCJrpS)2v7@Ur8p9$b8C63
zgtkdt&(C`GQ1p2|LaI_a8LT-D!Lk;-yI5#kT>bpE-u@{wS@8FlKjmXdv<VX^QeBu;
zo#(DK%=VOlb&%}Ui+%r{m`(5#YxBl_m(D;l{_J<I&`We5rN*P<ciO9^IeXKlrP91p
z-*WgFQVGiq?3|C!`0djoTkYFtuVU8D?wL2aGm_UWijF-AUk95|uU@He)Sbpfg|4UC
zb;~{Z*>%5RnEGnD92?p%xmT7J)kw(D38qjdED7}uXzZU652GVQ;OisYpAc4-g3tV^
zZW**W*p{xJA`?J2$dc1s`~EFSyyjhdy5mD=y4&fFE1%l7x-556%PW?87525nA$hHs
zCG3_uU`_HE8fDkLBoVlC84##MMsU#Y#N&ON=#oBByIx=>kH~%jL;@gv5u)iOlHcz!
z0jUZrs+|^!5<Q-OrQTWVU*V`vU&G7o`cKupL_b+6i;@?bdjzDJ0(L1RB=cDGHuUNQ
z)dfWYGV=`vrt}(ivrDO!dsl3jkkAA&^$zn@-(eH-=AA$_K!<(WeKrR|xa2GV{EgtS
zg8|-jRK`Jiec^h%#yP*{Y^ycVq@QY^IJDu0nT5EI=s1`6In<VI7JPfzD~4d|81(0(
z1fOoU%Vi<1`}f>_q?v;T)zc~K^S!-2?$fqd2afSH&P}w1x9RA*9k1HL;<5p%yMIh6
zM%U71R_HWL#jhsAF)(D|1_fO?3B`<-TYw8*XThprHhaqF*3yEM2J#}@ou93gxnCNF
zP#rgp`WhojJg<}Iz7&zgzdX0&15PDpY#=3(Z6FJmlLkvqj6GI-h%Waue9)w9WkpBA
z^T3>!A5uR7zSJdzL2Jy{Y{BBfBCq3W@R<;k=jz9c5FzH%<;Uj=h=zw?8v*&=cJM%}
zsjVC~Wh9%+_avmS>rP_nl>)8Kjy$QcvNN09mxT*7RO?O&)ia@eb`}k*yhbm@>3&AO
z-Huv9j$Wh<L+s?(2j3-yMxR>Eql{1@XTxCX55=Xx*M7IwvN3n=;n!MlTy3w?G@0nS
zbjr*4EWw@4;s3?nd&V`nZ0*B}D5!KqdXpv~O?pQ_ssd7_i*yh|N4lWWd+)thsi7qi
zkluUmz1JiVO8(jBJbQ2VIq%uW=l%Tff#01wllz`ovu0+^nrmIl^~8DU%f=jjlb^Dj
z$=sP6E(j(LA1z^xEy<E!u!j#fudw(4iY7fn{8yl?n&o;8lI(m*Tf)G+6%1c?mtjZT
z26I3pw3sfOgQk7^B@&A)sx(zq<HE-G@+$Ba+xVi*LbLO(CQA?52mN-|zV5i52Y|u$
z?I+MQ86_6|hV2!FtzgzLrK8At&h<J^E#K8eDTNT&Xx(8*|H=Z%?6rKhKKcl`=EwPo
zJL3zG2R8Z5`^jytGZ(}<%Hm}4RcvnI6_Hb+$5HR)GtvGIT8+Z78(@CPf6XW4ysgSq
zb1`xMIHQ9#;>i9i*u}Wp1MtCNZi}MesdTOq<&H(M4roWwoBLC?3Nr6hm}77Mx>L!~
zVo&$<08CbJt?BO3E7QrYeNJ>|R*_<;Jv?4EznX7+Vx}KUk)p5M+2068Ra6(uZy4Gw
zHCvsJ{yM`v&G0gNd%N7~)vLZ{w^IbvaV9)N$ayDMK4xGr&v|~Ax_-}c)91#wYPvWh
zdZ&gjlrX;wvNtLJa<<OiukGBjJFPElORhOh{|+y8#mv&%rybS+CG0rQ72A}wzVy;O
z@`;1u<E1$7cZb_myvYulAa50ISHcc!n6GHJ;fhT<hFcIu*_TaW+gO8QhrKJv3EWR!
zIoDm3*Vnl;Om|#g1bOaza-`<JoA)3fivLt;&iiF4)6>nm!$&2#i;w8MD0zAz=Pr8S
z%5(_zGhH|^DlyZ-^~BLh=fhU``}L-(gK*a#KK4NC(>Ushh{*?T@()59p8G+V5$#M{
zc?1|yyyOvAEP|$)o$st(`LGiv5#Hov3)tr`1`cPb2Ccq};6*Y+=meR^Vi2S;-N*Ul
zn+u7olDYGx-mtQMCZ>L}wYkIk5)qYpryM%S(nMg_`Le=HfUKoe4TWy474Kody?hRD
z%NtDB7a3iZK+_JfgjE57HnG*4`^@)M?YSOqdRCrxoNuRtn?HC!X7Wg|C<tY@ZN{Mm
zarcUl?<RBj>r0FdH3Lj(-G^EIzkFm)K*~*eowR3Fo{D_RrYUhn8joLIP}sPeDCm8d
zJQBhMR>nJ+%`uIrK5?l^TW@liY>yk_HJ9w&3?8;0q3Se_gGWHCI|gux(`FQ)K<m?&
zJId;Q33)l=0*mg%zNrV;taHuFr}Lx49|yF`=0V++enIcXei)@wtH#+5ijmdLlS51v
zjbh3Hm%N--frY+*i)gy4x&I?HDR<F?U^ddf<~|kw_9MB*7O7T-m{j<?9^Gpz8$|4I
zWs9ogMb@?3B@aZRT=cv@+&3tQE-Z^HX%g4V`7@}51<<b69#fI_{DYmHBQ&ba&^Cwo
zW4)n&P2UgfipSlQ8X3*aAGE9xU+^pMcs@hH!Z-K1E1TKf8fT{|4&t5Y80i7eDb<Bq
z190CAoDN}A*+#z72&dA2Z`HX_wJhN3u_#-?@5ynvg#$t)5Z1`5KTU63b=(@tnl$ve
zMg<}abPy5}azB60{)x_dxY%@%sX&=r_}PdHVk*5XB_vjRn88r70Z&P5tE(Gza4N{?
z>mJQi=Y|;^V{2|JRD174+)cR~$T??!slMQW^BS~`xMm<%SSQk~IoS7VOQ;Xcb3x&e
z6tGu3(PW*>Q%bDbb0i2;c^e8gfZQL2Xm?{zM(=|ZrFd-5@Lu10Gf!FZI5y~71s9(W
za@qm+koK6O8R!X4`REpH@r?C)ah_`6o&{pLtJ><G)LSch`%|daAW}ffoRD#>=OAp+
znt<4oUU~agu~VmY)@LNAO!aeC??m`Plv+C4w-g?qtAje?xWngGs3<L~I@z&v0jOg3
z_S$Eph>UDVy}?AII9Q{2EkrJhZk3UF`pKP`uwwW5pvCgZdVI}3ri`oEH}(Z(Sg*p<
z^5%#S27C&JR@ZpJAo)}re4c#=_-mi`FXvcf0{&pH{RBad%TGg((H!zj55=IhOd?jR
zHAy{DkD_CdH@dpY0+v$%9R<GT3fsmAQvBC3JBJ0}%U1W9QE7@UZ*JMw=4X(1tSzG8
zftoK7X<SNC6@B_qUf)->@tLY7gF%N=_obwA%UAN?N2zhjLY0Q=hWoB?Gv>=#*4;-z
zN}k0W&2}$lp(?`5^ZGmvJ*AI^brRqOK*;I0r_W3)I6MqX&%eu8clu+d;ix}ja;UDJ
zJdOh$NYv8I=Gzkco`n+`0KLX%)6=z!Tn-I2ZHV<4=OZT!Zv4k`B4iZp2dFwF>o;bi
zo+$kn0Fs0R<GYw2Vu7PBQb_cEQVIk!Vdy~pm*|{}lc3SKYtf>ecMD9`3m$-eCR7we
z)jOL7e`Obqo)jGa8ev;`B5{>GAi(ovVFxZYy(H+-cF@Lon5ByaBO}W9stOrD^rHU_
z*0a-^q8fKoCq_pg`>-=w%>G-|u55rD7I_hl<66D67AsYqU|vg5xD@5qSI)eb7`Trq
zd8P*s0praZ3*+G%3qcL}pw)2{2t7Y9FUnJ0eXO5<anFH9wsZemZlf?8FJ<5C(ZbHS
zwb=A;Z);maChy{C^Lrztm%AdxqP)`=vJ|UfLi8NYPS`w;y>EuaI+cu0_S}-;4d=Q2
zX(grE`N|6jz3D8?Nk^Nw*}U$BA<|LeMc!q}{chI}W5fo<u1t1vh%NJq$BTT?>RQg7
zrzyx(YnBpwA@t4A>8tC5=$C_@1@Z-vRDHqD7Wc>whS#J}A$+^tVVx}fJ-&pRy)Xbc
z;{yJmMa<YN)hlIDRvw<6p5LTJ6wez3`07{?t_6a^HUeB!sv>CSRJ|22F^%<0Uo{%_
zQS{%@F?2cWFx6#V&QuM1VO6X10EbGu#`7}7YUh5QA^n`mSUTtPrG=y&aAi>@ioE^=
zLY&gVXFc6Qhcv$cL#-Io7Dq^jlQS`{-2HnXC>T=3L~Lwf=abraBB~4V!A-#MQvt2Z
z#iHYzjeyyVIg4VI0K4)PjL{g51A+x9Ssc<b(%Nd~ef`{PbOu{y!;7h^)H|pwQ;55>
zs=9Rt>jmSX!QVf2PGh{tF)Ij3FqHGq6o)#%T*ujhv-6Aq1G5n#6=o#4bKYs!HW;^C
ziceQI<IPXuU{JrNwa_=%*8r`Jp=0uuLB$LE7jHG1pVn@X1C;T@9W~j#1U*VN^0?~=
z8FUSA4hv%YO_}XRYU$RllFC=&Bv(|?7aBDb4bRJ8$(L7ZD^biee;9UbO$aQeBNC4q
zS8KQ!?Z<cp+x_C%A)6qzA2`cr5(>2VuKK<ur*}crNfN8By@r2NzM#c_{-(FmCeiWG
ziuu~iMk$=mm(F}1oE*+z=Y%g;p}jn-B@S(!>E9u%(|+YKDcW$x%j=;)<~koo=_V_W
zLf106*gAY6j^}EB8eespnsfK>k4~86C5Q?7n~WP@&??QEG;*oM>AS72MP(`3dB!1Y
zs56@#TA7|eTQ1FTHR_;W@{Y0y554!gG0L@KXj}a*#5FH-`@GM=)7$rGi$8KI^)()b
zJ9Va+O%5|XS@&h4s%M-o#0*yUazL;}uqD}SErH#ahPZ;mj_})f$g84hjq2ZzB?_s}
z((zxS?^3o{WskJKZh|J8fRwPL02K7d5pK_}^$!Ykz1TA&UmNO52%&v_ePd%|v$jpI
z3;c)gJ3odVV`o0tpJp_lhkq}dtnUvIyGYiJ7mM6(#-lJmTkXVlR%f1M8hB#^r{lbG
zFyKT>XNntov7=;(0{mTXI15il+ipQ2ubc;%?uSD5ADbHS?_arsQ(KoS-~!KVc!WN4
zT_AK1J>D;ey1cBlN-(>wqV~C}OnFjL8Vk&8ZT%5%!+%j(?%~mU@&LCZ%pLg-;uz;_
zz8>TZE^l-{Ln@7y-kaSPXP>QJ&}LLW6dyaBOBdqJkv+gAukwB)qU_ntFMN2T<4E-o
zx^orn#}Gj^?NaDHM2=g4bzF(cG`3E3Df~FPqu@%MqXLI{s(v+{lFj8Max(rEDI3A9
zsrcHB2o7(KX!82k?CT^5dGo=?e9VGRvpJq2s$a_AX)nupuMa<{TTiCPZP1?NV4f-%
zGTn>j+3dIvp<F$&vA90pXX9u*0(Poso7+bg6zIIZZBH740afvWAo3lvgo+HtvlCGe
zNu^N0>BCko8bsmz<)WgY+G2bgrLV8i?c3%%I}{KXt=!Q=LouJy=x%dvkT<g0BbGhD
z;H`QtB(Hg7+CY8c;h>5AiK6zv!$DKEVE>H=SRrIIY2{8(270u%k%Sw2?;7RaMkZ=)
z^F>Hl&)ciegoMOc6Aq7s<GO^xb{{u0=_U-!Nb=q+(-6%gQaYQr`7v@11|NU0!6Y2h
z1UXfn3r8t@^jtT#zhY`C`DnxBaOh)I_K8NTH9Px?Esp&ICBaNfac1tfKFF12c>D`_
zSj=F_g#ga__p_HA{nX>oxFyb2s8re`;Kw~7wgwLIayO}95F00_mBgpZcT8-a?k#Z&
z2I`%R<$3g%QJap^cBCPOiTslNKM3}zSoD*dPTwv+@)L4hh|e|?n313KKO7F6DJ05k
zyt;DJ(Q>3hDw?Ib>{~pmA23G6l8nqC4U(;qR`Lzk+X4Bkz28km>i-MvjPFC~?{jZQ
zhq52uubQYG;<J^`tb&@A7YU8OhYmyeNhI|N*!rNn&TJ=uJm(kJZIV*X?DGe{)1}Y?
zCGD%rOI<SEEeqE>Hi+fMBlNYR4>fQ1PoHyU`;d>m7rxo&27HL7<J3F-aYqaO!|80B
zS4E2nus;;VLhP-&|G51EZ{7rg(YI6eI2S3{-?oug)Gf)3c`!{59C+p2vye&Rb??g7
za)*LpJM?oopsL;!Kr*qg*|k8EbZ*J)DqJErQ9VF)O_fSohB~^`+)W{i<;SaxsZ-R|
zoo@_WWJ@|)!UK}V8h@)d2k6DcNAA*kd=}ZN+EDg(2|eY2lx@yc^B;h_MLnc6A(kz<
zvihyxIy0kzuoPa^G@8v&64i_oi`0!U&gTq*&>svQtAj{ha1ILPMIi<YYS%v7c1r3$
z6A)adms9OYWkBK8<S$8ls!xvP2jpcp8Wn(hVW9;Xb|@s8s@{elmN`+7Qz{BtU1d8s
z7M!@NpyYfsgzkowh8NeqT~#Dx!-8Qd25Y5&zQfXvtKwf92~uypMpjQnfnIp&x9<|B
zRSIxx!f4r7a#3*i-nY$NHY;DgsoD$nm>s=kz*ol49K0>$(P5$`HU8ELvO^G|Py2K=
zYx6+K^=5@HCGDPdLT|kx3TnninN|<WIe9kBKr;_%9e*d<qV55jY$aHOPYAMKT#S~p
zHVE1ctPrPG^FOj&ADwnq7C~*R4+T7=qTg4fec8h{Wjy+O-l`!RbhJxZ60GZ@P_Dvh
z@-;Tj)^|K)#&f7Pl@A3blI-x1JrRloy?7wjsB%YpN14IvOuA75xZD_v-K)l|jMZ<V
zJ5A2>MQYJ@)t6pbaX)MOJDEU4-snaV=cW<RT*Hg0pCThg^Rzo5?~sV6$n8$~i}QXm
zK=Y}2rPP>>SlAc#Jzzw>VN=d|8JmVjYQ%WtSEm=a1_^e(iJayJzHkwt?t1Xj^n6b*
zzPiVCIT@*=vYBV|O={NJ7&R(#>u!Pi-DuakLb6Oi+fA%`OUj{vYQ868vGE;(S3Ge6
z8NuAty36OK>Uq{CPAw+X+QcLeuO=@Dr80Kk6knevvMN;I<cX(+qrj!R^U*IU2z>e3
z<fuW&F5Lzq-MJxBY$LdVxI;3s5_<PlcW2zEHJ{O|BFnF)09&DC-Axy(z%|$1@wS7+
z$CSm=qb-Ax_}Tz)Wb*0s497`unkxRI>%!PjT{H8r=T<)9fWy-W-J^oI7=E8*5G`=-
zVhFoIn3Hc8Hd_vPKH#R%x_NEsHZ}ua80^>T3mN?WMV{NXQIM7W$76eo&K=R>my;KE
zt505`V`Unvo%22%aO0C~1+7#>ym4B|p7AG+z8K2rpy)ycNc*g7HRe1}%s4F}=k6@N
zFW_RR-y!^dfG|SV6lqgC8$_!5PNAb&c;hvxN_<&p$LYH}7_#+F=<TMWpsvFl9~)6s
zedZIT_pxtW1=SfsVPaB#dIcj{_&laJ-10GX-iT@Q*^qHJt-j&b`h)zGim-?F1`273
z0__Bp#stMwN(?$6jYjk}$x^!qUA<4>$3&F0w+BQ-LM6MbF0=F5-B%DJb3Wx4TII7W
z@oxq%HS#a3%Xyc;<@7~O)Y!8J&f()!0^y6wxnY>j|D922>-lYKFAxJyjgMD%0yX6t
z<y@AUYz@eA%G6M$IT9W5omE}Wt|q<MmR)?>sd?kosJ0-v1aV;q7B1QIr$0!R4^1=1
z+x<{>gy)L7VjHOv;})^lQ~Ckt-YM;Nv$9gINxrxJWt&%?UY7yrFJ;lKfV8X;lN8n#
zah_fnve<zmuAC3diTCGgb=dM(p{5#a&acbPR`9J$UT^M-o7i;)PJQ$BT_E5PAz=`X
zE6}mhEj8bs+yaA_ZH<pJb1X+PcZo?T@VGezYPc5$6Z@sXbxA(=7db@q0HIhS0E2k{
zotfm(*X9GMS%R3Dm_xWEcvScYiw9y{pv$bR#^U1qptH4J{xQxelI`g3Oi~dI8@BOr
z-hy5EobgG132HKY((N_W$%U$hkAF5N7Fgu@4+h+p>9O|u>Y6c4t#OremrZci9c&bZ
z%D(*$nSriU?Ow11{#!I6Lc-}NQbBPR{fE#i&zV}AwT9&HeA5Bscsq5R?4Kga6SqVn
z6|KJtgKn*V74KgT7zGFKN0e1G*I-3Oz1U}4aandA%rO#-ygZD4+<jQ;)IOFG5!}26
z#+zwJ`xi=^fB)#K82hQ==wjWvMjXU%P;Iw7KBFb8m+fnaFmi^osv`{0I`hN}0`dM~
z&n{iv7htfvT32?Q3m+BqA^!FYEPbHJPYr8%>xbjP-`kityafn10hm;qYTF0s;iqEr
zOP=>I^#8l+{Yek!`%q4TSd3Aya&FE+^FeShrReoe><#gdz$<4a6oZ!&lm68If(p$y
zoqmbX9y&McK0@oM{}k<-J(hOrf5nN0s@WFVZ!ZobuleWcJ3A@bO~NaBO!U9q0{qTr
z)~JBu=F(@t5dDV`d_xqLN?+Oo1ZRuYkN<u(`Cas&*zcw&<~n2kuLj!M^6_o0t&QDc
zegBN@yNbO(_3SYNplxz-akC&4%^2g~72x0QY~4n4c6MH4U|~Up8eh1?=>N{o=WENb
z^tm+5cKzY%-;tgCUNKR{TNNtX+6zbb{)@Z$Umj+QBAHwEN5}q`+yCX`Q1x%zbk)tv
z*uNz9KY$W*C<47U?E7SY-1w!7O!NCF-aT`-HuAp(b^n_?vL3}&7C=tG^K+o(f4`O(
zBtVgz4W9V(|8GXhZ9F>^6B`acy~UrS=ifT}9Jx1-?fGaNbdJ1DASXwoO)Ehkgo#NY
zP4^|_i62bHQ>IW-7nK2=?Hxz#igMI@+Yr52kGm`ynPg`Qr883xve|eX)?eIYGrTSK
z%l<@`eH-md<Skn5C1jeQaJ6|x>%A&k-@z?w2eXYnLGuMim+7>N15$K6iCedS`nRL?
z=~g%bn$P#sy?-h4^G6y9RPkE`nlztop<({_e^6G5Te8>gYUICC7?TE%237pleb%4f
z_?O!L<qKZ~5zVI@Z%`5T&kg!Zk-vO_iAVE^?$Z~dU#K^#h{W{+yzg%y3uFGj)KW}z
zOuX;-60Hw@O^%t~cQKa=4FOhC|G9lXR~`)=a|x5i=<ct{Q3ZmAZZ}rJUrYOI-E<pO
z96j<I+RtzN&vGm@yp1NXGnq2;pNssgW4^b1G4I*&SdK^+3p?+qOXQXQ{O#Yok}T}g
z18)^yJbWuB^g9B{e7q0E?N_9~Br8?^Vh@U97A|2BVd7`)JR$i$oc;2lrIUt+#{b_3
z;FFWHhKYG!)z9vStL!pA{+pWrB$&X$PhUjkjy|hrq0v53*FrTUJ10lC?gR6Fd0`=q
zKb_=e#C!Z-5eSU~8o?2b5w0rui-a7F^cstm!_HVyR~-A-g!p)&J3%~vh34Oo49Pq}
zdSS7lzoxXQd7sclQU&ZK(Wu6z$O(>?92%aG9pO#i!dZ@#V&UKrcR$<G9{DExi)x2N
zdk&K+(JXsH2BO6vI=+Q-S4&^tYj29{zM`PpiHUUQRUz_JI_#Ia&o2GGT)oU_{%hSD
z3zX=|hnWflY@v_7FOSLoqMk~8SI#V2d>-;kuR{$K=rh#pBl=m5^4D6s#36Aj0D{^3
zYmb)@eTbS)2A9+WeywNDQN@=zTA%+~T~r2t8}Qr$<G(oIZ&1b0L%#i@mW);3x=jJa
zQgZ&arhbB;ir+kWM)zxz&;N=2KWN1NiTyt)|Nm+Ge;A1WH_7}bll1>4ng2M+NT^?r
zx$aF>USGng#XReai+9$#W1woxwSUSo6^`~gg%1Uia@(CKo2|1!Eyo@U)Q4_vpHA*(
zp;$?(s#L+xy4GBpl+%Qq4X7-?;1tWpFur;7=0q}*nURrENJz(k7{55=-z}X?+q+`t
zOP?FrB1iBfGO5rJ@I&e>ohMY^X|;?)f`b(l6rMQUdKB_U<?U!6b``vCIOZ4ydtF9H
zN2{u;);rG!B0i&A$!&E+(a9<(Dz0Nu3D`-Du=wZTQ??5Nih~ydLqe=kmPC`wz8-r*
zE<>mkn(%<zti>Ns{bQj@)y!;eZq_K#Ea;cHhmL1~i5BJEBE$Dds=VNEs!}Ta#Zy88
zg0+OGlay~}{mH!O+B1Lrl*Wz<^EXTC0NyJHFf}zL;CU8Bq2J`f;Ga{Os!jSqYCzw}
zX!&5i2?Zh<9UT>R+WIcXVs3{Dwr>;lfCa7<WOyf|{^H~F!JcU^-t77PTkW9CG~(YQ
z0mu8ZzywyEE0P?s^`eKqGY`5dhUsr;M=D0U?%8#rtT+%YJ~^eZOKhd5wW5UgPx}$8
z$B_}q4iH1e`@}Z~O^0i31)k_}O_RKb?GyeqG>a}K&DcSLPubbQE5WRdPTM1RI^%M)
zG#tK)WtN)*X@;K1UnyP|D5b5vd~xPUCz{1W{#O%tNs=%!i)UT8d5$Ff476PBtAPv3
z`%01?_I>)$1LrbJZ!mU|F#Vc#OivPJ2CvD!+v#SO28?;)Oa=eZRy!CP0sAv*VFoe@
zF~6Q_^)+wUbb|bSe4@yJ0t%6jDy_CAOW4``JHa~gwzGAwWej-fQa;j-#XVd9Q(OOe
zg(rX8EznnlPUF1**-2NG16&8oVtLvL9cxfVdEWyEd)+-h^r<H-K*jMsKGxC{#0N6Q
z20^^v3rilnt^21%z9TIm=F$_O>=qyFi5FKOHzuF-h(OSHwKL*yzDcVClfga5HmY5%
zBP&WSzs_cs;QJe3UF^SZ8701;)4NNx+u>2!^R;dsO?W5v=YKVl9FN?mAe$IG;zm^<
zvOqheR4=luCE@i?llxfKC(rZPTR6}cH8>%8g>sncnwkocFDeW`Pu`s0HOLovX@MG%
zPdt5v?aqJt**_$}<9VA@T8)f3LM7@}_+vI5o~wJKlIZLvx7|L4xcAH8WLd5SmlqdD
zx2}U29W+#awlo_*A&!c~0(W-h`6X_X`sSd<gj4_y_BWd_kbJiLS{FW=0NJHm?)AUC
zlGyLlRX)Vqd%}nIokJ+**k_4c!)kmAU#T#ICxceS7>va~ZFD5i#{!h0FCInSW2eCl
zjU~ZJKgJIlr7wn_$_>czq(A?&3;wyAs?S6ZT&T}f;>Yly!jwkvlDFUs4BYX;x&5;e
zKB1?v=OZw|%W7rT{19Z4P5!T1@sHs;RFD2d08Mt)FSGXN7NE?ElfEwZ@=7jEpxdb#
zX>qP{hFGmT4trhLvEHcJPXh^6Bj1NAG$W7=$Srw66Z9u6c-xcDZd2fkdOZsNLzh2&
zPr|HMbXnhofDnhf69Cp4xNBY>ym7<d7r2-_&MmlLV0pu~a0ZOah_ACSBI%6igf?1Q
zEUJ51e}1j_#W#7U`0GJWuoO|8s*d_A&-b3Mw%)V4`dqZb1|c)LZ%lar2Ue3sT7w2f
zHr8F#jk#TbqS8{m=8wmy%qbae8%d}r#nkD>+OR8M#AGIX2L=N4_sGEpTYm28f3$z|
zt3)o~UIwuo1v(nG9L-3DHmZMzy7QTTk`9T?ItIr;Y7M9Or|cTLS@#QZz;fvsJ~y$5
zgKjpHY<mw=HL-h}NU`ll*JcoNW~e_<as?~*jg@zN*`?F57w*mQo#WlfN$dt5xmPmw
zEg94vTRvjAh0HeJzqlcxqhmB4=q6>0L_Ubo4A}mx>)F<@_|0(y<Z7KGg&*KOgP^;n
zJgLDRdR`v_ygA*?k*P828g&rLHJlgZnge8d@NYirt8A(*v2xDY8Be|?|JTm?9~H5p
z#XDH9)_Eka`SaHTQn%ra<}ynCwTHR^Pfc_UTqerttch{8?%3B1b*{?UE^LXdO!mLU
zKj2vWmc#$0tbT8*NbNae&|u9aGM(yXSNyWHiueKlvqtlwgFI_<Cu=z_ibe0s{bG%h
z+_2;0W7G(3T94OthwV+*SgJLR(<1p|Ny2*usTu)(qbaf+I-(7L`j(f&{j;S0AZxn4
zaoRy_@}FD?{}?n!L>5mMSG;uF3D7XV5CooC!_FpeBx^&VKlKrf3J@($HzA$Ry-m%y
zCDpCO6{86Bq^r@txhH5rC5Stfn)Ryfjxh?)#VseuuuFxB4>CH04<wQTG%%)5=Sqd_
zSAIN1LE^5?kK-pE5fWCvYe6Fo&e@pgsw~8Uy+~Vy5PV&J#b!bi{;goA*lVG=UBmVe
zjrnI`{xQG@bbV#ur_HCZS9b6ItRivqr%RAHIG?Wmo|5N5CH{Q$%KSmkNNWVKsEFlP
zQF>n!-AbqHiYl4y9KhBkUv>>Tg`D+xGhcuC+%@#z<THjC@*Kp#0dnjDD6<B?Fa%!I
znnOi`Ca?E`Fsf0B6bHSpa2F&Jv6aEPA9vY`uvc_PQ1Ql1j++C8g@s#N7D2lSx581&
zZRy*}71RnC&x^>qn@@Kw{OLPco37f!soq0xcEGn;Ar&`-Ldj`nMu4m|`~OGtd>`s$
zKGqsye_QZbR_WRG)=_5@>z%vq1s$Q=lZfnkGvAcAIS)NghYk5XHD*K(s%8VAA*1|}
zGJp8`jvlBVFtb3}Nu>-@`T53m!h?h5cjm+|#}ja|>j9t`<Jn7L78z4?NVR^0$1ZUb
zJVAqem~GajzEpAZ$B^>9A`$iG)0FIMQ`x+C-Dxx1(PQ*TNd~_koPCEl&+#N*#ojQq
zPOFaQf43QUkt*V*8b<PF_f~kYGBp+NG`YuetObKodbFRi`=o~F$w-OLLNB$a=>W;8
z5tY6S<V;m>VsJxH&`{?lq6Jrf^;vq!kCx9Eiyv39fwPpv#0BX|PhOCtaywO>BwLru
zzkZEPluf&9dLjtp3}03`E(Zj|Vkyhw*&`!UXKEd-n!Te%8R}VCu}{~U!U{>O9oMt;
zg&{K_LwBV}+l_dzs<%41OdDr$ggm^+sf7KJO7b%MLhbeL{AEebENpv`TZ~z-f1T7-
zD*LS;mGsB{Iu~cH_(wj-d8$hilqu@?rfF^M$I|+}ve39c_3WQl(lQd@F4_Ed3NLT@
z2L85Y%qFtG?IvlxgdY-bpcZRBYfT?6LjG%SxYp&Gs#&Dv1%$-``KHcIr+{Ym?K+V_
z)$(*f!lP~ng~^s{cfywCINGnj&+g}#HAmV)PMNK8<5JA;8?h+1bRgg{(|QH{Jb$Xa
z<-Mu$_VCw$zEn<G^5V8RzK=cGNjV6F7ef4Oz430fS=rQM6_uIqq|-=%g-jKTGkhnh
zEx*jpD)D5;|INI}F%1K?i0f{yp805w8@azL?1NAZGb*`ic(tY8z|JwLS(o%uE}DRe
z*ZzBf<d?O)SZq(*fbU9F%r#yvi;KHF###j*yE0D2)o!_?NXj?+kp<?b2XS{92ruQk
zH(hiZoh;ql+(I6+rB2<wxJUolPF+h&9C>vLxq((NP)<o+zzT6#uPUP2Q{s_>G1U{7
z&ctoJCOx5sVPv^bG5F3lP^lO06xYISNM(8j1@DPK_yp$rDh3Nb2ol=X3VpHOr~;;N
zG^(-MXv4;v%*1$j7e_;DURp1{`e=RCb#XWSgu9?re~)|W)l`2x8q37B{X*#lE1G-5
z2Zam)*N&+d^CGoJ7(XxUzfXt0j%-V=_u+c{1sw<mcVooacC;yKUPYP26<mkfHhOh=
zbJNJ#&*NFy{OVNGh$c9Wfy1!nJua&F;U4Bwv{yWEbekV({@ZA|%aMOr7_XP=<M~3N
ztG4IMTe3`xZfzQAG3r}VeM4@CIMD9Zrlseheiy5IO$&&+s|!Mw6o?R@9&P|l=rs>d
zUB~Vn;wJx!3WwB%SgrV(cft}lu;eZE&&mz~GlIps%C#FMuXoR0lk*ef9PSmppT)SC
z$v?AhoOlGvYQ@=0d|(41i!M+~GWP$HnEMn|GXj8&K6e@1+V}zJ+IgG+hs>N8P`21_
zWh};KSmnHAw-BB%bQsB%C#b~d!IAP`k966RC7vox2F_f}Q$M?D&rN+d-~Lpe%V#GT
z&Qz`^!q*+sRHZ^r#VCF$cD*-qmrRLYSf##An>6w%n}}UzgMrRK1wYY_k@WFNS(c6u
z*PgH~RkeAsMm1}^GQ>!8s4h9rMpwXjO+0_?8C9GS@qpo9=R;pRbQV_|_rrbDl1UpK
zLyOMdCOu0K0*CCQqvk|r`X)lxSs(!Kxw7eTKBV+&<eRsN<6L0V_CZ$B3vVfW2RQeX
z-O~5l(<P{#QZ1#*Db~(=VstzK^4pGGi!n^&*02vfMQ)27_}{ZS7M|8IHiR>W@KTR!
z+kybw={j+d*Wni(I;T#)7<OZ!Z9lE*iZozXq?7S1-|HMs*MYG)LH}h1a?jDF+jq*h
zowX;wZ>D@aoh5$VY+W;k5Ue<)N-s<AcCZ*-i5w<}vEO~jWa`?L;-$NpXnQAs<TUMV
zgdfC5ol8MKgn7DVz<kReiUgK9)RU#<d>j>?$?u~!phB#Kky_dB#HyEUxLg-p&Sp<G
zi(lJAL?WfA4hRSx?N+&w$4$7+ms6(2ycn>9Gh2nedVzt0;@I9x5`W6?w0TLF?$sGF
zv7Wp4$1&Zq71BIu5hr1?lG1=FS-o#|Yklmj)fhz_Vc@p5DL1s6Vp}tH4fGGk<pKsa
z0?YdZPU<Yf<m?G=cJ{#=IeN|0{jsO*wVM6qQzyZOXEHiwW>?@e6f;kVX4mM6FE!3<
zXRD*KM25fi<ZVOWo_Xp%3gK?5?BS-eni@MV@A510-mcW+6E!K1dq~;<*8u-yhr@Xh
zAEWTm#^QATFJ!7?-H!41p_kYfV2)Ak$L$BGL%cV)p+eY*loFv*pnWrbVI{xGIW`nC
zPDsQ%Sn`h*P$F{~(<Jn=e<`z!nXPZIw>zE3cB+iuWP!)~c(HEG$z#qgEWL7TKMuf=
z%+(6~Mnrv3Tr=@VTzuYxL2|+*JUt2Mus<^n7)*OEy~rSbIbF6vRivFW+Pn)ayVle2
z*<xKh$8I16gH^EORH~qqhx;FmyF|Stuiv&~#iNMe%Dp-jON)#zVF~*7alo$x58r?N
zEO1vgEf|Ul)QuvAWGTN9J0=@PVM1f$jrdHWG4j!ss>D)d+#>ibir<fx3hvgj-7()-
zD>G<vF<tPZohf41=VFDtO?$&u!KAIm-?XwotW~ZDa-W`avVjaco=%h-fE?C)E-RGm
zG(8%FnB3{uL`D1K77C;a4^(^2d@he47d&x$*E1JK4Q}{&Ji@=If4%c+|7n;8^}$G0
zl=PpH`|S#oO{L0q?Hdi&lF^6Xxd4XA!NQOF8aZ|&bgi46mYby7bb@UczRgHk<4G)`
z5n61CbE_Hy_E713kT-Yo@&eWrOhr>O+fLa_0(4r7R=Rve+b<Pxs7v^=b98|Y49;7T
zc!WE#4ZX0v3vkWZROQar+a#R^J)2qjbAxlIru7q#SiMhSLD8ynvM3IyX`n3XU`wX6
zu2G;&jeO8pDc49A=Mj-NWU!R4&UvJrS+xXUJs&p_ha@TC(%cv^9ydF1Auh<XSU*1?
zawz&R$iJ8ntIJRmkA_xU?Hc=-m?$BZx~|x2-zs4&>$T)l91rT7C%=1J!W3wVPxr<J
zxr{r@hGZ&^#6OMrrS91ao(42GK5NqbX2iz0(agoyc9o=fG9+tIw!p30r0lcw%`-Hl
zXzD~W{jq+On0w1g_jQ@h3PxDZKu8J2GG*<%>u4Y(7NbHh$vGgZX~?#_4p&Tk3<y}s
zs^FXM=LvZ8t*#uYWn>B*;A%%ABuZ%6Sk<tvjEFO@<8ZG~CyPqbesy^+-8r(JRD~<$
zLhLbWKZ^2a&hckMaHz%0agS6q@;aY>Sgi3f9AqU(^&)>G*@_$=Yre2#=d<y$4&ob8
zG#l`DBi*6%@kH)5YvJm1kKi0U^|~$_v?ZrryHCgKT3t90BtIg^N~mMy$wn~K&eWmn
z#dpM#Zrzhj>@zkgjMJfs%6H)A($9Y5sk`j_S*Vvk@P{q%H5G8VOi~I*2Rvhv2Xri^
z@%`P5`5#}2PUd-1l-j=H?JP%a-Hk<lz&l@ailI>x&=P;I>&3%`Ter~3Vt(7rV_(C7
zWFE#y-#hllWgM2I$bBGjk8)0rOQ{<wOlk7bh3mut@Kqw8n>16#rw8!O3q^DBB=X2f
zxdxXrpBwiNTEd*Gr;|Qh_T4Vb_N}er@C9hk9c2zUGw5=NI6Z9++Ep-kwQ;<z+jI7s
zd2#_M4FkF4$;Q8KF!sGrtPAZ-Z-lm)XPjA^NWyig(qSRD)An?rerO{vsX0=F9en{d
zn$^^lv*Vk|Zqv!c8A(Y^9gt674hX4I__7U|kkCKRq{6glxacnXvBeF5JJ87my*HWj
zCUD{G5hA)y`ch9vhv-H3$w1w*E$rIHQ{Fq+ZD3-+<`v9%{|%kY%=xAInZLQ?rf>&#
zdRzv;e8Fd_kbboZm&D?k(*qrNOI^3ur4O{lj5UD}WW;VWrzg<t2=oEN!L{AVd5d0o
zq{<HLs120y!j5pq<Q3ai_S+2Q*#*kM4E6SS2=T`VM((z!bB*hTBETQ1I(29CV=Hx6
z5v(2N=dusJ4)>28fE`6uI?Q_m8x&=suVLCmCRr2xFt!{X^PND7HeS0U%1NB9+0BFP
z(>@YH#=lPTzIJ!#nvg}fKxSM|N`81lhQZ`(?|ohEH&@3!#EktYVigwC^0yGER=Vsr
zf8Dmb$s8m6pE*=CamalG@1rbe-P63@KuS%LySv5!3L*9Q$SE1`_{krI5hOKS9K->`
z-)Bs<-4`u6WZfT%9Bs40U+JvqPpHmnu_2~ARwm<>50<pIZ!Crf^Vjd*10<$|@NI~3
z?wniqGEF6k-jU@<{urT|n>Gi&^7VM2+7pb{%Q92HW**TF;`T{=&?E5P;5z;&m`z!U
zdsW~nziPjP3OQYTxp{N3uwZk=cfsa;)pJ&)$cHG4eOWy%C7#yg=?zfE>h#shpR1;q
z)9`;&=QUiDK_q@WvvwOsd+%{4+3(WHJih<KiJXVWV`ykQF2Kd>xZ?Hh#I@Iau#GRo
zj=4|2#$DP)lQm;i(YAy`mO($B8JF+4oA%+%H%!aVqu1H2*)z~r{3j?3xefIP-or&%
z=O*hw>+4`u4b^4g6r9)KlTl|DwW4JO$GFGEHoHhbipR&jd;8k;cMhBDjOLjD+K#t6
z<I>b>mW8gi2RhgNQtjy+C8^$C+^7PVl^<*JKh!q)?%x8}(+a6jOrLMFa2ccymp9xZ
zzNb-4)%}5Jg-l?j#qbryLW7a>&@HNef#+aLWuAQ6Y=T$~d?)oG5ihJ(=={M1r%u0i
z7|*)g5Qf}v-rNiWbKGHPfF`}&r&ngm_DNUnG>xW`Rt4onyk94qaEXY0fUe5gNmqLk
zRZR3Xq0aiA_NvW`${c-Bt7R>lVNVC;U<WJuvycT4M5xgw<3<!(;YGyI1i3bYd!L$P
zslJ<yRU&3$+L^tcWtE!kE$)e)H}tG+Ds9y1s6DjXHcgAUX3s}IX#cH8may)U+1?5e
zgZWDXq+iNvX=$V_znO3Vt|K2%3<Kj|rfR_MxJAqkliw$WD>pYOZ{i%ZHSvQ^3+8w?
z&PipaPwx7FtYQ0U^x6%puTcx_`b<{NA>suPR=JMh3OGLvaU(C23$1D%&xmLM%0?b@
zs@hUqhb-TjCC6Ck^?L4_!@K5B39?_kj=-jlr1IKJan0}%QVxr#G;Nv5)&(eYAz#+`
z8^dshqqv+}BQW5$)LwhNxJcMqv_|xcd<Hcix9O8P?{rM8+5vO0c^kLVnSagNW?T8|
zAZKfa4@rm+Vq~hY=6i`Au>r?y{^$M+K5$%wQ=r4)bnSLrfg>A^@x|)kBGlHUz<)Nu
z3n%sN?^;R|D`EOl-m*cMg{5cTMYg?8K_N6ESbi^_OYVl6SFkDDWHJD-`AT;SE6nKe
z=}o60nYNebgEJ)kE_bqD59z$Z!=<NlOv4ReEy}q|=*NxVRja8lCAOg1w?>N_9P@hL
zY7fQt5~EviMfsLuwx?N|bCzNT>&Q^az8vQHX!@I+!c}d((8DY04(-YH&y*v??nqH^
zn;h!}*gbpu?cIE%^NC%O#J2^Ihd6A?n2XDMvKWnfVmNsO7p_iL<ULu{x@A^dC<d|?
zzIGaWKRBeVQB8O$&LMU4Iz1Tx*I1-fnB45w&VbLT0X9t;Cfy!-mb}0JmtCO66&lxm
zQxCuAA@Q?aI2eVKZGh=Wp$X`*?+TXWv0*QU5X3bla3qSe4w5ft!JPAOla5miu}^Tz
zE9Ops$TWU&^OQ{>y}PK)%=h8x2+`Q6TyRf=mNLXS`C2i$g*(C25M;d}HNfBU+irEw
z+N(tLY<=f$^+qY?)8RO=^I=l8s>TakhvMQ7-cFt5+~xzv9#b|mkuQA`7bZt<<*f8V
zOb6YsEfi1PdxyO`(v(F-MYhxcUO25yc-w}j9@bA#4g_afl(+bURI>t+08GZ|%#vzZ
zk9Z6_Ka_3}*&807SYvX-Imr1~-vbIhp6M-6)-%D;uCza$Jechd{8}OIsa)H18OZcl
znPf@OUn%+m(Ytx|VWaqow%R(Zfu`(4PuOyK&q%b?X|l39fr8pALNr*mwT<KI*k#aI
zOSN&}P>1)7skaQa$0lm~_BKVjPN_Iu`bQf-QN&mE%g?2|-p4VWW%a??=7!gWi(kCm
z&DiwMu2y@;SHfZ*n|bKGPh^<0o9B?xWq7m>J{i`JxvXWrZ~>ZkT32r>gWu#e!M1pp
z{K2D#i6#yt*5EmDkXnF0YI0}W#Qps=AJ6|gamAIVUO4=D*N=qB@Nw@a1Q}z3)_Z&7
zAP=*!l*31wh~>=yti@Y6=DJ(b&J7ppj|O8W2DlYcK$70tBbqW&cI6Q@)>&d^46sJA
z(JtmAli51Ef%gSvTJQ$M&W2YQ5lj8rwVPv|fCssytKs-9+b|}0^9U!n3fF$Kg-#{`
z-J_e+#V1=_t)uCNBEKV)wAy;I9OW16;{4*yty5!hy!08jN6*mh-u9~4W&J(e1~F+7
zx%I3b*!`%R%zbK{l~Dn&Wvpb%7$FN-%H2^#7q2SI)gA0ZNQU9kerkI5!vax6L9L?f
zMSI~EH2P1!-#^@=c)mR#;Z()jRrTICUgC2??k9o5mwF4@VS)IgZXaK?9A#=Atl)av
zZ_-~D`zgnd*s$h@zvZ$Y?y2-j!wc?#yoPYkhIb!z+ps+<AEX3&pUwd@sAHcQnzKF(
zX*PtOIHDktDiOnh5p^!pP#}^jDvkJUY$@}6yts|Y%@S$F0M!f|XIrcMDw-DAS60S3
zor@j+>G{%%QQ-v-uWLS!XKHO*K0IAv4K!b;N}hOePnDx!PBbd~sI$<18HDOw(o^(s
zkUe8wD)D9P!IW{$u^2^e=RV5n#aDYzlICMq<h3C(Ig2r8S9^#rn`bbinJ%-^G-9yh
zjjY&Dyl<_MLT)>t(xyj`<uw()ppqnv1unQeVbGNG2LVs{O}Erg)1?mSxY2hXQLZy8
zR)L(Shh>zwXS-JXW7CQR9(-4(VLAheXMxI!p@ol_jedwmq#y&?k(V0*2<-6SYL0U1
zE87U8kAf@iVO}4l`!)#ZmQQShT8f8D=)-<DdwD+k#@nD$lp0@r=mpArm&ggyGBL4=
zkha%Pcd2ttdw7a;wz#74!o-2YQ$Ujxp=Vga!Swl;k-p`A&<S4rgg09tPA*PSL6+%r
z{x+4{6nV32LP5QRXwhz+(1Gy;$B*~k>uf76t^*L|08QB@Q4BG?{U0tQGM#;6G&z&g
zZo9hxl<!hDoFXY9!4-9$1{$EgISTmg&=wHn?MvyNZa3n7E6}<tbb9)8>-28wW|2+x
zJW=}u9{2EbeYe@d8(`RTvnG_<!H^)3lV&+Arou+}vk2oxDm5GSA3pehIL*isB|Im^
zEd61lgbl$_8N$5cTFFWAf*+3{xb+*w2KvGU2=T9Kd|KWYa)Dden|Q=ZBuOxs0<YNn
z<Hoz*!{nCRN&BH*cf|%1=3#xhhFD}7v<w1^kNZpT2|z|Tw^y*YBaI|j>Y7Pd+}kWA
zZc3v>Idp}4zz<eRanrhxi`ax_=6MSKTN^WP3$k3_Jw#0cc;OPGcF)IksYpGH4;Mh~
z6E%QEa10YF?TS)&j9PJVcrP+KvfbUfPq5_afOC<)>p@LMX!=c`;iRXYQ)XZ2M93}|
z?QH4+<&eDTw*4Wp`SPI2dZP4LjJ{o8+a+^r^@`Z1$s$BQ6uD>(05gug+)k-@)8??%
zgnq?1x^TYQR9+Rc0I?}==;c=Mue3?PQlk98a=qbLi|8orRgR6LJWA@xR&D&~qEihc
zce6-RYlSh0H`t$XS6o3?DPNk#nRV*}fFg_$TaQ*SJ`a@B|KXhU=ZKux)B#1ENX46L
z9*#_Q-3=HY>>u_i8)4ahe;B~9SjziMe?-}jEw$(<X>(HWVf4Af^!xpRy5Tx0YY%Jn
z#U|U6Tu{ObEV@&jQ+xU%Eu6~JB%ggO;M_Z(no;0{htR>vi_e73wdKeR<h&*B#y9xq
zNrTIQrtO}rNo!Kj?yexiVkinjv52BnohZ`<))cVoH(o7ah+E9mY-`H^NMt-0QyB2N
zxZ}zbp}={uj9Gp*su)XU<HrG4I!45Ju*DtjtupuJS{s-45iZwo&H|(7rW{%o`GvUy
zq*6?S9&Ya&HJ$QA<O2V?E=w%&pdEW<q;m;aq__HAr3y~3%HT9DC-)tX5(8%TxhGcQ
zk!g8`R$UaL+<^6+T5B!##B4*wr)jXu+6mxjaGc^<*7K1~cHPU3k@k=TaKrL`!vdh1
zK&)z=HNz^k1V4Q%tmf>DN6S3}hl`=2Pp^<)*zqjXlr`_BIVlHYXLl3n?VJbxP@tcb
zL%a^Uc3H^AM`+1k(Dp9!Ve|tIi4P1f()?d7Z!l7$VWwL9%0bKqPafz{o}#={^xjeg
z4sT9o0WRBsw^bec@d6E}-U_6Ur5lZy_`=m^Gxb;7VZCKet+l{8&v|Eltor-_zQ9Tm
z`gwsW^G<Q`i?dN5Tg0UKY#p)opl}gB^YzJ^%B*e;miVJ=4;|HSeQ)FwT=^#wja_1i
z;;6V({q$~$+kHP3Zsk>0);o17tm{I24p1i1$B0Pz<`732u3F>SJ=)8b^5tN1;p+3Q
z?Us*JM6Am4Q{LFVKQ?ojEvW4Z6=y3i(;$vlBy3%YJSrt#5D~u1VLN{HeG-XssBxUx
zK<6i2q5Aj}s-A<wvQ3XSW{8M3UQ-&22(2>l*Jt<egP<Q=!oA;^E}aVt34djTHgL^%
zjrwnL0!?l%H6{XDYi^|UST(1<7JKQ@A)IkwLBq_IHw2Uc;q}jvUzPVBOe#}&ZTSZH
z^DcsS8X%q~6|oRXSu86&e5R9mS;qUq9}gNfdwP24*%m|T30}xVM{>HBwU{UFxm+gJ
zT-<eWW$CBl%eFIv>0b+zVnEyu<J?ZQJ}NsPt%cHzC~r5dze@b*+0$PZ3Uj^LO8yjP
zR90wOougBGiepvnJ<$ema<_f!e<7U_Jii;?ydf$>SGJoZE%|la<oRDwu$yrbn_1P4
z#l{`|+Hcz4$Uh6X5;y56ncfMakJBaI{0Q+gRqE3gnV{g4%D>5}GPLowSfjX<l)f1m
z%r`gvA*(+&L7~uwI@$>vslkWiDnPMHNMk(bq1!UPYExi`j10O$$^M3ax?uP<=F!Wp
zPO!bEB5P=s+0s)@*TWz-Cq7zU9%1~Axl1tw#)V`1+<D5L#>Z3Ajv6O)9N@;y<R}+M
z?A4Ud1m9_i#fnS9cba%m*)Vr^<$i<EE<fP;;Tnm88`T09#m4Y!tS6P8f0=RjE>+%g
zKJ1x0OL#1n0UQqf{H>rWtmI@3SrB#*0pfABV<M{k#st_v>el3U4G>N&vbYBN4EKSo
zr`EL2+bah$)x~s^+x6*Rkn{eCiuKaQGyANODw~3Ty13o=Vf&P0(`HhEZ5GU>d}Da#
z1kajwWLlKN3mBAt_dDQ%EKlO($7cRoSnA;@tkrMsD<YG8rh``bx{G3J^l*|<$3L<=
z_tJ--3l9D|0JCv(l-cOFf1LIsvLN4S6vFib-pD;VwK1FO13?jVP>)w5p&bu0SOqLy
z=SZI0O%>&U3G@$|ktnZ(Fg}IMG!sW3jJ-(HsrgbI(Ze+D&(%#saZ)SSvHbB61ZQDo
zHI)vnso@D)D@>VSfcd<Czu~n|u8|lc%Fgs{>x>z0_LjH^jsI(PhyK3f-QKBq;l<`Y
z&4tsly5&8p#De&KD!ai*!MjQs&r-P$1_b?C`!#g7$Sq>U>Vca&@7{%#zWA&A^@ym8
zBptNuPhElN-Bm<ZwI1%qrQ5fcM%~}nR658|uRNvOm-J($>z`_LR;)#UT%3A$EW8SA
zs1FLex&o<%4(GEFR<5QmUtWN{7Htd~#t=H&^ZAA~b`#-=O-|~Dhj)Y0$ZrOx=_@G-
znM^E0-tf;M$AAfY7Dn?&R&g$%y$$}tj=)O*)SD}OCzW@qR&4RIOqG|$c<z+kdxwpe
zG2izpxqX&i6_aKt5Zw=4omLI&jY&5jOlQ+#v9|D)2FTTsJx`@hd9UiOoCrGi?WxMH
zaJ9X5>fH!KzO8P*zcF>QHfTl<;f83<ML`Cxy0dxH>6E(aO-&{s`q2|v#;Q$qlrx@b
z{HEEWA6}Zg0*kxM4N=*xs5`85y<i(?)!u(iZ!$L}%0DTRN`C0Gx1q!q;eM0l;?RZr
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%0A)!WHCx#Lrm
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%0D??+h_nAw(EURj;TMA0ps^7$
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
X*ATiVm}=z)>Zd5HDpMi#;`RRl`G+ZG

literal 0
HcmV?d00001

diff --git a/tests/scancode/data/resource/samples/zlib/ada/zlib.ads b/tests/scancode/data/resource/samples/zlib/ada/zlib.ads
new file mode 100644
index 00000000000..79ffc4095cf
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/ada/zlib.ads
@@ -0,0 +1,328 @@
+------------------------------------------------------------------------------
+--                      ZLib for Ada thick binding.                         --
+--                                                                          --
+--              Copyright (C) 2002-2004 Dmitriy Anisimkov                   --
+--                                                                          --
+--  This library is free software; you can redistribute it and/or modify    --
+--  it under the terms of the GNU General Public License as published by    --
+--  the Free Software Foundation; either version 2 of the License, or (at   --
+--  your option) any later version.                                         --
+--                                                                          --
+--  This library is distributed in the hope that it will be useful, but     --
+--  WITHOUT ANY WARRANTY; without even the implied warranty of              --
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       --
+--  General Public License for more details.                                --
+--                                                                          --
+--  You should have received a copy of the GNU General Public License       --
+--  along with this library; if not, write to the Free Software Foundation, --
+--  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.          --
+--                                                                          --
+--  As a special exception, if other files instantiate generics from this   --
+--  unit, or you link this unit with other files to produce an executable,  --
+--  this  unit  does not  by itself cause  the resulting executable to be   --
+--  covered by the GNU General Public License. This exception does not      --
+--  however invalidate any other reasons why the executable file  might be  --
+--  covered by the  GNU Public License.                                     --
+------------------------------------------------------------------------------
+
+--  $Id: zlib.ads,v 1.26 2004/09/06 06:53:19 vagul Exp $
+
+with Ada.Streams;
+
+with Interfaces;
+
+package ZLib is
+
+   ZLib_Error   : exception;
+   Status_Error : exception;
+
+   type Compression_Level is new Integer range -1 .. 9;
+
+   type Flush_Mode is private;
+
+   type Compression_Method is private;
+
+   type Window_Bits_Type is new Integer range 8 .. 15;
+
+   type Memory_Level_Type is new Integer range 1 .. 9;
+
+   type Unsigned_32 is new Interfaces.Unsigned_32;
+
+   type Strategy_Type is private;
+
+   type Header_Type is (None, Auto, Default, GZip);
+   --  Header type usage have a some limitation for inflate.
+   --  See comment for Inflate_Init.
+
+   subtype Count is Ada.Streams.Stream_Element_Count;
+
+   Default_Memory_Level : constant Memory_Level_Type := 8;
+   Default_Window_Bits  : constant Window_Bits_Type  := 15;
+
+   ----------------------------------
+   -- Compression method constants --
+   ----------------------------------
+
+   Deflated : constant Compression_Method;
+   --  Only one method allowed in this ZLib version
+
+   ---------------------------------
+   -- Compression level constants --
+   ---------------------------------
+
+   No_Compression      : constant Compression_Level := 0;
+   Best_Speed          : constant Compression_Level := 1;
+   Best_Compression    : constant Compression_Level := 9;
+   Default_Compression : constant Compression_Level := -1;
+
+   --------------------------
+   -- Flush mode constants --
+   --------------------------
+
+   No_Flush      : constant Flush_Mode;
+   --  Regular way for compression, no flush
+
+   Partial_Flush : constant Flush_Mode;
+   --  Will be removed, use Z_SYNC_FLUSH instead
+
+   Sync_Flush    : constant Flush_Mode;
+   --  All pending output is flushed to the output buffer and the output
+   --  is aligned on a byte boundary, so that the decompressor can get all
+   --  input data available so far. (In particular avail_in is zero after the
+   --  call if enough output space has been provided  before the call.)
+   --  Flushing may degrade compression for some compression algorithms and so
+   --  it should be used only when necessary.
+
+   Block_Flush   : constant Flush_Mode;
+   --  Z_BLOCK requests that inflate() stop
+   --  if and when it get to the next deflate block boundary. When decoding the
+   --  zlib or gzip format, this will cause inflate() to return immediately
+   --  after the header and before the first block. When doing a raw inflate,
+   --  inflate() will go ahead and process the first block, and will return
+   --  when it gets to the end of that block, or when it runs out of data.
+
+   Full_Flush    : constant Flush_Mode;
+   --  All output is flushed as with SYNC_FLUSH, and the compression state
+   --  is reset so that decompression can restart from this point if previous
+   --  compressed data has been damaged or if random access is desired. Using
+   --  Full_Flush too often can seriously degrade the compression.
+
+   Finish        : constant Flush_Mode;
+   --  Just for tell the compressor that input data is complete.
+
+   ------------------------------------
+   -- Compression strategy constants --
+   ------------------------------------
+
+   --  RLE stategy could be used only in version 1.2.0 and later.
+
+   Filtered         : constant Strategy_Type;
+   Huffman_Only     : constant Strategy_Type;
+   RLE              : constant Strategy_Type;
+   Default_Strategy : constant Strategy_Type;
+
+   Default_Buffer_Size : constant := 4096;
+
+   type Filter_Type is tagged limited private;
+   --  The filter is for compression and for decompression.
+   --  The usage of the type is depend of its initialization.
+
+   function Version return String;
+   pragma Inline (Version);
+   --  Return string representation of the ZLib version.
+
+   procedure Deflate_Init
+     (Filter       : in out Filter_Type;
+      Level        : in     Compression_Level  := Default_Compression;
+      Strategy     : in     Strategy_Type      := Default_Strategy;
+      Method       : in     Compression_Method := Deflated;
+      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
+      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
+      Header       : in     Header_Type        := Default);
+   --  Compressor initialization.
+   --  When Header parameter is Auto or Default, then default zlib header
+   --  would be provided for compressed data.
+   --  When Header is GZip, then gzip header would be set instead of
+   --  default header.
+   --  When Header is None, no header would be set for compressed data.
+
+   procedure Inflate_Init
+     (Filter      : in out Filter_Type;
+      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
+      Header      : in     Header_Type      := Default);
+   --  Decompressor initialization.
+   --  Default header type mean that ZLib default header is expecting in the
+   --  input compressed stream.
+   --  Header type None mean that no header is expecting in the input stream.
+   --  GZip header type mean that GZip header is expecting in the
+   --  input compressed stream.
+   --  Auto header type mean that header type (GZip or Native) would be
+   --  detected automatically in the input stream.
+   --  Note that header types parameter values None, GZip and Auto are
+   --  supported for inflate routine only in ZLib versions 1.2.0.2 and later.
+   --  Deflate_Init is supporting all header types.
+
+   function Is_Open (Filter : in Filter_Type) return Boolean;
+   pragma Inline (Is_Open);
+   --  Is the filter opened for compression or decompression.
+
+   procedure Close
+     (Filter       : in out Filter_Type;
+      Ignore_Error : in     Boolean := False);
+   --  Closing the compression or decompressor.
+   --  If stream is closing before the complete and Ignore_Error is False,
+   --  The exception would be raised.
+
+   generic
+      with procedure Data_In
+        (Item : out Ada.Streams.Stream_Element_Array;
+         Last : out Ada.Streams.Stream_Element_Offset);
+      with procedure Data_Out
+        (Item : in Ada.Streams.Stream_Element_Array);
+   procedure Generic_Translate
+     (Filter          : in out Filter_Type;
+      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
+      Out_Buffer_Size : in     Integer := Default_Buffer_Size);
+   --  Compress/decompress data fetch from Data_In routine and pass the result
+   --  to the Data_Out routine. User should provide Data_In and Data_Out
+   --  for compression/decompression data flow.
+   --  Compression or decompression depend on Filter initialization.
+
+   function Total_In (Filter : in Filter_Type) return Count;
+   pragma Inline (Total_In);
+   --  Returns total number of input bytes read so far
+
+   function Total_Out (Filter : in Filter_Type) return Count;
+   pragma Inline (Total_Out);
+   --  Returns total number of bytes output so far
+
+   function CRC32
+     (CRC    : in Unsigned_32;
+      Data   : in Ada.Streams.Stream_Element_Array)
+      return Unsigned_32;
+   pragma Inline (CRC32);
+   --  Compute CRC32, it could be necessary for make gzip format
+
+   procedure CRC32
+     (CRC  : in out Unsigned_32;
+      Data : in     Ada.Streams.Stream_Element_Array);
+   pragma Inline (CRC32);
+   --  Compute CRC32, it could be necessary for make gzip format
+
+   -------------------------------------------------
+   --  Below is more complex low level routines.  --
+   -------------------------------------------------
+
+   procedure Translate
+     (Filter    : in out Filter_Type;
+      In_Data   : in     Ada.Streams.Stream_Element_Array;
+      In_Last   :    out Ada.Streams.Stream_Element_Offset;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode);
+   --  Compress/decompress the In_Data buffer and place the result into
+   --  Out_Data. In_Last is the index of last element from In_Data accepted by
+   --  the Filter. Out_Last is the last element of the received data from
+   --  Filter. To tell the filter that incoming data are complete put the
+   --  Flush parameter to Finish.
+
+   function Stream_End (Filter : in Filter_Type) return Boolean;
+   pragma Inline (Stream_End);
+   --  Return the true when the stream is complete.
+
+   procedure Flush
+     (Filter    : in out Filter_Type;
+      Out_Data  :    out Ada.Streams.Stream_Element_Array;
+      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
+      Flush     : in     Flush_Mode);
+   pragma Inline (Flush);
+   --  Flushing the data from the compressor.
+
+   generic
+      with procedure Write
+        (Item : in Ada.Streams.Stream_Element_Array);
+      --  User should provide this routine for accept
+      --  compressed/decompressed data.
+
+      Buffer_Size : in Ada.Streams.Stream_Element_Offset
+         := Default_Buffer_Size;
+      --  Buffer size for Write user routine.
+
+   procedure Write
+     (Filter  : in out Filter_Type;
+      Item    : in     Ada.Streams.Stream_Element_Array;
+      Flush   : in     Flush_Mode := No_Flush);
+   --  Compress/Decompress data from Item to the generic parameter procedure
+   --  Write. Output buffer size could be set in Buffer_Size generic parameter.
+
+   generic
+      with procedure Read
+        (Item : out Ada.Streams.Stream_Element_Array;
+         Last : out Ada.Streams.Stream_Element_Offset);
+      --  User should provide data for compression/decompression
+      --  thru this routine.
+
+      Buffer : in out Ada.Streams.Stream_Element_Array;
+      --  Buffer for keep remaining data from the previous
+      --  back read.
+
+      Rest_First, Rest_Last : in out Ada.Streams.Stream_Element_Offset;
+      --  Rest_First have to be initialized to Buffer'Last + 1
+      --  Rest_Last have to be initialized to Buffer'Last
+      --  before usage.
+
+      Allow_Read_Some : in Boolean := False;
+      --  Is it allowed to return Last < Item'Last before end of data.
+
+   procedure Read
+     (Filter : in out Filter_Type;
+      Item   :    out Ada.Streams.Stream_Element_Array;
+      Last   :    out Ada.Streams.Stream_Element_Offset;
+      Flush  : in     Flush_Mode := No_Flush);
+   --  Compress/Decompress data from generic parameter procedure Read to the
+   --  Item. User should provide Buffer and initialized Rest_First, Rest_Last
+   --  indicators. If Allow_Read_Some is True, Read routines could return
+   --  Last < Item'Last only at end of stream.
+
+private
+
+   use Ada.Streams;
+
+   pragma Assert (Ada.Streams.Stream_Element'Size    =    8);
+   pragma Assert (Ada.Streams.Stream_Element'Modulus = 2**8);
+
+   type Flush_Mode is new Integer range 0 .. 5;
+
+   type Compression_Method is new Integer range 8 .. 8;
+
+   type Strategy_Type is new Integer range 0 .. 3;
+
+   No_Flush      : constant Flush_Mode := 0;
+   Partial_Flush : constant Flush_Mode := 1;
+   Sync_Flush    : constant Flush_Mode := 2;
+   Full_Flush    : constant Flush_Mode := 3;
+   Finish        : constant Flush_Mode := 4;
+   Block_Flush   : constant Flush_Mode := 5;
+
+   Filtered         : constant Strategy_Type := 1;
+   Huffman_Only     : constant Strategy_Type := 2;
+   RLE              : constant Strategy_Type := 3;
+   Default_Strategy : constant Strategy_Type := 0;
+
+   Deflated : constant Compression_Method := 8;
+
+   type Z_Stream;
+
+   type Z_Stream_Access is access all Z_Stream;
+
+   type Filter_Type is tagged limited record
+      Strm        : Z_Stream_Access;
+      Compression : Boolean;
+      Stream_End  : Boolean;
+      Header      : Header_Type;
+      CRC         : Unsigned_32;
+      Offset      : Stream_Element_Offset;
+      --  Offset for gzip header/footer output.
+   end record;
+
+end ZLib;
diff --git a/tests/scancode/data/resource/samples/zlib/adler32.c b/tests/scancode/data/resource/samples/zlib/adler32.c
new file mode 100644
index 00000000000..a868f073d8a
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/adler32.c
@@ -0,0 +1,179 @@
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2011 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+
+#define local static
+
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+
+#define BASE 65521      /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
+#ifdef NO_DIVIDE
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
+    do { \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD(a) \
+    do { \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD28(sum2);            /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
+local uLong adler32_combine_(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 >= BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
+
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
diff --git a/tests/scancode/data/resource/samples/zlib/deflate.c b/tests/scancode/data/resource/samples/zlib/deflate.c
new file mode 100644
index 00000000000..696957705b7
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/deflate.c
@@ -0,0 +1,1967 @@
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in http://tools.ietf.org/html/rfc1951
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id$ */
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+   " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
+local block_state deflate_rle    OF((deflate_state *s, int flush));
+local block_state deflate_huff   OF((deflate_state *s, int flush));
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
+local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifdef ASMV
+      void match_init OF((void)); /* asm code initialization */
+      uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#endif
+
+#ifdef DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+#ifndef NO_DUMMY_DECL
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+#endif
+
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
+ *    input characters, so that a running hash key can be computed from the
+ *    previous key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ *    input characters and the first MIN_MATCH bytes of str are valid
+ *    (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    s->head[s->hash_size-1] = NIL; \
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                         Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
+
+    ushf *overlay;
+    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+     * output size for (length,distance) codes is <= 24 bits.
+     */
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+        return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+        strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
+
+    s->wrap = wrap;
+    s->gzhead = Z_NULL;
+    s->w_bits = windowBits;
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
+    s->hash_bits = memLevel + 7;
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->high_water = 0;      /* nothing written to s->window yet */
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+    s->pending_buf = (uchf *) overlay;
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
+        strm->msg = ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    z_const unsigned char *next;
+
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
+        return Z_STREAM_ERROR;
+
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
+
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
+    }
+
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (z_const Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
+    }
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateResetKeep (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+        return Z_STREAM_ERROR;
+    }
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+    }
+    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
+    s->last_flush = Z_NO_FLUSH;
+
+    _tr_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader (strm, head)
+    z_streamp strm;
+    gz_headerp head;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
+    strm->state->gzhead = head;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePending (strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime (strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    deflate_state *s;
+    int put;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+    int err = Z_OK;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if ((strategy != s->strategy || func != configuration_table[level].func) &&
+        strm->total_in != 0) {
+        /* Flush the last buffer: */
+        err = deflate(strm, Z_BLOCK);
+        if (err == Z_BUF_ERROR && s->pending == 0)
+            err = Z_OK;
+    }
+    if (s->level != level) {
+        s->level = level;
+        s->max_lazy_match   = configuration_table[level].max_lazy;
+        s->good_match       = configuration_table[level].good_length;
+        s->nice_match       = configuration_table[level].nice_length;
+        s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return err;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+    z_streamp strm;
+    int good_length;
+    int max_lazy;
+    int nice_length;
+    int max_chain;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+    s->good_match = good_length;
+    s->max_lazy_match = max_lazy;
+    s->nice_match = nice_length;
+    s->max_chain_length = max_chain;
+    return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns
+ * a close to exact, as well as small, upper bound on the compressed size.
+ * They are coded as constants here for a reason--if the #define's are
+ * changed, then this function needs to be changed as well.  The return
+ * value for 15 and 8 only works for those exact settings.
+ *
+ * For any setting other than those defaults for windowBits and memLevel,
+ * the value returned is a conservative worst case for the maximum expansion
+ * resulting from using fixed blocks instead of stored blocks, which deflate
+ * can emit on compressed data for some combinations of the parameters.
+ *
+ * This function could be more sophisticated to provide closer upper bounds for
+ * every combination of windowBits and memLevel.  But even the conservative
+ * upper bound of about 14% expansion does not seem onerous for output buffer
+ * allocation.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong complen, wraplen;
+    Bytef *str;
+
+    /* conservative upper bound for compressed data */
+    complen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+
+    /* if can't get parameters, return conservative bound plus zlib wrapper */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return complen + 6;
+
+    /* compute wrapper length */
+    s = strm->state;
+    switch (s->wrap) {
+    case 0:                                 /* raw deflate */
+        wraplen = 0;
+        break;
+    case 1:                                 /* zlib wrapper */
+        wraplen = 6 + (s->strstart ? 4 : 0);
+        break;
+    case 2:                                 /* gzip wrapper */
+        wraplen = 18;
+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
+            if (s->gzhead->extra != Z_NULL)
+                wraplen += 2 + s->gzhead->extra_len;
+            str = s->gzhead->name;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            str = s->gzhead->comment;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            if (s->gzhead->hcrc)
+                wraplen += 2;
+        }
+        break;
+    default:                                /* for compiler happiness */
+        wraplen = 6;
+    }
+
+    /* if not default parameters, return conservative bound */
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return complen + wraplen;
+
+    /* default settings: return tight bound for that case */
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13 - 6 + wraplen;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len;
+    deflate_state *s = strm->state;
+
+    _tr_flush_bits(s);
+    len = s->pending;
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, s->pending_out, len);
+    strm->next_out  += len;
+    s->pending_out  += len;
+    strm->total_out += len;
+    strm->avail_out  -= len;
+    s->pending -= len;
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
+    }
+}
+
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        flush > Z_BLOCK || flush < 0) {
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    s->strm = strm; /* just in case */
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
+    /* Write the header */
+    if (s->status == INIT_STATE) {
+#ifdef GZIP
+        if (s->wrap == 2) {
+            strm->adler = crc32(0L, Z_NULL, 0);
+            put_byte(s, 31);
+            put_byte(s, 139);
+            put_byte(s, 8);
+            if (s->gzhead == Z_NULL) {
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, OS_CODE);
+                s->status = BUSY_STATE;
+            }
+            else {
+                put_byte(s, (s->gzhead->text ? 1 : 0) +
+                            (s->gzhead->hcrc ? 2 : 0) +
+                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                            (s->gzhead->name == Z_NULL ? 0 : 8) +
+                            (s->gzhead->comment == Z_NULL ? 0 : 16)
+                        );
+                put_byte(s, (Byte)(s->gzhead->time & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, s->gzhead->os & 0xff);
+                if (s->gzhead->extra != Z_NULL) {
+                    put_byte(s, s->gzhead->extra_len & 0xff);
+                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+                }
+                if (s->gzhead->hcrc)
+                    strm->adler = crc32(strm->adler, s->pending_buf,
+                                        s->pending);
+                s->gzindex = 0;
+                s->status = EXTRA_STATE;
+            }
+        }
+        else
+#endif
+        {
+            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+            uInt level_flags;
+
+            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+                level_flags = 0;
+            else if (s->level < 6)
+                level_flags = 1;
+            else if (s->level == 6)
+                level_flags = 2;
+            else
+                level_flags = 3;
+            header |= (level_flags << 6);
+            if (s->strstart != 0) header |= PRESET_DICT;
+            header += 31 - (header % 31);
+
+            s->status = BUSY_STATE;
+            putShortMSB(s, header);
+
+            /* Save the adler32 of the preset dictionary: */
+            if (s->strstart != 0) {
+                putShortMSB(s, (uInt)(strm->adler >> 16));
+                putShortMSB(s, (uInt)(strm->adler & 0xffff));
+            }
+            strm->adler = adler32(0L, Z_NULL, 0);
+        }
+    }
+#ifdef GZIP
+    if (s->status == EXTRA_STATE) {
+        if (s->gzhead->extra != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+
+            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size)
+                        break;
+                }
+                put_byte(s, s->gzhead->extra[s->gzindex]);
+                s->gzindex++;
+            }
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (s->gzindex == s->gzhead->extra_len) {
+                s->gzindex = 0;
+                s->status = NAME_STATE;
+            }
+        }
+        else
+            s->status = NAME_STATE;
+    }
+    if (s->status == NAME_STATE) {
+        if (s->gzhead->name != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->name[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0) {
+                s->gzindex = 0;
+                s->status = COMMENT_STATE;
+            }
+        }
+        else
+            s->status = COMMENT_STATE;
+    }
+    if (s->status == COMMENT_STATE) {
+        if (s->gzhead->comment != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->comment[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0)
+                s->status = HCRC_STATE;
+        }
+        else
+            s->status = HCRC_STATE;
+    }
+    if (s->status == HCRC_STATE) {
+        if (s->gzhead->hcrc) {
+            if (s->pending + 2 > s->pending_buf_size)
+                flush_pending(strm);
+            if (s->pending + 2 <= s->pending_buf_size) {
+                put_byte(s, (Byte)(strm->adler & 0xff));
+                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+                strm->adler = crc32(0L, Z_NULL, 0);
+                s->status = BUSY_STATE;
+            }
+        }
+        else
+            s->status = BUSY_STATE;
+    }
+#endif
+
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
+        bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :
+                        (*(configuration_table[s->level].func))(s, flush));
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+            if (strm->avail_out == 0) {
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+            }
+            return Z_OK;
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+             * of deflate should use the same flush parameter to make sure
+             * that the flush is complete. So we don't have to output an
+             * empty block here, this will be done at next call. This also
+             * ensures that for a very small output buffer, we emit at most
+             * one empty block.
+             */
+        }
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                    if (s->lookahead == 0) {
+                        s->strstart = 0;
+                        s->block_start = 0L;
+                        s->insert = 0;
+                    }
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) {
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+              return Z_OK;
+            }
+        }
+    }
+    Assert(strm->avail_out > 0, "bug2");
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->wrap <= 0) return Z_STREAM_END;
+
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+    z_streamp strm;
+{
+    int status;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+    status = strm->state->status;
+    if (status != INIT_STATE &&
+        status != EXTRA_STATE &&
+        status != NAME_STATE &&
+        status != COMMENT_STATE &&
+        status != HCRC_STATE &&
+        status != BUSY_STATE &&
+        status != FINISH_STATE) {
+      return Z_STREAM_ERROR;
+    }
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+    ushf *overlay;
+
+
+    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+    ds->pending_buf = (uchf *) overlay;
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local int read_buf(strm, buf, size)
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    zmemcpy(buf, strm->next_in, len);
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, buf, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, buf, len);
+    }
+#endif
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return (int)len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->insert = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+#ifndef FASTEST
+#ifdef ASMV
+    match_init(); /* initialize the asm code */
+#endif
+#endif
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    int best_len = s->prev_length;              /* best match length so far */
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
+#else
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end   = scan[best_len];
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
+    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2.  Note that the checks below
+         * for insufficient lookahead only occur occasionally for performance
+         * reasons.  Therefore uninitialized memory will be accessed, and
+         * conditional jumps will be made that depend on those values.
+         * However the length of the match is limited to the lookahead, so
+         * the output of deflate is not affected by the uninitialized values.
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match+best_len-1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window+strstart+257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]   != scan_end  ||
+            match[best_len-1] != scan_end1 ||
+            *match            != *scan     ||
+            *++match          != scan[1])      continue;
+
+        /* The check at best_len-1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart+258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan+best_len-1);
+#else
+            scan_end1  = scan[best_len-1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+#endif /* ASMV */
+
+#else /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for FASTEST only
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len-1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart+258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             scan < strend);
+
+    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#endif /* FASTEST */
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+                start, match, length);
+        do {
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+        } while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
+#endif /* DEBUG */
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
+    register unsigned n, m;
+    register Posf *p;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize+MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+
+            /* Slide the hash table (could be avoided with 32 bit values
+               at the expense of memory usage). We slide even when level == 0
+               to keep the hash table consistent if we switch back to level > 0
+               later. (Using level 0 permanently is not an optimal usage of
+               zlib, so we don't care about this pathological case.)
+             */
+            n = s->hash_size;
+            p = &s->head[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+            } while (--n);
+
+            n = wsize;
+#ifndef FASTEST
+            p = &s->prev[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+                /* If n is not on any hash chain, prev[n] is garbage but
+                 * its value will never be used.
+                 */
+            } while (--n);
+#endif
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) break;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, last) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+                (ulg)((long)s->strstart - s->block_start), \
+                (last)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, last) { \
+   FLUSH_BLOCK_ONLY(s, last); \
+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+     * to pending_buf_size, and each stored block has a 5 byte header:
+     */
+    ulg max_block_size = 0xffff;
+    ulg max_start;
+
+    if (max_block_size > s->pending_buf_size - 5) {
+        max_block_size = s->pending_buf_size - 5;
+    }
+
+    /* Copy as much as possible from input to output: */
+    for (;;) {
+        /* Fill the window as much as possible: */
+        if (s->lookahead <= 1) {
+
+            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+                   s->block_start >= (long)s->w_size, "slide too late");
+
+            fill_window(s);
+            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+        Assert(s->block_start >= 0L, "block gone");
+
+        s->strstart += s->lookahead;
+        s->lookahead = 0;
+
+        /* Emit a stored block if pending_buf will be full: */
+        max_start = s->block_start + max_block_size;
+        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
+            /* strstart == 0 is possible when wraparound on 16-bit machine */
+            s->lookahead = (uInt)(s->strstart - max_start);
+            s->strstart = (uInt)max_start;
+            FLUSH_BLOCK(s, 0);
+        }
+        /* Flush if we may have to slide, otherwise block_start may become
+         * negative and the data will be gone:
+         */
+        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+            FLUSH_BLOCK(s, 0);
+        }
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if ((long)s->strstart > s->block_start)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;       /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+            {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;          /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+                           s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length-1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart-1]));
+            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        s->match_available = 0;
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+#endif /* FASTEST */
+
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+    uInt prev;              /* byte at distance one to match */
+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the longest run, plus one for the unrolled loop.
+         */
+        if (s->lookahead <= MAX_MATCH) {
+            fill_window(s);
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* See how many times the previous byte repeats */
+        s->match_length = 0;
+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
+            scan = s->window + s->strstart - 1;
+            prev = *scan;
+            if (prev == *++scan && prev == *++scan && prev == *++scan) {
+                strend = s->window + s->strstart + MAX_MATCH;
+                do {
+                } while (prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         scan < strend);
+                s->match_length = MAX_MATCH - (int)(strend - scan);
+                if (s->match_length > s->lookahead)
+                    s->match_length = s->lookahead;
+            }
+            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+        }
+
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, s->match_length);
+
+            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+            s->strstart += s->match_length;
+            s->match_length = 0;
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+local block_state deflate_huff(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we have a literal to write. */
+        if (s->lookahead == 0) {
+            fill_window(s);
+            if (s->lookahead == 0) {
+                if (flush == Z_NO_FLUSH)
+                    return need_more;
+                break;      /* flush the current block */
+            }
+        }
+
+        /* Output a literal byte */
+        s->match_length = 0;
+        Tracevv((stderr,"%c", s->window[s->strstart]));
+        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        s->lookahead--;
+        s->strstart++;
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
diff --git a/tests/scancode/data/resource/samples/zlib/deflate.h b/tests/scancode/data/resource/samples/zlib/deflate.h
new file mode 100644
index 00000000000..ce0299edd19
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/deflate.h
@@ -0,0 +1,346 @@
+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-2012 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef DEFLATE_H
+#define DEFLATE_H
+
+#include "zutil.h"
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip encoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GZIP
+#endif
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS  256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES   30
+/* number of distance codes */
+
+#define BL_CODES  19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
+#define INIT_STATE    42
+#define EXTRA_STATE   69
+#define NAME_STATE    73
+#define COMMENT_STATE 91
+#define HCRC_STATE   103
+#define BUSY_STATE   113
+#define FINISH_STATE 666
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+    union {
+        ush  freq;       /* frequency count */
+        ush  code;       /* bit string */
+    } fc;
+    union {
+        ush  dad;        /* father node in Huffman tree */
+        ush  len;        /* length of bit string */
+    } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad  dl.dad
+#define Len  dl.len
+
+typedef struct static_tree_desc_s  static_tree_desc;
+
+typedef struct tree_desc_s {
+    ct_data *dyn_tree;           /* the dynamic tree */
+    int     max_code;            /* largest code with non zero frequency */
+    static_tree_desc *stat_desc; /* the corresponding static tree */
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+    z_streamp strm;      /* pointer back to this zlib stream */
+    int   status;        /* as the name implies */
+    Bytef *pending_buf;  /* output still pending */
+    ulg   pending_buf_size; /* size of pending_buf */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
+    uInt   pending;      /* nb of bytes in the pending buffer */
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    uInt   gzindex;      /* where in extra, name, or comment */
+    Byte  method;        /* can only be DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
+
+                /* used by deflate.c: */
+
+    uInt  w_size;        /* LZ77 window size (32K by default) */
+    uInt  w_bits;        /* log2(w_size)  (8..16) */
+    uInt  w_mask;        /* w_size - 1 */
+
+    Bytef *window;
+    /* Sliding window. Input bytes are read into the second half of the window,
+     * and move to the first half later to keep a dictionary of at least wSize
+     * bytes. With this organization, matches are limited to a distance of
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always
+     * performed with a length multiple of the block size. Also, it limits
+     * the window size to 64K, which is quite useful on MSDOS.
+     * To do: use the user input buffer as sliding window.
+     */
+
+    ulg window_size;
+    /* Actual size of window: 2*wSize, except when the user input buffer
+     * is directly used as sliding window.
+     */
+
+    Posf *prev;
+    /* Link to older string with same hash index. To limit the size of this
+     * array to 64K, this link is maintained only for the last 32K strings.
+     * An index in this array is thus a window index modulo 32K.
+     */
+
+    Posf *head; /* Heads of the hash chains or NIL. */
+
+    uInt  ins_h;          /* hash index of string to be inserted */
+    uInt  hash_size;      /* number of elements in hash table */
+    uInt  hash_bits;      /* log2(hash_size) */
+    uInt  hash_mask;      /* hash_size-1 */
+
+    uInt  hash_shift;
+    /* Number of bits by which ins_h must be shifted at each input
+     * step. It must be such that after MIN_MATCH steps, the oldest
+     * byte no longer takes part in the hash key, that is:
+     *   hash_shift * MIN_MATCH >= hash_bits
+     */
+
+    long block_start;
+    /* Window position at the beginning of the current output block. Gets
+     * negative when the window is moved backwards.
+     */
+
+    uInt match_length;           /* length of best match */
+    IPos prev_match;             /* previous match */
+    int match_available;         /* set if previous match exists */
+    uInt strstart;               /* start of string to insert */
+    uInt match_start;            /* start of matching string */
+    uInt lookahead;              /* number of valid bytes ahead in window */
+
+    uInt prev_length;
+    /* Length of the best match at previous step. Matches not greater than this
+     * are discarded. This is used in the lazy match evaluation.
+     */
+
+    uInt max_chain_length;
+    /* To speed up deflation, hash chains are never searched beyond this
+     * length.  A higher limit improves compression ratio but degrades the
+     * speed.
+     */
+
+    uInt max_lazy_match;
+    /* Attempt to find a better match only when the current match is strictly
+     * smaller than this value. This mechanism is used only for compression
+     * levels >= 4.
+     */
+#   define max_insert_length  max_lazy_match
+    /* Insert new strings in the hash table only if the match length is not
+     * greater than this length. This saves time but degrades compression.
+     * max_insert_length is used only for compression levels <= 3.
+     */
+
+    int level;    /* compression level (1..9) */
+    int strategy; /* favor or force Huffman coding*/
+
+    uInt good_match;
+    /* Use a faster search when the previous match is longer than this */
+
+    int nice_match; /* Stop searching when current match exceeds this */
+
+                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
+
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap_len;               /* number of elements in the heap */
+    int heap_max;               /* element of largest frequency */
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+     * The same heap array is used to build all trees.
+     */
+
+    uch depth[2*L_CODES+1];
+    /* Depth of each subtree used as tie breaker for trees of equal frequency
+     */
+
+    uchf *l_buf;          /* buffer for literals or lengths */
+
+    uInt  lit_bufsize;
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for
+     * limiting lit_bufsize to 64K:
+     *   - frequencies can be kept in 16 bit counters
+     *   - if compression is not successful for the first block, all input
+     *     data is still in the window so we can still emit a stored block even
+     *     when input comes from standard input.  (This can also be done for
+     *     all blocks if lit_bufsize is not greater than 32K.)
+     *   - if compression is not successful for a file smaller than 64K, we can
+     *     even emit a stored file instead of a stored block (saving 5 bytes).
+     *     This is applicable only for zip (not gzip or zlib).
+     *   - creating new Huffman trees less frequently may not provide fast
+     *     adaptation to changes in the input data statistics. (Take for
+     *     example a binary file with poorly compressible code followed by
+     *     a highly compressible string table.) Smaller buffer sizes give
+     *     fast adaptation but have of course the overhead of transmitting
+     *     trees more frequently.
+     *   - I can't count above 4
+     */
+
+    uInt last_lit;      /* running index in l_buf */
+
+    ushf *d_buf;
+    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+     * the same number of elements. To use different lengths, an extra flag
+     * array would be necessary.
+     */
+
+    ulg opt_len;        /* bit length of current block with optimal trees */
+    ulg static_len;     /* bit length of current block with static trees */
+    uInt matches;       /* number of string matches in current block */
+    uInt insert;        /* bytes at end of window left to insert */
+
+#ifdef DEBUG
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
+#endif
+
+    ush bi_buf;
+    /* Output buffer. bits are inserted starting at the bottom (least
+     * significant bits).
+     */
+    int bi_valid;
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit
+     * are always zero.
+     */
+
+    ulg high_water;
+    /* High water mark offset in window for initialized bytes -- bytes above
+     * this are set to zero in order to avoid memory check warnings when
+     * longest match routines access bytes past the input.  This is then
+     * updated to the new high water mark.
+     */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+#define WIN_INIT MAX_MATCH
+/* Number of bytes after end of data in window to initialize in order to avoid
+   memory checker errors from longest match routines */
+
+        /* in trees.c */
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+
+#define d_code(dist) \
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
+#ifndef DEBUG
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
+#else
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->last_lit] = 0; \
+    s->l_buf[s->last_lit++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (length); \
+    ush dist = (distance); \
+    s->d_buf[s->last_lit] = dist; \
+    s->l_buf[s->last_lit++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+  }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+              flush = _tr_tally(s, distance, length)
+#endif
+
+#endif /* DEFLATE_H */
diff --git a/tests/scancode/data/resource/samples/zlib/dotzlib/AssemblyInfo.cs b/tests/scancode/data/resource/samples/zlib/dotzlib/AssemblyInfo.cs
new file mode 100644
index 00000000000..0491bfc2b03
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/dotzlib/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("DotZLib")]
+[assembly: AssemblyDescription(".Net bindings for ZLib compression dll 1.2.x")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Henrik Ravn")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing.
+//
+// Notes:
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/tests/scancode/data/resource/samples/zlib/dotzlib/ChecksumImpl.cs b/tests/scancode/data/resource/samples/zlib/dotzlib/ChecksumImpl.cs
new file mode 100644
index 00000000000..788b2fceced
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/dotzlib/ChecksumImpl.cs
@@ -0,0 +1,202 @@
+//
+// � Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+
+namespace DotZLib
+{
+    #region ChecksumGeneratorBase
+    /// <summary>
+    /// Implements the common functionality needed for all <see cref="ChecksumGenerator"/>s
+    /// </summary>
+    /// <example></example>
+    public abstract class ChecksumGeneratorBase : ChecksumGenerator
+    {
+        /// <summary>
+        /// The value of the current checksum
+        /// </summary>
+        protected uint _current;
+
+        /// <summary>
+        /// Initializes a new instance of the checksum generator base - the current checksum is
+        /// set to zero
+        /// </summary>
+        public ChecksumGeneratorBase()
+        {
+            _current = 0;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the checksum generator basewith a specified value
+        /// </summary>
+        /// <param name="initialValue">The value to set the current checksum to</param>
+        public ChecksumGeneratorBase(uint initialValue)
+        {
+            _current = initialValue;
+        }
+
+        /// <summary>
+        /// Resets the current checksum to zero
+        /// </summary>
+        public void Reset() { _current = 0; }
+
+        /// <summary>
+        /// Gets the current checksum value
+        /// </summary>
+        public uint Value { get { return _current; } }
+
+        /// <summary>
+        /// Updates the current checksum with part of an array of bytes
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        /// <param name="offset">Where in <c>data</c> to start updating</param>
+        /// <param name="count">The number of bytes from <c>data</c> to use</param>
+        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
+        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
+        /// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one.
+        /// This is therefore the only method a derived class has to implement</remarks>
+        public abstract void Update(byte[] data, int offset, int count);
+
+        /// <summary>
+        /// Updates the current checksum with an array of bytes.
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        public void Update(byte[] data)
+        {
+            Update(data, 0, data.Length);
+        }
+
+        /// <summary>
+        /// Updates the current checksum with the data from a string
+        /// </summary>
+        /// <param name="data">The string to update the checksum with</param>
+        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>
+        public void Update(string data)
+        {
+			Update(Encoding.UTF8.GetBytes(data));
+        }
+
+        /// <summary>
+        /// Updates the current checksum with the data from a string, using a specific encoding
+        /// </summary>
+        /// <param name="data">The string to update the checksum with</param>
+        /// <param name="encoding">The encoding to use</param>
+        public void Update(string data, Encoding encoding)
+        {
+            Update(encoding.GetBytes(data));
+        }
+
+    }
+    #endregion
+
+    #region CRC32
+    /// <summary>
+    /// Implements a CRC32 checksum generator
+    /// </summary>
+    public sealed class CRC32Checksum : ChecksumGeneratorBase
+    {
+        #region DLL imports
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern uint crc32(uint crc, int data, uint length);
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the CRC32 checksum generator
+        /// </summary>
+        public CRC32Checksum() : base() {}
+
+        /// <summary>
+        /// Initializes a new instance of the CRC32 checksum generator with a specified value
+        /// </summary>
+        /// <param name="initialValue">The value to set the current checksum to</param>
+        public CRC32Checksum(uint initialValue) : base(initialValue) {}
+
+        /// <summary>
+        /// Updates the current checksum with part of an array of bytes
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        /// <param name="offset">Where in <c>data</c> to start updating</param>
+        /// <param name="count">The number of bytes from <c>data</c> to use</param>
+        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
+        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
+        public override void Update(byte[] data, int offset, int count)
+        {
+            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
+            if ((offset+count) > data.Length) throw new ArgumentException();
+            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                _current = crc32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);
+            }
+            finally
+            {
+                hData.Free();
+            }
+        }
+
+    }
+    #endregion
+
+    #region Adler
+    /// <summary>
+    /// Implements a checksum generator that computes the Adler checksum on data
+    /// </summary>
+    public sealed class AdlerChecksum : ChecksumGeneratorBase
+    {
+        #region DLL imports
+
+        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
+        private static extern uint adler32(uint adler, int data, uint length);
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the Adler checksum generator
+        /// </summary>
+        public AdlerChecksum() : base() {}
+
+        /// <summary>
+        /// Initializes a new instance of the Adler checksum generator with a specified value
+        /// </summary>
+        /// <param name="initialValue">The value to set the current checksum to</param>
+        public AdlerChecksum(uint initialValue) : base(initialValue) {}
+
+        /// <summary>
+        /// Updates the current checksum with part of an array of bytes
+        /// </summary>
+        /// <param name="data">The data to update the checksum with</param>
+        /// <param name="offset">Where in <c>data</c> to start updating</param>
+        /// <param name="count">The number of bytes from <c>data</c> to use</param>
+        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
+        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
+        public override void Update(byte[] data, int offset, int count)
+        {
+            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
+            if ((offset+count) > data.Length) throw new ArgumentException();
+            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                _current = adler32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);
+            }
+            finally
+            {
+                hData.Free();
+            }
+        }
+
+    }
+    #endregion
+
+}
\ No newline at end of file
diff --git a/tests/scancode/data/resource/samples/zlib/dotzlib/LICENSE_1_0.txt b/tests/scancode/data/resource/samples/zlib/dotzlib/LICENSE_1_0.txt
new file mode 100644
index 00000000000..30aac2cf479
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/dotzlib/LICENSE_1_0.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/tests/scancode/data/resource/samples/zlib/dotzlib/readme.txt b/tests/scancode/data/resource/samples/zlib/dotzlib/readme.txt
new file mode 100644
index 00000000000..b2395720d4c
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/dotzlib/readme.txt
@@ -0,0 +1,58 @@
+This directory contains a .Net wrapper class library for the ZLib1.dll
+
+The wrapper includes support for inflating/deflating memory buffers,
+.Net streaming wrappers for the gz streams part of zlib, and wrappers
+for the checksum parts of zlib. See DotZLib/UnitTests.cs for examples.
+
+Directory structure:
+--------------------
+
+LICENSE_1_0.txt       - License file.
+readme.txt            - This file.
+DotZLib.chm           - Class library documentation
+DotZLib.build         - NAnt build file
+DotZLib.sln           - Microsoft Visual Studio 2003 solution file
+
+DotZLib\*.cs          - Source files for the class library
+
+Unit tests:
+-----------
+The file DotZLib/UnitTests.cs contains unit tests for use with NUnit 2.1 or higher.
+To include unit tests in the build, define nunit before building.
+
+
+Build instructions:
+-------------------
+
+1. Using Visual Studio.Net 2003:
+   Open DotZLib.sln in VS.Net and build from there. Output file (DotZLib.dll)
+   will be found ./DotZLib/bin/release or ./DotZLib/bin/debug, depending on
+   you are building the release or debug version of the library. Check
+   DotZLib/UnitTests.cs for instructions on how to include unit tests in the
+   build.
+
+2. Using NAnt:
+   Open a command prompt with access to the build environment and run nant
+   in the same directory as the DotZLib.build file.
+   You can define 2 properties on the nant command-line to control the build:
+   debug={true|false} to toggle between release/debug builds (default=true).
+   nunit={true|false} to include or esclude unit tests (default=true).
+   Also the target clean will remove binaries.
+   Output file (DotZLib.dll) will be found in either ./DotZLib/bin/release
+   or ./DotZLib/bin/debug, depending on whether you are building the release
+   or debug version of the library.
+
+   Examples:
+     nant -D:debug=false -D:nunit=false
+       will build a release mode version of the library without unit tests.
+     nant
+       will build a debug version of the library with unit tests
+     nant clean
+       will remove all previously built files.
+
+
+---------------------------------
+Copyright (c) Henrik Ravn 2004
+
+Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/tests/scancode/data/resource/samples/zlib/gcc_gvmat64/gvmat64.S b/tests/scancode/data/resource/samples/zlib/gcc_gvmat64/gvmat64.S
new file mode 100644
index 00000000000..dd858ddbd16
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/gcc_gvmat64/gvmat64.S
@@ -0,0 +1,574 @@
+/*
+;uInt longest_match_x64(
+;    deflate_state *s,
+;    IPos cur_match);                             // current match 
+
+; gvmat64.S -- Asm portion of the optimized longest_match for 32 bits x86_64
+;  (AMD64 on Athlon 64, Opteron, Phenom
+;     and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)
+; this file is translation from gvmat64.asm to GCC 4.x (for Linux, Mac XCode)
+; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
+;
+; File written by Gilles Vollant, by converting to assembly the longest_match
+;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.
+;  and by taking inspiration on asm686 with masm, optimised assembly code
+;        from Brian Raiter, written 1998
+;
+;  This software is provided 'as-is', without any express or implied
+;  warranty.  In no event will the authors be held liable for any damages
+;  arising from the use of this software.
+;
+;  Permission is granted to anyone to use this software for any purpose,
+;  including commercial applications, and to alter it and redistribute it
+;  freely, subject to the following restrictions:
+;
+;  1. The origin of this software must not be misrepresented; you must not
+;     claim that you wrote the original software. If you use this software
+;     in a product, an acknowledgment in the product documentation would be
+;     appreciated but is not required.
+;  2. Altered source versions must be plainly marked as such, and must not be
+;     misrepresented as being the original software
+;  3. This notice may not be removed or altered from any source distribution.
+;
+;         http://www.zlib.net
+;         http://www.winimage.com/zLibDll
+;         http://www.muppetlabs.com/~breadbox/software/assembly.html
+;
+; to compile this file for zLib, I use option:
+;   gcc -c -arch x86_64 gvmat64.S
+
+
+;uInt longest_match(s, cur_match)
+;    deflate_state *s;
+;    IPos cur_match;                             // current match /
+;
+; with XCode for Mac, I had strange error with some jump on intel syntax
+; this is why BEFORE_JMP and AFTER_JMP are used
+ */
+
+
+#define BEFORE_JMP .att_syntax
+#define AFTER_JMP .intel_syntax noprefix
+
+#ifndef NO_UNDERLINE
+#	define	match_init	_match_init
+#	define	longest_match	_longest_match
+#endif
+
+.intel_syntax noprefix
+
+.globl	match_init, longest_match
+.text
+longest_match:
+
+
+
+#define LocalVarsSize 96
+/*
+; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12
+; free register :  r14,r15
+; register can be saved : rsp
+*/
+
+#define chainlenwmask     (rsp + 8 - LocalVarsSize)
+#define nicematch         (rsp + 16 - LocalVarsSize)
+
+#define save_rdi        (rsp + 24 - LocalVarsSize)
+#define save_rsi        (rsp + 32 - LocalVarsSize)
+#define save_rbx        (rsp + 40 - LocalVarsSize)
+#define save_rbp        (rsp + 48 - LocalVarsSize)
+#define save_r12        (rsp + 56 - LocalVarsSize)
+#define save_r13        (rsp + 64 - LocalVarsSize)
+#define save_r14        (rsp + 72 - LocalVarsSize)
+#define save_r15        (rsp + 80 - LocalVarsSize)
+
+
+/*
+;  all the +4 offsets are due to the addition of pending_buf_size (in zlib
+;  in the deflate_state structure since the asm code was first written
+;  (if you compile with zlib 1.0.4 or older, remove the +4).
+;  Note : these value are good with a 8 bytes boundary pack structure
+*/
+
+#define    MAX_MATCH              258
+#define    MIN_MATCH              3
+#define    MIN_LOOKAHEAD          (MAX_MATCH+MIN_MATCH+1)
+
+/*
+;;; Offsets for fields in the deflate_state structure. These numbers
+;;; are calculated from the definition of deflate_state, with the
+;;; assumption that the compiler will dword-align the fields. (Thus,
+;;; changing the definition of deflate_state could easily cause this
+;;; program to crash horribly, without so much as a warning at
+;;; compile time. Sigh.)
+
+;  all the +zlib1222add offsets are due to the addition of fields
+;  in zlib in the deflate_state structure since the asm code was first written
+;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
+;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
+;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
+*/
+
+
+
+/* you can check the structure offset by running
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "deflate.h"
+
+void print_depl()
+{
+deflate_state ds;
+deflate_state *s=&ds;
+printf("size pointer=%u\n",(int)sizeof(void*));
+
+printf("#define dsWSize         %u\n",(int)(((char*)&(s->w_size))-((char*)s)));
+printf("#define dsWMask         %u\n",(int)(((char*)&(s->w_mask))-((char*)s)));
+printf("#define dsWindow        %u\n",(int)(((char*)&(s->window))-((char*)s)));
+printf("#define dsPrev          %u\n",(int)(((char*)&(s->prev))-((char*)s)));
+printf("#define dsMatchLen      %u\n",(int)(((char*)&(s->match_length))-((char*)s)));
+printf("#define dsPrevMatch     %u\n",(int)(((char*)&(s->prev_match))-((char*)s)));
+printf("#define dsStrStart      %u\n",(int)(((char*)&(s->strstart))-((char*)s)));
+printf("#define dsMatchStart    %u\n",(int)(((char*)&(s->match_start))-((char*)s)));
+printf("#define dsLookahead     %u\n",(int)(((char*)&(s->lookahead))-((char*)s)));
+printf("#define dsPrevLen       %u\n",(int)(((char*)&(s->prev_length))-((char*)s)));
+printf("#define dsMaxChainLen   %u\n",(int)(((char*)&(s->max_chain_length))-((char*)s)));
+printf("#define dsGoodMatch     %u\n",(int)(((char*)&(s->good_match))-((char*)s)));
+printf("#define dsNiceMatch     %u\n",(int)(((char*)&(s->nice_match))-((char*)s)));
+}
+*/
+
+#define dsWSize          68
+#define dsWMask          76
+#define dsWindow         80
+#define dsPrev           96
+#define dsMatchLen       144
+#define dsPrevMatch      148
+#define dsStrStart       156
+#define dsMatchStart     160
+#define dsLookahead      164
+#define dsPrevLen        168
+#define dsMaxChainLen    172
+#define dsGoodMatch      188
+#define dsNiceMatch      192
+
+#define window_size      [ rcx + dsWSize]
+#define WMask            [ rcx + dsWMask]
+#define window_ad        [ rcx + dsWindow]
+#define prev_ad          [ rcx + dsPrev]
+#define strstart         [ rcx + dsStrStart]
+#define match_start      [ rcx + dsMatchStart]
+#define Lookahead        [ rcx + dsLookahead] //; 0ffffffffh on infozip
+#define prev_length      [ rcx + dsPrevLen]
+#define max_chain_length [ rcx + dsMaxChainLen]
+#define good_match       [ rcx + dsGoodMatch]
+#define nice_match       [ rcx + dsNiceMatch]
+
+/*
+; windows:
+; parameter 1 in rcx(deflate state s), param 2 in rdx (cur match)
+
+; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
+; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
+;
+; All registers must be preserved across the call, except for
+;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.
+
+;
+; gcc on macosx-linux:
+; see http://www.x86-64.org/documentation/abi-0.99.pdf
+; param 1 in rdi, param 2 in rsi
+; rbx, rsp, rbp, r12 to r15 must be preserved
+
+;;; Save registers that the compiler may be using, and adjust esp to
+;;; make room for our stack frame.
+
+
+;;; Retrieve the function arguments. r8d will hold cur_match
+;;; throughout the entire function. edx will hold the pointer to the
+;;; deflate_state structure during the function's setup (before
+;;; entering the main loop.
+
+; ms: parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)
+; mac: param 1 in rdi, param 2 rsi
+; this clear high 32 bits of r8, which can be garbage in both r8 and rdx
+*/
+        mov [save_rbx],rbx
+        mov [save_rbp],rbp
+
+
+        mov rcx,rdi
+
+        mov r8d,esi
+
+
+        mov [save_r12],r12
+        mov [save_r13],r13
+        mov [save_r14],r14
+        mov [save_r15],r15
+
+
+//;;; uInt wmask = s->w_mask;
+//;;; unsigned chain_length = s->max_chain_length;
+//;;; if (s->prev_length >= s->good_match) {
+//;;;     chain_length >>= 2;
+//;;; }
+
+
+        mov edi, prev_length
+        mov esi, good_match
+        mov eax, WMask
+        mov ebx, max_chain_length
+        cmp edi, esi
+        jl  LastMatchGood
+        shr ebx, 2
+LastMatchGood:
+
+//;;; chainlen is decremented once beforehand so that the function can
+//;;; use the sign flag instead of the zero flag for the exit test.
+//;;; It is then shifted into the high word, to make room for the wmask
+//;;; value, which it will always accompany.
+
+        dec ebx
+        shl ebx, 16
+        or  ebx, eax
+
+//;;; on zlib only
+//;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+
+
+        mov eax, nice_match
+        mov [chainlenwmask], ebx
+        mov r10d, Lookahead
+        cmp r10d, eax
+        cmovnl r10d, eax
+        mov [nicematch],r10d
+
+
+
+//;;; register Bytef *scan = s->window + s->strstart;
+        mov r10, window_ad
+        mov ebp, strstart
+        lea r13, [r10 + rbp]
+
+//;;; Determine how many bytes the scan ptr is off from being
+//;;; dword-aligned.
+
+         mov r9,r13
+         neg r13
+         and r13,3
+
+//;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+//;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;
+
+
+        mov eax, window_size
+        sub eax, MIN_LOOKAHEAD
+
+
+        xor edi,edi
+        sub ebp, eax
+
+        mov r11d, prev_length
+
+        cmovng ebp,edi
+
+//;;; int best_len = s->prev_length;
+
+
+//;;; Store the sum of s->window + best_len in esi locally, and in esi.
+
+       lea  rsi,[r10+r11]
+
+//;;; register ush scan_start = *(ushf*)scan;
+//;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
+//;;; Posf *prev = s->prev;
+
+        movzx r12d,word ptr [r9]
+        movzx ebx, word ptr [r9 + r11 - 1]
+
+        mov rdi, prev_ad
+
+//;;; Jump into the main loop.
+
+        mov edx, [chainlenwmask]
+
+        cmp bx,word ptr [rsi + r8 - 1]
+        jz  LookupLoopIsZero
+				
+						
+						
+LookupLoop1:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+        jbe LeaveNow
+		
+		
+		
+        sub edx, 0x00010000
+		BEFORE_JMP
+        js  LeaveNow
+		AFTER_JMP
+
+LoopEntry1:
+        cmp bx,word ptr [rsi + r8 - 1]
+		BEFORE_JMP
+        jz  LookupLoopIsZero
+		AFTER_JMP
+
+LookupLoop2:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+		BEFORE_JMP
+        jbe LeaveNow
+		AFTER_JMP
+        sub edx, 0x00010000
+		BEFORE_JMP
+        js  LeaveNow
+		AFTER_JMP
+
+LoopEntry2:
+        cmp bx,word ptr [rsi + r8 - 1]
+		BEFORE_JMP
+        jz  LookupLoopIsZero
+		AFTER_JMP
+
+LookupLoop4:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+		BEFORE_JMP
+        jbe LeaveNow
+		AFTER_JMP
+        sub edx, 0x00010000
+		BEFORE_JMP
+        js  LeaveNow
+		AFTER_JMP
+
+LoopEntry4:
+
+        cmp bx,word ptr [rsi + r8 - 1]
+		BEFORE_JMP
+        jnz LookupLoop1
+        jmp LookupLoopIsZero
+		AFTER_JMP
+/*
+;;; do {
+;;;     match = s->window + cur_match;
+;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
+;;;         *(ushf*)match != scan_start) continue;
+;;;     [...]
+;;; } while ((cur_match = prev[cur_match & wmask]) > limit
+;;;          && --chain_length != 0);
+;;;
+;;; Here is the inner loop of the function. The function will spend the
+;;; majority of its time in this loop, and majority of that time will
+;;; be spent in the first ten instructions.
+;;;
+;;; Within this loop:
+;;; ebx = scanend
+;;; r8d = curmatch
+;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
+;;; esi = windowbestlen - i.e., (window + bestlen)
+;;; edi = prev
+;;; ebp = limit
+*/
+.balign 16
+LookupLoop:
+        and r8d, edx
+
+        movzx   r8d, word ptr [rdi + r8*2]
+        cmp r8d, ebp
+		BEFORE_JMP
+        jbe LeaveNow
+		AFTER_JMP
+        sub edx, 0x00010000
+		BEFORE_JMP
+        js  LeaveNow
+		AFTER_JMP
+
+LoopEntry:
+
+        cmp bx,word ptr [rsi + r8 - 1]
+		BEFORE_JMP
+        jnz LookupLoop1
+		AFTER_JMP
+LookupLoopIsZero:
+        cmp     r12w, word ptr [r10 + r8]
+		BEFORE_JMP
+        jnz LookupLoop1
+		AFTER_JMP
+
+
+//;;; Store the current value of chainlen.
+        mov [chainlenwmask], edx
+/*
+;;; Point edi to the string under scrutiny, and esi to the string we
+;;; are hoping to match it up with. In actuality, esi and edi are
+;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
+;;; initialized to -(MAX_MATCH_8 - scanalign).
+*/
+        lea rsi,[r8+r10]
+        mov rdx, 0xfffffffffffffef8 //; -(MAX_MATCH_8)
+        lea rsi, [rsi + r13 + 0x0108] //;MAX_MATCH_8]
+        lea rdi, [r9 + r13 + 0x0108] //;MAX_MATCH_8]
+
+        prefetcht1 [rsi+rdx]
+        prefetcht1 [rdi+rdx]
+
+/*
+;;; Test the strings for equality, 8 bytes at a time. At the end,
+;;; adjust rdx so that it is offset to the exact byte that mismatched.
+;;;
+;;; We already know at this point that the first three bytes of the
+;;; strings match each other, and they can be safely passed over before
+;;; starting the compare loop. So what this code does is skip over 0-3
+;;; bytes, as much as necessary in order to dword-align the edi
+;;; pointer. (rsi will still be misaligned three times out of four.)
+;;;
+;;; It should be confessed that this loop usually does not represent
+;;; much of the total running time. Replacing it with a more
+;;; straightforward "rep cmpsb" would not drastically degrade
+;;; performance.
+*/
+
+LoopCmps:
+        mov rax, [rsi + rdx]
+        xor rax, [rdi + rdx]
+        jnz LeaveLoopCmps
+
+        mov rax, [rsi + rdx + 8]
+        xor rax, [rdi + rdx + 8]
+        jnz LeaveLoopCmps8
+
+
+        mov rax, [rsi + rdx + 8+8]
+        xor rax, [rdi + rdx + 8+8]
+        jnz LeaveLoopCmps16
+
+        add rdx,8+8+8
+
+		BEFORE_JMP
+        jnz  LoopCmps
+        jmp  LenMaximum
+		AFTER_JMP
+		
+LeaveLoopCmps16: add rdx,8
+LeaveLoopCmps8: add rdx,8
+LeaveLoopCmps:
+
+        test    eax, 0x0000FFFF
+        jnz LenLower
+
+        test eax,0xffffffff
+
+        jnz LenLower32
+
+        add rdx,4
+        shr rax,32
+        or ax,ax
+		BEFORE_JMP
+        jnz LenLower
+		AFTER_JMP
+
+LenLower32:
+        shr eax,16
+        add rdx,2
+		
+LenLower:		
+        sub al, 1
+        adc rdx, 0
+//;;; Calculate the length of the match. If it is longer than MAX_MATCH,
+//;;; then automatically accept it as the best possible match and leave.
+
+        lea rax, [rdi + rdx]
+        sub rax, r9
+        cmp eax, MAX_MATCH
+		BEFORE_JMP
+        jge LenMaximum
+		AFTER_JMP
+/*
+;;; If the length of the match is not longer than the best match we
+;;; have so far, then forget it and return to the lookup loop.
+;///////////////////////////////////
+*/
+        cmp eax, r11d
+        jg  LongerMatch
+
+        lea rsi,[r10+r11]
+
+        mov rdi, prev_ad
+        mov edx, [chainlenwmask]
+		BEFORE_JMP
+        jmp LookupLoop
+		AFTER_JMP
+/*
+;;;         s->match_start = cur_match;
+;;;         best_len = len;
+;;;         if (len >= nice_match) break;
+;;;         scan_end = *(ushf*)(scan+best_len-1);
+*/
+LongerMatch:
+        mov r11d, eax
+        mov match_start, r8d
+        cmp eax, [nicematch]
+		BEFORE_JMP
+        jge LeaveNow
+		AFTER_JMP
+
+        lea rsi,[r10+rax]
+
+        movzx   ebx, word ptr [r9 + rax - 1]
+        mov rdi, prev_ad
+        mov edx, [chainlenwmask]
+		BEFORE_JMP
+        jmp LookupLoop
+		AFTER_JMP
+
+//;;; Accept the current string, with the maximum possible length.
+
+LenMaximum:
+        mov r11d,MAX_MATCH
+        mov match_start, r8d
+
+//;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+//;;; return s->lookahead;
+
+LeaveNow:
+        mov eax, Lookahead
+        cmp r11d, eax
+        cmovng eax, r11d
+
+
+
+//;;; Restore the stack and return from whence we came.
+
+
+//        mov rsi,[save_rsi]
+//        mov rdi,[save_rdi]
+        mov rbx,[save_rbx]
+        mov rbp,[save_rbp]
+        mov r12,[save_r12]
+        mov r13,[save_r13]
+        mov r14,[save_r14]
+        mov r15,[save_r15]
+
+
+        ret 0
+//; please don't remove this string !
+//; Your can freely use gvmat64 in any free or commercial app
+//; but it is far better don't remove the string in the binary!
+ //   db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0
+
+
+match_init:
+  ret 0
+
+
diff --git a/tests/scancode/data/resource/samples/zlib/infback9/infback9.c b/tests/scancode/data/resource/samples/zlib/infback9/infback9.c
new file mode 100644
index 00000000000..05fb3e33807
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/infback9/infback9.c
@@ -0,0 +1,615 @@
+/* infback9.c -- inflate deflate64 data using a call-back interface
+ * Copyright (C) 1995-2008 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "infback9.h"
+#include "inftree9.h"
+#include "inflate9.h"
+
+#define WSIZE 65536UL
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   window is a user-supplied window and output buffer that is 64K bytes.
+ */
+int ZEXPORT inflateBack9Init_(strm, window, version, stream_size)
+z_stream FAR *strm;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (voidpf)state;
+    state->window = window;
+    return Z_OK;
+}
+
+/*
+   Build and output length and distance decoding tables for fixed code
+   decoding.
+ */
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+void makefixed9(void)
+{
+    unsigned sym, bits, low, size;
+    code *next, *lenfix, *distfix;
+    struct inflate_state state;
+    code fixed[544];
+
+    /* literal/length table */
+    sym = 0;
+    while (sym < 144) state.lens[sym++] = 8;
+    while (sym < 256) state.lens[sym++] = 9;
+    while (sym < 280) state.lens[sym++] = 7;
+    while (sym < 288) state.lens[sym++] = 8;
+    next = fixed;
+    lenfix = next;
+    bits = 9;
+    inflate_table9(LENS, state.lens, 288, &(next), &(bits), state.work);
+
+    /* distance table */
+    sym = 0;
+    while (sym < 32) state.lens[sym++] = 5;
+    distfix = next;
+    bits = 5;
+    inflate_table9(DISTS, state.lens, 32, &(next), &(bits), state.work);
+
+    /* write tables */
+    puts("    /* inffix9.h -- table for decoding deflate64 fixed codes");
+    puts("     * Generated automatically by makefixed9().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", lenfix[low].op, lenfix[low].bits,
+               lenfix[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 5) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", distfix[low].op, distfix[low].bits,
+               distfix[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/* Macros for inflateBack(): */
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n <= 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = window; \
+            left = WSIZE; \
+            wrap = 1; \
+            if (out(out_desc, put, (unsigned)left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack9(strm, in, in_desc, out, out_desc)
+z_stream FAR *strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have;              /* available input */
+    unsigned long left;         /* available output */
+    inflate_mode mode;          /* current inflate mode */
+    int lastblock;              /* true if processing last block */
+    int wrap;                   /* true if the window has wrapped */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned extra;             /* extra bits needed */
+    unsigned long length;       /* literal or length of data to copy */
+    unsigned long offset;       /* distance back to copy string from */
+    unsigned long copy;         /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+#include "inffix9.h"
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    mode = TYPE;
+    lastblock = 0;
+    wrap = 0;
+    window = state->window;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = window;
+    left = WSIZE;
+    lencode = Z_NULL;
+    distcode = Z_NULL;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (lastblock) {
+                BYTEBITS();
+                mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            lastblock = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        lastblock ? " (last)" : ""));
+                mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                lencode = lenfix;
+                lenbits = 9;
+                distcode = distfix;
+                distbits = 5;
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        lastblock ? " (last)" : ""));
+                mode = LEN;                     /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        lastblock ? " (last)" : ""));
+                mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                mode = BAD;
+                break;
+            }
+            length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %lu\n",
+                    length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (length != 0) {
+                copy = length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+            if (state->nlen > 286) {
+                strm->msg = (char *)"too many length symbols";
+                mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            lencode = (code const FAR *)(state->next);
+            lenbits = 7;
+            ret = inflate_table9(CODES, state->lens, 19, &(state->next),
+                                &(lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = lencode[BITS(lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    NEEDBITS(here.bits);
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftree9.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            lencode = (code const FAR *)(state->next);
+            lenbits = 9;
+            ret = inflate_table9(LENS, state->lens, state->nlen,
+                            &(state->next), &(lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                mode = BAD;
+                break;
+            }
+            distcode = (code const FAR *)(state->next);
+            distbits = 6;
+            ret = inflate_table9(DISTS, state->lens + state->nlen,
+                            state->ndist, &(state->next), &(distbits),
+                            state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            mode = LEN;
+
+        case LEN:
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                here = lencode[BITS(lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            length = (unsigned)here.val;
+
+            /* process literal */
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                ROOM();
+                *put++ = (unsigned char)(length);
+                left--;
+                mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            extra = (unsigned)(here.op) & 31;
+            if (extra != 0) {
+                NEEDBITS(extra);
+                length += BITS(extra);
+                DROPBITS(extra);
+            }
+            Tracevv((stderr, "inflate:         length %lu\n", length));
+
+            /* get distance code */
+            for (;;) {
+                here = distcode[BITS(distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                mode = BAD;
+                break;
+            }
+            offset = (unsigned)here.val;
+
+            /* get distance extra bits, if any */
+            extra = (unsigned)(here.op) & 15;
+            if (extra != 0) {
+                NEEDBITS(extra);
+                offset += BITS(extra);
+                DROPBITS(extra);
+            }
+            if (offset > WSIZE - (wrap ? 0: left)) {
+                strm->msg = (char *)"invalid distance too far back";
+                mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %lu\n", offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = WSIZE - offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - offset;
+                    copy = left;
+                }
+                if (copy > length) copy = length;
+                length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly -- write leftover output */
+            ret = Z_STREAM_END;
+            if (left < WSIZE) {
+                if (out(out_desc, window, (unsigned)(WSIZE - left)))
+                    ret = Z_BUF_ERROR;
+            }
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:                /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Return unused input */
+  inf_leave:
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBack9End(strm)
+z_stream FAR *strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
diff --git a/tests/scancode/data/resource/samples/zlib/infback9/infback9.h b/tests/scancode/data/resource/samples/zlib/infback9/infback9.h
new file mode 100644
index 00000000000..1073c0a38e6
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/infback9/infback9.h
@@ -0,0 +1,37 @@
+/* infback9.h -- header for using inflateBack9 functions
+ * Copyright (C) 2003 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * This header file and associated patches provide a decoder for PKWare's
+ * undocumented deflate64 compression method (method 9).  Use with infback9.c,
+ * inftree9.h, inftree9.c, and inffix9.h.  These patches are not supported.
+ * This should be compiled with zlib, since it uses zutil.h and zutil.o.
+ * This code has not yet been tested on 16-bit architectures.  See the
+ * comments in zlib.h for inflateBack() usage.  These functions are used
+ * identically, except that there is no windowBits parameter, and a 64K
+ * window must be provided.  Also if int's are 16 bits, then a zero for
+ * the third parameter of the "out" function actually means 65536UL.
+ * zlib.h must be included before this header file.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+ZEXTERN int ZEXPORT inflateBack9End OF((z_stream FAR *strm));
+ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define inflateBack9Init(strm, window) \
+        inflateBack9Init_((strm), (window), \
+        ZLIB_VERSION, sizeof(z_stream))
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/scancode/data/resource/samples/zlib/iostream2/zstream.h b/tests/scancode/data/resource/samples/zlib/iostream2/zstream.h
new file mode 100644
index 00000000000..43d2332b79b
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/iostream2/zstream.h
@@ -0,0 +1,307 @@
+/*
+ *
+ * Copyright (c) 1997
+ * Christian Michelsen Research AS
+ * Advanced Computing
+ * Fantoftvegen 38, 5036 BERGEN, Norway
+ * http://www.cmr.no
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Christian Michelsen Research AS makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ */
+
+#ifndef ZSTREAM__H
+#define ZSTREAM__H
+
+/*
+ * zstream.h - C++ interface to the 'zlib' general purpose compression library
+ * $Id: zstream.h 1.1 1997-06-25 12:00:56+02 tyge Exp tyge $
+ */
+
+#include <strstream.h>
+#include <string.h>
+#include <stdio.h>
+#include "zlib.h"
+
+#if defined(_WIN32)
+#   include <fcntl.h>
+#   include <io.h>
+#   define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+#   define SET_BINARY_MODE(file)
+#endif
+
+class zstringlen {
+public:
+    zstringlen(class izstream&);
+    zstringlen(class ozstream&, const char*);
+    size_t value() const { return val.word; }
+private:
+    struct Val { unsigned char byte; size_t word; } val;
+};
+
+//  ----------------------------- izstream -----------------------------
+
+class izstream
+{
+    public:
+        izstream() : m_fp(0) {}
+        izstream(FILE* fp) : m_fp(0) { open(fp); }
+        izstream(const char* name) : m_fp(0) { open(name); }
+        ~izstream() { close(); }
+
+        /* Opens a gzip (.gz) file for reading.
+         * open() can be used to read a file which is not in gzip format;
+         * in this case read() will directly read from the file without
+         * decompression. errno can be checked to distinguish two error
+         * cases (if errno is zero, the zlib error is Z_MEM_ERROR).
+         */
+        void open(const char* name) {
+            if (m_fp) close();
+            m_fp = ::gzopen(name, "rb");
+        }
+
+        void open(FILE* fp) {
+            SET_BINARY_MODE(fp);
+            if (m_fp) close();
+            m_fp = ::gzdopen(fileno(fp), "rb");
+        }
+
+        /* Flushes all pending input if necessary, closes the compressed file
+         * and deallocates all the (de)compression state. The return value is
+         * the zlib error number (see function error() below).
+         */
+        int close() {
+            int r = ::gzclose(m_fp);
+            m_fp = 0; return r;
+        }
+
+        /* Binary read the given number of bytes from the compressed file.
+         */
+        int read(void* buf, size_t len) {
+            return ::gzread(m_fp, buf, len);
+        }
+
+        /* Returns the error message for the last error which occurred on the
+         * given compressed file. errnum is set to zlib error number. If an
+         * error occurred in the file system and not in the compression library,
+         * errnum is set to Z_ERRNO and the application may consult errno
+         * to get the exact error code.
+         */
+        const char* error(int* errnum) {
+            return ::gzerror(m_fp, errnum);
+        }
+
+        gzFile fp() { return m_fp; }
+
+    private:
+        gzFile m_fp;
+};
+
+/*
+ * Binary read the given (array of) object(s) from the compressed file.
+ * If the input file was not in gzip format, read() copies the objects number
+ * of bytes into the buffer.
+ * returns the number of uncompressed bytes actually read
+ * (0 for end of file, -1 for error).
+ */
+template <class T, class Items>
+inline int read(izstream& zs, T* x, Items items) {
+    return ::gzread(zs.fp(), x, items*sizeof(T));
+}
+
+/*
+ * Binary input with the '>' operator.
+ */
+template <class T>
+inline izstream& operator>(izstream& zs, T& x) {
+    ::gzread(zs.fp(), &x, sizeof(T));
+    return zs;
+}
+
+
+inline zstringlen::zstringlen(izstream& zs) {
+    zs > val.byte;
+    if (val.byte == 255) zs > val.word;
+    else val.word = val.byte;
+}
+
+/*
+ * Read length of string + the string with the '>' operator.
+ */
+inline izstream& operator>(izstream& zs, char* x) {
+    zstringlen len(zs);
+    ::gzread(zs.fp(), x, len.value());
+    x[len.value()] = '\0';
+    return zs;
+}
+
+inline char* read_string(izstream& zs) {
+    zstringlen len(zs);
+    char* x = new char[len.value()+1];
+    ::gzread(zs.fp(), x, len.value());
+    x[len.value()] = '\0';
+    return x;
+}
+
+// ----------------------------- ozstream -----------------------------
+
+class ozstream
+{
+    public:
+        ozstream() : m_fp(0), m_os(0) {
+        }
+        ozstream(FILE* fp, int level = Z_DEFAULT_COMPRESSION)
+            : m_fp(0), m_os(0) {
+            open(fp, level);
+        }
+        ozstream(const char* name, int level = Z_DEFAULT_COMPRESSION)
+            : m_fp(0), m_os(0) {
+            open(name, level);
+        }
+        ~ozstream() {
+            close();
+        }
+
+        /* Opens a gzip (.gz) file for writing.
+         * The compression level parameter should be in 0..9
+         * errno can be checked to distinguish two error cases
+         * (if errno is zero, the zlib error is Z_MEM_ERROR).
+         */
+        void open(const char* name, int level = Z_DEFAULT_COMPRESSION) {
+            char mode[4] = "wb\0";
+            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
+            if (m_fp) close();
+            m_fp = ::gzopen(name, mode);
+        }
+
+        /* open from a FILE pointer.
+         */
+        void open(FILE* fp, int level = Z_DEFAULT_COMPRESSION) {
+            SET_BINARY_MODE(fp);
+            char mode[4] = "wb\0";
+            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
+            if (m_fp) close();
+            m_fp = ::gzdopen(fileno(fp), mode);
+        }
+
+        /* Flushes all pending output if necessary, closes the compressed file
+         * and deallocates all the (de)compression state. The return value is
+         * the zlib error number (see function error() below).
+         */
+        int close() {
+            if (m_os) {
+                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
+                delete[] m_os->str(); delete m_os; m_os = 0;
+            }
+            int r = ::gzclose(m_fp); m_fp = 0; return r;
+        }
+
+        /* Binary write the given number of bytes into the compressed file.
+         */
+        int write(const void* buf, size_t len) {
+            return ::gzwrite(m_fp, (voidp) buf, len);
+        }
+
+        /* Flushes all pending output into the compressed file. The parameter
+         * _flush is as in the deflate() function. The return value is the zlib
+         * error number (see function gzerror below). flush() returns Z_OK if
+         * the flush_ parameter is Z_FINISH and all output could be flushed.
+         * flush() should be called only when strictly necessary because it can
+         * degrade compression.
+         */
+        int flush(int _flush) {
+            os_flush();
+            return ::gzflush(m_fp, _flush);
+        }
+
+        /* Returns the error message for the last error which occurred on the
+         * given compressed file. errnum is set to zlib error number. If an
+         * error occurred in the file system and not in the compression library,
+         * errnum is set to Z_ERRNO and the application may consult errno
+         * to get the exact error code.
+         */
+        const char* error(int* errnum) {
+            return ::gzerror(m_fp, errnum);
+        }
+
+        gzFile fp() { return m_fp; }
+
+        ostream& os() {
+            if (m_os == 0) m_os = new ostrstream;
+            return *m_os;
+        }
+
+        void os_flush() {
+            if (m_os && m_os->pcount()>0) {
+                ostrstream* oss = new ostrstream;
+                oss->fill(m_os->fill());
+                oss->flags(m_os->flags());
+                oss->precision(m_os->precision());
+                oss->width(m_os->width());
+                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
+                delete[] m_os->str(); delete m_os; m_os = oss;
+            }
+        }
+
+    private:
+        gzFile m_fp;
+        ostrstream* m_os;
+};
+
+/*
+ * Binary write the given (array of) object(s) into the compressed file.
+ * returns the number of uncompressed bytes actually written
+ * (0 in case of error).
+ */
+template <class T, class Items>
+inline int write(ozstream& zs, const T* x, Items items) {
+    return ::gzwrite(zs.fp(), (voidp) x, items*sizeof(T));
+}
+
+/*
+ * Binary output with the '<' operator.
+ */
+template <class T>
+inline ozstream& operator<(ozstream& zs, const T& x) {
+    ::gzwrite(zs.fp(), (voidp) &x, sizeof(T));
+    return zs;
+}
+
+inline zstringlen::zstringlen(ozstream& zs, const char* x) {
+    val.byte = 255;  val.word = ::strlen(x);
+    if (val.word < 255) zs < (val.byte = val.word);
+    else zs < val;
+}
+
+/*
+ * Write length of string + the string with the '<' operator.
+ */
+inline ozstream& operator<(ozstream& zs, const char* x) {
+    zstringlen len(zs, x);
+    ::gzwrite(zs.fp(), (voidp) x, len.value());
+    return zs;
+}
+
+#ifdef _MSC_VER
+inline ozstream& operator<(ozstream& zs, char* const& x) {
+    return zs < (const char*) x;
+}
+#endif
+
+/*
+ * Ascii write with the << operator;
+ */
+template <class T>
+inline ostream& operator<<(ozstream& zs, const T& x) {
+    zs.os_flush();
+    return zs.os() << x;
+}
+
+#endif
diff --git a/tests/scancode/data/resource/samples/zlib/iostream2/zstream_test.cpp b/tests/scancode/data/resource/samples/zlib/iostream2/zstream_test.cpp
new file mode 100644
index 00000000000..6273f62d62a
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/iostream2/zstream_test.cpp
@@ -0,0 +1,25 @@
+#include "zstream.h"
+#include <math.h>
+#include <stdlib.h>
+#include <iomanip.h>
+
+void main() {
+    char h[256] = "Hello";
+    char* g = "Goodbye";
+    ozstream out("temp.gz");
+    out < "This works well" < h < g;
+    out.close();
+
+    izstream in("temp.gz"); // read it back
+    char *x = read_string(in), *y = new char[256], z[256];
+    in > y > z;
+    in.close();
+    cout << x << endl << y << endl << z << endl;
+
+    out.open("temp.gz"); // try ascii output; zcat temp.gz to see the results
+    out << setw(50) << setfill('#') << setprecision(20) << x << endl << y << endl << z << endl;
+    out << z << endl << y << endl << x << endl;
+    out << 1.1234567890123456789 << endl;
+
+    delete[] x; delete[] y;
+}
diff --git a/tests/scancode/data/resource/samples/zlib/zlib.h b/tests/scancode/data/resource/samples/zlib/zlib.h
new file mode 100644
index 00000000000..3e0c7672ac5
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/zlib.h
@@ -0,0 +1,1768 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.8, April 28th, 2013
+
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.8"
+#define ZLIB_VERNUM 0x1280
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_SUBREVISION 0
+
+/*
+    The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed data.
+  This version of the library supports only one compression method (deflation)
+  but other algorithms will be added later and will have the same stream
+  interface.
+
+    Compression can be done in a single step if the buffers are large enough,
+  or can be done by repeated calls of the compression function.  In the latter
+  case, the application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+    The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+    The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+    This library can optionally read and write gzip streams in memory as well.
+
+    The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+    The library does not install any signal handler.  The decoder checks
+  the consistency of the compressed data, so the library should never crash
+  even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    z_const Bytef *next_in;     /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total number of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte should be put there */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total number of bytes output so far */
+
+    z_const char *msg;  /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: binary or text */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+     The application must update next_in and avail_in when avail_in has dropped
+   to zero.  It must update next_out and avail_out when avail_out has dropped
+   to zero.  The application must initialize zalloc, zfree and opaque before
+   calling the init function.  All other fields are set by the compression
+   library and must not be updated by the application.
+
+     The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree.  This can be useful for custom
+   memory management.  The compression library attaches no meaning to the
+   opaque value.
+
+     zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.
+
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this if
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
+   returned by zalloc for objects of exactly 65536 bytes *must* have their
+   offset normalized to zero.  The default allocation function provided by this
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid
+   any allocation of 64K objects, at the expense of compression ratio, compile
+   the library with -DMAX_WBITS=14 (see zconf.h).
+
+     The fields total_in and total_out can be used for statistics or progress
+   reports.  After compression, total_in holds the total size of the
+   uncompressed data and may be saved for use in the decompressor (particularly
+   if the decompressor wants to decompress everything in a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+#define Z_TREES         6
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is not
+   compatible with the zlib.h header file used by the application.  This check
+   is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression.  The fields
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+   allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
+   requests a default compromise between speed and compression (currently
+   equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
+   if there is no error message.  deflateInit does not perform any compression:
+   this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows.  deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary (in interactive applications).  Some
+    output may be provided even if flush is not set.
+
+    Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating avail_in or avail_out accordingly; avail_out should
+  never be zero before the call.  The application can consume the compressed
+  output when it wants, for example when the output buffer is full (avail_out
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with
+  zero avail_out, it must be called again after making room in the output
+  buffer because there might be more output pending.
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumulate before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far.  (In
+  particular avail_in is zero after the call if enough output space has been
+  provided before the call.) Flushing may degrade compression for some
+  compression algorithms and so it should be used only when necessary.  This
+  completes the current deflate block and follows it with an empty stored block
+  that is three bits plus filler bits to the next byte, followed by four bytes
+  (00 00 ff ff).
+
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+  output buffer, but the output is not aligned to a byte boundary.  All of the
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+  This completes the current deflate block and follows it with an empty fixed
+  codes block that is 10 bits long.  This assures that enough bytes are output
+  in order for the decompressor to finish the block before the empty fixed code
+  block.
+
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+  seven bits of the current block are held to be written as the next byte after
+  the next deflate block is completed.  In this case, the decompressor may not
+  be provided enough bits at this point in order to complete decompression of
+  the data provided so far to the compressor.  It may need to wait for the next
+  block to be emitted.  This is for advanced applications that need to control
+  the emission of deflate blocks.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there was
+  enough output space; if deflate returns with Z_OK, this function must be
+  called again with Z_FINISH and more output space (updated avail_out) but no
+  more input data, until it returns with Z_STREAM_END or an error.  After
+  deflate has returned Z_STREAM_END, the only possible operations on the stream
+  are deflateReset or deflateEnd.
+
+    Z_FINISH can be used immediately after deflateInit if all the compression
+  is to be done in a single step.  In this case, avail_out must be at least the
+  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  not return Z_STREAM_END, and it must be called again as described above.
+
+    deflate() sets strm->adler to the adler32 checksum of all input read
+  so far (that is, total_in bytes).
+
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
+  binary.  This field is only for information purposes and does not affect the
+  compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
+  fatal, and deflate() can be called again with more input and more output
+  space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded).  In the error case, msg
+   may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression.  The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
+   exact value depends on the compression method), inflateInit determines the
+   compression method from the zlib header and allocates all data structures
+   accordingly; otherwise the allocation will be deferred to the first call of
+   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit() does not process any header information -- that is deferred
+   until inflate() is called.
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows.  inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing will
+    resume at this point for the next call of inflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there is
+    no more input data or no more space in the output buffer (see below about
+    the flush parameter).
+
+    Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating the next_* and avail_* values accordingly.  The
+  application can consume the uncompressed output when it wants, for example
+  when the output buffer is full (avail_out == 0), or after each call of
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
+  called again after making room in the output buffer because there might be
+  more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()
+  stop if and when it gets to the next deflate block boundary.  When decoding
+  the zlib or gzip format, this will cause inflate() to return immediately
+  after the header and before the first block.  When doing a raw inflate,
+  inflate() will go ahead and process the first block, and will return when it
+  gets to the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  Also to assist in this, on return inflate() will set strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  inflate() is currently decoding the last block in the deflate stream, plus
+  128 if inflate() returned immediately after decoding an end-of-block code or
+  decoding the complete header up to just before the first byte of the deflate
+  stream.  The end-of-block will not be indicated until all of the uncompressed
+  data from that block has been written to strm->next_out.  The number of
+  unused bits may in general be greater than seven, except when bit 7 of
+  data_type is set, in which case the number of unused bits will be less than
+  eight.  data_type is set as noted here every time inflate() returns for all
+  flush options, and so can be used to determine the amount of currently
+  consumed input in bits.
+
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+  end of each deflate block header is reached, before any actual data in that
+  block is decoded.  This allows the caller to determine the length of the
+  deflate block header for later use in random access within a deflate block.
+  256 is added to the value of strm->data_type when inflate() returns
+  immediately after reaching the end of the deflate block header.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error.  However if all decompression is to be performed in a single step (a
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In
+  this case all pending input is processed and all pending output is flushed;
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below.  At the end of the stream, inflate() checks that its computed adler32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically, if requested when
+  initializing with inflateInit2().  Any information contained in the gzip
+  header is not retained, so applications that need that information should
+  instead use raw inflate, see inflateInit2() below, or inflateBack() and
+  perform their own processing of the gzip header and trailer.  When processing
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+  producted so far.  The CRC-32 is checked against the gzip trailer.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may
+  then call inflateSync() to look for a good compression block if a partial
+  recovery of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+   was inconsistent.  In the error case, msg may be set but then points to a
+   static string (which must not be deallocated).
+*/
+
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options.  The
+   fields next_in, zalloc, zfree and opaque must be initialized before by the
+   caller.
+
+     The method parameter is the compression method.  It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library.  Larger values of this parameter result in better
+   compression at the expense of memory usage.  The default value is 15 if
+   deflateInit is used instead.
+
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
+   determines the window size.  deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute an adler32 check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding.  Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper.  The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero), no
+   header crc, and the operating system will be set to 255 (unknown).  If a
+   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state.  memLevel=1 uses minimum memory but is
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage
+   as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm.  Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding).  Filtered data consists mostly of small values with a somewhat
+   random distribution.  In this case, the compression algorithm is tuned to
+   compress them better.  The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
+   strategy parameter only affects the compression ratio but not the
+   correctness of the compressed output even if it is not set appropriately.
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+   decoder for special applications.
+
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
+   set to null if there is no error message.  deflateInit2 does not perform any
+   compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary.  Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
+   useful should be put at the end of the dictionary, not at the front.  In
+   addition, the current implementation of deflate will use at most the window
+   size minus 262 bytes of the provided dictionary.
+
+     Upon return of this function, strm->adler is set to the adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor.  (The adler32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
+   adler32 value is not computed and strm->adler is not set.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter.  The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and can
+   consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit,
+   but does not free and reallocate all the internal compression state.  The
+   stream will keep the same compression level and any other attributes that
+   may have been set by deflateInit2.
+
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2.  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different strategy.
+   If the compression level is changed, the input available so far is
+   compressed with the old level (and may be flushed); the new level will take
+   effect only at the next call of deflate().
+
+     Before the call of deflateParams, the stream state must be set as for
+   a call of deflate(), since the currently available input may have to be
+   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+   strm->avail_out was zero.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit() or
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
+   to allocate an output buffer for deflation in a single pass, and so would be
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
+*/
+
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+   is that this function is used to start off the deflate output with the bits
+   leftover from a previous deflate stream when appending to it.  As such, this
+   function can only be used for raw deflate, and must be used before the first
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less
+   than or equal to 16, and that many of the least significant bits of value
+   will be inserted in the output.
+
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+     If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter.  The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library.  The default value is 15 if inflateInit is used
+   instead.  windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used.  If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be zero to request that inflate use the window size in
+   the zlib header of the compressed stream.
+
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
+   determines the window size.  inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream.  This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values.  If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is.  Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding.  Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
+   crc32 instead of an adler32.
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit2 does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit2() does not process any header information -- that is
+   deferred until inflate() is called.
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence.  This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
+   can be determined from the adler32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+   available input is skipped.  No output is provided.
+
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate all the internal decompression state.  The
+   stream will keep attributes that may have been set by inflateInit2.
+
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+                                      int windowBits));
+/*
+     This function is the same as inflateReset, but it also permits changing
+   the wrap and window size requests.  The windowBits parameter is interpreted
+   the same as it is for inflateInit2.
+
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+   the windowBits parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+   that this function is used to start inflating at a bit position in the
+   middle of a byte.  The provided bits will be used before any bytes are used
+   from next_in.  This function should only be used with raw inflate, and
+   should be used before the first inflate() call after inflateInit2() or
+   inflateReset().  bits must be less than or equal to 16, and that many of the
+   least significant bits of value will be inserted in the input.
+
+     If bits is negative, then the input stream bit buffer is emptied.  Then
+   inflatePrime() can be called again to put bits in the buffer.  This is used
+   to clear out bits leftover after feeding inflate a block description prior
+   to feeding inflate codes.
+
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+     This function returns two values, one in the lower 16 bits of the return
+   value, and the other in the remaining upper bits, obtained by shifting the
+   return value down 16 bits.  If the upper value is -1 and the lower value is
+   zero, then inflate() is currently decoding information outside of a block.
+   If the upper value is -1 and the lower value is non-zero, then inflate is in
+   the middle of a stored block, with the lower value equaling the number of
+   bytes from the input remaining to copy.  If the upper value is not -1, then
+   it is the number of bits back from the current bit position in the input of
+   the code (literal or length/distance pair) currently being processed.  In
+   that case the lower value is the number of bytes already emitted for that
+   code.
+
+     A code is being processed if inflate is waiting for more input to complete
+   decoding of the code, or if it has completed decoding but is waiting for
+   more output space to write the literal or match data.
+
+     inflateMark() is used to mark locations in the input data for random
+   access, which may be at bit positions, and to note those cases where the
+   output of a code may span boundaries of random access blocks.  The current
+   location in the input stream can be determined from avail_in and data_type
+   as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+     inflateMark returns the value noted above or -1 << 16 if the provided
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
+   used to force inflate() to return immediately after header processing is
+   complete and before any actual data is decompressed.
+
+     The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When any
+   of extra, name, or comment are not Z_NULL and the respective field is not
+   present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+     If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+   allocated, or Z_VERSION_ERROR if the version of the library does not match
+   the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free the
+   allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects only
+   the raw deflate stream to decompress.  This is different from the normal
+   behavior of inflate(), which expects either a zlib or gzip header and
+   trailer around the deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero--buf is ignored in that
+   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   should return zero on success, or non-zero on failure.  If out() returns
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+   in the deflate stream (in which case strm->msg is set to indicate the nature
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+   non-zero.  (in() will always be called before out(), so strm->next_in is
+   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+#ifndef Z_SOLO
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the basic
+   stream-oriented functions.  To simplify the interface, some default options
+   are assumed (compression level and memory usage, standard memory allocation
+   functions).  The source code of these utility functions can be modified if
+   you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer.  The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer.  Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before a
+   compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data.  (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit, destLen
+   is the actual size of the uncompressed buffer.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
+*/
+
+                        /* gzip file access functions */
+
+/*
+     This library supports reading and writing files in gzip (.gz) format with
+   an interface similar to that of stdio, using the functions that start with
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
+
+/*
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
+   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
+   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
+   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
+   for fixed code compression as in "wb9F".  (See the description of
+   deflateInit2 for more information about the strategy parameter.)  'T' will
+   request transparent writing or appending with no compression and not using
+   the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
+
+     gzopen returns NULL if the file could not be opened, if there was
+   insufficient memory to allocate the gzFile state, or if an invalid mode was
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+   errno can be checked to determine if the reason gzopen failed was that the
+   file could not be opened.
+*/
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
+   are obtained from calls like open, dup, creat, pipe or fileno (if the file
+   has been previously opened with fopen).  The mode parameter is as in gzopen.
+
+     The next call of gzclose on the returned gzFile will also close the file
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
+
+     gzdopen returns NULL if there was insufficient memory to allocate the
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
+   used until the next gz* read, write, seek, or close operation, so gzdopen
+   will not detect if fd is invalid (unless fd is -1).
+*/
+
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+/*
+     Set the internal buffer size used by this library's functions.  The
+   default buffer size is 8192 bytes.  This function must be called after
+   gzopen() or gzdopen(), and before any other calls that read or write the
+   file.  The buffer memory allocation is always deferred to the first read or
+   write.  Two buffers are allocated, either both of the specified size when
+   writing, or one of the specified size and the other twice that size when
+   reading.  A larger buffer size of, for example, 64K or 128K bytes will
+   noticeably increase the speed of decompression (reading).
+
+     The new buffer size also affects the maximum length for gzprintf().
+
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called
+   too late.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy.  See the description
+   of deflateInit2 for the meaning of these parameters.
+
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+   opened for writing.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.  If
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
+
+     After reaching the end of a gzip stream in the input, gzread will continue
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
+
+     gzread returns the number of uncompressed bytes actually read, less than
+   len for end of file, or -1 for error.
+*/
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+                                voidpc buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes written or 0 in case of
+   error.
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the arguments to the compressed file under
+   control of the format string, as in fprintf.  gzprintf returns the number of
+   uncompressed bytes actually written, or 0 in case of error.  The number of
+   uncompressed bytes written is limited to 8191, or one less than the buffer
+   size given to gzbuffer().  The caller should assure that this limit is not
+   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
+   nothing written.  In this case, there may also be a buffer overflow with
+   unpredictable consequences, which is possible only if zlib was compiled with
+   the insecure functions sprintf() or vsprintf() because the secure snprintf()
+   or vsnprintf() functions were not available.  This can be determined using
+   zlibCompileFlags().
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+     Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+
+     gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+     Reads bytes from the compressed file until len-1 characters are read, or a
+   newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  If any characters are read or if len == 1, the
+   string is terminated with a null character.  If no characters are read due
+   to an end-of-file or len < 1, then the buffer is left untouched.
+
+     gzgets returns buf which is a null-terminated string, or it returns NULL
+   for end-of-file or in case of error.  If there was an error, the contents at
+   buf are indeterminate.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+   returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+     Reads one byte from the compressed file.  gzgetc returns this byte or -1
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+     Push one character back onto the stream to be read as the first character
+   on the next read.  At least one character of push-back is allowed.
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
+   fail if c is -1, and may fail if a character has been pushed but not read
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
+   The pushed character will be discarded if the stream is repositioned with
+   gzseek() or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+     Flushes all pending output into the compressed file.  The parameter flush
+   is as in the deflate() function.  The return value is the zlib error number
+   (see function gzerror below).  gzflush is only permitted when writing.
+
+     If the flush parameter is Z_FINISH, the remaining data is written and the
+   gzip stream is completed in the output.  If gzwrite() is called again, a new
+   gzip stream will be started in the output.  gzread() is able to read such
+   concatented gzip streams.
+
+     gzflush should be called only when strictly necessary because it will
+   degrade compression if called too often.
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+                                   z_off_t offset, int whence));
+
+     Sets the starting position for the next gzread or gzwrite on the given
+   compressed file.  The offset represents a number of bytes in the
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow.  If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+     gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+
+     Returns the starting position for the next gzread or gzwrite on the given
+   compressed file.  This position represents a number of bytes in the
+   uncompressed data stream, and is zero when starting, even if appending or
+   reading a gzip stream from the middle of a file using gzdopen().
+
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+
+     Returns the current offset in the file being read or written.  This offset
+   includes the count of bytes that precede the gzip stream, for example when
+   appending or when using gzdopen() for reading.  When reading, the offset
+   does not include as yet unused buffered input.  This information can be used
+   for a progress indicator.  On error, gzoffset() returns -1.
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns true (1) if the end-of-file indicator has been set while reading,
+   false (0) otherwise.  Note that the end-of-file indicator is set only if the
+   read tried to go past the end of the input, but came up short.  Therefore,
+   just like feof(), gzeof() may return false even if there is no more data to
+   read, in the event that the last read request was for the exact number of
+   bytes remaining in the input file.  This will happen if the input file size
+   is an exact multiple of the buffer size.
+
+     If gzeof() returns true, then the read functions will return no more data,
+   unless the end-of-file indicator is reset by gzclearerr() and the input file
+   has grown since the previous end of file was detected.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns true (1) if file is being copied directly while reading, or false
+   (0) if file is a gzip stream being decompressed.
+
+     If the input file is empty, gzdirect() will return true, since the input
+   does not contain a gzip stream.
+
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will
+   cause buffers to be allocated to allow reading the file to determine if it
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
+   gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file and
+   deallocates the (de)compression state.  Note that once file is closed, you
+   cannot call gzerror with file, since its structures have been deallocated.
+   gzclose must not be called more than once on the same file, just as free
+   must not be called more than once on the same allocation.
+
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+     Same as gzclose(), but gzclose_r() is only for use when reading, and
+   gzclose_w() is only for use when writing or appending.  The advantage to
+   using these instead of gzclose() is that they avoid linking in zlib
+   compression or decompression code that is not used when only reading or only
+   writing respectively.  If gzclose() is used, then both compression and
+   decompression code will be included the application when linking to a static
+   zlib library.
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Returns the error message for the last error which occurred on the given
+   compressed file.  errnum is set to zlib error number.  If an error occurred
+   in the file system and not in the compression library, errnum is set to
+   Z_ERRNO and the application may consult errno to get the exact error code.
+
+     The application must not modify the returned string.  Future calls to
+   this function may invalidate the previously returned string.  If file is
+   closed, then the string previously returned by gzerror will no longer be
+   available.
+
+     gzerror() should be used to distinguish errors from end-of-file for those
+   functions above that do not distinguish those cases in their return values.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears the error and end-of-file flags for file.  This is analogous to the
+   clearerr() function in stdio.  This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+#endif /* !Z_SOLO */
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the compression
+   library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum.  If buf is Z_NULL, this function returns the
+   required initial value for the checksum.
+
+     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster.
+
+   Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32.  If buf is Z_NULL, this function returns the required
+   initial value for the crc.  Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
+
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                      (int)sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+        inflateBackInit_((strm), (windowBits), (window), \
+                      ZLIB_VERSION, (int)sizeof(z_stream))
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#endif
+
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#ifdef Z_LARGE64
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#  endif
+#  ifndef Z_LARGE64
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#  endif
+#else
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+#endif
+
+#else /* Z_SOLO */
+
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+
+#endif /* !Z_SOLO */
+
+/* hack for buggy compilers */
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+    struct internal_state {int dummy;};
+#endif
+
+/* undocumented functions */
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/tests/scancode/data/resource/samples/zlib/zutil.c b/tests/scancode/data/resource/samples/zlib/zutil.c
new file mode 100644
index 00000000000..23d2ebef008
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/zutil.c
@@ -0,0 +1,324 @@
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
+
+#ifndef NO_DUMMY_DECL
+struct internal_state      {int dummy;}; /* for buggy compilers */
+#endif
+
+z_const char * const z_errmsg[10] = {
+"need dictionary",     /* Z_NEED_DICT       2  */
+"stream end",          /* Z_STREAM_END      1  */
+"",                    /* Z_OK              0  */
+"file error",          /* Z_ERRNO         (-1) */
+"stream error",        /* Z_STREAM_ERROR  (-2) */
+"data error",          /* Z_DATA_ERROR    (-3) */
+"insufficient memory", /* Z_MEM_ERROR     (-4) */
+"buffer error",        /* Z_BUF_ERROR     (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch ((int)(sizeof(uInt))) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch ((int)(sizeof(uLong))) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch ((int)(sizeof(voidpf))) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch ((int)(sizeof(z_off_t))) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
+#ifdef DEBUG
+    flags += 1 << 8;
+#endif
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1L << 20;
+#endif
+#ifdef FASTEST
+    flags += 1L << 21;
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifdef NO_vsnprintf
+    flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#else
+    flags += 1L << 24;
+#  ifdef NO_snprintf
+    flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
+#ifdef DEBUG
+
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int ZLIB_INTERNAL z_verbose = verbose;
+
+void ZLIB_INTERNAL z_error (m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE)
+    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+     * errno.  We define it as a global variable to simplify porting.
+     * Its value is always 0 and should not be used.
+     */
+    int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void ZLIB_INTERNAL zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+#ifndef Z_SOLO
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf = opaque; /* just to make some compilers happy */
+    ulg bsize = (ulg)items*size;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+    int n;
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    ptr = opaque; /* just to make some compilers happy */
+    Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    return _halloc((long)items, size);
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    if (opaque) items += size - size; /* make compiler happy */
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
+}
+
+void ZLIB_INTERNAL zcfree (opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    free(ptr);
+    if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */
diff --git a/tests/scancode/data/resource/samples/zlib/zutil.h b/tests/scancode/data/resource/samples/zlib/zutil.h
new file mode 100644
index 00000000000..24ab06b1cf6
--- /dev/null
+++ b/tests/scancode/data/resource/samples/zlib/zutil.h
@@ -0,0 +1,253 @@
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include "zlib.h"
+
+#if defined(STDC) && !defined(Z_SOLO)
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+#    include <stddef.h>
+#  endif
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifdef Z_SOLO
+   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
+#  ifndef Z_SOLO
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+         /* Allow compilation with ANSI keywords only enabled */
+         void _Cdecl farfree( void *block );
+         void *_Cdecl farmalloc( unsigned long nbytes );
+#      else
+#        include <alloc.h>
+#      endif
+#    else /* MSC or DJGPP */
+#      include <malloc.h>
+#    endif
+#  endif
+#endif
+
+#ifdef AMIGA
+#  define OS_CODE  0x01
+#endif
+
+#if defined(VAXC) || defined(VMS)
+#  define OS_CODE  0x02
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#if defined(ATARI) || defined(atarist)
+#  define OS_CODE  0x05
+#endif
+
+#ifdef OS2
+#  define OS_CODE  0x06
+#  if defined(M_I86) && !defined(Z_SOLO)
+#    include <malloc.h>
+#  endif
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  0x07
+#  ifndef Z_SOLO
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#      include <unix.h> /* for fdopen */
+#    else
+#      ifndef fdopen
+#        define fdopen(fd,mode) NULL /* No fdopen() */
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef TOPS20
+#  define OS_CODE  0x0a
+#endif
+
+#ifdef WIN32
+#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
+#    define OS_CODE  0x0b
+#  endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+#  define OS_CODE  0x0f
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#    ifndef _PTRDIFF_T_DEFINED
+       typedef int ptrdiff_t;
+#      define _PTRDIFF_T_DEFINED
+#    endif
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
+#endif
+
+#if defined(__BORLANDC__) && !defined(MSDOS)
+  #pragma warn -8004
+  #pragma warn -8008
+  #pragma warn -8066
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_WIN32) && \
+    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#endif
+
+        /* common defaults */
+
+#ifndef OS_CODE
+#  define OS_CODE  0x03  /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#if defined(pyr) || defined(Z_SOLO)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef DEBUG
+#  include <stdio.h>
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+#ifndef Z_SOLO
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+#endif /* ZUTIL_H */
diff --git a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
index 99048ea6301..30c2f68cb21 100644
--- a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
+++ b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
@@ -9,7 +9,6 @@
   "files": [
     {
       "path": "fping-2.4-0.b2.rhfc1.dag.i386.rpm",
-      "scan_errors": [],
       "packages": [
         {
           "type": "RPM",
@@ -83,7 +82,8 @@
             }
           ]
         }
-      ]
+      ],
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/single/iproute.expected.json b/tests/scancode/data/single/iproute.expected.json
index 28aaa76b8a8..2f9a4e33c56 100644
--- a/tests/scancode/data/single/iproute.expected.json
+++ b/tests/scancode/data/single/iproute.expected.json
@@ -17,9 +17,6 @@
       "size": 469,
       "sha1": "f0f352c14a8d0b0510cbbeae056542ae7f252151",
       "md5": "b8e7112a6e82921687fd1e008e72058f",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": "C",
@@ -29,6 +26,9 @@
       "is_media": false,
       "is_source": true,
       "is_script": false,
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
       "scan_errors": []
     }
   ]
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
index ed205e707c1..b1b13ee36c3 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json
@@ -22,9 +22,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -34,12 +31,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
@@ -50,9 +50,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -62,12 +59,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328",
@@ -78,9 +78,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -90,12 +87,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328a",
@@ -106,9 +106,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -118,12 +115,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--quiet b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--quiet
index 09e60ff2009..6bd0f547d37 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--quiet
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--quiet
@@ -23,9 +23,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -35,12 +32,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
@@ -51,9 +51,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -63,12 +60,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328",
@@ -79,9 +79,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -91,12 +88,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328a",
@@ -107,9 +107,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -119,12 +116,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--verbose b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--verbose
index 749e6d3e4ea..02f1c4763ce 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--verbose
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-linux.json--verbose
@@ -23,9 +23,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -35,12 +32,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
@@ -51,9 +51,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -63,12 +60,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328",
@@ -79,9 +79,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -91,12 +88,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328a",
@@ -107,9 +107,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -119,12 +116,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
index 2ce6074370d..56e70c6d551 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json
@@ -22,9 +22,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -34,12 +31,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u03bf\u0313\u2328",
@@ -51,9 +51,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -63,12 +60,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u03bf\u0313\u2328a",
@@ -80,9 +80,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -92,12 +89,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma.pdf",
@@ -109,9 +109,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -121,12 +118,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--quiet b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--quiet
index 3ccd9d9f2a8..2675c516b33 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--quiet
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--quiet
@@ -23,9 +23,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -35,12 +32,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u03bf\u0313\u2328",
@@ -52,9 +52,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -64,12 +61,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u03bf\u0313\u2328a",
@@ -81,9 +81,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -93,12 +90,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma.pdf",
@@ -110,9 +110,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -122,12 +119,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--verbose b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--verbose
index 4c9354fb8b7..872d3f42f8a 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--verbose
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-mac.json--verbose
@@ -23,9 +23,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -35,12 +32,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u03bf\u0313\u2328",
@@ -52,9 +52,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -64,12 +61,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u03bf\u0313\u2328a",
@@ -81,9 +81,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -93,12 +90,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja koris\u030ctenjem Ka\u0308rkka\u0308inen \u2013 Sandersovog algoritma.pdf",
@@ -110,9 +110,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -122,12 +119,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
index ed205e707c1..b1b13ee36c3 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-win.json
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json
@@ -22,9 +22,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -34,12 +31,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
@@ -50,9 +50,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -62,12 +59,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328",
@@ -78,9 +78,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -90,12 +87,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328a",
@@ -106,9 +106,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -118,12 +115,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json--quiet b/tests/scancode/data/unicodepath/unicodepath.expected-win.json--quiet
index 09e60ff2009..6bd0f547d37 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-win.json--quiet
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json--quiet
@@ -23,9 +23,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -35,12 +32,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
@@ -51,9 +51,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -63,12 +60,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328",
@@ -79,9 +79,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -91,12 +88,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328a",
@@ -107,9 +107,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -119,12 +116,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/unicodepath/unicodepath.expected-win.json--verbose b/tests/scancode/data/unicodepath/unicodepath.expected-win.json--verbose
index 749e6d3e4ea..02f1c4763ce 100644
--- a/tests/scancode/data/unicodepath/unicodepath.expected-win.json--verbose
+++ b/tests/scancode/data/unicodepath/unicodepath.expected-win.json--verbose
@@ -23,9 +23,6 @@
       "size": 0,
       "sha1": null,
       "md5": null,
-      "files_count": 3,
-      "dirs_count": 0,
-      "size_count": 20,
       "mime_type": null,
       "file_type": null,
       "programming_language": null,
@@ -35,12 +32,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 3,
+      "dirs_count": 0,
+      "size_count": 20,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/Izgradnja sufiksnog polja kori\u0161tenjem K\u00e4rkk\u00e4inen \u2013 Sandersovog algoritma.pdf",
@@ -51,9 +51,6 @@
       "size": 2,
       "sha1": "71853c6197a6a7f222db0f1978c7cb232b87c5ee",
       "md5": "e1c06d85ae7b8b032bef47e42e4c08f9",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text",
       "programming_language": null,
@@ -63,12 +60,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328",
@@ -79,9 +79,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -91,12 +88,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "unicodepath/\u03e8\u1f40\u2328a",
@@ -107,9 +107,6 @@
       "size": 9,
       "sha1": "37aa63c77398d954473262e1a0057c1e632eda77",
       "md5": "552e21cd4cd9918678e3c1a0df491bc3",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "ASCII text, with no line terminators",
       "programming_language": null,
@@ -119,12 +116,15 @@
       "is_media": false,
       "is_source": false,
       "is_script": false,
-      "scan_errors": [],
       "licenses": [],
       "copyrights": [],
       "packages": [],
       "emails": [],
-      "urls": []
+      "urls": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/weird_file_name/expected-linux.json b/tests/scancode/data/weird_file_name/expected-linux.json
index ea6cd36210d..c1d6372274e 100644
--- a/tests/scancode/data/weird_file_name/expected-linux.json
+++ b/tests/scancode/data/weird_file_name/expected-linux.json
@@ -15,13 +15,10 @@
       "name": "some 'file",
       "base_name": "some 'file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 20,
+      "date": "2016-12-21",
       "sha1": "715037088f2582f3fbb7e9492f819987f713a332",
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -31,22 +28,22 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some /file",
       "type": "file",
       "name": "some \\file",
-      "base_name": "some \\file",
+      "base_name": "file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 21,
+      "date": "2016-12-21",
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -56,8 +53,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some file",
@@ -65,13 +65,10 @@
       "name": "some file",
       "base_name": "some file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 38,
+      "date": "2016-12-21",
       "sha1": "5fbba80b758b93a311369979d8a68f22c4817d37",
       "md5": "41ac81497162f2ff48a0442847238ad7",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -81,8 +78,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some\"file",
@@ -90,13 +90,10 @@
       "name": "some\"file",
       "base_name": "some\"file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 39,
+      "date": "2016-12-21",
       "sha1": "b2016984d073f405f9788fbf6ae270b452ab73b0",
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -106,22 +103,22 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some/\"file",
       "type": "file",
       "name": "some\\\"file",
-      "base_name": "some\\\"file",
+      "base_name": "\"file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 21,
+      "date": "2016-12-21",
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -131,8 +128,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/weird_file_name/expected-mac.json b/tests/scancode/data/weird_file_name/expected-mac.json
index f90c93144e5..df7d6f029df 100644
--- a/tests/scancode/data/weird_file_name/expected-mac.json
+++ b/tests/scancode/data/weird_file_name/expected-mac.json
@@ -15,13 +15,10 @@
       "name": "some 'file",
       "base_name": "some 'file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 20,
+      "date": "2016-12-21",
       "sha1": "715037088f2582f3fbb7e9492f819987f713a332",
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -31,8 +28,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some /file",
@@ -40,13 +40,10 @@
       "name": "some \\file",
       "base_name": "some \\file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 21,
+      "date": "2016-12-21",
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -56,8 +53,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some file",
@@ -65,13 +65,10 @@
       "name": "some file",
       "base_name": "some file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 38,
+      "date": "2016-12-21",
       "sha1": "5fbba80b758b93a311369979d8a68f22c4817d37",
       "md5": "41ac81497162f2ff48a0442847238ad7",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "a /usr/bin/env node script, ASCII text executable",
       "programming_language": null,
@@ -81,8 +78,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some\"file",
@@ -90,13 +90,10 @@
       "name": "some\"file",
       "base_name": "some\"file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 39,
+      "date": "2016-12-21",
       "sha1": "b2016984d073f405f9788fbf6ae270b452ab73b0",
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/plain",
       "file_type": "a /usr/bin/env node script, ASCII text executable",
       "programming_language": null,
@@ -106,8 +103,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some/\"file",
@@ -115,13 +115,10 @@
       "name": "some\\\"file",
       "base_name": "some\\\"file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 21,
+      "date": "2016-12-21",
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -131,8 +128,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/data/weird_file_name/expected-win.json b/tests/scancode/data/weird_file_name/expected-win.json
index 16a8764c062..0de4ba42fcf 100644
--- a/tests/scancode/data/weird_file_name/expected-win.json
+++ b/tests/scancode/data/weird_file_name/expected-win.json
@@ -14,13 +14,10 @@
       "type": "file",
       "name": "some%22file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 39,
+      "date": "2016-12-21",
       "sha1": "b2016984d073f405f9788fbf6ae270b452ab73b0",
       "md5": "9153a386e70bd1713fef91121fb9cbbf",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -30,21 +27,21 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some+%27file",
       "type": "file",
       "name": "some+%27file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 20,
+      "date": "2016-12-21",
       "sha1": "715037088f2582f3fbb7e9492f819987f713a332",
       "md5": "62c4cdf80d860c09f215ffff0a9ed020",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -54,21 +51,21 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some+/file",
       "type": "file",
       "name": "some+%5Cfile",
       "extension": "",
-      "date": "2016-12-21",
       "size": 21,
+      "date": "2016-12-21",
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -78,21 +75,21 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some+file",
       "type": "file",
       "name": "some+file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 38,
+      "date": "2016-12-21",
       "sha1": "5fbba80b758b93a311369979d8a68f22c4817d37",
       "md5": "41ac81497162f2ff48a0442847238ad7",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "application/javascript",
       "file_type": "Node.js script, ASCII text executable",
       "programming_language": null,
@@ -102,21 +99,21 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     },
     {
       "path": "some/%22file",
       "type": "file",
       "name": "some%5C%22file",
       "extension": "",
-      "date": "2016-12-21",
       "size": 21,
+      "date": "2016-12-21",
       "sha1": "73e029b07257966106d79d35271bf400e3543cea",
       "md5": "e99c06d03836700154f01778ac782d50",
-      "files_count": 0,
-      "dirs_count": 0,
-      "size_count": 0,
       "mime_type": "text/x-shellscript",
       "file_type": "POSIX shell script, ASCII text executable",
       "programming_language": "Bash",
@@ -126,8 +123,11 @@
       "is_media": false,
       "is_source": true,
       "is_script": true,
-      "scan_errors": [],
-      "copyrights": []
+      "copyrights": [],
+      "files_count": 0,
+      "dirs_count": 0,
+      "size_count": 0,
+      "scan_errors": []
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/scancode/test_api.py b/tests/scancode/test_api.py
index 1c048031819..b96330b41c1 100644
--- a/tests/scancode/test_api.py
+++ b/tests/scancode/test_api.py
@@ -54,37 +54,60 @@ def test_get_package_info_can_pickle(self):
     def test_get_file_info_flag_are_not_null(self):
         # note the test file is EMPTY on purpose to generate all False is_* flags
         test_dir = self.get_test_loc('api/info')
-        infos = api.get_file_info(test_dir)
-        assert len(infos) == 1
-        for info in infos:
-            is_key_values = [v for k, v in info.items() if k.startswith('is_')]
-            assert all(v is not None for v in is_key_values)
+        info = api.get_file_info(test_dir)
+        expected = [
+            (u'date', None),
+            (u'size', 4096),
+            (u'sha1', None),
+            (u'md5', None),
+            (u'mime_type', None),
+            (u'file_type', None),
+            (u'programming_language', None),
+            (u'is_binary', False),
+            (u'is_text', False),
+            (u'is_archive', False),
+            (u'is_media', False),
+            (u'is_source', False),
+            (u'is_script', False)
+        ]
+        assert expected == info.items()
 
     def test_get_package_info_works_for_maven_dot_pom(self):
         test_file = self.get_test_loc('api/package/p6spy-1.3.pom')
         packages = api.get_package_info(test_file)
         assert len(packages) == 1
-        for package in packages:
-            assert package['version'] == '1.3'
+        assert packages['packages'][0]['version'] == '1.3'
 
     def test_get_package_info_works_for_maven_pom_dot_xml(self):
         test_file = self.get_test_loc('api/package/pom.xml')
         packages = api.get_package_info(test_file)
         assert len(packages) == 1
-        for package in packages:
-            assert package['version'] == '1.3'
+        assert packages['packages'][0]['version'] == '1.3'
 
-    def test_get_file_info_include_base_name(self):
+    def test_get_file_info_include_size(self):
         test_dir = self.get_test_loc('api/info/test.txt')
-        infos = api.get_file_info(test_dir)
-        assert len(infos) == 1
-        for info in infos:
-            assert 'test' == info['base_name']
+        info = api.get_file_info(test_dir)
+        expected = [
+            (u'date', '2017-10-03'),
+            (u'size', 0),
+            (u'sha1', None),
+            (u'md5', None),
+            (u'mime_type',
+            u'inode/x-empty'),
+            (u'file_type', u'empty'),
+            (u'programming_language', None),
+            (u'is_binary', False),
+            (u'is_text', True),
+            (u'is_archive', False),
+            (u'is_media', False),
+            (u'is_source', False),
+            (u'is_script', False)]
+        assert expected == info.items()
 
     def test_get_copyrights_include_copyrights_and_authors(self):
         test_file = self.get_test_loc('api/copyright/iproute.c')
         cops = api.get_copyrights(test_file)
-        expected = [
+        expected = dict(copyrights=[
             OrderedDict([
                 (u'statements', [u'Copyright (c) 2010 Patrick McHardy']),
                 (u'holders', [u'Patrick McHardy']),
@@ -95,5 +118,5 @@ def test_get_copyrights_include_copyrights_and_authors(self):
                 (u'holders', []),
                 (u'authors', [u'Patrick McHardy <kaber@trash.net>']),
                 (u'start_line', 11), (u'end_line', 11)])
-        ]
+        ])
         assert expected == cops
diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py
index ec7416e35db..2ca3e213161 100644
--- a/tests/scancode/test_cli.py
+++ b/tests/scancode/test_cli.py
@@ -122,7 +122,7 @@ def test_usage_and_help_return_a_correct_script_name_on_all_platforms():
     assert 'scancode-script.py' not in result.output
 
 
-def test_scan_info_does_collect_infos():
+def test_scan_info_does_collect_info():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
     args = ['--info', '--strip-root', test_dir, '--json', result_file]
@@ -130,7 +130,7 @@ def test_scan_info_does_collect_infos():
     check_json_scan(test_env.get_test_loc('info/basic.expected.json'), result_file)
 
 
-def test_scan_info_does_collect_infos_with_root():
+def test_scan_info_does_collect_info_with_root():
     test_dir = test_env.extract_test_tar('info/basic.tgz')
     result_file = test_env.get_temp_file('json')
     run_scan_click(['--info', test_dir, '--json', result_file])
@@ -318,20 +318,14 @@ def test_scan_works_with_multiple_processes_and_timeouts():
 
     expected = [
         [(u'path', u'test1.txt'),
-         (u'scan_errors',
-          [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
-         (u'copyrights', [])
-        ],
+         (u'copyrights', []),
+         (u'scan_errors', [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.'])],
         [(u'path', u'test2.txt'),
-         (u'scan_errors',
-          [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
-         (u'copyrights', [])
-        ],
+         (u'copyrights', []),
+         (u'scan_errors', [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.'])],
         [(u'path', u'test3.txt'),
-         (u'scan_errors',
-          [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.']),
-         (u'copyrights', [])
-        ],
+         (u'copyrights', []),
+         (u'scan_errors', [u'ERROR: for scanner: copyrights:\nERROR: Processing interrupted: timeout after 0 seconds.'])]
     ]
 
     result_json = json.loads(open(result_file).read(), object_pairs_hook=OrderedDict)
@@ -346,8 +340,8 @@ def check_scan_does_not_fail_when_scanning_unicode_files_and_paths(verbosity):
         test_dir = fsencode(test_dir)
         result_file = fsencode(result_file)
 
-    args = ['--info', '--license', '--copyright', '--package', 
-            '--email', '--url', '--strip-root', test_dir , '--json', 
+    args = ['--info', '--license', '--copyright', '--package',
+            '--email', '--url', '--strip-root', test_dir , '--json',
             result_file] + ([verbosity] if verbosity else [])
     results = run_scan_click(args)
 
@@ -649,29 +643,32 @@ def test_scan_with_timing_json_return_timings_for_each_scanner():
     run_scan_click(args)
     file_results = load_json_result(result_file)['files']
 
-    expected = set(['emails', 'urls', 'licenses', 'copyrights', 'infos', 'packages'])
-
-    for res in file_results:
-        scan_timings = res['scan_timings']
-        assert scan_timings
-        for scanner, timing in scan_timings.items():
-            assert scanner in expected
-            assert timing
+    expected = set(['emails', 'urls', 'licenses', 'copyrights', 'info', 'packages'])
+    check_timings(expected, file_results)
 
 
 def test_scan_with_timing_jsonpp_return_timings_for_each_scanner():
     test_dir = test_env.extract_test_tar('timing/basic.tgz')
     result_file = test_env.get_temp_file('json')
     args = ['--email', '--url', '--license', '--copyright', '--info',
-            '--package', '--timing', '--json-pp', result_file, test_dir]
+            '--package', '--timing', '--verbose', '--json-pp', result_file, test_dir]
     run_scan_click(args)
     file_results = load_json_result(result_file)['files']
+    expected = set(['emails', 'urls', 'licenses', 'copyrights', 'info', 'packages'])
+    check_timings(expected, file_results)
 
-    expected = set(['emails', 'urls', 'licenses', 'copyrights', 'infos', 'packages'])
 
+def check_timings(expected, file_results):
     for res in file_results:
         scan_timings = res['scan_timings']
+
+        if not res['type'] == 'file':
+            # should be an empty dict for dirs
+            assert not scan_timings
+            continue
+
         assert scan_timings
+
         for scanner, timing in scan_timings.items():
             assert scanner in expected
             assert timing
diff --git a/tests/scancode/test_extract_cli.py b/tests/scancode/test_extract_cli.py
index fff78697554..78c162dd789 100644
--- a/tests/scancode/test_extract_cli.py
+++ b/tests/scancode/test_extract_cli.py
@@ -40,7 +40,6 @@
 from commoncode.system import on_windows
 from scancode import extract_cli
 
-
 test_env = FileDrivenTesting()
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
diff --git a/tests/scancode/test_plugin_ignore.py b/tests/scancode/test_plugin_ignore.py
index 0729e44b9de..203edf642fb 100644
--- a/tests/scancode/test_plugin_ignore.py
+++ b/tests/scancode/test_plugin_ignore.py
@@ -66,11 +66,10 @@ def test_is_ignored_glob_file(self):
         assert is_ignored(location=location, ignores=ignores)
 
     def check_ProcessIgnore(self, test_dir, expected, ignore):
-        codebase = Codebase(test_dir)
+        codebase = Codebase(test_dir, strip_root=True)
         test_plugin = ProcessIgnore()
         test_plugin.process_codebase(codebase, ignore=ignore)
-        resources = [res.get_path(strip_root=True, decode=True, posix=True)
-                     for res in codebase.walk(skip_root=True)]
+        resources = [res.path for res in codebase.walk(skip_root=True)]
         assert expected == sorted(resources)
 
     def test_ProcessIgnore_with_single_file(self):
diff --git a/tests/scancode/test_plugin_mark_source.py b/tests/scancode/test_plugin_mark_source.py
index b087da45869..ac644c893b1 100644
--- a/tests/scancode/test_plugin_mark_source.py
+++ b/tests/scancode/test_plugin_mark_source.py
@@ -50,10 +50,9 @@ def test_is_source_directory_below_threshold(self):
 
     def test_scan_mark_source_without_info(self):
         test_dir = self.extract_test_tar('plugin_mark_source/JGroups.tgz')
-        result_file = self.get_temp_file('json')
-        expected_file = self.get_test_loc('plugin_mark_source/without_info.expected.json')
-        run_scan_click(['--mark-source', test_dir, '--json', result_file])
-        check_json_scan(expected_file, result_file, regen=False)
+        result = run_scan_click(['--mark-source', test_dir, '--json', '-'],
+                                expected_rc=2)
+        assert 'Error: The option --mark-source requires the option(s) --info and is missing --info.' in result.output
 
     def test_scan_mark_source_with_info(self):
         test_dir = self.extract_test_tar('plugin_mark_source/JGroups.tgz')
diff --git a/tests/scancode/test_plugin_only_findings.py b/tests/scancode/test_plugin_only_findings.py
index 86181f02821..94c7d70c18d 100644
--- a/tests/scancode/test_plugin_only_findings.py
+++ b/tests/scancode/test_plugin_only_findings.py
@@ -31,34 +31,30 @@
 from commoncode.testcase import FileDrivenTesting
 from scancode.cli_test_utils import run_scan_click
 from scancode.cli_test_utils import check_json_scan
-from scancode.plugin_only_findings import has_findings
-from scancode.resource import Resource
 
 
 class TestHasFindings(FileDrivenTesting):
 
     test_data_dir = join(dirname(__file__), 'data')
 
-    def test_has_findings(self):
-        resource = Resource('name', 1, 2, 3, use_cache=False)
-        resource.put_scans({'licenses': ['MIT']})
-        assert has_findings(resource)
-
-    def test_has_findings_with_children(self):
-        resource = Resource('name', 1, 2, 3, use_cache=False)
-        resource.children_rids.append(1)
-        assert not has_findings(resource)
-
-    def test_has_findings_includes_errors(self):
-        resource = Resource('name', 1, 2, 3, use_cache=False)
-        resource.errors = [
-                'ERROR: Processing interrupted: timeout after 10 seconds.'
-            ]
-        assert has_findings(resource)
-
     def test_scan_only_findings(self):
         test_dir = self.extract_test_tar('plugin_only_findings/basic.tgz')
         result_file = self.get_temp_file('json')
         expected_file = self.get_test_loc('plugin_only_findings/expected.json')
         run_scan_click(['-clip', '--only-findings', '--json', result_file, test_dir])
         check_json_scan(expected_file, result_file, strip_dates=True)
+
+    def test_scan_only_findings_with_errors(self):
+        test_dir = self.get_test_loc('plugin_only_findings/errors')
+        result_file = self.get_temp_file('json')
+        expected_file = self.get_test_loc('plugin_only_findings/errors.expected.json')
+        run_scan_click(['-pi', '--only-findings', '--json-pp',
+                        result_file, test_dir], expected_rc=1)
+        check_json_scan(expected_file, result_file, strip_dates=True)
+
+    def test_scan_only_findings_with_only_info(self):
+        test_dir = self.extract_test_tar('plugin_only_findings/basic.tgz')
+        result_file = self.get_temp_file('json')
+        expected_file = self.get_test_loc('plugin_only_findings/info.expected.json')
+        run_scan_click(['--info', '--only-findings', '--json', result_file, test_dir])
+        check_json_scan(expected_file, result_file, strip_dates=True)
diff --git a/tests/scancode/test_resource.py b/tests/scancode/test_resource.py
index c0b62347cca..7a472143845 100644
--- a/tests/scancode/test_resource.py
+++ b/tests/scancode/test_resource.py
@@ -27,7 +27,6 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from collections import OrderedDict
 from os.path import dirname
 from os.path import exists
 from os.path import join
@@ -36,6 +35,7 @@
 
 from scancode.resource import Codebase
 from commoncode.fileutils import parent_directory
+from scancode.resource import get_path
 
 
 class TestCodebase(FileBasedTesting):
@@ -43,7 +43,7 @@ class TestCodebase(FileBasedTesting):
 
     def test_walk_defaults(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         results = list(codebase.walk())
         expected = [
             ('codebase', False),
@@ -59,7 +59,7 @@ def test_walk_defaults(self):
 
     def test_walk_topdown(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         results = list(codebase.walk(topdown=True))
         expected = [
             ('codebase', False),
@@ -75,7 +75,7 @@ def test_walk_topdown(self):
 
     def test_walk_bottomup(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         results = list(codebase.walk(topdown=False))
         expected = [
               ('abc', True),
@@ -91,7 +91,7 @@ def test_walk_bottomup(self):
 
     def test_walk_skip_root_basic(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         results = list(codebase.walk(skip_root=True))
         expected = [
             ('abc', True),
@@ -104,11 +104,11 @@ def test_walk_skip_root_basic(self):
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_walk_skip_filtered_root(self):
+    def test_walk_filtered_with_filtered_root(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         codebase.root.is_filtered = True
-        results = list(codebase.walk(skip_filtered=True))
+        results = list(codebase.walk_filtered())
         expected = [
             ('abc', True),
             ('et131x.h', True),
@@ -120,25 +120,25 @@ def test_walk_skip_filtered_root(self):
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_walk_skip_filtered_all(self):
+    def test_walk_filtered_with_all_filtered(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
-        for res in codebase.get_resources(None):
+        codebase = Codebase(test_codebase)
+        for res in codebase.walk():
             res.is_filtered = True
-        results = list(codebase.walk(skip_filtered=True))
+        results = list(codebase.walk_filtered())
         expected = []
         assert expected == [(r.name, r.is_file) for r in results]
 
     def test_compute_counts_filtered_None(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         results = codebase.compute_counts(skip_filtered=True)
         expected = (5, 3, 0)
         assert expected == results
 
     def test_compute_counts_filtered_None_with_size(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         for res in codebase.walk():
             if res.is_file:
                 res.size = 10
@@ -149,15 +149,15 @@ def test_compute_counts_filtered_None_with_size(self):
 
     def test_compute_counts_filtered_None_with_cache(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=True)
+        codebase = Codebase(test_codebase)
         results = codebase.compute_counts(skip_filtered=True)
         expected = (5, 3, 0)
         assert expected == results
 
     def test_compute_counts_filtered_all(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
-        for res in codebase.get_resources(None):
+        codebase = Codebase(test_codebase)
+        for res in codebase.walk():
             res.is_filtered = True
         results = codebase.compute_counts(skip_filtered=True)
         expected = (0, 0, 0)
@@ -165,8 +165,8 @@ def test_compute_counts_filtered_all(self):
 
     def test_compute_counts_filtered_all_with_cache(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=True)
-        for res in codebase.get_resources(None):
+        codebase = Codebase(test_codebase)
+        for res in codebase.walk():
             res.is_filtered = True
         results = codebase.compute_counts(skip_filtered=True)
         expected = (0, 0, 0)
@@ -174,8 +174,8 @@ def test_compute_counts_filtered_all_with_cache(self):
 
     def test_compute_counts_filtered_files(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
-        for res in codebase.get_resources(None):
+        codebase = Codebase(test_codebase)
+        for res in codebase.walk():
             if res.is_file:
                 res.is_filtered = True
         results = codebase.compute_counts(skip_filtered=True)
@@ -184,8 +184,8 @@ def test_compute_counts_filtered_files(self):
 
     def test_compute_counts_filtered_dirs(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
-        for res in codebase.get_resources(None):
+        codebase = Codebase(test_codebase)
+        for res in codebase.walk():
             if not res.is_file:
                 res.is_filtered = True
         results = codebase.compute_counts(skip_filtered=True)
@@ -194,12 +194,12 @@ def test_compute_counts_filtered_dirs(self):
 
     def test_walk_filtered_dirs(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
-        for res in codebase.get_resources(None):
+        codebase = Codebase(test_codebase)
+        for res in codebase.walk():
             if not res.is_file:
                 res.is_filtered = True
 
-        results = list(codebase.walk(topdown=True, skip_filtered=True))
+        results = list(codebase.walk_filtered(topdown=True))
         expected = [
               ('abc', True),
               ('et131x.h', True),
@@ -209,11 +209,11 @@ def test_walk_filtered_dirs(self):
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_walk_skip_filtered_skip_root(self):
+    def test_walk_filtered_skip_root(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         codebase.root.is_filtered = True
-        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        results = list(codebase.walk_filtered(skip_root=True))
         expected = [
             ('abc', True),
             ('et131x.h', True),
@@ -225,216 +225,228 @@ def test_walk_skip_filtered_skip_root(self):
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_walk_skip_filtered_all_skip_root(self):
+    def test_walk_filtered_all_skip_root(self):
         test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
-        for res in codebase.get_resources(None):
+        codebase = Codebase(test_codebase)
+        for res in codebase.walk():
             res.is_filtered = True
-        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        results = list(codebase.walk_filtered(skip_root=True))
         expected = []
         assert expected == [(r.name, r.is_file) for r in results]
 
     def test_walk_skip_root_single_file(self):
         test_codebase = self.get_test_loc('resource/codebase/et131x.h')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         results = list(codebase.walk(skip_root=True))
         expected = [
             ('et131x.h', True)
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_walk_skip_root_not_filtered_single_file(self):
+    def test_walk_filtered_with_skip_root_and_single_file_not_filtered(self):
         test_codebase = self.get_test_loc('resource/codebase/et131x.h')
-        codebase = Codebase(test_codebase, use_cache=False)
-        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        codebase = Codebase(test_codebase)
+        results = list(codebase.walk_filtered(skip_root=True))
         expected = [
             ('et131x.h', True)
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_walk_skip_root_filtered_single_file(self):
+    def test_walk_filtered__with_skip_root_and_filtered_single_file(self):
         test_codebase = self.get_test_loc('resource/codebase/et131x.h')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         codebase.root.is_filtered = True
-        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        results = list(codebase.walk_filtered(skip_root=True))
         expected = [
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
     def test_walk_skip_root_single_file_with_children(self):
         test_codebase = self.get_test_loc('resource/codebase/et131x.h')
-        codebase = Codebase(test_codebase, use_cache=False)
-        c1 = codebase.root.add_child('some child', is_file=True)
-        _c2 = c1.add_child('some child2', is_file=False)
+        codebase = Codebase(test_codebase, strip_root=True)
+
+        c1 = codebase.create_resource('some child', parent=codebase.root, is_file=True)
+        _c2 = codebase.create_resource('some child2', parent=c1, is_file=False)
         results = list(codebase.walk(skip_root=True))
         expected = [
             (u'some child', True), (u'some child2', False)
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_walk_skip_root_skip_filtered_single_file_with_children(self):
+    def test_walk_filtered_with_skip_root_and_single_file_with_children(self):
         test_codebase = self.get_test_loc('resource/codebase/et131x.h')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase, strip_root=True)
 
-        c1 = codebase.root.add_child('some child', is_file=True)
-        c2 = c1.add_child('some child2', is_file=False)
+        c1 = codebase.create_resource('some child', parent=codebase.root, is_file=True)
+        c2 = codebase.create_resource('some child2', parent=c1, is_file=False)
         c2.is_filtered = True
-        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        codebase.save_resource(c2)
+
+        results = list(codebase.walk_filtered(skip_root=True))
         expected = [(u'some child', True)]
         assert expected == [(r.name, r.is_file) for r in results]
 
         c1.is_filtered = True
-        results = list(codebase.walk(skip_root=True, skip_filtered=True))
+        codebase.save_resource(c1)
+        results = list(codebase.walk_filtered(skip_root=True))
         expected = []
         assert expected == [(r.name, r.is_file) for r in results]
 
     def test_walk_skip_root_single_dir(self):
         test_codebase = self.get_temp_dir('walk')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase, strip_root=True)
+
         results = list(codebase.walk(skip_root=True))
         expected = [
             ('walk', False)
         ]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_add_child_can_add_child_to_file(self):
+    def test_create_resource_can_add_child_to_file(self):
         test_codebase = self.get_test_loc('resource/codebase/et131x.h')
-        codebase = Codebase(test_codebase, use_cache=False)
-        codebase.root.add_child('some child', is_file=True)
+        codebase = Codebase(test_codebase)
+        codebase.create_resource('some child', codebase.root, is_file=True)
         results = list(codebase.walk())
         expected = [('et131x.h', True), (u'some child', True)]
         assert expected == [(r.name, r.is_file) for r in results]
 
-    def test_add_child_can_add_child_to_dir(self):
+    def test_create_resource_can_add_child_to_dir(self):
         test_codebase = self.get_temp_dir('resource')
-        codebase = Codebase(test_codebase, use_cache=False)
-        codebase.root.add_child('some child', is_file=False)
+        codebase = Codebase(test_codebase)
+        codebase.create_resource('some child', codebase.root, is_file=False)
         results = list(codebase.walk())
         expected = [('resource', False), (u'some child', False)]
         assert expected == [(r.name, r.is_file) for r in results]
 
     def test_get_resource(self):
         test_codebase = self.get_temp_dir('resource')
-        codebase = Codebase(test_codebase, use_cache=False)
+        codebase = Codebase(test_codebase)
         assert codebase.root is codebase.get_resource(0)
 
-    def test_get_resources(self):
-        test_codebase = self.get_test_loc('resource/codebase')
-        codebase = Codebase(test_codebase, use_cache=False)
-        expected = [
-            ('codebase', False),
-            ('abc', True),
-            ('et131x.h', True),
-              ('dir', False),
-              ('other dir', False),
-                ('that', True),
-                ('this', True),
-                ('file', True),
-        ]
-        assert expected == [(r.name, r.is_file) for r in codebase.get_resources(None)]
-
-        expected = [
-            ('codebase', False),
-            ('abc', True),
-              ('dir', False),
-                ('this', True),
-        ]
-
-        assert expected == [(r.name, r.is_file) for r in codebase.get_resources([0, 1, 3, 6])]
+    def test_get_path(self):
+        import os
+        from commoncode.fileutils import fsdecode
+        from commoncode.fileutils import fsencode
+        from commoncode.system import on_linux
+
+        test_dir = self.get_test_loc('resource/samples')
+        locations = []
+        for top, dirs, files in os.walk(test_dir):
+            for x in dirs:
+                locations.append(os.path.join(top, x))
+            for x in files:
+                locations.append(os.path.join(top, x))
+        transcoder = fsencode if on_linux else fsdecode
+        locations = [transcoder(p) for p in locations]
+        root_location = transcoder(test_dir)
+
+        expected_default = [
+            u'samples/JGroups', u'samples/zlib', u'samples/arch',
+            u'samples/README', u'samples/screenshot.png',
+            u'samples/JGroups/src', u'samples/JGroups/licenses',
+            u'samples/JGroups/LICENSE', u'samples/JGroups/EULA',
+            u'samples/JGroups/src/GuardedBy.java',
+            u'samples/JGroups/src/ImmutableReference.java',
+            u'samples/JGroups/src/RouterStub.java',
+            u'samples/JGroups/src/S3_PING.java',
+            u'samples/JGroups/src/FixedMembershipToken.java',
+            u'samples/JGroups/src/RouterStubManager.java',
+            u'samples/JGroups/src/RATE_LIMITER.java',
+            u'samples/JGroups/licenses/cpl-1.0.txt',
+            u'samples/JGroups/licenses/bouncycastle.txt',
+            u'samples/JGroups/licenses/lgpl.txt',
+            u'samples/JGroups/licenses/apache-2.0.txt',
+            u'samples/JGroups/licenses/apache-1.1.txt', u'samples/zlib/dotzlib',
+            u'samples/zlib/iostream2', u'samples/zlib/infback9',
+            u'samples/zlib/gcc_gvmat64', u'samples/zlib/ada',
+            u'samples/zlib/deflate.h', u'samples/zlib/zutil.c',
+            u'samples/zlib/zlib.h', u'samples/zlib/deflate.c',
+            u'samples/zlib/zutil.h', u'samples/zlib/adler32.c',
+            u'samples/zlib/dotzlib/AssemblyInfo.cs',
+            u'samples/zlib/dotzlib/LICENSE_1_0.txt',
+            u'samples/zlib/dotzlib/readme.txt',
+            u'samples/zlib/dotzlib/ChecksumImpl.cs',
+            u'samples/zlib/iostream2/zstream_test.cpp',
+            u'samples/zlib/iostream2/zstream.h',
+            u'samples/zlib/infback9/infback9.c',
+            u'samples/zlib/infback9/infback9.h',
+            u'samples/zlib/gcc_gvmat64/gvmat64.S', u'samples/zlib/ada/zlib.ads',
+            u'samples/arch/zlib.tar.gz']
+
+        default = sorted(get_path(root_location, loc) for loc in locations)
+        assert sorted(expected_default) == default
+
+        expected_strip_root = [
+            u'JGroups', u'zlib', u'arch', u'README', u'screenshot.png',
+            u'JGroups/src', u'JGroups/licenses', u'JGroups/LICENSE',
+            u'JGroups/EULA', u'JGroups/src/GuardedBy.java',
+            u'JGroups/src/ImmutableReference.java',
+            u'JGroups/src/RouterStub.java', u'JGroups/src/S3_PING.java',
+            u'JGroups/src/FixedMembershipToken.java',
+            u'JGroups/src/RouterStubManager.java',
+            u'JGroups/src/RATE_LIMITER.java', u'JGroups/licenses/cpl-1.0.txt',
+            u'JGroups/licenses/bouncycastle.txt', u'JGroups/licenses/lgpl.txt',
+            u'JGroups/licenses/apache-2.0.txt',
+            u'JGroups/licenses/apache-1.1.txt', u'zlib/dotzlib',
+            u'zlib/iostream2', u'zlib/infback9', u'zlib/gcc_gvmat64',
+            u'zlib/ada', u'zlib/deflate.h', u'zlib/zutil.c', u'zlib/zlib.h',
+            u'zlib/deflate.c', u'zlib/zutil.h', u'zlib/adler32.c',
+            u'zlib/dotzlib/AssemblyInfo.cs', u'zlib/dotzlib/LICENSE_1_0.txt',
+            u'zlib/dotzlib/readme.txt', u'zlib/dotzlib/ChecksumImpl.cs',
+            u'zlib/iostream2/zstream_test.cpp', u'zlib/iostream2/zstream.h',
+            u'zlib/infback9/infback9.c', u'zlib/infback9/infback9.h',
+            u'zlib/gcc_gvmat64/gvmat64.S', u'zlib/ada/zlib.ads',
+            u'arch/zlib.tar.gz']
+
+        skipped = sorted(get_path(root_location, loc, strip_root=True) for loc in locations)
+        assert sorted(expected_strip_root) == skipped
+
+        expected_full_ends = sorted(expected_default)
+        full = sorted(get_path(root_location, loc, full_root=True) for loc in locations)
+        for full_loc, ending in zip(full, expected_full_ends):
+            assert full_loc.endswith((ending))
+
+        full_skipped = sorted(get_path(root_location, loc, full_root=True, strip_root=True) for loc in locations)
+        assert full == full_skipped
 
 
 class TestCodebaseCache(FileBasedTesting):
     test_data_dir = join(dirname(__file__), 'data')
 
-    def test_codebase_with_use_cache(self):
+    def test_codebase_cache_memory(self):
         test_codebase = self.get_test_loc('resource/cache/package')
-        codebase = Codebase(test_codebase, use_cache=True)
+        codebase = Codebase(test_codebase)
         assert codebase.temp_dir
         assert codebase.cache_dir
         codebase.cache_dir
         root = codebase.root
 
-        assert ('00', '00000000') == root.cache_keys
-        cp = root._get_cached_path(create=False)
+        cp = codebase._get_resource_cache_location(root.rid, create=False)
         assert not exists(cp)
-        cp = root._get_cached_path(create=True)
+        cp = codebase._get_resource_cache_location(root.rid, create=True)
         assert not exists(cp)
         assert exists(parent_directory(cp))
 
-        assert not root._scans
-
-        scans = OrderedDict(this='that')
-        scans_put = root.put_scans(scans)
-        assert scans == scans_put
-        assert scans == root.get_scans()
-        assert not root._scans
-        assert exists (root._get_cached_path(create=False))
-
-        scans_put = root.put_scans(scans)
-        assert scans == scans_put
-        assert not root._scans
-        assert scans == root.get_scans()
-        assert scans is not root.get_scans()
-        assert exists (root._get_cached_path(create=False))
-
-        scans = OrderedDict(food='bar')
-        scans_put = root.put_scans(scans, update=False)
-        assert scans == scans_put
-        assert not root._scans
-        assert scans == root.get_scans()
-        assert scans is not root.get_scans()
-
-        scans2 = OrderedDict(this='that')
-        scans_put = root.put_scans(scans2, update=True)
-        expected = OrderedDict(this='that', food='bar')
-        assert expected == root.get_scans()
-        assert expected is not root.get_scans()
-
-        scans = OrderedDict(food='bar')
-        scans_put = root.put_scans(scans, update=False)
-        assert scans == scans_put
-        assert scans == root.get_scans()
-        assert not root._scans
-        assert scans is not root.get_scans()
-        assert exists (root._get_cached_path(create=False))
-
-    def test_codebase_without_use_cache(self):
-        test_codebase = self.get_test_loc('resource/cache/package')
-        codebase = Codebase(test_codebase, use_cache=False)
-        assert not codebase.cache_dir
+        child = codebase.create_resource('child', root, is_file=True)
+        child.size = 12
+        codebase.save_resource(child)
+        child_2 = codebase.get_resource(child.rid)
+        assert child == child_2
 
+    def test_codebase_cache_disk(self):
+        test_codebase = self.get_test_loc('resource/cache/package')
+        codebase = Codebase(test_codebase, max_in_memory=-1)
+        assert codebase.temp_dir
+        assert codebase.cache_dir
+        codebase.cache_dir
         root = codebase.root
-
-        assert ('00', '00000000') == root.cache_keys
-        assert root._get_cached_path(create=False) is None
-
-        assert not root._scans
-
-        scans = OrderedDict(this='that')
-        scans_put = root.put_scans(scans)
-        assert scans == scans_put
-        assert scans == root.get_scans()
-        assert scans_put is root.get_scans()
-
-        scans_put = root.put_scans(scans)
-        assert scans == scans_put
-        assert scans_put is root.get_scans()
-
-        scans = OrderedDict(food='bar')
-        scans_put = root.put_scans(scans, update=False)
-        assert scans == scans_put
-        assert scans == root.get_scans()
-        assert scans_put is root.get_scans()
-
-        scans2 = OrderedDict(this='that')
-        scans_put = root.put_scans(scans2, update=True)
-        expected = OrderedDict(this='that', food='bar')
-        assert expected == root.get_scans()
-        assert expected is not root.get_scans()
-
-        scans = OrderedDict(food='bar')
-        scans_put = root.put_scans(scans, update=False)
-        assert scans == scans_put
-        assert scans == root.get_scans()
-        assert scans_put is root.get_scans()
-        assert scans is not root.get_scans()
+        cp = codebase._get_resource_cache_location(root.rid, create=False)
+        assert not exists(cp)
+        cp = codebase._get_resource_cache_location(root.rid, create=True)
+        assert not exists(cp)
+        assert exists(parent_directory(cp))
+        child = codebase.create_resource('child', root, is_file=True)
+        child.size = 12
+        codebase.save_resource(child)
+        child_2 = codebase.get_resource(child.rid)
+        assert child == child_2

From 29d289bd502cc8885b9e9b8cd88a627ab6d290fe Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 1 Feb 2018 20:05:00 +0100
Subject: [PATCH 109/122] Correct formatting of CSV outputs

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/formattedcode/output_csv.py               |    7 +-
 .../data/csv/flatten_scan/full.json-expected  | 2358 ++++++-----------
 .../csv/flatten_scan/minimal.json-expected    |   24 +-
 .../package_license_value_null.json-expected  |   12 +-
 .../data/csv/livescan/expected.csv            |    8 +-
 tests/formattedcode/test_output_csv.py        |    6 +-
 6 files changed, 804 insertions(+), 1611 deletions(-)

diff --git a/src/formattedcode/output_csv.py b/src/formattedcode/output_csv.py
index 75c1a6a6a31..f9d6f4a5aa3 100644
--- a/src/formattedcode/output_csv.py
+++ b/src/formattedcode/output_csv.py
@@ -128,16 +128,19 @@ def collect_keys(mapping, key_group):
                 # do not include matched text for now.
                 if k == 'matched_text':
                     continue
+
                 if k == 'matched_rule':
+                    is_choice = val.get('license_choice', False)
                     for mrk, mrv in val.items():
-                        mrk = 'matched_rule__' + mrk
                         if mrk == 'license_choice':
                             mrv = 'y' if mrv else ''
                         if mrk == 'licenses':
-                            mrv = ' '.join(mrv)
+                            sep = ' OR ' if is_choice else ' AND '
+                            mrv = sep.join(mrv)
                         if mrk in ('match_coverage', 'rule_relevance'):
                             # normalize the string representation of this number
                             mrv = '{:.2f}'.format(mrv)
+                        mrk = 'matched_rule__' + mrk
                         lic[mrk] = mrv
                     continue
 
diff --git a/tests/formattedcode/data/csv/flatten_scan/full.json-expected b/tests/formattedcode/data/csv/flatten_scan/full.json-expected
index 73ec2b55d2d..3ee87b68b6c 100644
--- a/tests/formattedcode/data/csv/flatten_scan/full.json-expected
+++ b/tests/formattedcode/data/csv/flatten_scan/full.json-expected
@@ -35,11 +35,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_sevenzip.py",
@@ -56,11 +53,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_sevenzip.py",
@@ -164,11 +158,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_tar.py",
@@ -185,11 +176,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_tar.py",
@@ -269,11 +257,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_patch.py",
@@ -290,11 +275,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_patch.py",
@@ -362,11 +344,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_extract.py",
@@ -383,11 +362,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_extract.py",
@@ -455,11 +431,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/extractcode_assert_utils.py",
@@ -476,11 +449,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/extractcode_assert_utils.py",
@@ -548,11 +518,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_extractcode.py",
@@ -569,11 +536,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_extractcode.py",
@@ -641,11 +605,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_archive.py",
@@ -662,11 +623,8 @@
         "start_line": 4,
         "end_line": 23,
         "matched_rule__identifier": "apache-2.0_scancode.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0",
-            "scancode-acknowledgment"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0 AND scancode-acknowledgment"
     },
     {
         "Resource": "/test_archive.py",
@@ -1597,10 +1555,8 @@
         "start_line": 386,
         "end_line": 386,
         "matched_rule__identifier": "apache-2.0_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0"
     },
     {
         "Resource": "/data/extract/TODO/org-jvnet-glassfish-comms-sipagent_1530.jar",
@@ -1617,10 +1573,8 @@
         "start_line": 386,
         "end_line": 386,
         "matched_rule__identifier": "cddl-1.0_6.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "cddl-1.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "cddl-1.0"
     },
     {
         "Resource": "/data/extract/TODO/org-jvnet-glassfish-comms-sipagent_1530.jar",
@@ -4525,10 +4479,8 @@
         "start_line": 1141,
         "end_line": 1149,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff.expected",
@@ -4545,10 +4497,8 @@
         "start_line": 1151,
         "end_line": 1151,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff.expected",
@@ -4565,10 +4515,8 @@
         "start_line": 1152,
         "end_line": 1152,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff.expected",
@@ -4585,10 +4533,8 @@
         "start_line": 1153,
         "end_line": 1153,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff.expected",
@@ -4605,10 +4551,8 @@
         "start_line": 1770,
         "end_line": 1770,
         "matched_rule__identifier": "gpl_71.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff.expected",
@@ -4907,10 +4851,8 @@
         "start_line": 1118,
         "end_line": 1126,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff",
@@ -4927,10 +4869,8 @@
         "start_line": 1128,
         "end_line": 1128,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff",
@@ -4947,10 +4887,8 @@
         "start_line": 1129,
         "end_line": 1129,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff",
@@ -4967,10 +4905,8 @@
         "start_line": 1130,
         "end_line": 1130,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff",
@@ -4987,10 +4923,8 @@
         "start_line": 1681,
         "end_line": 1681,
         "matched_rule__identifier": "gpl_71.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/dnsmasq_2.63-1.diff",
@@ -6504,10 +6438,8 @@
         "start_line": 160,
         "end_line": 173,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch.expected",
@@ -6524,10 +6456,8 @@
         "start_line": 405,
         "end_line": 418,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch.expected",
@@ -6544,10 +6474,8 @@
         "start_line": 564,
         "end_line": 577,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch.expected",
@@ -6564,10 +6492,8 @@
         "start_line": 652,
         "end_line": 665,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch.expected",
@@ -6584,10 +6510,8 @@
         "start_line": 735,
         "end_line": 748,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch.expected",
@@ -6604,10 +6528,8 @@
         "start_line": 824,
         "end_line": 837,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch.expected",
@@ -6624,10 +6546,8 @@
         "start_line": 887,
         "end_line": 900,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch.expected",
@@ -6644,10 +6564,8 @@
         "start_line": 984,
         "end_line": 997,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch.expected",
@@ -7381,10 +7299,8 @@
         "start_line": 131,
         "end_line": 144,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch",
@@ -7401,10 +7317,8 @@
         "start_line": 370,
         "end_line": 383,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch",
@@ -7421,10 +7335,8 @@
         "start_line": 505,
         "end_line": 518,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch",
@@ -7441,10 +7353,8 @@
         "start_line": 587,
         "end_line": 600,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch",
@@ -7461,10 +7371,8 @@
         "start_line": 658,
         "end_line": 671,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch",
@@ -7481,10 +7389,8 @@
         "start_line": 741,
         "end_line": 754,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch",
@@ -7501,10 +7407,8 @@
         "start_line": 798,
         "end_line": 811,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch",
@@ -7521,10 +7425,8 @@
         "start_line": 889,
         "end_line": 902,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/patches/webcore_videoplane.patch",
@@ -8210,10 +8112,8 @@
         "start_line": 69,
         "end_line": 82,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/prepatches/webcore_videoplane.patch.expected",
@@ -8362,10 +8262,8 @@
         "start_line": 58,
         "end_line": 71,
         "matched_rule__identifier": "lgpl-2.0-plus_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/webkit/opensource/prepatches/webcore_videoplane.patch",
@@ -8925,10 +8823,8 @@
         "start_line": 102,
         "end_line": 114,
         "matched_rule__identifier": "gpl-2.0-plus_49.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -8945,10 +8841,8 @@
         "start_line": 2287,
         "end_line": 2287,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -8965,10 +8859,8 @@
         "start_line": 2305,
         "end_line": 2313,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -8985,10 +8877,8 @@
         "start_line": 2315,
         "end_line": 2315,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9005,10 +8895,8 @@
         "start_line": 2402,
         "end_line": 2410,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9025,10 +8913,8 @@
         "start_line": 2412,
         "end_line": 2412,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9045,10 +8931,8 @@
         "start_line": 3174,
         "end_line": 3182,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9065,10 +8949,8 @@
         "start_line": 3184,
         "end_line": 3184,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9085,10 +8967,8 @@
         "start_line": 4119,
         "end_line": 4127,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9105,10 +8985,8 @@
         "start_line": 4129,
         "end_line": 4129,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9125,10 +9003,8 @@
         "start_line": 4175,
         "end_line": 4183,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9145,10 +9021,8 @@
         "start_line": 4185,
         "end_line": 4185,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch.expected",
@@ -9381,10 +9255,8 @@
         "start_line": 772,
         "end_line": 772,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9401,10 +9273,8 @@
         "start_line": 801,
         "end_line": 801,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9421,10 +9291,8 @@
         "start_line": 819,
         "end_line": 819,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9441,10 +9309,8 @@
         "start_line": 876,
         "end_line": 878,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9461,10 +9327,8 @@
         "start_line": 946,
         "end_line": 946,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9481,10 +9345,8 @@
         "start_line": 974,
         "end_line": 974,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9501,10 +9363,8 @@
         "start_line": 1029,
         "end_line": 1031,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9521,10 +9381,8 @@
         "start_line": 1920,
         "end_line": 1922,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9541,10 +9399,8 @@
         "start_line": 2814,
         "end_line": 2816,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9561,10 +9417,8 @@
         "start_line": 3370,
         "end_line": 3372,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9581,10 +9435,8 @@
         "start_line": 3779,
         "end_line": 3781,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9601,10 +9453,8 @@
         "start_line": 4093,
         "end_line": 4095,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9621,10 +9471,8 @@
         "start_line": 4262,
         "end_line": 4264,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9641,10 +9489,8 @@
         "start_line": 4682,
         "end_line": 4684,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9661,10 +9507,8 @@
         "start_line": 5058,
         "end_line": 5060,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9681,10 +9525,8 @@
         "start_line": 6100,
         "end_line": 6102,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9701,10 +9543,8 @@
         "start_line": 6684,
         "end_line": 6686,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9721,10 +9561,8 @@
         "start_line": 7445,
         "end_line": 7445,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9741,10 +9579,8 @@
         "start_line": 7475,
         "end_line": 7477,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9761,10 +9597,8 @@
         "start_line": 7575,
         "end_line": 7577,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9781,10 +9615,8 @@
         "start_line": 7872,
         "end_line": 7874,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9801,10 +9633,8 @@
         "start_line": 8400,
         "end_line": 8402,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9821,10 +9651,8 @@
         "start_line": 8513,
         "end_line": 8515,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9841,10 +9669,8 @@
         "start_line": 8621,
         "end_line": 8623,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9861,10 +9687,8 @@
         "start_line": 8728,
         "end_line": 8730,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9881,10 +9705,8 @@
         "start_line": 9787,
         "end_line": 9789,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9901,10 +9723,8 @@
         "start_line": 10453,
         "end_line": 10455,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9921,10 +9741,8 @@
         "start_line": 10747,
         "end_line": 10749,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9941,10 +9759,8 @@
         "start_line": 11336,
         "end_line": 11338,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9961,10 +9777,8 @@
         "start_line": 11513,
         "end_line": 11515,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -9981,10 +9795,8 @@
         "start_line": 11632,
         "end_line": 11634,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff.expected",
@@ -12422,10 +12234,8 @@
         "start_line": 695,
         "end_line": 695,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12442,10 +12252,8 @@
         "start_line": 718,
         "end_line": 718,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12462,10 +12270,8 @@
         "start_line": 736,
         "end_line": 736,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12482,10 +12288,8 @@
         "start_line": 787,
         "end_line": 789,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12502,10 +12306,8 @@
         "start_line": 857,
         "end_line": 857,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12522,10 +12324,8 @@
         "start_line": 885,
         "end_line": 885,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12542,10 +12342,8 @@
         "start_line": 928,
         "end_line": 930,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12562,10 +12360,8 @@
         "start_line": 1813,
         "end_line": 1815,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12582,10 +12378,8 @@
         "start_line": 2701,
         "end_line": 2703,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12602,10 +12396,8 @@
         "start_line": 3251,
         "end_line": 3253,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12622,10 +12414,8 @@
         "start_line": 3654,
         "end_line": 3656,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12642,10 +12432,8 @@
         "start_line": 3962,
         "end_line": 3964,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12662,10 +12450,8 @@
         "start_line": 4125,
         "end_line": 4127,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12682,10 +12468,8 @@
         "start_line": 4539,
         "end_line": 4541,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12702,10 +12486,8 @@
         "start_line": 4909,
         "end_line": 4911,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12722,10 +12504,8 @@
         "start_line": 5945,
         "end_line": 5947,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12742,10 +12522,8 @@
         "start_line": 6523,
         "end_line": 6525,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12762,10 +12540,8 @@
         "start_line": 7284,
         "end_line": 7284,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12782,10 +12558,8 @@
         "start_line": 7308,
         "end_line": 7310,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12802,10 +12576,8 @@
         "start_line": 7402,
         "end_line": 7404,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12822,10 +12594,8 @@
         "start_line": 7693,
         "end_line": 7695,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12842,10 +12612,8 @@
         "start_line": 8215,
         "end_line": 8217,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12862,10 +12630,8 @@
         "start_line": 8322,
         "end_line": 8324,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12882,10 +12648,8 @@
         "start_line": 8424,
         "end_line": 8426,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12902,10 +12666,8 @@
         "start_line": 8525,
         "end_line": 8527,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12922,10 +12684,8 @@
         "start_line": 9578,
         "end_line": 9580,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12942,10 +12702,8 @@
         "start_line": 10238,
         "end_line": 10240,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12962,10 +12720,8 @@
         "start_line": 10526,
         "end_line": 10528,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -12982,10 +12738,8 @@
         "start_line": 11109,
         "end_line": 11111,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -13002,10 +12756,8 @@
         "start_line": 11280,
         "end_line": 11282,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -13022,10 +12774,8 @@
         "start_line": 11375,
         "end_line": 11377,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/unionfs-2.5.1_for_2.6.23.17.diff",
@@ -16120,10 +15870,8 @@
         "start_line": 34,
         "end_line": 35,
         "matched_rule__identifier": "curl.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "curl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "curl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19x3_board.patch",
@@ -16140,10 +15888,8 @@
         "start_line": 34,
         "end_line": 35,
         "matched_rule__identifier": "gpl-2.0-plus_6.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19x3_board.patch",
@@ -16244,10 +15990,8 @@
         "start_line": 99,
         "end_line": 111,
         "matched_rule__identifier": "gpl-2.0-plus_49.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16264,10 +16008,8 @@
         "start_line": 2239,
         "end_line": 2239,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16284,10 +16026,8 @@
         "start_line": 2273,
         "end_line": 2281,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16304,10 +16044,8 @@
         "start_line": 2283,
         "end_line": 2283,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16324,10 +16062,8 @@
         "start_line": 3023,
         "end_line": 3031,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16344,10 +16080,8 @@
         "start_line": 3033,
         "end_line": 3033,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16364,10 +16098,8 @@
         "start_line": 3122,
         "end_line": 3130,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16384,10 +16116,8 @@
         "start_line": 3132,
         "end_line": 3132,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16404,10 +16134,8 @@
         "start_line": 4066,
         "end_line": 4074,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16424,10 +16152,8 @@
         "start_line": 4076,
         "end_line": 4076,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16444,10 +16170,8 @@
         "start_line": 4121,
         "end_line": 4129,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16464,10 +16188,8 @@
         "start_line": 4131,
         "end_line": 4131,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch.expected",
@@ -16610,10 +16332,8 @@
         "start_line": 42,
         "end_line": 66,
         "matched_rule__identifier": "dual-bsd-gpl.LICENSE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "dual-bsd-gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "dual-bsd-gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/motorola_rootdisk.c.patch",
@@ -16630,10 +16350,8 @@
         "start_line": 204,
         "end_line": 204,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/motorola_rootdisk.c.patch",
@@ -16821,10 +16539,8 @@
         "start_line": 101,
         "end_line": 125,
         "matched_rule__identifier": "dual-bsd-gpl.LICENSE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "dual-bsd-gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "dual-bsd-gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/fan_ctrl.patch.expected",
@@ -16841,10 +16557,8 @@
         "start_line": 138,
         "end_line": 138,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/fan_ctrl.patch.expected",
@@ -16888,10 +16602,8 @@
         "start_line": 42,
         "end_line": 66,
         "matched_rule__identifier": "dual-bsd-gpl.LICENSE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "dual-bsd-gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "dual-bsd-gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx_nand.patch",
@@ -16908,10 +16620,8 @@
         "start_line": 364,
         "end_line": 364,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx_nand.patch",
@@ -16988,10 +16698,8 @@
         "start_line": 104,
         "end_line": 116,
         "matched_rule__identifier": "gpl-2.0-plus_49.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17008,10 +16716,8 @@
         "start_line": 2289,
         "end_line": 2289,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17028,10 +16734,8 @@
         "start_line": 2308,
         "end_line": 2316,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17048,10 +16752,8 @@
         "start_line": 2318,
         "end_line": 2318,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17068,10 +16770,8 @@
         "start_line": 2406,
         "end_line": 2414,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17088,10 +16788,8 @@
         "start_line": 2416,
         "end_line": 2416,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17108,10 +16806,8 @@
         "start_line": 3180,
         "end_line": 3188,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17128,10 +16824,8 @@
         "start_line": 3190,
         "end_line": 3190,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17148,10 +16842,8 @@
         "start_line": 4126,
         "end_line": 4134,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17168,10 +16860,8 @@
         "start_line": 4136,
         "end_line": 4136,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17188,10 +16878,8 @@
         "start_line": 4183,
         "end_line": 4191,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17208,10 +16896,8 @@
         "start_line": 4193,
         "end_line": 4193,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch.expected",
@@ -17687,10 +17373,8 @@
         "start_line": 51,
         "end_line": 52,
         "matched_rule__identifier": "curl.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "curl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "curl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19x3_board.patch.expected",
@@ -17707,10 +17391,8 @@
         "start_line": 51,
         "end_line": 52,
         "matched_rule__identifier": "gpl-2.0-plus_6.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19x3_board.patch.expected",
@@ -17985,10 +17667,8 @@
         "start_line": 72,
         "end_line": 96,
         "matched_rule__identifier": "dual-bsd-gpl.LICENSE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "dual-bsd-gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "dual-bsd-gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/fan_ctrl.patch",
@@ -18005,10 +17685,8 @@
         "start_line": 109,
         "end_line": 109,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/fan_ctrl.patch",
@@ -18079,10 +17757,8 @@
         "start_line": 1569,
         "end_line": 1569,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/sched-cfs-v2.6.23.12-v24.1.mod.patch.expected",
@@ -18099,10 +17775,8 @@
         "start_line": 3001,
         "end_line": 3001,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/sched-cfs-v2.6.23.12-v24.1.mod.patch.expected",
@@ -18119,10 +17793,8 @@
         "start_line": 3592,
         "end_line": 3592,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/sched-cfs-v2.6.23.12-v24.1.mod.patch.expected",
@@ -18139,10 +17811,8 @@
         "start_line": 4625,
         "end_line": 4625,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/sched-cfs-v2.6.23.12-v24.1.mod.patch.expected",
@@ -18282,10 +17952,8 @@
         "start_line": 88,
         "end_line": 100,
         "matched_rule__identifier": "gpl-2.0-plus_49.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18302,10 +17970,8 @@
         "start_line": 2273,
         "end_line": 2273,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18322,10 +17988,8 @@
         "start_line": 2286,
         "end_line": 2294,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18342,10 +18006,8 @@
         "start_line": 2296,
         "end_line": 2296,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18362,10 +18024,8 @@
         "start_line": 2378,
         "end_line": 2386,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18382,10 +18042,8 @@
         "start_line": 2388,
         "end_line": 2388,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18402,10 +18060,8 @@
         "start_line": 3141,
         "end_line": 3149,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18422,10 +18078,8 @@
         "start_line": 3151,
         "end_line": 3151,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18442,10 +18096,8 @@
         "start_line": 4081,
         "end_line": 4089,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18462,10 +18114,8 @@
         "start_line": 4091,
         "end_line": 4091,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18482,10 +18132,8 @@
         "start_line": 4132,
         "end_line": 4140,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18502,10 +18150,8 @@
         "start_line": 4142,
         "end_line": 4142,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch",
@@ -18834,10 +18480,8 @@
         "start_line": 1438,
         "end_line": 1438,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/sched-cfs-v2.6.23.12-v24.1.mod.patch",
@@ -18854,10 +18498,8 @@
         "start_line": 2870,
         "end_line": 2870,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/sched-cfs-v2.6.23.12-v24.1.mod.patch",
@@ -18874,10 +18516,8 @@
         "start_line": 3461,
         "end_line": 3461,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/sched-cfs-v2.6.23.12-v24.1.mod.patch",
@@ -18894,10 +18534,8 @@
         "start_line": 4494,
         "end_line": 4494,
         "matched_rule__identifier": "gpl_62.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/sched-cfs-v2.6.23.12-v24.1.mod.patch",
@@ -18968,10 +18606,8 @@
         "start_line": 77,
         "end_line": 77,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/localversion.patch",
@@ -19135,10 +18771,8 @@
         "start_line": 59,
         "end_line": 83,
         "matched_rule__identifier": "dual-bsd-gpl.LICENSE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "dual-bsd-gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "dual-bsd-gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx_nand.patch.expected",
@@ -19155,10 +18789,8 @@
         "start_line": 381,
         "end_line": 381,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx_nand.patch.expected",
@@ -19229,10 +18861,8 @@
         "start_line": 82,
         "end_line": 94,
         "matched_rule__identifier": "gpl-2.0-plus_49.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19249,10 +18879,8 @@
         "start_line": 2222,
         "end_line": 2222,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19269,10 +18897,8 @@
         "start_line": 2244,
         "end_line": 2252,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19289,10 +18915,8 @@
         "start_line": 2254,
         "end_line": 2254,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19309,10 +18933,8 @@
         "start_line": 2988,
         "end_line": 2996,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19329,10 +18951,8 @@
         "start_line": 2998,
         "end_line": 2998,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19349,10 +18969,8 @@
         "start_line": 3081,
         "end_line": 3089,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19369,10 +18987,8 @@
         "start_line": 3091,
         "end_line": 3091,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19389,10 +19005,8 @@
         "start_line": 4019,
         "end_line": 4027,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19409,10 +19023,8 @@
         "start_line": 4029,
         "end_line": 4029,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19429,10 +19041,8 @@
         "start_line": 4068,
         "end_line": 4076,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19449,10 +19059,8 @@
         "start_line": 4078,
         "end_line": 4078,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.4.patch",
@@ -19811,10 +19419,8 @@
         "start_line": 10,
         "end_line": 22,
         "matched_rule__identifier": "gpl-2.0_34.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx.h.patch",
@@ -19969,10 +19575,8 @@
         "start_line": 85,
         "end_line": 97,
         "matched_rule__identifier": "gpl-2.0-plus_49.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -19989,10 +19593,8 @@
         "start_line": 2270,
         "end_line": 2270,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20009,10 +19611,8 @@
         "start_line": 2282,
         "end_line": 2290,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20029,10 +19629,8 @@
         "start_line": 2292,
         "end_line": 2292,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20049,10 +19647,8 @@
         "start_line": 2373,
         "end_line": 2381,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20069,10 +19665,8 @@
         "start_line": 2383,
         "end_line": 2383,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20089,10 +19683,8 @@
         "start_line": 3133,
         "end_line": 3141,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20109,10 +19701,8 @@
         "start_line": 3143,
         "end_line": 3143,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20129,10 +19719,8 @@
         "start_line": 4072,
         "end_line": 4080,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20149,10 +19737,8 @@
         "start_line": 4082,
         "end_line": 4082,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20169,10 +19755,8 @@
         "start_line": 4122,
         "end_line": 4130,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20189,10 +19773,8 @@
         "start_line": 4132,
         "end_line": 4132,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert1.patch",
@@ -20335,10 +19917,8 @@
         "start_line": 15,
         "end_line": 27,
         "matched_rule__identifier": "gpl-2.0_34.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx.h.patch.expected",
@@ -20445,10 +20025,8 @@
         "start_line": 105,
         "end_line": 117,
         "matched_rule__identifier": "gpl-2.0-plus_49.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20465,10 +20043,8 @@
         "start_line": 2290,
         "end_line": 2290,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20485,10 +20061,8 @@
         "start_line": 2309,
         "end_line": 2317,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20505,10 +20079,8 @@
         "start_line": 2319,
         "end_line": 2319,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20525,10 +20097,8 @@
         "start_line": 2407,
         "end_line": 2415,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20545,10 +20115,8 @@
         "start_line": 2417,
         "end_line": 2417,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20565,10 +20133,8 @@
         "start_line": 3182,
         "end_line": 3190,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20585,10 +20151,8 @@
         "start_line": 3192,
         "end_line": 3192,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20605,10 +20169,8 @@
         "start_line": 4128,
         "end_line": 4136,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20625,10 +20187,8 @@
         "start_line": 4138,
         "end_line": 4138,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20645,10 +20205,8 @@
         "start_line": 4185,
         "end_line": 4193,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20665,10 +20223,8 @@
         "start_line": 4195,
         "end_line": 4195,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert3.patch.expected",
@@ -20811,10 +20367,8 @@
         "start_line": 85,
         "end_line": 85,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/i2c-stm.c.patch2.expected",
@@ -20915,10 +20469,8 @@
         "start_line": 82,
         "end_line": 82,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/pmb.c.patch",
@@ -21019,10 +20571,8 @@
         "start_line": 56,
         "end_line": 80,
         "matched_rule__identifier": "dual-bsd-gpl.LICENSE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "dual-bsd-gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "dual-bsd-gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx_nor.patch.expected",
@@ -21039,10 +20589,8 @@
         "start_line": 219,
         "end_line": 219,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx_nor.patch.expected",
@@ -21560,10 +21108,8 @@
         "start_line": 39,
         "end_line": 63,
         "matched_rule__identifier": "dual-bsd-gpl.LICENSE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "dual-bsd-gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "dual-bsd-gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx_nor.patch",
@@ -21580,10 +21126,8 @@
         "start_line": 202,
         "end_line": 202,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/vip19xx_nor.patch",
@@ -21702,10 +21246,8 @@
         "start_line": 2317,
         "end_line": 2319,
         "matched_rule__identifier": "gpl_15.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21722,11 +21264,8 @@
         "start_line": 2318,
         "end_line": 2318,
         "matched_rule__identifier": "lgpl-2.1_released.RULE",
-        "matched_rule__license_choice": true,
-        "matched_rule__licenses": [
-            "gpl-2.0",
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "y",
+        "matched_rule__licenses": "gpl-2.0 OR lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21743,11 +21282,8 @@
         "start_line": 2318,
         "end_line": 2318,
         "matched_rule__identifier": "lgpl-2.1_released.RULE",
-        "matched_rule__license_choice": true,
-        "matched_rule__licenses": [
-            "gpl-2.0",
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "y",
+        "matched_rule__licenses": "gpl-2.0 OR lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21764,10 +21300,8 @@
         "start_line": 2321,
         "end_line": 2321,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21784,10 +21318,8 @@
         "start_line": 2321,
         "end_line": 2321,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21804,10 +21336,8 @@
         "start_line": 2712,
         "end_line": 2714,
         "matched_rule__identifier": "lgpl-2.1_22.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21824,10 +21354,8 @@
         "start_line": 2716,
         "end_line": 2716,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21844,10 +21372,8 @@
         "start_line": 2716,
         "end_line": 2716,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21864,10 +21390,8 @@
         "start_line": 2787,
         "end_line": 2789,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21884,10 +21408,8 @@
         "start_line": 3202,
         "end_line": 3202,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21904,10 +21426,8 @@
         "start_line": 3205,
         "end_line": 3205,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21924,10 +21444,8 @@
         "start_line": 3205,
         "end_line": 3205,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21944,10 +21462,8 @@
         "start_line": 3246,
         "end_line": 3248,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21964,10 +21480,8 @@
         "start_line": 3588,
         "end_line": 3588,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -21984,10 +21498,8 @@
         "start_line": 3591,
         "end_line": 3591,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22004,10 +21516,8 @@
         "start_line": 3591,
         "end_line": 3591,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22024,10 +21534,8 @@
         "start_line": 3648,
         "end_line": 3650,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22044,10 +21552,8 @@
         "start_line": 6004,
         "end_line": 6004,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22064,10 +21570,8 @@
         "start_line": 6024,
         "end_line": 6024,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22084,10 +21588,8 @@
         "start_line": 6027,
         "end_line": 6027,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22104,10 +21606,8 @@
         "start_line": 6027,
         "end_line": 6027,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22124,10 +21624,8 @@
         "start_line": 6067,
         "end_line": 6069,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22144,10 +21642,8 @@
         "start_line": 13609,
         "end_line": 13609,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22164,10 +21660,8 @@
         "start_line": 13612,
         "end_line": 13612,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22184,10 +21678,8 @@
         "start_line": 13612,
         "end_line": 13612,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22204,10 +21696,8 @@
         "start_line": 14520,
         "end_line": 14520,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22224,10 +21714,8 @@
         "start_line": 14523,
         "end_line": 14523,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22244,10 +21732,8 @@
         "start_line": 14523,
         "end_line": 14523,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22264,10 +21750,8 @@
         "start_line": 14549,
         "end_line": 14551,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22284,10 +21768,8 @@
         "start_line": 14928,
         "end_line": 14928,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22304,10 +21786,8 @@
         "start_line": 14931,
         "end_line": 14931,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22324,10 +21804,8 @@
         "start_line": 14931,
         "end_line": 14931,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22344,10 +21822,8 @@
         "start_line": 14967,
         "end_line": 14969,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22364,10 +21840,8 @@
         "start_line": 15226,
         "end_line": 15226,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22384,10 +21858,8 @@
         "start_line": 15229,
         "end_line": 15229,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22404,10 +21876,8 @@
         "start_line": 15229,
         "end_line": 15229,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22424,10 +21894,8 @@
         "start_line": 15264,
         "end_line": 15266,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22444,10 +21912,8 @@
         "start_line": 15516,
         "end_line": 15516,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22464,10 +21930,8 @@
         "start_line": 15519,
         "end_line": 15519,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22484,10 +21948,8 @@
         "start_line": 15519,
         "end_line": 15519,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22504,10 +21966,8 @@
         "start_line": 15557,
         "end_line": 15559,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22524,10 +21984,8 @@
         "start_line": 15703,
         "end_line": 15703,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22544,10 +22002,8 @@
         "start_line": 15706,
         "end_line": 15706,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22564,10 +22020,8 @@
         "start_line": 15706,
         "end_line": 15706,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22584,10 +22038,8 @@
         "start_line": 15752,
         "end_line": 15752,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22604,10 +22056,8 @@
         "start_line": 15755,
         "end_line": 15755,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22624,10 +22074,8 @@
         "start_line": 15755,
         "end_line": 15755,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22644,10 +22092,8 @@
         "start_line": 15805,
         "end_line": 15807,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22664,10 +22110,8 @@
         "start_line": 15868,
         "end_line": 15868,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22684,10 +22128,8 @@
         "start_line": 15871,
         "end_line": 15871,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22704,10 +22146,8 @@
         "start_line": 15871,
         "end_line": 15871,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22724,10 +22164,8 @@
         "start_line": 15914,
         "end_line": 15916,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22744,10 +22182,8 @@
         "start_line": 16133,
         "end_line": 16133,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22764,10 +22200,8 @@
         "start_line": 16136,
         "end_line": 16136,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22784,10 +22218,8 @@
         "start_line": 16136,
         "end_line": 16136,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22804,10 +22236,8 @@
         "start_line": 16181,
         "end_line": 16203,
         "matched_rule__identifier": "bsd-new_19.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "bsd-new"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "bsd-new"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22824,10 +22254,8 @@
         "start_line": 16356,
         "end_line": 16356,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22844,10 +22272,8 @@
         "start_line": 16359,
         "end_line": 16359,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22864,10 +22290,8 @@
         "start_line": 16359,
         "end_line": 16359,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22884,10 +22308,8 @@
         "start_line": 16388,
         "end_line": 16390,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22904,10 +22326,8 @@
         "start_line": 16933,
         "end_line": 16933,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22924,10 +22344,8 @@
         "start_line": 16936,
         "end_line": 16936,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22944,10 +22362,8 @@
         "start_line": 16936,
         "end_line": 16936,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22964,10 +22380,8 @@
         "start_line": 16983,
         "end_line": 16985,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -22984,10 +22398,8 @@
         "start_line": 17022,
         "end_line": 17022,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -23004,10 +22416,8 @@
         "start_line": 17025,
         "end_line": 17025,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -23024,10 +22434,8 @@
         "start_line": 17025,
         "end_line": 17025,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -23044,10 +22452,8 @@
         "start_line": 17056,
         "end_line": 17056,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -23064,10 +22470,8 @@
         "start_line": 17059,
         "end_line": 17059,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -23084,10 +22488,8 @@
         "start_line": 17059,
         "end_line": 17059,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch.expected",
@@ -23938,10 +23340,8 @@
         "start_line": 87,
         "end_line": 99,
         "matched_rule__identifier": "gpl-2.0-plus_49.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -23958,10 +23358,8 @@
         "start_line": 2272,
         "end_line": 2272,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -23978,10 +23376,8 @@
         "start_line": 2285,
         "end_line": 2293,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -23998,10 +23394,8 @@
         "start_line": 2295,
         "end_line": 2295,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24018,10 +23412,8 @@
         "start_line": 2377,
         "end_line": 2385,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24038,10 +23430,8 @@
         "start_line": 2387,
         "end_line": 2387,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24058,10 +23448,8 @@
         "start_line": 3139,
         "end_line": 3147,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24078,10 +23466,8 @@
         "start_line": 3149,
         "end_line": 3149,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24098,10 +23484,8 @@
         "start_line": 4079,
         "end_line": 4087,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24118,10 +23502,8 @@
         "start_line": 4089,
         "end_line": 4089,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24138,10 +23520,8 @@
         "start_line": 4130,
         "end_line": 4138,
         "matched_rule__identifier": "gpl-2.0-plus_3.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0-plus"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0-plus"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24158,10 +23538,8 @@
         "start_line": 4140,
         "end_line": 4140,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/squashfs3.3_revert2.patch",
@@ -24367,10 +23745,8 @@
         "start_line": 80,
         "end_line": 80,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24408,10 +23784,8 @@
         "start_line": 2288,
         "end_line": 2290,
         "matched_rule__identifier": "gpl_15.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24428,11 +23802,8 @@
         "start_line": 2289,
         "end_line": 2289,
         "matched_rule__identifier": "lgpl-2.1_released.RULE",
-        "matched_rule__license_choice": true,
-        "matched_rule__licenses": [
-            "gpl-2.0",
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "y",
+        "matched_rule__licenses": "gpl-2.0 OR lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24449,11 +23820,8 @@
         "start_line": 2289,
         "end_line": 2289,
         "matched_rule__identifier": "lgpl-2.1_released.RULE",
-        "matched_rule__license_choice": true,
-        "matched_rule__licenses": [
-            "gpl-2.0",
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "y",
+        "matched_rule__licenses": "gpl-2.0 OR lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24470,10 +23838,8 @@
         "start_line": 2292,
         "end_line": 2292,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24490,10 +23856,8 @@
         "start_line": 2292,
         "end_line": 2292,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24510,10 +23874,8 @@
         "start_line": 2665,
         "end_line": 2667,
         "matched_rule__identifier": "lgpl-2.1_22.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24530,10 +23892,8 @@
         "start_line": 2669,
         "end_line": 2669,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24550,10 +23910,8 @@
         "start_line": 2669,
         "end_line": 2669,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24570,10 +23928,8 @@
         "start_line": 2734,
         "end_line": 2736,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24590,10 +23946,8 @@
         "start_line": 3143,
         "end_line": 3143,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24610,10 +23964,8 @@
         "start_line": 3146,
         "end_line": 3146,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24630,10 +23982,8 @@
         "start_line": 3146,
         "end_line": 3146,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24650,10 +24000,8 @@
         "start_line": 3181,
         "end_line": 3183,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24670,10 +24018,8 @@
         "start_line": 3517,
         "end_line": 3517,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24690,10 +24036,8 @@
         "start_line": 3520,
         "end_line": 3520,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24710,10 +24054,8 @@
         "start_line": 3520,
         "end_line": 3520,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24730,10 +24072,8 @@
         "start_line": 3571,
         "end_line": 3573,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24750,10 +24090,8 @@
         "start_line": 5927,
         "end_line": 5927,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24770,10 +24108,8 @@
         "start_line": 5941,
         "end_line": 5941,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24790,10 +24126,8 @@
         "start_line": 5944,
         "end_line": 5944,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24810,10 +24144,8 @@
         "start_line": 5944,
         "end_line": 5944,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24830,10 +24162,8 @@
         "start_line": 5978,
         "end_line": 5980,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24850,10 +24180,8 @@
         "start_line": 13514,
         "end_line": 13514,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24870,10 +24198,8 @@
         "start_line": 13517,
         "end_line": 13517,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24890,10 +24216,8 @@
         "start_line": 13517,
         "end_line": 13517,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24910,10 +24234,8 @@
         "start_line": 14419,
         "end_line": 14419,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24930,10 +24252,8 @@
         "start_line": 14422,
         "end_line": 14422,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24950,10 +24270,8 @@
         "start_line": 14422,
         "end_line": 14422,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24970,10 +24288,8 @@
         "start_line": 14442,
         "end_line": 14444,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -24990,10 +24306,8 @@
         "start_line": 14815,
         "end_line": 14815,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25010,10 +24324,8 @@
         "start_line": 14818,
         "end_line": 14818,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25030,10 +24342,8 @@
         "start_line": 14818,
         "end_line": 14818,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25050,10 +24360,8 @@
         "start_line": 14848,
         "end_line": 14850,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25070,10 +24378,8 @@
         "start_line": 15101,
         "end_line": 15101,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25090,10 +24396,8 @@
         "start_line": 15104,
         "end_line": 15104,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25110,10 +24414,8 @@
         "start_line": 15104,
         "end_line": 15104,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25130,10 +24432,8 @@
         "start_line": 15133,
         "end_line": 15135,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25150,10 +24450,8 @@
         "start_line": 15379,
         "end_line": 15379,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25170,10 +24468,8 @@
         "start_line": 15382,
         "end_line": 15382,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25190,10 +24486,8 @@
         "start_line": 15382,
         "end_line": 15382,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25210,10 +24504,8 @@
         "start_line": 15414,
         "end_line": 15416,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25230,10 +24522,8 @@
         "start_line": 15554,
         "end_line": 15554,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25250,10 +24540,8 @@
         "start_line": 15557,
         "end_line": 15557,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25270,10 +24558,8 @@
         "start_line": 15557,
         "end_line": 15557,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25290,10 +24576,8 @@
         "start_line": 15597,
         "end_line": 15597,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25310,10 +24594,8 @@
         "start_line": 15600,
         "end_line": 15600,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25330,10 +24612,8 @@
         "start_line": 15600,
         "end_line": 15600,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25350,10 +24630,8 @@
         "start_line": 15644,
         "end_line": 15646,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25370,10 +24648,8 @@
         "start_line": 15701,
         "end_line": 15701,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25390,10 +24666,8 @@
         "start_line": 15704,
         "end_line": 15704,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25410,10 +24684,8 @@
         "start_line": 15704,
         "end_line": 15704,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25430,10 +24702,8 @@
         "start_line": 15741,
         "end_line": 15743,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25450,10 +24720,8 @@
         "start_line": 15954,
         "end_line": 15954,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25470,10 +24738,8 @@
         "start_line": 15957,
         "end_line": 15957,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25490,10 +24756,8 @@
         "start_line": 15957,
         "end_line": 15957,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25510,10 +24774,8 @@
         "start_line": 15996,
         "end_line": 16018,
         "matched_rule__identifier": "bsd-new_19.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "bsd-new"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "bsd-new"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25530,10 +24792,8 @@
         "start_line": 16165,
         "end_line": 16165,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25550,10 +24810,8 @@
         "start_line": 16168,
         "end_line": 16168,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25570,10 +24828,8 @@
         "start_line": 16168,
         "end_line": 16168,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25590,10 +24846,8 @@
         "start_line": 16191,
         "end_line": 16193,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25610,10 +24864,8 @@
         "start_line": 16730,
         "end_line": 16730,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25630,10 +24882,8 @@
         "start_line": 16733,
         "end_line": 16733,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25650,10 +24900,8 @@
         "start_line": 16733,
         "end_line": 16733,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25670,10 +24918,8 @@
         "start_line": 16774,
         "end_line": 16776,
         "matched_rule__identifier": "gpl-2.0_8.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25690,10 +24936,8 @@
         "start_line": 16807,
         "end_line": 16807,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25710,10 +24954,8 @@
         "start_line": 16810,
         "end_line": 16810,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25730,10 +24972,8 @@
         "start_line": 16810,
         "end_line": 16810,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25750,10 +24990,8 @@
         "start_line": 16835,
         "end_line": 16835,
         "matched_rule__identifier": "lgpl-2.1_36.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl-2.1"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl-2.1"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25770,10 +25008,8 @@
         "start_line": 16838,
         "end_line": 16838,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -25790,10 +25026,8 @@
         "start_line": 16838,
         "end_line": 16838,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/yaffs2-2008.07.15_for_2.6.23.17.patch",
@@ -26476,10 +25710,8 @@
         "start_line": 59,
         "end_line": 83,
         "matched_rule__identifier": "dual-bsd-gpl.LICENSE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "dual-bsd-gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "dual-bsd-gpl"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/motorola_rootdisk.c.patch.expected",
@@ -26496,10 +25728,8 @@
         "start_line": 221,
         "end_line": 221,
         "matched_rule__identifier": "gpl-2.0_43.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/patch/patches/misc/linux-st710x/patches/motorola_rootdisk.c.patch.expected",
@@ -29427,10 +28657,8 @@
         "start_line": 10,
         "end_line": 10,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/archive/TODO/rpmticket_6327/gettext-runtime-32bit-0.17-61.40.x86_64.rpm",
@@ -29447,10 +28675,8 @@
         "start_line": 10,
         "end_line": 10,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/archive/TODO/rpmticket_6327/gettext-runtime-32bit-0.17-61.40.x86_64.rpm",
@@ -29467,10 +28693,8 @@
         "start_line": 98,
         "end_line": 98,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/archive/TODO/rpmticket_6327/gettext-runtime-32bit-0.17-61.40.x86_64.rpm",
@@ -29487,10 +28711,8 @@
         "start_line": 98,
         "end_line": 98,
         "matched_rule__identifier": "gpl_61.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/archive/TODO/rpmticket_6327/gettext-runtime-32bit-0.17-61.40.x86_64.rpm",
@@ -30529,10 +29751,8 @@
         "start_line": 135,
         "end_line": 135,
         "matched_rule__identifier": "gpl-2.0_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/archive/cpio/elfinfo-1.0-1.fc9.src.cpio",
@@ -30588,10 +29808,8 @@
         "start_line": 135,
         "end_line": 135,
         "matched_rule__identifier": "gpl-2.0_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/archive/cpio/cpio_trailing.cpio",
@@ -30689,10 +29907,8 @@
         "start_line": 138,
         "end_line": 138,
         "matched_rule__identifier": "gpl-2.0_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/archive/cpio/cpio_broken.cpio",
@@ -35135,10 +34351,8 @@
         "start_line": 9,
         "end_line": 9,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/archive/rpm/broken.rpm",
@@ -35273,10 +34487,8 @@
         "start_line": 9,
         "end_line": 9,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/archive/rpm/renamed.rpm",
@@ -35340,10 +34552,8 @@
         "start_line": 9,
         "end_line": 9,
         "matched_rule__identifier": "lgpl_20.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "lgpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "lgpl"
     },
     {
         "Resource": "/data/archive/rpm/python-glc-0.7.1-1.src.rpm",
@@ -35407,10 +34617,8 @@
         "start_line": 8,
         "end_line": 8,
         "matched_rule__identifier": "gpl-2.0_75.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/archive/rpm/elfinfo-1.0-1.fc9.src.rpm",
@@ -35474,10 +34682,8 @@
         "start_line": 8,
         "end_line": 8,
         "matched_rule__identifier": "gpl-2.0_75.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl-2.0"
     },
     {
         "Resource": "/data/archive/rpm/rpm_trailing.rpm",
@@ -36792,10 +35998,8 @@
         "start_line": 1619,
         "end_line": 1619,
         "matched_rule__identifier": "gpl_63.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "gpl"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "gpl"
     },
     {
         "Resource": "/data/archive/bz2/bzip2_with_gentoo_trailing_data/sys-libs%253Azlib-1.2.3-r1%7E1.tbz2",
@@ -36812,10 +36016,8 @@
         "start_line": 2139,
         "end_line": 2139,
         "matched_rule__identifier": "zlib_10.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "zlib"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "zlib"
     },
     {
         "Resource": "/data/archive/bz2/bzip2_with_gentoo_trailing_data/sys-libs%253Azlib-1.2.3-r1%7E1.tbz2",
diff --git a/tests/formattedcode/data/csv/flatten_scan/minimal.json-expected b/tests/formattedcode/data/csv/flatten_scan/minimal.json-expected
index 0d33ece20da..d8a72a7d78d 100644
--- a/tests/formattedcode/data/csv/flatten_scan/minimal.json-expected
+++ b/tests/formattedcode/data/csv/flatten_scan/minimal.json-expected
@@ -18,10 +18,8 @@
         "start_line": 4,
         "end_line": 5,
         "matched_rule__identifier": "apache-2.0_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0"
     },
     {
         "Resource": "/srp_vfy.c",
@@ -38,10 +36,8 @@
         "start_line": 4,
         "end_line": 4,
         "matched_rule__identifier": "openssl-ssleay_2.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "openssl-ssleay"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "openssl-ssleay"
     },
     {
         "Resource": "/srp_vfy.c",
@@ -74,10 +70,8 @@
         "start_line": 4,
         "end_line": 5,
         "matched_rule__identifier": "apache-2.0_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0"
     },
     {
         "Resource": "/srp_lib.c",
@@ -94,10 +88,8 @@
         "start_line": 4,
         "end_line": 4,
         "matched_rule__identifier": "openssl-ssleay_2.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "openssl-ssleay"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "openssl-ssleay"
     },
     {
         "Resource": "/srp_lib.c",
diff --git a/tests/formattedcode/data/csv/flatten_scan/package_license_value_null.json-expected b/tests/formattedcode/data/csv/flatten_scan/package_license_value_null.json-expected
index 1955d928eed..e9968fb1e4b 100644
--- a/tests/formattedcode/data/csv/flatten_scan/package_license_value_null.json-expected
+++ b/tests/formattedcode/data/csv/flatten_scan/package_license_value_null.json-expected
@@ -18,10 +18,8 @@
         "start_line": 4,
         "end_line": 5,
         "matched_rule__identifier": "apache-2.0_23.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "apache-2.0"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "apache-2.0"
     },
     {
         "Resource": "/srp_vfy.c",
@@ -38,10 +36,8 @@
         "start_line": 4,
         "end_line": 4,
         "matched_rule__identifier": "openssl-ssleay_2.RULE",
-        "matched_rule__license_choice": false,
-        "matched_rule__licenses": [
-            "openssl-ssleay"
-        ]
+        "matched_rule__license_choice": "",
+        "matched_rule__licenses": "openssl-ssleay"
     },
     {
         "Resource": "/srp_vfy.c",
diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv
index e38066deeab..ed8e9c06718 100644
--- a/tests/formattedcode/data/csv/livescan/expected.csv
+++ b/tests/formattedcode/data/csv/livescan/expected.csv
@@ -1,16 +1,16 @@
 Resource,type,name,base_name,extension,size,date,sha1,md5,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,files_count,dirs_count,size_count,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
 /json2csv.rb,file,json2csv.rb,json2csv,.rb,1014,2017-10-03,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,,apache-2.0,,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
 /json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
 /license,file,license,license,,679,2017-10-03,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,text/plain,ASCII text,,False,True,False,False,False,False,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,['gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,,gpl-2.0-plus,,,,,,,,,,,,,,,,,,,
 /package.json,file,package.json,package,.json,2200,2017-10-03,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,['mit'],,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,,mit,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,,mit,,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
diff --git a/tests/formattedcode/test_output_csv.py b/tests/formattedcode/test_output_csv.py
index 054e76e2c90..931a6d2d54c 100644
--- a/tests/formattedcode/test_output_csv.py
+++ b/tests/formattedcode/test_output_csv.py
@@ -57,7 +57,7 @@ def load_scan(json_input):
     return scan_results
 
 
-def check_json(result, expected_file, regen=False):
+def check_json(result, expected_file, regen=True):
     if regen:
         with codecs.open(expected_file, 'wb', encoding='utf-8') as reg:
             reg.write(json.dumps(result, indent=4, separators=(',', ': ')))
@@ -68,7 +68,7 @@ def check_json(result, expected_file, regen=False):
 
 def check_csvs(result_file, expected_file,
                ignore_keys=('date', 'file_type', 'mime_type',),
-               regen=False):
+               regen=True):
     """
     Load and compare two CSVs.
     `ignore_keys` is a tuple of keys that will be ignored in the comparisons.
@@ -212,4 +212,4 @@ def test_can_process_live_scan_with_all_options():
     args = ['-clip', '--email', '--url', '--strip-root', test_dir, '--output-csv', result_file]
     run_scan_plain(args)
     expected_file = test_env.get_test_loc('csv/livescan/expected.csv')
-    check_csvs(result_file, expected_file, regen=False)
+    check_csvs(result_file, expected_file)

From 01c635f68ac640fb7139e5e9d7df4203e388bf46 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 1 Feb 2018 20:06:35 +0100
Subject: [PATCH 110/122] Do not regen in tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/formattedcode/test_output_csv.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/formattedcode/test_output_csv.py b/tests/formattedcode/test_output_csv.py
index 931a6d2d54c..63fbbd88128 100644
--- a/tests/formattedcode/test_output_csv.py
+++ b/tests/formattedcode/test_output_csv.py
@@ -57,7 +57,7 @@ def load_scan(json_input):
     return scan_results
 
 
-def check_json(result, expected_file, regen=True):
+def check_json(result, expected_file, regen=False):
     if regen:
         with codecs.open(expected_file, 'wb', encoding='utf-8') as reg:
             reg.write(json.dumps(result, indent=4, separators=(',', ': ')))
@@ -68,7 +68,7 @@ def check_json(result, expected_file, regen=True):
 
 def check_csvs(result_file, expected_file,
                ignore_keys=('date', 'file_type', 'mime_type',),
-               regen=True):
+               regen=False):
     """
     Load and compare two CSVs.
     `ignore_keys` is a tuple of keys that will be ignored in the comparisons.

From cfa3f5611a159c6794013a342d6666df3ff12995 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 1 Feb 2018 20:17:55 +0100
Subject: [PATCH 111/122] Correct API tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/scancode/test_api.py | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/tests/scancode/test_api.py b/tests/scancode/test_api.py
index b96330b41c1..ff93cbe7478 100644
--- a/tests/scancode/test_api.py
+++ b/tests/scancode/test_api.py
@@ -51,26 +51,25 @@ def test_get_package_info_can_pickle(self):
             _pickled = pickle.dumps(package)
             _cpickled = cPickle.dumps(package)
 
-    def test_get_file_info_flag_are_not_null(self):
+    def test_get_file_info_include_size(self):
         # note the test file is EMPTY on purpose to generate all False is_* flags
-        test_dir = self.get_test_loc('api/info')
+        test_dir = self.get_test_loc('api/info/test.txt')
         info = api.get_file_info(test_dir)
         expected = [
-            (u'date', None),
-            (u'size', 4096),
+            (u'size', 0),
             (u'sha1', None),
             (u'md5', None),
-            (u'mime_type', None),
-            (u'file_type', None),
+            (u'mime_type', u'inode/x-empty'),
+            (u'file_type', u'empty'),
             (u'programming_language', None),
             (u'is_binary', False),
-            (u'is_text', False),
+            (u'is_text', True),
             (u'is_archive', False),
             (u'is_media', False),
             (u'is_source', False),
             (u'is_script', False)
         ]
-        assert expected == info.items()
+        assert expected == [(k, v) for k, v in info.items() if k != 'date']
 
     def test_get_package_info_works_for_maven_dot_pom(self):
         test_file = self.get_test_loc('api/package/p6spy-1.3.pom')
@@ -84,26 +83,6 @@ def test_get_package_info_works_for_maven_pom_dot_xml(self):
         assert len(packages) == 1
         assert packages['packages'][0]['version'] == '1.3'
 
-    def test_get_file_info_include_size(self):
-        test_dir = self.get_test_loc('api/info/test.txt')
-        info = api.get_file_info(test_dir)
-        expected = [
-            (u'date', '2017-10-03'),
-            (u'size', 0),
-            (u'sha1', None),
-            (u'md5', None),
-            (u'mime_type',
-            u'inode/x-empty'),
-            (u'file_type', u'empty'),
-            (u'programming_language', None),
-            (u'is_binary', False),
-            (u'is_text', True),
-            (u'is_archive', False),
-            (u'is_media', False),
-            (u'is_source', False),
-            (u'is_script', False)]
-        assert expected == info.items()
-
     def test_get_copyrights_include_copyrights_and_authors(self):
         test_file = self.get_test_loc('api/copyright/iproute.c')
         cops = api.get_copyrights(test_file)

From 37fc25d38eb7a2f86c84b7e2a0158d5c37dcd071 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 1 Feb 2018 23:20:40 +0100
Subject: [PATCH 112/122] Fix comment grammar

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 4a93979a013..9ddc6dd65aa 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -725,7 +725,7 @@ def scancode(ctx, input,  # NOQA
 
         # TODO: add progress indicator
         # note: inventory timing collection is built in Codebase initialization
-        # TODO: this should also compute the basic base_name/ext and collect size/dates
+        # TODO: this should also collect the basic size/dates
         try:
             codebase = Codebase(
                 location=input,

From dc1c99780c57238619eb1879bdf04e4727fb3eb5 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Thu, 1 Feb 2018 23:43:04 +0100
Subject: [PATCH 113/122] Add new simple splitext function working from a name

 * correct the base_name reported for weird names. Some failures and
   quirks still expected

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/fileutils.py                   | 47 +++++++++++++++++++
 src/scancode/resource.py                      | 10 ++--
 .../data/weird_file_name/expected-linux.json  |  4 +-
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/commoncode/fileutils.py b/src/commoncode/fileutils.py
index dea5e94cb19..5b6a738fa25 100644
--- a/src/commoncode/fileutils.py
+++ b/src/commoncode/fileutils.py
@@ -315,6 +315,53 @@ def file_extension(path, force_posix=False):
     return splitext(path, force_posix)[1]
 
 
+def splitext_name(file_name, is_file=True):
+    """
+    Return a tuple of Unicode strings (basename, extension) for a file name. The
+    basename is the file name minus its extension. Return an empty extension
+    string for a directory. Not the same as os.path.splitext_simple.
+
+    For example:
+    >>> expected = 'path', '.ext'
+    >>> assert expected == splitext_simple('path.ext')
+
+    Directories even with dotted names have no extension:
+    >>> expected = 'path.ext', ''
+    >>> assert expected == splitext_simple('path.ext', is_file=False)
+
+    >>> expected = 'file', '.txt'
+    >>> assert expected == splitext_simple('file.txt')
+
+    Composite extensions for tarballs are properly handled:
+    >>> expected = 'archive', '.tar.gz'
+    >>> assert expected == splitext_simple('archive.tar.gz')
+
+    dotfile are properly handled:
+    >>> expected = '.dotfile', ''
+    >>> assert expected == splitext_simple('.dotfile')
+    >>> expected = '.dotfile', '.this'
+    >>> assert expected == splitext_simple('.dotfile.this')
+    """
+
+    if not file_name:
+        return '', ''
+    file_name = fsdecode(file_name)
+
+    if not is_file:
+        return file_name, ''
+        
+    if file_name.startswith('.') and '.' not in file_name[1:]:
+        # .dot files base name is the full name and they do not have an extension
+        return file_name, ''
+
+    base_name, extension = posixpath.splitext(file_name)
+    # handle composed extensions of tar.gz, bz, zx,etc
+    if base_name.endswith('.tar'):
+        base_name, extension2 = posixpath.splitext(base_name)
+        extension = extension2 + extension
+    return base_name, extension
+
+# TODO: FIXME: this is badly broken!!!!
 def splitext(path, force_posix=False):
     """
     Return a tuple of strings (basename, extension) for a path. The basename is
diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index db9f6b1aaa0..78dd86efc5f 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -59,7 +59,7 @@
 from commoncode.fileutils import fsdecode
 from commoncode.fileutils import fsencode
 from commoncode.fileutils import parent_directory
-from commoncode.fileutils import splitext
+from commoncode.fileutils import splitext_name
 from commoncode import ignore
 from commoncode.system import on_linux
 
@@ -712,16 +712,12 @@ def type(self):
 
     @property
     def base_name(self):
-        if not self.is_file:
-            return self.name
-        base_name, _extension = splitext(self.name)
+        base_name, _extension = splitext_name(self.name, is_file=self.is_file)
         return base_name
 
     @property
     def extension(self):
-        if not self.is_file:
-            return b'' if on_linux else ''
-        _base_name, extension = splitext(self.name)
+        _base_name, extension = splitext_name(self.name, is_file=self.is_file)
         return extension
 
     def _compute_children_counts(self, codebase, skip_filtered=False):
diff --git a/tests/scancode/data/weird_file_name/expected-linux.json b/tests/scancode/data/weird_file_name/expected-linux.json
index c1d6372274e..a799c2d6229 100644
--- a/tests/scancode/data/weird_file_name/expected-linux.json
+++ b/tests/scancode/data/weird_file_name/expected-linux.json
@@ -38,7 +38,7 @@
       "path": "some /file",
       "type": "file",
       "name": "some \\file",
-      "base_name": "file",
+      "base_name": "some \\file",
       "extension": "",
       "size": 21,
       "date": "2016-12-21",
@@ -113,7 +113,7 @@
       "path": "some/\"file",
       "type": "file",
       "name": "some\\\"file",
-      "base_name": "\"file",
+      "base_name": "some\\\"file",
       "extension": "",
       "size": 21,
       "date": "2016-12-21",

From fc2176a08ce53c14c8092e92e6062fe538b737ff Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Fri, 2 Feb 2018 07:16:36 +0100
Subject: [PATCH 114/122] Correct splitext_name function name in doctests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/commoncode/fileutils.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/commoncode/fileutils.py b/src/commoncode/fileutils.py
index 5b6a738fa25..9f45aee8b4a 100644
--- a/src/commoncode/fileutils.py
+++ b/src/commoncode/fileutils.py
@@ -319,28 +319,28 @@ def splitext_name(file_name, is_file=True):
     """
     Return a tuple of Unicode strings (basename, extension) for a file name. The
     basename is the file name minus its extension. Return an empty extension
-    string for a directory. Not the same as os.path.splitext_simple.
+    string for a directory. Not the same as os.path.splitext_name.
 
     For example:
     >>> expected = 'path', '.ext'
-    >>> assert expected == splitext_simple('path.ext')
+    >>> assert expected == splitext_name('path.ext')
 
     Directories even with dotted names have no extension:
     >>> expected = 'path.ext', ''
-    >>> assert expected == splitext_simple('path.ext', is_file=False)
+    >>> assert expected == splitext_name('path.ext', is_file=False)
 
     >>> expected = 'file', '.txt'
-    >>> assert expected == splitext_simple('file.txt')
+    >>> assert expected == splitext_name('file.txt')
 
     Composite extensions for tarballs are properly handled:
     >>> expected = 'archive', '.tar.gz'
-    >>> assert expected == splitext_simple('archive.tar.gz')
+    >>> assert expected == splitext_name('archive.tar.gz')
 
     dotfile are properly handled:
     >>> expected = '.dotfile', ''
-    >>> assert expected == splitext_simple('.dotfile')
+    >>> assert expected == splitext_name('.dotfile')
     >>> expected = '.dotfile', '.this'
-    >>> assert expected == splitext_simple('.dotfile.this')
+    >>> assert expected == splitext_name('.dotfile.this')
     """
 
     if not file_name:

From 8b4e46d96a08eb48faa03f50556c949f0d7cebc5 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Mon, 5 Feb 2018 16:12:45 +0100
Subject: [PATCH 115/122] Remove obsolete TODO

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/plugin_mark_source.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/scancode/plugin_mark_source.py b/src/scancode/plugin_mark_source.py
index 2a9faf3e071..f1810793ea8 100644
--- a/src/scancode/plugin_mark_source.py
+++ b/src/scancode/plugin_mark_source.py
@@ -68,7 +68,6 @@ def process_codebase(self, codebase, mark_source, **kwargs):
         if not mark_source:
             return
 
-        # FIXME: TODO: these two nested walk() calls are not super efficient
         for resource in codebase.walk(topdown=False):
             if resource.is_file:
                 continue

From b8faffd42dec6fcd7b407b052ecb7bcdeeb6f73d Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 6 Feb 2018 12:19:39 +0100
Subject: [PATCH 116/122] Correct codebasse cache handling at boundaries

 * when using a mixed disk/memory caching things were not working

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/resource.py                      | 170 ++++++++++++------
 tests/scancode/data/resource/cache2/abc       |   0
 tests/scancode/data/resource/cache2/dir/that  |   0
 tests/scancode/data/resource/cache2/dir/this  |   0
 tests/scancode/data/resource/cache2/et131x.h  |  47 +++++
 .../data/resource/cache2/other dir/file       |   0
 tests/scancode/test_resource.py               |  63 +++++--
 ...nctools_lru_cache-1.4-py2.py3-none-any.whl | Bin 0 -> 5964 bytes
 .../prod/backports.functools_lru_cache.ABOUT  |  11 ++
 .../backports.functools_lru_cache.LICENSE     |  18 ++
 10 files changed, 235 insertions(+), 74 deletions(-)
 create mode 100644 tests/scancode/data/resource/cache2/abc
 create mode 100644 tests/scancode/data/resource/cache2/dir/that
 create mode 100644 tests/scancode/data/resource/cache2/dir/this
 create mode 100644 tests/scancode/data/resource/cache2/et131x.h
 create mode 100644 tests/scancode/data/resource/cache2/other dir/file
 create mode 100644 thirdparty/prod/backports.functools_lru_cache-1.4-py2.py3-none-any.whl
 create mode 100644 thirdparty/prod/backports.functools_lru_cache.ABOUT
 create mode 100644 thirdparty/prod/backports.functools_lru_cache.LICENSE

diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index 78dd86efc5f..037815c9d89 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -147,7 +147,23 @@ def __init__(self, location, resource_class=None,
         no memory is used and 0 means unlimited memory is used.
         """
         self.original_location = location
+        self.full_root = full_root
+        self.strip_root = strip_root
+
+        # Resourse sub-class to use. Configured with plugin attributes attached.
+        self.resource_class = resource_class or Resource
+
+        # dir used for caching and other temp files
+        self.temp_dir = temp_dir
 
+        # maximmum number of Resource objects kept in memory cached in this
+        # Codebase. When the number of in-memory Resources exceed this number,
+        # the next Resource instances are saved to disk instead and re-loaded
+        # from disk when used/needed.
+        self.max_in_memory = max_in_memory
+
+        # setup location
+        ########################################################################
         if on_linux:
             location = fsencode(location)
         else:
@@ -159,41 +175,38 @@ def __init__(self, location, resource_class=None,
         # TODO: we should also accept to create "virtual" codebase without a
         # backing filesystem location
         assert exists(location)
-
         # FIXME: what if is_special(location)???
         self.location = location
-
         self.is_file = filetype_is_file(location)
 
-        # True if this codebase root is a file or an empty directory.
-        self.has_single_resource = bool(self.is_file or not os.listdir(location))
-
-        self.resource_class = resource_class or Resource
-
-        # maximmum number of Resource objects kept in memory cached in this
-        # Codebase. When the number of in-memory Resources exceed this number,
-        # the next Resource instances are saved to disk instead and re-loaded
-        # from disk when used/needed.
-        self.max_in_memory = max_in_memory
-        # use only memory
-        self.all_in_memory = max_in_memory == 0
-        # use only disk
-        self.all_on_disk = max_in_memory == -1
+        # setup Resources
+        ########################################################################
+        # root resource, never cached on disk
+        self.root = None
 
         # set index of existing resource ids ints, initially allocated with
         # 10000 positions (this will grow as needed)
         self.resource_ids = intbitset(10000)
 
-        # root resource, never cached on disk
-        self.root = None
+        # True if this codebase root is a file or an empty directory.
+        self.has_single_resource = bool(self.is_file or not os.listdir(location))
 
+        # setup caching
+        ########################################################################
         # map of {rid: resource} for resources that are kept in memory
         self.resources = {}
-
-        # list of errors from collecting the codebase details (such as
-        # unreadable file, etc).
-        self.errors = []
-
+        # use only memory
+        self.all_in_memory = max_in_memory == 0
+        # use only disk
+        self.all_on_disk = max_in_memory == -1
+        # dir where the on-disk cache is stored
+        self.cache_dir = None
+        if not self.all_in_memory:
+            # this is unique to this codebase instance
+            self.cache_dir = get_codebase_cache_dir(temp_dir=temp_dir)
+
+        # setup extra misc attributes
+        ########################################################################
         # mapping of scan summary data and statistics at the codebase level such
         # as ScanCode version, notice, command options, etc.
         # This is populated automatically.
@@ -203,14 +216,12 @@ def __init__(self, location, resource_class=None,
         # This is populated automatically.
         self.timings = OrderedDict()
 
-        # setup cache
-        self.temp_dir = temp_dir
-
-        # this is unique to this codebase instance
-        self.cache_dir = get_codebase_cache_dir(temp_dir=temp_dir)
+        # list of errors from collecting the codebase details (such as
+        # unreadable file, etc).
+        self.errors = []
 
-        self.full_root = full_root
-        self.strip_root = strip_root
+        # finally walk the location and populate
+        ########################################################################
         self._populate()
 
     def _get_next_rid(self):
@@ -224,6 +235,8 @@ def _get_resource_cache_location(self, rid, create=False):
         Return the location where to get/put a Resource in the cache given a
         Resource `rid`. Create the directories if requested.
         """
+        if not self.cache_dir:
+            return
         resid = (b'%08x'if on_linux else '%08x') % rid
         cache_sub_dir, cache_file_name = resid[-2:], resid
         parent = join(self.cache_dir, cache_sub_dir)
@@ -254,6 +267,7 @@ def skip_ignored(_loc):
             ignored = partial(ignore.is_ignored, ignores=ignore.ignores_VCS)
 
             if TRACE_DEEP:
+                logger_debug()
                 logger_debug('Codebase.populate: walk: ignored loc:', _loc,
                              'ignored:', ignored(_loc),
                              'is_special:', is_special(_loc))
@@ -320,7 +334,7 @@ def create_root_resource(self):
             path = get_path(location, location, full_root=self.full_root,
                             strip_root=self.strip_root)
         if TRACE:
-            logger_debug('Codebase.create_resource: root:', path)
+            logger_debug('  Codebase.create_root_resource:', path)
             logger_debug()
 
         root = self.resource_class(name=name, location=location, path=path,
@@ -343,7 +357,7 @@ def create_resource(self, name, parent, is_file=False):
 
         rid = self._get_next_rid()
 
-        if self._must_use_disk_cache(rid):
+        if self._use_disk_cache_for_resource(rid):
             cache_location = self._get_resource_cache_location(rid, create=True)
         else:
             cache_location = None
@@ -351,9 +365,7 @@ def create_resource(self, name, parent, is_file=False):
         location = join(parent.location, name)
         path = posixpath.join(parent.path, fsdecode(name))
         if TRACE:
-            logger_debug('Codebase.create_resource: non-root: parent.path', parent.path)
-            logger_debug('Codebase.create_resource: non-root: path', path)
-            logger_debug()
+            logger_debug('  Codebase.create_resource: parent.path:', parent.path, 'path:', path)
 
         child = self.resource_class(
             name=name,
@@ -378,20 +390,38 @@ def exists(self, resource):
         """
         return resource.rid in self.resource_ids
 
-    def _must_use_disk_cache(self, rid):
+    def _use_disk_cache_for_resource(self, rid):
         """
-        Return True if Resource `rid` should be cached in on disk or False if it
-        should be cached in memory.
+        Return True if Resource `rid` should be cached on-disk or False if it
+        should be cached in-memory.
         """
+        if TRACE:
+            msg = ['    Codebase._use_disk_cache_for_resource:, rid:', rid, 'mode:']
+            if rid == 0:
+                msg.append('root')
+            elif self.all_on_disk:
+                msg.append('all_on_disk')
+            elif self.all_in_memory:
+                msg.append('all_in_memory')
+            else:
+                msg.extend(['mixed:', 'self.max_in_memory:', self.max_in_memory])
+                if rid < self.max_in_memory:
+                    msg.append('from memory')
+                else:
+                    msg.append('from disk')
+            logger_debug(*msg)
+
         if rid == 0:
             return False
-        if self.all_on_disk:
+        elif self.all_on_disk:
             return True
-        if self.all_in_memory:
+        elif self.all_in_memory:
             return False
         # mixed case where some are in memory and some on disk
-        if  rid < self.max_in_memory:
+        elif  rid < self.max_in_memory:
             return False
+        else:
+            return True
 
     def _exists_in_memory(self, rid):
         """
@@ -404,30 +434,55 @@ def _exists_on_disk(self, rid):
         Return True if Resource `rid` exists in the codebase disk cache.
         """
         cache_location = self._get_resource_cache_location(rid)
-        return exists(cache_location)
+        if cache_location:
+            return exists(cache_location)
 
     def get_resource(self, rid):
         """
         Return the Resource with `rid` or None if it does not exists.
         """
-        if rid == 0:
-            return self.root
-
-        if not rid or rid not in self.resource_ids:
-            return
-
-        if self.all_on_disk:
-            return self._load_resource(rid)
+        if TRACE:
+            msg = ['  Codebase.get_resource:', 'rid:', rid]
+            if rid == 0:
+                msg.append('root')
+            elif not rid or rid not in self.resource_ids:
+                msg.append('not in resources!')
+            elif self._use_disk_cache_for_resource(rid):
+                msg.extend(['from disk', 'exists:', self._exists_on_disk(rid)])
+            else:
+                msg.extend(['from memory', 'exists:', self._exists_in_memory(rid)])
+            logger_debug(*msg)
 
-        if self.all_in_memory or rid < self.max_in_memory:
-            return self.resources.get(rid)
+        if rid == 0:
+            res = self.root
+        elif not rid or rid not in self.resource_ids:
+            res = None
+        if self._use_disk_cache_for_resource(rid):
+            res = self._load_resource(rid)
+        else:
+            res = self.resources.get(rid)
 
-        return self._load_resource(rid)
+        if TRACE:
+            logger_debug('    Resource:', res)
+        return res
 
     def save_resource(self, resource):
         """
         Save the `resource` Resource to cache (in memory or disk).
         """
+        if TRACE:
+            msg = ['  Codebase.save_resource:', resource]
+            rid = resource.rid
+            if resource.is_root:
+                msg.append('root')
+            elif rid not in self.resource_ids:
+                msg.append('missing resource')
+            elif self._use_disk_cache_for_resource(rid):
+                msg.extend(['to disk:', 'exists:', self._exists_on_disk(rid)])
+            else:
+                msg.extend(['to memory:', 'exists:', self._exists_in_memory(rid)])
+            logger_debug(*msg)
+
         if not resource:
             return
 
@@ -436,10 +491,10 @@ def save_resource(self, resource):
             raise UnknownResource('Not part of codebase: %(resource)r' % resource)
 
         if resource.is_root:
-            # we dot nothing for the root at all
-            return
+            # this can possibly damage things badly
+            self.root = resource
 
-        if self._must_use_disk_cache(rid):
+        if self._use_disk_cache_for_resource(rid):
             self._dump_resource(resource)
         else:
             self.resources[rid] = resource
@@ -465,6 +520,9 @@ def _load_resource(self, rid):
         """
         cache_location = self._get_resource_cache_location(rid, create=False)
 
+        if TRACE:
+            logger_debug('    Codebase._load_resource: exists:', exists(cache_location), 'cache_location:', cache_location)
+
         if not exists(cache_location):
             raise ResourceNotInCache(
                 'Failed to load Resource: %(rid)d from %(cache_location)r' % locals())
diff --git a/tests/scancode/data/resource/cache2/abc b/tests/scancode/data/resource/cache2/abc
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/scancode/data/resource/cache2/dir/that b/tests/scancode/data/resource/cache2/dir/that
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/scancode/data/resource/cache2/dir/this b/tests/scancode/data/resource/cache2/dir/this
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/scancode/data/resource/cache2/et131x.h b/tests/scancode/data/resource/cache2/et131x.h
new file mode 100644
index 00000000000..4ffb839292b
--- /dev/null
+++ b/tests/scancode/data/resource/cache2/et131x.h
@@ -0,0 +1,47 @@
+/* Copyright © 2005 Agere Systems Inc.
+ * All rights reserved.
+ *   http://www.agere.com
+ *
+ * SOFTWARE LICENSE
+ *
+ * This software is provided subject to the following terms and conditions,
+ * which you should read carefully before using the software.  Using this
+ * software indicates your acceptance of these terms and conditions.  If you do
+ * not agree with these terms and conditions, do not use the software.
+ *
+ * Copyright © 2005 Agere Systems Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source or binary forms, with or without
+ * modifications, are permitted provided that the following conditions are met:
+ *
+ * . Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following Disclaimer as comments in the code as
+ *    well as in the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * . Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following Disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * . Neither the name of Agere Systems Inc. nor the names of the contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * Disclaimer
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
+ * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
+ * RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ */
+
diff --git a/tests/scancode/data/resource/cache2/other dir/file b/tests/scancode/data/resource/cache2/other dir/file
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/scancode/test_resource.py b/tests/scancode/test_resource.py
index 7a472143845..f72a9ccd48f 100644
--- a/tests/scancode/test_resource.py
+++ b/tests/scancode/test_resource.py
@@ -413,8 +413,8 @@ def test_get_path(self):
 class TestCodebaseCache(FileBasedTesting):
     test_data_dir = join(dirname(__file__), 'data')
 
-    def test_codebase_cache_memory(self):
-        test_codebase = self.get_test_loc('resource/cache/package')
+    def test_codebase_cache_default(self):
+        test_codebase = self.get_test_loc('resource/cache2')
         codebase = Codebase(test_codebase)
         assert codebase.temp_dir
         assert codebase.cache_dir
@@ -433,20 +433,47 @@ def test_codebase_cache_memory(self):
         child_2 = codebase.get_resource(child.rid)
         assert child == child_2
 
-    def test_codebase_cache_disk(self):
-        test_codebase = self.get_test_loc('resource/cache/package')
+    def test_codebase_cache_all_in_memory(self):
+        test_codebase = self.get_test_loc('resource/cache2')
+        codebase = Codebase(test_codebase, max_in_memory=0)
+        for rid in codebase.resource_ids:
+            if rid == 0:
+                assert codebase.root == codebase.get_resource(rid)
+                assert codebase._exists_in_memory(rid)
+                assert not codebase._exists_on_disk(rid)
+            else:
+                assert codebase._exists_in_memory(rid)
+                assert not codebase._exists_on_disk(rid)
+
+        assert len(codebase.resource_ids) == len(list(codebase.walk()))
+
+    def test_codebase_cache_all_on_disk(self):
+        test_codebase = self.get_test_loc('resource/cache2')
         codebase = Codebase(test_codebase, max_in_memory=-1)
-        assert codebase.temp_dir
-        assert codebase.cache_dir
-        codebase.cache_dir
-        root = codebase.root
-        cp = codebase._get_resource_cache_location(root.rid, create=False)
-        assert not exists(cp)
-        cp = codebase._get_resource_cache_location(root.rid, create=True)
-        assert not exists(cp)
-        assert exists(parent_directory(cp))
-        child = codebase.create_resource('child', root, is_file=True)
-        child.size = 12
-        codebase.save_resource(child)
-        child_2 = codebase.get_resource(child.rid)
-        assert child == child_2
+        for rid in codebase.resource_ids:
+            if rid == 0:
+                assert codebase.root == codebase.get_resource(rid)
+                assert codebase._exists_in_memory(rid)
+                assert not codebase._exists_on_disk(rid)
+            else:
+                assert not codebase._exists_in_memory(rid)
+                assert codebase._exists_on_disk(rid)
+
+        assert len(codebase.resource_ids) == len(list(codebase.walk()))
+
+    def test_codebase_cache_mixed_two_in_memory(self):
+        test_codebase = self.get_test_loc('resource/cache2')
+        codebase = Codebase(test_codebase, max_in_memory=2)
+        for rid in codebase.resource_ids:
+            if rid == 0:
+                assert codebase.root == codebase.get_resource(rid)
+                assert codebase._exists_in_memory(rid)
+                assert not codebase._exists_on_disk(rid)
+            elif rid < 2:
+                assert codebase._exists_in_memory(rid)
+                assert not codebase._exists_on_disk(rid)
+            else:
+                assert not codebase._exists_in_memory(rid)
+                assert codebase._exists_on_disk(rid)
+
+        assert len(codebase.resource_ids) == len(list(codebase.walk()))
\ No newline at end of file
diff --git a/thirdparty/prod/backports.functools_lru_cache-1.4-py2.py3-none-any.whl b/thirdparty/prod/backports.functools_lru_cache-1.4-py2.py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..12e6f65d056bd770840b9e030a2602a738b21441
GIT binary patch
literal 5964
zcmb7IbyQUS+8q?>?vl<S1|$Wga|VVEK}tGi=<Y6Q5u}uqZUm%3N*L)bY3T+*;^Vz{
zeb@J8-EXbWbJnwFoqzWJoi)$ddq0l~<RLN<002M(c%YSn+gc}kh3}pu?uz)XUKyL%
z*xNZeJAn)ht>9M9hK5}B9#OF%d5*sDSnUeU@Yult&R!5OB6d;*)C&c1_6?{`jzLOU
z6%Y`l;*sz$-~>_;0y3Z!9Xq-D0HE>@vNh6TGD>s+Ac+b9p#2A#xeMIH+0M?^$<Wr(
z#n8mq#M11JxAq0hZnhWyrp&O?UNps-ysII%J_w1JU(ImPl7Q@!6O4}ROX^GTv(kED
zE-RVy?Oy{sM+kzX)j)y@>3H61-s-_;yt&mQB{EbNE}F@}7@3xZlq!OwVG4b1pld4&
zq2Kf3sN5&AvkJ125yQGnnsAI+OA^P@k)j35HR&R=Leo^zDB164%?etH3Rh5Oh>O0d
z?0_e@UBT;`k>EJd%-}_OdWn-wl1Sov*iBgWXf78-)DMj%v2RgtBY##6ZaZ{cCRixV
z?d*~B)jpv}5v%;sjYw+vb>}<;cOh|NJxVe!JX>#nu`XFqP`mDMZGQe#Ow70b(%sKZ
zW%|Ni=X?|)#<gF**MX_^?CH~`eaaV15LH;TdkLw$CtY`TI?jnfcqyB96`xCd<iML(
zFErDlw99+HI#(CJ%}+^nJjAdn8&9jVyA}2zNuPcELX)ZZ7+uSb=}3_yFRx!Bk&6VQ
zQz5y-5pS~>Cmgy+8Jj8{vQjx!X=HHw^XwzdrKqAwt0_j)VCuL|wgziZHa>Db0XB{F
zRa6ZmX`yiOVaDuNI|V8|7_eU!ivR0KVM{jy`jeTCBj%XCd|9XhY=LjaolV7Qak3OW
zBvH3Pip$j(R6IJt0Uz-IL{zjs&_7{6;kXnEWyZtVE?EP2vDadnHdMsxz|_698Xp3B
zIOUUzUl>vQNoAlK6Nx7G<(A4%e=8{p^f1tfuON2CAHNL)+7FZCil$12;Cfw>q<<KB
z_bZZW!2D|S#QX#wy)=^i#{2b08oZ!5db%>aa2f8&6l~S_G0%-<d`c51HwAg4M}gu{
zAf9`(mW-M5G{xrNkL<Pg;!oCc>%?~S(zUH&bU%Di7<t!h0(#s{wn5bbPP;CFZ0PEU
zlU;qRk)_&A=n4j^<KbLOvFx{P_1^CH^%VG08~p~fa@ZyG7CHMF)p>jzbQeg@Qaou9
zlj%xY-FX)mQoYh+w8pq$&;mo_=1BS+>eSCACJQ5NiB~(P7Y#k@I~IkdTT=(k9gZMK
zk`c}6o*Ari9tWootjNax5XE$9TQS|k%YweHAQG%0i$`rtiLq}d7NMxH<xj#E95VM+
z4m*g7nQ@An5@Je6k~bX*!$~b<Ka}Sf(~HPhbJ^>sz^u_BWDZ*5P-pUWP$ZG9A&Fh^
z#TXPI$YgJJTD|7|B;)hehAWiAo%cEJG*fzLDLmu`{9Ic1sPSuiS;fa%Gt$SJe3SS_
zrR>}D&9?ed!ZY0JJwpW)m1Qs)2wsSaWYa=<!;I@uf$NLm2N5nlbH)(lvCj-k6oM`D
zIMUfxGsYW+0%nj8{R7BL8sTobeN}bHkLLA4iS+V<O|#Y{!32*wn3Zg!fTuCcu>!Q^
zQ#Jt6T#-C3=}|&Wp854+s&l74pJ3nS<p##Lp2lFE7qg_V+kQ?kaNi&!LuWF#DT%q>
zic`g9s~cnBCGI@4U4lv_6p})ST8PswRW~B)n;KdUWaozSSP7bY8N$MS6%BT&LnV5O
zkgs_zLv09#G~<m_iufOf%eN`nbbM9R6sg*QA<_E3ahS~{q(v7>NR0IAQzOB&eJY-B
zLw&~RP>w*NID|f<LyyDysK0R}gE3q`odMu~`KeW9lQUW<%%Y9w^g~SY5&-{*ipt@J
z_AG`pP*<Nu2>zOuHL8OMRGTF^U5nz^(4EdK`f_nzf4-e-pvBib4gmMbf8$2mp9F>3
z<XV+;4}F?3W;}d=#pkr4F1%mf=1o6=v6G-?UCUGK*;x~<`P_%VtyaK9g?C_hqkSdh
zyO65m&WU82+=<lkaYgCt2{LJI?rtgJJsR$_0)mJP0%4FAFwdj+V^Tx4Q0cR9G%0-s
z?oi20nkgo`w@lCE6PpwPU)6F^x+;z#=(;vW!`Mnr!qLIMoJ*kZaih&BIvh!FS8yt%
zmGC6v^-^PXg8;}IY;f<qeFqI6B(Pwec56p$@$H=4vZ3~E^q1Z7`H$!4)SB@>=?Lu7
zYw2=X$52$SW%o7{Kks{#Kl$;&(c1h6ui$7#hUyA#SjHmAg3P^FoY9xTS6OxD7eBoz
z%K8TpenKrRn?0Zxi9ST)Wzd$-dT%C)_P06BnTH65a$GX=0+C<(U!J|@n-)*bE4?WT
z*2%ACW`h~_q!)lc`$sR;I=6f)e(t0FV};?=_Xn&)m+J$5?~))9jO{?Y`b&j)w0?Hl
zTI(co?Uq?LmN9X=&aNHW$V#%fEA8O=*~5L;03AD1+_Q6IzEryzUmTy9ib7vG4nJJ!
zopZ_TX*)5ECx#qM1*LELzFsoNR6WW%Kug_ec}$M*hN3yevah<IQ;mqZ+ta~Co8kv3
z2Jvd&y9iq*uo%Z;Yd;S|)@KG=j}}J7^GvJo$%K8MT#qo^)j*&{Y*b{g9U>WviBTC2
zhBk=+m7qOoYR_f%YE<55?P7ckpq>9&74S6vD2UWTq{l`671ViQD=x|5F;)n&wY74I
zi$;}8e&TJaxUhl;V<*S7p^?T>akziXEh@P;(yU=DVG&CkL2UL*v>y9tiX}RKbk|Z-
zV;>*TCKCSRcbu>Y&ryv$>UlY=&-gBl1GQ;Y?lJV&YQ|vH<dwqiSI@Ly$zrbt>Wu2?
z`J>fD_^c>wK3M|57pUm1#D@0$C4&5wDT@@IS_cyzLz3)E)-K9cqpA=}t8;}29C#03
z07`m*$`x$FdBfy_g_#Z&i#n=)ewZ&*&eg59?U-rpebeIrU8gqx_meRX=AsZhk*Yi=
zaz{L>f)$UgRP_0*o7+bdV&$@K-o5Jcq9%@b?4u!<aT0*#FDk}@OYy!wCDvmv6-v1^
zoR@0)EXwu3wvxssAgoO^aE?7Won8NJqibBAB^!2_v6Ng<4GnVo%E|&x_oMew_<S=t
z6;hlvovHzaMGk7cTa=BHf<sN)2&WOtOf^rR?ZJ~U2~pXG)j?bpKF-s{UMzJ_M@Prv
zpN3Bd7jOA)Z7pLM1{Ru7ZEt4@PdrulPMXh;3K&uk;u>%Chca8k7Fc}3j`#ZJL7!-5
zmY#^Rx?Q2WnlifzUybBII+pz4SQLkuwsk$b2l8UFt3nG}aemMJhDFY3GM3UZ6mFFc
z0!SqiZ;^fntGK%qH*(3tUW^0)oIeBrME)MExc*D9;^g7t<1)2!a^|#xo7;h;Wz?nA
z6jU@6l%ZUXPR^xj2<tg+yq0aY^|vGxg>-L_6NwTMB(uUKXOGLYGHY4lnKXF?4rjGL
z3F6e4O-pSs^5yK?<?^doP?i8KWeBvpRVFRr=st+lYy}f~-joa%Wj1r;=KY{VvgdZ*
zdxGCSlknq4Kkx_J!c`0^^LvEXyK|{%hWi}I@=mNAM}&;bBLkF&T!5DI*EHOHuCxNN
z0(zveQmNmnjBYHvAGu2iyFr3K0)Tlf37u^P@MK+(KN;)TYKf6Pl$Nu@m~$v=Y9=y7
zP%Ybj;uroa@o@6bDXLx9&u$ocklH=^6}^D$?!`;T#wc5X5}Aug3>{iC9btogvqpKg
z;Q6L6<8d|D(8j4|on@92Rvxlfd+~^_o?TgX7e9N95TDZ`?edDj${@R(8lJYi7Ucf8
z%M2EHlmvT4vy<dQ-{fWYEYJ?uM8WRd_d=fS-XE;Q%edN;`{iW_$=k&K)bR@qun*8L
z+InD!Hw4ApEwBvxq!<JSql_u(CNp<T1CMQo4d@Gi{4jFH*m3U^Yk|toA|KkeB|nmT
zyQUzw3^a$Oo7}8i4~rcN=Bu^d>w%AC#jcxoJ@E0a2cG_655UZvjZKZ6jk&Cy?BLOA
z`!=)Oc-Pv&qAnGzR-X;AYf5T@%$#j3FJVMEz1n)EoE{@=Ht08tZY&~r-6+?l7YmJE
z%KJ5m`NKRjsF-wLLw>TA8(~K8>)NwU6!6GY>V%)aqStCq?)z{G2e;)TU1;^@N!c^K
zS*A}SNk=k|<#lINEh|ML<+ZOih>R-3^o2Y=x%Kg2kxhA*tMX|6(}d=-ZX<9LSXXLL
zaTcTObh=dgCAOR)v)606omZb>WLzjXW9LZ;SR9s?W!fYK;|{Ay93l{xyC?_}xH&#h
z?XD}?a>m5+9gUZUC)J;{%&&3>+C9l7WJ8{=cHdN5Zo=H790P|lPsMbapN%J<uI)Oy
z)HPjXNlH(vlji+ILy01i4Kuv{pv&Ouz>}dxvRz}WJlekCoP$u`cqn@smoBlNro%@^
zESpAQx_B-{Ac3nK;B7XDhR@bUrSS+SP__yRP8*Ts@SOxi3#Arb6s9&Wg}!xU=ihn-
zQ8sGoc!|Ktxd=-_fAJ1WONjMnlC8fER^#`~<7$U%x`tP=vA>Ka2d2G5gL{|?WB6RU
zl$U;7?MNf4wIkK}C!R}u->MWwj8BbEJn#1cuNwUn4R75@l##6WD-&J2$$An|I1-R=
z@5obIiUYcBxN4^k_lldX^kn%Z_D>CQ#iJU)y6YQ^yZY1qakjHJv^8@zv*mJjcZPr!
zzj57-h-~YBpa1@nsp8o{Lc=?F_+9bb)qjS~|A$Oz%ge|pVh+kHA%?LboWO4bgVk!>
zW4zxTl@Sn5Fh?J#N=+Wz$H5f=LM>Ds;vV9y8si;W#rQf18b0Niz-HwHBl;Ap)L7Yo
zN^2MjigjwN1$-lj{z1sN(m-)=1Q~;L{okh5zfP+VNLKgb0RUi$3IOo^;c1m*G$f=Y
zG$cwjVd`VtcsH4bm5XiUX&41Yr)2mpUr3F<B*(@<&S&Hk-`IL~UV8~nItrqOZ@j*6
zY~B$atZwXsw-{;UMFM{X1iW^8WZTcOtn-4ysN}?KTZ-}NW_rwm;2Zv|{+bc~$VWyH
zQDTdXTHwH5S32){Q;+unNwt=yqCwA;TKq;*gp1(Ync1sk4Dhcj<H#Vc2~na0)p)l9
z&5o>dSH(`>P_1|Q{+U}Yw~4)77CFQCn0{h6&fZ7II_UyHsCPwwMyD+Py9kMVzbJKE
zZ<}Emp(vm$vJBE7ZP4iVeyAMuxkYDvJMmn6)DJMn(g${I;b?S$IEQvE@36Rpp1x^(
zsv6jVdg#$DNNy26z>Y^!9#}O|k0Hvg?eemJ)lYb3NB?r>?cgnW<*(TA$A`q_!h~^E
zzSaKMss!dg#@;kt?+K%5if{6B`YcjJ3d%9)iJECLMI)|<W9EEM2)F}`_yVJYXX~-C
zh|Empm_m`K6F@gOS)T;<F3V<jg&5RURp6boFP<>g!W!zb1ps?!XW_3ugG0QoL*5wK
zZuy&GlIbZFVGA%RtQ@;eq<UZ4Q_81mJpe=&NQOA{CAE!&0XG^?FkP-7f~AyDk+id2
zsLhvJE-R~BTyjzmYs=EZcs&{X&gM0f<xI9wAN0voxn=XJaMe~4N+Yz_?9p2BX){9M
z{2lfjMqv$@Y4MOO&C!825oDUSOaBh#^}WRrX+ZN2s3+sn_4kKNPAQ?(59vB&N?zcW
z&&obc%1?AZ-N1(=PZ_PEn}-YMdfVJCzr;8+?<Lali7$S+ijnwz7eO`^FY*Cx20lkt
z^i+a)Y1w~cnP{}>i$UgiEl9PfAt1q+T236MOXB;f@!Zr6w7=F$NK@TALa-dSPf=&-
zA2Sk{VnM1p`R%0(75Ze`6p@Xc^ps9;!*EaLLcV0KdT1|b^opU>gCJ@Lg+zzi@~GV=
z8Wx<>u&a-D^}S@7risw)X~<9Pe@e;pcq3K8ofTo<S<#a}{BqP}q?Fa9lj8dmvc>Ua
z&Ix(^9`JQZg?4e^;o%bn5PVURIUHFoQ~@F;2M0Q03<kRA7M+gF^M#7buf=<CgXQH|
zCFf2P$w4}Cq^-qaaV2=*o^1GsA6@Hna{@;QqFlue2d?tmfUt_A&?yU&qd}TY(vl`O
z^4(wN(g=Gw@^4&Sf^hEQuEqFoVA53h(7g9^kGB}~;;@n&U+cMsCS&KK?o?Ij58ez;
zw{+G1iS_BP-!SP<``ry6sAtqO3o(?kmkFV$3$9X(OtT&3b5FlO>9yh+6p3F<>P#n^
zWGcQ_O@->A9EkfWf9B6Jw^Z?(*0G)J-XYYoU@4xp$(;YRcS)b!B&ty9s_ZC-Pp^5_
z{tl^itjp_D+gNj(QOdd6;SAsWWMH#OwWxW}?ze@Su(@wU8x`TpfOnl-@+<nh<Y%?2
zsakKy06)(aVG<58Z0kjp`v%>FW1vf4LXvLB45n9lo)M^Tj}?O~&?AI(EG(G_L2VY@
z1<PsYAFqk|yK*drgngQyRRee6&A#ORNu4&6E!j>~wfF(fIkp_L65AW`DJwzLDSpJa
zcZ!Mhfau}>y-vLQ^Z#|_2K@E&AHDzka`8UI{UzbQ0RVv90N6hu{!6mGTN(Zx?Y|}C
z-)P-;i^%^R=>K6r_j2-mqWkgdH_=zjKO_1_7`sn%-=%-kVBq{2%|AT*KFxin{!Ih>
zLz;j2_I>#K*7_Ts68F#E;(v|yKEr(p`puw8@MjGF79<tOBb2`|(C+TdyHKF?SI-0f
E2j<9d0{{R3

literal 0
HcmV?d00001

diff --git a/thirdparty/prod/backports.functools_lru_cache.ABOUT b/thirdparty/prod/backports.functools_lru_cache.ABOUT
new file mode 100644
index 00000000000..83a5793c0a3
--- /dev/null
+++ b/thirdparty/prod/backports.functools_lru_cache.ABOUT
@@ -0,0 +1,11 @@
+about_resource: backports.functools_lru_cache-1.4-py2.py3-none-any.whl
+version: 1.4
+name: backports.functools_lru_cache
+home_url: https://github.com/jaraco/backports.functools_lru_cache
+download_url: https://pypi.python.org/packages/02/0b/91573feec859f794689fa46a62240526f4f1db829271ac2d98cf04a8efa2/backports.functools_lru_cache-1.4-py2.py3-none-any.whl#md5=6496f96517b2b0d22175e9f193664bc3
+license_text: 
+    - backports.functools_lru_cache.LICENSE
+dje_license: mit
+owner: Jason R. Coombs
+
+copyright: Copyright Jason R. Coombs and Raymond Hettinger
diff --git a/thirdparty/prod/backports.functools_lru_cache.LICENSE b/thirdparty/prod/backports.functools_lru_cache.LICENSE
new file mode 100644
index 00000000000..625704c829f
--- /dev/null
+++ b/thirdparty/prod/backports.functools_lru_cache.LICENSE
@@ -0,0 +1,18 @@
+Copyright Jason R. Coombs and Raymond Hettinger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

From e7a06ee1f32032224ada5f93cccd61875c10cea2 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 6 Feb 2018 12:57:52 +0100
Subject: [PATCH 117/122] Add convenience methods to Resource

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/scancode/resource.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/scancode/resource.py b/src/scancode/resource.py
index 037815c9d89..68be015faa9 100644
--- a/src/scancode/resource.py
+++ b/src/scancode/resource.py
@@ -551,7 +551,7 @@ def _remove_resource(self, resource):
     def remove_resource(self, resource):
         """
         Remove the `resource` Resource object and all its children from the
-        resource tree.
+        resource tree. Return a set of removed Resource ids.
         """
         if TRACE:
             logger_debug('Codebase.remove_resource')
@@ -778,6 +778,35 @@ def extension(self):
         _base_name, extension = splitext_name(self.name, is_file=self.is_file)
         return extension
 
+    @classmethod
+    def get(cls, codebase, rid):
+        """
+        Return the Resource with `rid` in `codebase` or None if it does not
+        exists.
+        """
+        return codebase.get_resource(rid)
+
+    def save(self, codebase):
+        """
+        Save this resource in `codebase` (in memory or disk).
+        """
+        return codebase.save_resource(self)
+
+    def remove(self, codebase):
+        """
+        Remove this resource and all its children from the codebase.
+        Return a set of removed Resource ids.
+        """
+        return codebase.remove_resource(self)
+
+    def create_child(self, codebase, name, is_file=False):
+        """
+        Create and return a new child Resource of this resource in `codebase`
+        with `name`. `name` is always in native OS-preferred encoding (e.g. byte
+        on Linux, unicode elsewhere).
+        """
+        return  codebase.create_resource(name, self, is_file)
+
     def _compute_children_counts(self, codebase, skip_filtered=False):
         """
         Compute counts and update self with these counts from direct children.

From 5c9f9631709fd749d5b27f57e51da722850b9fe7 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 6 Feb 2018 12:58:20 +0100
Subject: [PATCH 118/122] Do not trace copyrights with nltk by default

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/cluecode/copyrights.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cluecode/copyrights.py b/src/cluecode/copyrights.py
index 296ef0a4a68..a7bce5f9f99 100644
--- a/src/cluecode/copyrights.py
+++ b/src/cluecode/copyrights.py
@@ -1072,7 +1072,7 @@ def __init__(self):
         from nltk import RegexpTagger
         from nltk import RegexpParser
         self.tagger = RegexpTagger(patterns)
-        self.chunker = RegexpParser(grammar, trace=TRACE)
+        self.chunker = RegexpParser(grammar, trace=0)
 
     @classmethod
     def as_str(cls, node, ignores=()):

From 439ad76654bc1b19b74105650b8ffbc42e93c346 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 6 Feb 2018 14:35:40 +0100
Subject: [PATCH 119/122] Correct brokrn archives error reporting

 * somehow there were cases where handling errors

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/extractcode/extract.py                    |  19 ++-
 src/extractcode/libarchive2.py                | 115 +++++++++-----
 .../weird_names.ar_libarch_linux.expected     |  39 -----
 .../weird_names.ar_libarch_mac.expected       |  39 -----
 .../weird_names.ar_libarch_win.expected       |  39 -----
 tests/extractcode/test_archive.py             | 148 +++++++++++-------
 tests/extractcode/test_tar.py                 |   2 +-
 7 files changed, 181 insertions(+), 220 deletions(-)

diff --git a/src/extractcode/extract.py b/src/extractcode/extract.py
index 88ae9e5d57e..619a71ddb47 100644
--- a/src/extractcode/extract.py
+++ b/src/extractcode/extract.py
@@ -32,6 +32,7 @@
 from os.path import abspath
 from os.path import expanduser
 from os.path import join
+import traceback
 
 from commoncode import fileutils
 from commoncode import ignore
@@ -164,7 +165,7 @@ def extract(location, kinds=extractcode.default_kinds, recurse=False):
                     yield xevent
 
 
-def extract_file(location, target, kinds=extractcode.default_kinds):
+def extract_file(location, target, kinds=extractcode.default_kinds, verbose=False):
     """
     Extract a single archive at `location` in the `target` directory if it is
     of a kind supported in the `kinds` kind tuple.
@@ -179,17 +180,21 @@ def extract_file(location, target, kinds=extractcode.default_kinds):
     if extractor:
         yield ExtractEvent(location, target, done=False, warnings=[], errors=[])
         try:
-            # extract first to a temp directory.
-            # if there is an error,  the extracted files will not be moved
-            # to target
+            # extract first to a temp directory: if there is an error,  the
+            # extracted files will not be moved to target
             tmp_tgt = fileutils.get_temp_dir(prefix='scancode-extract-')
             abs_location = abspath(expanduser(location))
-            warnings.extend(extractor(abs_location, tmp_tgt))
+            warns = extractor(abs_location, tmp_tgt) or []
+            warnings.extend(warns)
             fileutils.copytree(tmp_tgt, target)
             fileutils.delete(tmp_tgt)
         except Exception, e:
-            if TRACE:
-                logger.debug('extract_file: ERROR: %(location)r: %(errors)r, %(e)r.\n' % locals())
             errors = [str(e).strip(' \'"')]
+            if verbose:
+                errors.append(traceback.format_exc())
+            if TRACE:
+                tb = traceback.format_exc()
+                logger.debug('extract_file: ERROR: %(location)r: %(errors)r\n%(e)r\n%(tb)s' % locals())
+            
         finally:
             yield ExtractEvent(location, target, done=True, warnings=warnings, errors=errors)
diff --git a/src/extractcode/libarchive2.py b/src/extractcode/libarchive2.py
index 424b41315dc..aeb480fc7b4 100644
--- a/src/extractcode/libarchive2.py
+++ b/src/extractcode/libarchive2.py
@@ -138,17 +138,25 @@ def extract(location, target_dir):
     warnings = []
 
     for entry in list_entries(abs_location):
-        if not (entry.isdir or entry.isfile):
-            # skip special files and links
-            continue
-
-        _target_path = entry.write(abs_target_dir, transform_path=paths.safe_path)
-        if entry.warnings:
-            msgs = [w.strip('"\' ') for w in entry.warnings if w and w.strip('"\' ')]
-            msgs = msgs or ['No message provided']
-            formatted = entry.path + ': ' + '\n'.join(msgs)
-            if formatted not in warnings:
-                warnings.append(formatted)
+
+        if entry and entry.warnings:
+            if not entry.is_empty():
+                entry_path = entry.path
+                msgs = ['%(entry_path)r: ' % locals()]
+            else:
+                msgs = ['No path available: ']
+
+            msgs.extend([w.strip('"\' ') for w in entry.warnings if w and w.strip('"\' ')])
+            msgs = '\n'.join(msgs) or 'No message provided'
+
+            if msgs not in warnings:
+                warnings.append(msgs)
+
+        if not entry.is_empty():
+            if not (entry.isdir or entry.isfile):
+                # skip special files and links
+                continue
+            _target_path = entry.write(abs_target_dir, transform_path=paths.safe_path)
     return warnings
 
 
@@ -228,23 +236,37 @@ def close(self):
             free_archive(self.archive_struct)
             self.archive_struct = None
 
-    def iter(self):
+    def iter(self, verbose=False):
         """
         Yield Entry for this archive.
         """
         assert self.archive_struct, 'Archive must be used as a context manager.'
         entry_struct = new_entry()
         try:
-            while 1:
+            while True:
+                entry = None
+                warnings = []
                 try:
                     r = next_entry(self.archive_struct, entry_struct)
                     if r == ARCHIVE_EOF:
                         return
-                    e = Entry(self, entry_struct)
+                    entry = Entry(self, entry_struct)
                 except ArchiveWarning, aw:
-                    if aw.msg and aw.msg not in e.warnings:
-                        e.warnings.append(aw.msg)
-                yield e
+                    if not entry:
+                        entry = Entry(self, entry_struct)
+                    if aw.msg and aw.msg not in entry.warnings:
+                        entry.warnings.append(aw.msg)
+
+#                     msg = 'WARNING: '
+#                     if aw.msg and aw.msg not in entry.warnings:
+#                         msg += repr(aw.msg) + '\n'
+#                     if verbose:
+#                         msg += traceback.format_exc()
+#                     warnings.append(msg % locals())
+                finally:
+                    if entry:
+                        entry.warnings.extend(warnings)
+                        yield entry
         finally:
             if entry_struct:
                 free_entry(entry_struct)
@@ -274,32 +296,55 @@ def __init__(self, archive, entry_struct):
         self.archive = archive
         self.entry_struct = entry_struct
 
-        self.filetype = entry_type(self.entry_struct)
-        self.isfile = self.filetype & AE_IFMT == AE_IFREG
-        self.isdir = self.filetype & AE_IFMT == AE_IFDIR
-        self.isblk = self.filetype & AE_IFMT == AE_IFBLK
-        self.ischr = self.filetype & AE_IFMT == AE_IFCHR
-        self.isfifo = self.filetype & AE_IFMT == AE_IFIFO
-        self.issock = self.filetype & AE_IFMT == AE_IFSOCK
-        self.isspecial = self.ischr or self.isblk or self.isfifo or self.issock
+        self.filetype = None
+        self.isfile = None
+        self.isdir = None
+        self.isblk = None
+        self.ischr = None
+        self.isfifo = None
+        self.issock = None
+        self.isspecial = None
 
         # bytes
-        self.size = entry_size(self.entry_struct) or 0
+        self.size = None
         # sec since epoch
-        self.time = entry_time(self.entry_struct) or 0
+        self.time = None
 
         # all paths are byte strings not unicode
-        self.path = self._path_bytes(entry_path, entry_path_w)
-        self.issym = self.filetype & AE_IFMT == AE_IFLNK
-        # FIXME: could there be cases with link path and symlink is False?
-        if self.issym:
-            self.symlink_path = self._path_bytes(symlink_path, symlink_path_w)
-        self.hardlink_path = self._path_bytes(hardlink_path, hardlink_path_w)
-        # hardlinks do not have a filetype: we test the path instead
-        self.islnk = bool(self.hardlink_path)
+        self.path = None
 
+        self.issym = None
+        self.symlink_path = None
+
+        self.islnk = None
+        self.hardlink_path = None
+
+        # list of strings
         self.warnings = []
 
+        if self.entry_struct:
+            self.filetype = entry_type(self.entry_struct)
+            self.isfile = self.filetype & AE_IFMT == AE_IFREG
+            self.isdir = self.filetype & AE_IFMT == AE_IFDIR
+            self.isblk = self.filetype & AE_IFMT == AE_IFBLK
+            self.ischr = self.filetype & AE_IFMT == AE_IFCHR
+            self.isfifo = self.filetype & AE_IFMT == AE_IFIFO
+            self.issock = self.filetype & AE_IFMT == AE_IFSOCK
+            self.isspecial = self.ischr or self.isblk or self.isfifo or self.issock
+            self.size = entry_size(self.entry_struct) or 0
+            self.time = entry_time(self.entry_struct) or 0
+            self.path = self._path_bytes(entry_path, entry_path_w)
+            self.issym = self.filetype & AE_IFMT == AE_IFLNK
+            # FIXME: could there be cases with link path and symlink is False?
+            if self.issym:
+                self.symlink_path = self._path_bytes(symlink_path, symlink_path_w)
+            self.hardlink_path = self._path_bytes(hardlink_path, hardlink_path_w)
+            # hardlinks do not have a filetype: we test the path instead
+            self.islnk = bool(self.hardlink_path)
+
+    def is_empty(self):
+        return not self.archive or not self.entry_struct
+
     def _path_bytes(self, func, func_w):
         """
         Return a path as a byte string converted to UTF-8-encoded bytes if this is
diff --git a/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_linux.expected b/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_linux.expected
index 8e2233ea35b..3e8da5fa945 100644
--- a/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_linux.expected
+++ b/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_linux.expected
@@ -3,38 +3,6 @@
   "/COM2__1.txt", 
   "/COM3_", 
   "/COM3__1.txt", 
-  "/COM3__10.txt", 
-  "/COM3__11.txt", 
-  "/COM3__12.txt", 
-  "/COM3__13.txt", 
-  "/COM3__14.txt", 
-  "/COM3__15.txt", 
-  "/COM3__16.txt", 
-  "/COM3__17.txt", 
-  "/COM3__18.txt", 
-  "/COM3__19.txt", 
-  "/COM3__2.txt", 
-  "/COM3__20.txt", 
-  "/COM3__21.txt", 
-  "/COM3__22.txt", 
-  "/COM3__23.txt", 
-  "/COM3__24.txt", 
-  "/COM3__25.txt", 
-  "/COM3__26.txt", 
-  "/COM3__27.txt", 
-  "/COM3__28.txt", 
-  "/COM3__29.txt", 
-  "/COM3__3.txt", 
-  "/COM3__30.txt", 
-  "/COM3__31.txt", 
-  "/COM3__32.txt", 
-  "/COM3__33.txt", 
-  "/COM3__4.txt", 
-  "/COM3__5.txt", 
-  "/COM3__6.txt", 
-  "/COM3__7.txt", 
-  "/COM3__8.txt", 
-  "/COM3__9.txt", 
   "/COM4_", 
   "/COM5_", 
   "/COM7_", 
@@ -78,13 +46,6 @@
   "/com3_.txt", 
   "/com4_.txt", 
   "/com4__1", 
-  "/com4__2", 
-  "/com4__3", 
-  "/com4__4", 
-  "/com4__5", 
-  "/com4__6", 
-  "/com4__7", 
-  "/com4__8", 
   "/com5_.txt", 
   "/com6_", 
   "/com6_.txt", 
diff --git a/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_mac.expected b/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_mac.expected
index 8e2233ea35b..3e8da5fa945 100644
--- a/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_mac.expected
+++ b/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_mac.expected
@@ -3,38 +3,6 @@
   "/COM2__1.txt", 
   "/COM3_", 
   "/COM3__1.txt", 
-  "/COM3__10.txt", 
-  "/COM3__11.txt", 
-  "/COM3__12.txt", 
-  "/COM3__13.txt", 
-  "/COM3__14.txt", 
-  "/COM3__15.txt", 
-  "/COM3__16.txt", 
-  "/COM3__17.txt", 
-  "/COM3__18.txt", 
-  "/COM3__19.txt", 
-  "/COM3__2.txt", 
-  "/COM3__20.txt", 
-  "/COM3__21.txt", 
-  "/COM3__22.txt", 
-  "/COM3__23.txt", 
-  "/COM3__24.txt", 
-  "/COM3__25.txt", 
-  "/COM3__26.txt", 
-  "/COM3__27.txt", 
-  "/COM3__28.txt", 
-  "/COM3__29.txt", 
-  "/COM3__3.txt", 
-  "/COM3__30.txt", 
-  "/COM3__31.txt", 
-  "/COM3__32.txt", 
-  "/COM3__33.txt", 
-  "/COM3__4.txt", 
-  "/COM3__5.txt", 
-  "/COM3__6.txt", 
-  "/COM3__7.txt", 
-  "/COM3__8.txt", 
-  "/COM3__9.txt", 
   "/COM4_", 
   "/COM5_", 
   "/COM7_", 
@@ -78,13 +46,6 @@
   "/com3_.txt", 
   "/com4_.txt", 
   "/com4__1", 
-  "/com4__2", 
-  "/com4__3", 
-  "/com4__4", 
-  "/com4__5", 
-  "/com4__6", 
-  "/com4__7", 
-  "/com4__8", 
   "/com5_.txt", 
   "/com6_", 
   "/com6_.txt", 
diff --git a/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_win.expected b/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_win.expected
index 8e2233ea35b..3e8da5fa945 100644
--- a/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_win.expected
+++ b/tests/extractcode/data/archive/weird_names/weird_names.ar_libarch_win.expected
@@ -3,38 +3,6 @@
   "/COM2__1.txt", 
   "/COM3_", 
   "/COM3__1.txt", 
-  "/COM3__10.txt", 
-  "/COM3__11.txt", 
-  "/COM3__12.txt", 
-  "/COM3__13.txt", 
-  "/COM3__14.txt", 
-  "/COM3__15.txt", 
-  "/COM3__16.txt", 
-  "/COM3__17.txt", 
-  "/COM3__18.txt", 
-  "/COM3__19.txt", 
-  "/COM3__2.txt", 
-  "/COM3__20.txt", 
-  "/COM3__21.txt", 
-  "/COM3__22.txt", 
-  "/COM3__23.txt", 
-  "/COM3__24.txt", 
-  "/COM3__25.txt", 
-  "/COM3__26.txt", 
-  "/COM3__27.txt", 
-  "/COM3__28.txt", 
-  "/COM3__29.txt", 
-  "/COM3__3.txt", 
-  "/COM3__30.txt", 
-  "/COM3__31.txt", 
-  "/COM3__32.txt", 
-  "/COM3__33.txt", 
-  "/COM3__4.txt", 
-  "/COM3__5.txt", 
-  "/COM3__6.txt", 
-  "/COM3__7.txt", 
-  "/COM3__8.txt", 
-  "/COM3__9.txt", 
   "/COM4_", 
   "/COM5_", 
   "/COM7_", 
@@ -78,13 +46,6 @@
   "/com3_.txt", 
   "/com4_.txt", 
   "/com4__1", 
-  "/com4__2", 
-  "/com4__3", 
-  "/com4__4", 
-  "/com4__5", 
-  "/com4__6", 
-  "/com4__7", 
-  "/com4__8", 
   "/com5_.txt", 
   "/com6_", 
   "/com6_.txt", 
diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index bc9a4460f8a..1ba104e7a8a 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -1015,7 +1015,7 @@ def test_extract_python_testtar_tar_archive_with_special_files(self):
         # https://hg.python.org/cpython/raw-file/bff88c866886/Lib/test/testtar.tar
         test_dir = self.get_temp_dir()
         result = archive.extract_tar(test_file, test_dir)
-        expected_warnings = ["pax/regtype4: Pathname can't be converted from UTF-8 to current locale."]
+        expected_warnings = ["'pax/bad-pax-\\xe4\\xf6\\xfc': \nPathname can't be converted from UTF-8 to current locale."]
         assert sorted(expected_warnings) == sorted(result)
 
         expected = [
@@ -1032,12 +1032,12 @@ def test_extract_python_testtar_tar_archive_with_special_files(self):
             'misc/regtype-suntar',
             'misc/regtype-xstar',
             'pax/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/123/longname',
+            'pax/bad-pax-aou',
             'pax/hdrcharset-aou',
             'pax/regtype1',
             'pax/regtype2',
             'pax/regtype3',
             'pax/regtype4',
-            'pax/regtype4_1',
             'pax/umlauts-AOUaouss',
             'ustar/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/12345/1234567/longname',
             'ustar/conttype',
@@ -1046,6 +1046,8 @@ def test_extract_python_testtar_tar_archive_with_special_files(self):
             'ustar/sparse',
             'ustar/umlauts-AOUaouss'
         ]
+        if on_linux:
+            expected = [bytes(e) for e in expected]
         check_files(test_dir, expected)
 
 
@@ -1118,23 +1120,9 @@ def test_extract_ar_broken(self):
         test_file = self.get_test_loc('archive/ar/liby-corrupted.a')
         test_dir = self.get_temp_dir()
         result = archive.extract_ar(test_file, test_dir)
-        expected = [
-            '__.SYMDEF',
-            'main.o',
-            'main_1.o',
-            'main_10.o',
-            'main_11.o',
-            'main_2.o',
-            'main_3.o',
-            'main_4.o',
-            'main_5.o',
-            'main_6.o',
-            'main_7.o',
-            'main_8.o',
-            'main_9.o'
-        ]
+        expected = ['__.SYMDEF', 'main.o']
         check_files(test_dir, expected)
-        assert ['main.o: Incorrect file header signature'] == result
+        assert ['None: \nIncorrect file header signature'] == result
 
     def test_extract_ar_with_invalid_path(self):
         test_file = self.get_test_loc('archive/ar/ar_invalidpath.ar')
@@ -1161,12 +1149,12 @@ def test_extract_ar_with_relative_path_libarch(self):
         test_dir = self.get_temp_dir()
         result = archive.libarchive2.extract(test_file, test_dir)
         expected_warns = [
-            '/: Invalid string table',
-            "/: Invalid string table\nCan't find long filename for entry"
+            "'//': \nInvalid string table",
+            "'/0': \nCan't find long filename for entry"
         ]
         assert expected_warns == result
         # inccorrect for now: need this: ['__.SYMDEF', 'release/init.obj']
-        expected = ['dot', 'dot_1', 'dot_2', 'dot_3']
+        expected = ['0', 'dot', 'dot_1', 'dot_2']
         check_files(test_dir, expected)
 
     def test_extract_ar_with_relative_path_and_backslashes_in_names_libarch(self):
@@ -1174,50 +1162,86 @@ def test_extract_ar_with_relative_path_and_backslashes_in_names_libarch(self):
         test_dir = self.get_temp_dir()
         result = archive.libarchive2.extract(test_file, test_dir)
         expected_warns = [
-            '/: Invalid string table',
-            "/: Invalid string table\nCan't find long filename for entry"
+            u"'//': \nInvalid string table",
+            u"'/0': \nCan't find long filename for entry",
+            u"'/34': \nCan't find long filename for entry",
+            u"'/68': \nCan't find long filename for entry",
+            u"'/104': \nCan't find long filename for entry",
+            u"'/137': \nCan't find long filename for entry",
+            u"'/173': \nCan't find long filename for entry",
+            u"'/205': \nCan't find long filename for entry",
+            u"'/239': \nCan't find long filename for entry",
+            u"'/275': \nCan't find long filename for entry",
+            u"'/311': \nCan't find long filename for entry",
+            u"'/344': \nCan't find long filename for entry",
+            u"'/375': \nCan't find long filename for entry",
+            u"'/406': \nCan't find long filename for entry",
+            u"'/442': \nCan't find long filename for entry",
+            u"'/477': \nCan't find long filename for entry",
+            u"'/512': \nCan't find long filename for entry",
+            u"'/545': \nCan't find long filename for entry",
+            u"'/577': \nCan't find long filename for entry",
+            u"'/611': \nCan't find long filename for entry",
+            u"'/645': \nCan't find long filename for entry",
+            u"'/681': \nCan't find long filename for entry",
+            u"'/717': \nCan't find long filename for entry",
+            u"'/750': \nCan't find long filename for entry",
+            u"'/784': \nCan't find long filename for entry",
+            u"'/818': \nCan't find long filename for entry",
+            u"'/853': \nCan't find long filename for entry",
+            u"'/888': \nCan't find long filename for entry",
+            u"'/923': \nCan't find long filename for entry",
+            u"'/957': \nCan't find long filename for entry",
+            u"'/993': \nCan't find long filename for entry",
+            u"'/1027': \nCan't find long filename for entry",
+            u"'/1058': \nCan't find long filename for entry",
+            u"'/1089': \nCan't find long filename for entry"
         ]
         assert expected_warns == result
         # 7zip is better, but has a security bug for now
+        # GNU ar works fine otherwise, but there are portability issues
         expected = [
+            '0',
+            '1027',
+            '104',
+            '1058',
+            '1089',
+            '137',
+            '173',
+            '205',
+            '239',
+            '275',
+            '311',
+            '34',
+            '344',
+            '375',
+            '406',
+            '442',
+            '477',
+            '512',
+            '545',
+            '577',
+            '611',
+            '645',
+            '68',
+            '681',
+            '717',
+            '750',
+            '784',
+            '818',
+            '853',
+            '888',
+            '923',
+            '957',
+            '993',
             'dot',
             'dot_1',
-            'dot_10',
-            'dot_11',
-            'dot_12',
-            'dot_13',
-            'dot_14',
-            'dot_15',
-            'dot_16',
-            'dot_17',
-            'dot_18',
-            'dot_19',
-            'dot_2',
-            'dot_20',
-            'dot_21',
-            'dot_22',
-            'dot_23',
-            'dot_24',
-            'dot_25',
-            'dot_26',
-            'dot_27',
-            'dot_28',
-            'dot_29',
-            'dot_3',
-            'dot_30',
-            'dot_31',
-            'dot_32',
-            'dot_33',
-            'dot_34',
-            'dot_35',
-            'dot_4',
-            'dot_5',
-            'dot_6',
-            'dot_7',
-            'dot_8',
-            'dot_9'
+            'dot_2'
         ]
 
+        if on_linux:
+            expected = [bytes(e) for e in expected]
+
         check_files(test_dir, expected)
 
     def test_extract_ar_with_relative_path_and_backslashes_in_names_7z(self):
@@ -1333,8 +1357,12 @@ def test_extract_cpio_broken2(self):
         test_file = self.get_test_loc('archive/cpio/cpio_broken.cpio')
         test_dir = self.get_temp_dir()
         result = archive.extract_cpio(test_file, test_dir)
-        assert ['elfinfo-1.0.tar.gz', 'elfinfo-1_1.0.tar.gz'] == sorted(os.listdir(test_dir))
-        assert ['elfinfo-1.0.tar.gz: Skipped 72 bytes before finding valid header'] == result
+        expected = sorted(['elfinfo-1.0.tar.gz', 'elfinfo.spec'])
+        if on_linux:
+            expected = [bytes(e) for e in expected]
+
+        assert expected == sorted(os.listdir(test_dir))
+        assert ["'elfinfo.spec': \nSkipped 72 bytes before finding valid header"] == result
 
     def test_extract_cpio_with_absolute_path(self):
         assert not os.path.exists('/tmp/subdir')
@@ -2169,7 +2197,7 @@ def test_extract_7zip_with_weird_filenames_with_libarchive(self):
 
     def test_extract_ar_with_weird_filenames_with_libarchive(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.ar')
-        warns = ['COM3.txt: Incorrect file header signature', 'com4: Incorrect file header signature']
+        warns = ['None: \nIncorrect file header signature']
         self.check_extract(libarchive2.extract, test_file, expected_warnings=warns, expected_suffix='libarch')
 
     def test_extract_cpio_with_weird_filenames_with_libarchive(self):
diff --git a/tests/extractcode/test_tar.py b/tests/extractcode/test_tar.py
index c1a79d1e2e6..9bab4c43559 100644
--- a/tests/extractcode/test_tar.py
+++ b/tests/extractcode/test_tar.py
@@ -306,7 +306,7 @@ def test_extract_tar_archive_with_special_files(self):
         assert sorted(expected_warnings) == sorted(result)
 
     @skipIf(True, 'Unicode tar paths are not handled well yet: we use libarchive instead')
-    def test_extract_python_testtar_tar_archive_with_special_files(self):
+    def test_tar_extract_python_testtar_tar_archive_with_special_files(self):
         test_file = self.get_test_loc('archive/tar/testtar.tar')
         # this is from:
         # https://hg.python.org/cpython/raw-file/bff88c866886/Lib/test/testtar.tar

From 141f445e39b609bcb4836807ce1b4044a3b9f568 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 6 Feb 2018 15:40:26 +0100
Subject: [PATCH 120/122] Improve user feedback for missing plugins #787

 * also ensure that the extractcode cli does not depend
   on scancode cli.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 src/plugincode/__init__.py  | 13 +++++++---
 src/scancode/__init__.py    | 31 ++++++++++++++++++++++++
 src/scancode/cli.py         | 48 +++++++++++--------------------------
 src/scancode/extract_cli.py |  4 ++--
 4 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/src/plugincode/__init__.py b/src/plugincode/__init__.py
index f5757b6b81b..1ef5f285eb2 100644
--- a/src/plugincode/__init__.py
+++ b/src/plugincode/__init__.py
@@ -171,8 +171,12 @@ def load_plugins(cls):
         """
         plugin_classes = []
         plugin_options = []
-        for _stage, manager in cls.managers.items():
-            mplugin_classes, mplugin_options = manager.setup()
+        for stage, manager in cls.managers.items():
+            mgr_setup = manager.setup()
+            if not mgr_setup:
+                msg = 'Cannot load ScanCode plugins for stage: %(stage)s' % locals()
+                raise Exception(msg)
+            mplugin_classes, mplugin_options = mgr_setup
             plugin_classes.extend(mplugin_classes)
             plugin_options.extend(mplugin_options)
         return plugin_classes, plugin_options
@@ -191,7 +195,10 @@ def setup(self):
             return
 
         entrypoint = self.entrypoint
-        self.manager.load_setuptools_entrypoints(entrypoint)
+        try:
+            self.manager.load_setuptools_entrypoints(entrypoint)
+        except ImportError, e:
+            raise e
         stage = self.stage
 
         plugin_options = []
diff --git a/src/scancode/__init__.py b/src/scancode/__init__.py
index a691742f4d1..8d96cabaa22 100644
--- a/src/scancode/__init__.py
+++ b/src/scancode/__init__.py
@@ -279,3 +279,34 @@ def convert(self, value, param, ctx):
                 % (click.types.filename_to_ui(value),
             ), param, ctx)
         return click.File.convert(self, value, param, ctx)
+
+
+info_text = '''
+ScanCode scans code and other files for origin and license.
+Visit https://github.com/nexB/scancode-toolkit/ for support and download.
+
+'''
+
+notice_path = join(abspath(dirname(__file__)), 'NOTICE')
+notice_text = open(notice_path).read()
+
+delimiter = '\n\n\n'
+[notice_text, extra_notice_text] = notice_text.split(delimiter, 1)
+extra_notice_text = delimiter + extra_notice_text
+
+delimiter = '\n\n  '
+[notice_text, acknowledgment_text] = notice_text.split(delimiter, 1)
+acknowledgment_text = delimiter + acknowledgment_text
+
+notice = acknowledgment_text.strip().replace('  ', '')
+
+
+def print_about(ctx, param, value):
+    """
+    Click callback to print a notice.
+    """
+    if not value or ctx.resilient_parsing:
+        return
+    click.echo(info_text + notice_text + acknowledgment_text + extra_notice_text)
+    ctx.exit()
+
diff --git a/src/scancode/cli.py b/src/scancode/cli.py
index 9ddc6dd65aa..161f15f92cd 100644
--- a/src/scancode/cli.py
+++ b/src/scancode/cli.py
@@ -33,16 +33,12 @@
 from collections import OrderedDict
 from functools import partial
 from itertools import imap
-from os.path import abspath
-from os.path import dirname
-from os.path import join
 import sys
 from time import time
 import traceback
 
 import attr
 import click
-from scancode.resource import Resource
 click.disable_unicode_literals_warning = True
 
 # import early
@@ -74,12 +70,15 @@
 from scancode import PRE_SCAN_GROUP
 from scancode import SCAN_GROUP
 from scancode import SCAN_OPTIONS_GROUP
+from scancode import notice
+from scancode import print_about
 from scancode import Scanner
 from scancode import validate_option_dependencies
 from scancode.interrupt import DEFAULT_TIMEOUT
 from scancode.interrupt import fake_interruptible
 from scancode.interrupt import interruptible
 from scancode.resource import Codebase
+from scancode.resource import Resource
 from scancode.utils import BaseCommand
 from scancode.utils import path_progress_message
 from scancode.utils import progressmanager
@@ -117,33 +116,6 @@ def logger_debug(*args):
 
 echo_stderr = partial(click.secho, err=True)
 
-info_text = '''
-ScanCode scans code and other files for origin and license.
-Visit https://github.com/nexB/scancode-toolkit/ for support and download.
-
-'''
-
-notice_path = join(abspath(dirname(__file__)), 'NOTICE')
-notice_text = open(notice_path).read()
-
-delimiter = '\n\n\n'
-[notice_text, extra_notice_text] = notice_text.split(delimiter, 1)
-extra_notice_text = delimiter + extra_notice_text
-
-delimiter = '\n\n  '
-[notice_text, acknowledgment_text] = notice_text.split(delimiter, 1)
-acknowledgment_text = delimiter + acknowledgment_text
-
-notice = acknowledgment_text.strip().replace('  ', '')
-
-
-def print_about(ctx, param, value):
-    if not value or ctx.resilient_parsing:
-        return
-    click.echo(info_text + notice_text + acknowledgment_text + extra_notice_text)
-    ctx.exit()
-
-
 # FIXME: this should be pushed out in some external help or pushed down in plugins.
 # FIXME: the glob story is very weird!!!
 examples_text = '''
@@ -314,8 +286,17 @@ def format_options(self, ctx, formatter):
                     formatter.write_dl(sorted_records)
 
 
-# IMPORTANT: this discovers, loads and validates all available plugins
-plugin_classes, plugin_options = PluginManager.load_plugins()
+try:
+    # IMPORTANT: this discovers, loads and validates all available plugins
+    plugin_classes, plugin_options = PluginManager.load_plugins()
+except ImportError, e:
+    echo_stderr('========================================================================')
+    echo_stderr('ERROR: Unable to import ScanCode plugins.'.upper())
+    echo_stderr('Check your installation configuration (setup.py) or re-install/re-configure ScanCode.')
+    echo_stderr('The following plugin(s) are referenced and cannot be loaded/imported:')
+    echo_stderr(str(e), color='red')
+    echo_stderr('========================================================================')
+    raise e
 
 
 def print_plugins(ctx, param, value):
@@ -478,7 +459,6 @@ def print_plugins(ctx, param, value):
     hidden=True,
     help='Run ScanCode in a special "test mode". Only for testing.',
     help_group=MISC_GROUP, sort_order=1000, cls=CommandLineOption)
-
 def scancode(ctx, input,  # NOQA
              strip_root, full_root,
              processes, timeout,
diff --git a/src/scancode/extract_cli.py b/src/scancode/extract_cli.py
index df4d12f1bbc..92887218e0e 100644
--- a/src/scancode/extract_cli.py
+++ b/src/scancode/extract_cli.py
@@ -36,9 +36,9 @@
 from commoncode import filetype
 from commoncode.text import toascii
 
-from scancode.api import extract_archives
-from scancode.cli import print_about
 from scancode_config import __version__
+from scancode.api import extract_archives
+from scancode import print_about
 from scancode import utils
 
 # Python 2 and 3 support

From cf315642f11a152778eb4fe69667bebc67cc1406 Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 6 Feb 2018 16:21:33 +0100
Subject: [PATCH 121/122] Update test expectation for Windows

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/extractcode/test_archive.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index 1ba104e7a8a..b7bf3e83232 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -2259,7 +2259,7 @@ def test_extract_7zip_with_weird_filenames_with_libarchive(self):
 
     def test_extract_ar_with_weird_filenames_with_libarchive(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.ar')
-        warns = ['COM3.txt: Incorrect file header signature', 'com4: Incorrect file header signature']
+        warns = [u'None: \nIncorrect file header signature']
         self.check_extract(libarchive2.extract, test_file, expected_warnings=warns, expected_suffix='libarch')
 
     def test_extract_cpio_with_weird_filenames_with_libarchive(self):

From 5784b20a5c4263a55b8efae0509767aca30caeea Mon Sep 17 00:00:00 2001
From: Philippe Ombredanne <pombredanne@nexb.com>
Date: Tue, 6 Feb 2018 16:54:58 +0100
Subject: [PATCH 122/122] Update test expectation for macOS

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
---
 tests/extractcode/test_archive.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/extractcode/test_archive.py b/tests/extractcode/test_archive.py
index b7bf3e83232..42b02f0dec4 100644
--- a/tests/extractcode/test_archive.py
+++ b/tests/extractcode/test_archive.py
@@ -2228,7 +2228,7 @@ def test_extract_7zip_with_weird_filenames_with_libarchive(self):
 
     def test_extract_ar_with_weird_filenames_with_libarchive(self):
         test_file = self.get_test_loc('archive/weird_names/weird_names.ar')
-        warns = ['COM3.txt: Incorrect file header signature', 'com4: Incorrect file header signature']
+        warns = ['None: \nIncorrect file header signature']
         self.check_extract(libarchive2.extract, test_file, expected_warnings=warns, expected_suffix='libarch')
 
     def test_extract_cpio_with_weird_filenames_with_libarchive(self):