#221

Implement solution (append unc prefix) to fix the longpath issue when
using genattrib.py in Windows OS.
However, the test is still failing.

Author: chinyeungli

about_code_tool/genattrib.py

@@ -25,14 +25,17 @@
 import csv
 import errno
 import logging
+import ntpath
 import optparse
 import os
+import posixpath
 import sys
 
 from os.path import exists, dirname, join, abspath, isdir, basename, expanduser, normpath
-
+from about_code_tool.about import on_windows
 from about import Collector
 import genabout
+import about
 
 LOG_FILENAME = 'error.log'
 
@@ -147,16 +150,27 @@ def extract_zip(location):
     archive_base_name = os.path.basename(location).replace('.zip', '')
     base_dir = tempfile.mkdtemp()
     target_dir = os.path.join(base_dir, archive_base_name)
+    target_dir = about.add_unc(target_dir)
     os.makedirs(target_dir)
 
+    if target_dir.endswith((ntpath.sep, posixpath.sep)):
+        target_dir = target_dir[:-1]
+
     with zipfile.ZipFile(location) as zipf:
         for info in zipf.infolist():
             name = info.filename
             content = zipf.read(name)
             target = os.path.join(target_dir, name)
-            if not os.path.exists(os.path.dirname(target)):
-                os.makedirs(os.path.dirname(target))
-            if not content and target.endswith(os.path.sep):
+            is_dir = target.endswith((ntpath.sep, posixpath.sep))
+            if is_dir:
+                target = target[:-1]
+            parent = os.path.dirname(target)
+            if on_windows:
+                target = target.replace(posixpath.sep, ntpath.sep)
+                parent = parent.replace(posixpath.sep, ntpath.sep)
+            if not os.path.exists(parent):
+                os.makedirs(parent)
+            if not content and is_dir:
                 if not os.path.exists(target):
                     os.makedirs(target)
             if not os.path.exists(target):

about_code_tool/tests/test_genattrib.py

@@ -19,7 +19,7 @@
 import os
 import unittest
 
-from about_code_tool import genattrib
+from about_code_tool import genattrib, about
 
 from about_code_tool.tests.test_about import get_temp_file
 
@@ -111,7 +111,7 @@ def test_genattrib_basic_with_filter(self):
         not_expected = [
             'Annotator 1.2.10',
             'component_4',
-        'djangosnippets.org_2413 2011-04-12',
+            'djangosnippets.org_2413 2011-04-12',
         ]
         for ex in not_expected:
             self.assertFalse(ex in result, ex)
@@ -136,7 +136,6 @@ def test_genattrib_from_zipped_dir(self):
         for ex in expected:
             self.assertTrue(ex in result, ex)
 
-
     def test_genattrib_zip_with_filter(self):
         self.maxDiff = None
         # note: this contains an about_files subdir that is the root of all ABOUT files in the "project"
@@ -158,11 +157,18 @@ def test_genattrib_zip_with_filter(self):
         not_expected = [
             'Annotator 1.2.10',
             'component_4',
-        'djangosnippets.org_2413 2011-04-12',
+            'djangosnippets.org_2413 2011-04-12',
         ]
         for ex in not_expected:
             self.assertFalse(ex in result, ex)
 
+    def test_extract_deep_zip(self):
+        test_zip = 'about_code_tool/tests/testdata/longpath.zip'
+        extracted = genattrib.extract_zip(test_zip)
+        unc_extracted = about.add_unc(extracted)
+        for root, dirs, files in os.walk(unc_extracted):
+            self.assertTrue('non-supported_date_format.ABOUT' in files)
+
 def genattrib_command_tester(args, options):
     parser = genattrib.get_parser()
     options, args = parser.parse_args(args, options)