#22 - Working in progress (Need to add tests)

Author: chinyeungli

src/attributecode/cmd.py

@@ -411,7 +411,7 @@ def collect_redist_src(location, output, quiet, verbose):
     errors.extend(copy_errors)
     errors_count = report_errors(errors, quiet, verbose, log_file_loc=output + '-error.log')
     if not quiet:
-        msg = 'Inventory collected in {output}.'.format(**locals())
+        msg = 'Redistributed sources are copied to {output}.'.format(**locals())
         click.echo(msg)
     sys.exit(errors_count)
 

src/attributecode/model.py

@@ -36,7 +36,7 @@
 import posixpath
 import traceback
 
-from attributecode.util import python2
+from attributecode.util import python2, to_posix
 
 if python2:  # pragma: nocover
     from itertools import izip_longest as zip_longest  # NOQA
@@ -69,6 +69,7 @@
 from attributecode.util import filter_errors
 from attributecode.util import is_valid_name
 from attributecode.util import on_windows
+from attributecode.util import norm
 from attributecode.util import replace_tab_with_spaces
 from attributecode.util import wrap_boolean_value
 from attributecode.util import UNC_PREFIX
@@ -1284,7 +1285,14 @@ def copy_redist_src(abouts, location, output):
                     continue
             for k in about.about_resource.value:
                 from_path = about.about_resource.value.get(k)
-                copy_file(from_path, output)
+                norm_from_path = norm(from_path)
+                relative_from_path = norm_from_path.partition(util.norm(location))[2]
+                # Need to strip the '/' to use the join
+                if relative_from_path.startswith('/'):
+                    relative_from_path = relative_from_path.partition('/')[2]
+                # Get the directory name of the output path
+                output_dir = os.path.dirname(os.path.join(output, util.norm(relative_from_path)))
+                copy_file(from_path, output_dir)
     return errors
 
 

src/attributecode/util.py

@@ -191,21 +191,24 @@ def get_about_locations(location):
         if is_about_file(loc):
             yield loc
 
+def norm(p):
+    """
+    Normalize the path
+    """
+    if p.startswith(UNC_PREFIX) or p.startswith(to_posix(UNC_PREFIX)):
+        p = p.strip(UNC_PREFIX).strip(to_posix(UNC_PREFIX))
+    p = to_posix(p)
+    p = p.strip(posixpath.sep)
+    p = posixpath.normpath(p)
+    return p
+
 
 def get_relative_path(base_loc, full_loc):
     """
     Return a posix path for a given full location relative to a base location.
     The first segment of the different between full_loc and base_loc will become
     the first segment of the returned path.
     """
-    def norm(p):
-        if p.startswith(UNC_PREFIX) or p.startswith(to_posix(UNC_PREFIX)):
-            p = p.strip(UNC_PREFIX).strip(to_posix(UNC_PREFIX))
-        p = to_posix(p)
-        p = p.strip(posixpath.sep)
-        p = posixpath.normpath(p)
-        return p
-
     base = norm(base_loc)
     path = norm(full_loc)
 
@@ -476,8 +479,10 @@ def copy_file(from_path, to_path):
         return
 
     if on_windows:
-        from_path = add_unc(from_path)
-        to_path = add_unc(to_path)
+        if not from_path.startswith(UNC_PREFIXES):
+            from_path = add_unc(from_path)
+        if not to_path.startswith(UNC_PREFIXES):
+            to_path = add_unc(to_path)
 
     # Strip the white spaces
     from_path = from_path.strip()
@@ -491,9 +496,14 @@ def copy_file(from_path, to_path):
         os.makedirs(to_path)
     try:
         if os.path.isdir(from_path):
-            print("#############################")
-            from distutils.dir_util import copy_tree
-            copy_tree(from_path, to_path)
+            # Copy the whole directory structure
+            folder_name = os.path.basename(from_path)
+            to_path = os.path.join(to_path, folder_name)
+            # Since we need to copy everything along with the directory structure,
+            # making sure the directory does not exist will not hurt.
+            shutil.rmtree(to_path)
+            # Copy the directory recursively along with its structure 
+            shutil.copytree(from_path, to_path)
         else:
             shutil.copy2(from_path, to_path)
     except Exception as e: