Use good provided locations binaries & paths #469

- Some binaries initially committed were not correct for a given architecture. Also several provide location were not correct and have been updated. - All location keys are also inlined in plugins code to avoid recursive imports - Extra consistency checks are done on provided locations (they must exist) The version reported in p7zip plugins and ABOUT files was 9.20.1 but it is 9.38.1: this has been fixed. In sevenzip CLI calls, the empty password arg is now last on the CLI args to avoid any ambiguity with the file being extracted. The overall command execute2 logging has been aslo updated. Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
aboutcode-org · Aug 10, 2018 · c619cd0 · c619cd0
1 parent e3f2848
commit c619cd0
Show file tree

Hide file tree

Showing 26 changed files with 147 additions and 126 deletions.
diff --git a/plugins/extractcode-7z-macosx_10_9_intel/setup.py b/plugins/extractcode-7z-macosx_10_9_intel/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name='extractcode-7z',
-    version='9.20.1',
+    version='9.38.1',
     license='lgpl-2.1 and unrar and brian-gladman-3-clause',
     description=desc,
     long_description=desc,

diff --git a/plugins/extractcode-7z-macosx_10_9_intel/src/extractcode_7z/__init__.py b/plugins/extractcode-7z-macosx_10_9_intel/src/extractcode_7z/__init__.py
@@ -39,12 +39,10 @@
 
 class SevenzipPaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_EXE
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_LIBDIR
         curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'bin')
         locations = {
-            EXTRACTCODE_7ZIP_LIBDIR: lib_dir,
-            EXTRACTCODE_7ZIP_EXE: join(lib_dir, '7z'),
+            'extractcode.sevenzip.libdir': lib_dir,
+            'extractcode.sevenzip.exe': join(lib_dir, '7z'),
         }
         return locations
diff --git a/plugins/extractcode-7z-macosx_10_9_intel/src/extractcode_7z/bin/p7zip.ABOUT b/plugins/extractcode-7z-macosx_10_9_intel/src/extractcode_7z/bin/p7zip.ABOUT
@@ -2,12 +2,12 @@ about_resource:
     - 7z
     - 7z.so
 
-version: 9.20.1
+version: 9.38.1
 name: p7zip
 
 home_url: http://sourceforge.net/projects/p7zip/
 
-download_url: http://master.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2
+download_url: http://master.dl.sourceforge.net/project/p7zip/p7zip/9.38.1/p7zip_9.38.1_src_all.tar.bz2
 
 license_expression: lgpl-2.1-plus and unrar and brian-gladman-3-clause
 copyright: Copyright (C) Igor Pavlov

diff --git a/plugins/extractcode-7z-manylinux1_i686/setup.py b/plugins/extractcode-7z-manylinux1_i686/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name='extractcode-7z',
-    version='9.20.1',
+    version='9.38.1',
     license='lgpl-2.1 and unrar and brian-gladman-3-clause',
     description=desc,
     long_description=desc,

diff --git a/plugins/extractcode-7z-manylinux1_i686/src/extractcode_7z/__init__.py b/plugins/extractcode-7z-manylinux1_i686/src/extractcode_7z/__init__.py
@@ -35,12 +35,10 @@
 
 class SevenzipPaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_EXE
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_LIBDIR
         curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'bin')
         locations = {
-            EXTRACTCODE_7ZIP_LIBDIR: lib_dir,
-            EXTRACTCODE_7ZIP_EXE: join(lib_dir, '7z'),
+            'extractcode.sevenzip.libdir': lib_dir,
+            'extractcode.sevenzip.exe': join(lib_dir, '7z'),
         }
         return locations
diff --git a/plugins/extractcode-7z-manylinux1_i686/src/extractcode_7z/bin/p7zip.ABOUT b/plugins/extractcode-7z-manylinux1_i686/src/extractcode_7z/bin/p7zip.ABOUT
@@ -2,12 +2,12 @@ about_resource:
     - 7z
     - 7z.so
 
-version: 9.20.1
+version: 9.38.1
 name: p7zip
 
 home_url: http://sourceforge.net/projects/p7zip/
 
-download_url: http://master.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2
+download_url: http://master.dl.sourceforge.net/project/p7zip/p7zip/9.38.1/p7zip_9.38.1_src_all.tar.bz2
 
 license_expression: lgpl-2.1-plus and unrar and brian-gladman-3-clause
 copyright: Copyright (C) Igor Pavlov

diff --git a/plugins/extractcode-7z-manylinux1_x86_64/setup.py b/plugins/extractcode-7z-manylinux1_x86_64/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name='extractcode-7z',
-    version='9.20.1',
+    version='9.38.1',
     license='lgpl-2.1 and unrar and brian-gladman-3-clause',
     description=desc,
     long_description=desc,

diff --git a/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/__init__.py b/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/__init__.py
@@ -35,12 +35,10 @@
 
 class SevenzipPaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_EXE
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_LIBDIR
         curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'bin')
         locations = {
-            EXTRACTCODE_7ZIP_LIBDIR: lib_dir,
-            EXTRACTCODE_7ZIP_EXE: join(lib_dir, '7z'),
+            'extractcode.sevenzip.libdir': lib_dir,
+            'extractcode.sevenzip.exe': join(lib_dir, '7z'),
         }
         return locations
diff --git a/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/bin/7z b/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/bin/7z
diff --git a/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/bin/7z.so b/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/bin/7z.so
diff --git a/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/bin/p7zip.ABOUT b/plugins/extractcode-7z-manylinux1_x86_64/src/extractcode_7z/bin/p7zip.ABOUT
@@ -2,12 +2,12 @@ about_resource:
     - 7z
     - 7z.so
 
-version: 9.20.1
+version: 9.38.1
 name: p7zip
 
 home_url: http://sourceforge.net/projects/p7zip/
 
-download_url: http://master.dl.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2
+download_url: http://master.dl.sourceforge.net/project/p7zip/p7zip/9.38.1/p7zip_9.38.1_src_all.tar.bz2
 
 license_expression: lgpl-2.1-plus and unrar and brian-gladman-3-clause
 copyright: Copyright (C) Igor Pavlov

diff --git a/plugins/extractcode-7z-win32/src/extractcode_7z/__init__.py b/plugins/extractcode-7z-win32/src/extractcode_7z/__init__.py
@@ -33,18 +33,12 @@
 from plugincode.location_provider import location_provider_impl
 
 
-from plugincode.location_provider import LocationProviderPlugin
-from plugincode.location_provider import location_provider_impl
-
-
 class SevenzipPaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_EXE
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_LIBDIR
         curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'bin')
         locations = {
-            EXTRACTCODE_7ZIP_LIBDIR: lib_dir,
-            EXTRACTCODE_7ZIP_EXE: join(lib_dir, '7z.exe'),
+            'extractcode.sevenzip.libdir': lib_dir,
+            'extractcode.sevenzip.exe': join(lib_dir, '7z.exe'),
         }
         return locations
diff --git a/plugins/extractcode-7z-win_amd64/src/extractcode_7z/__init__.py b/plugins/extractcode-7z-win_amd64/src/extractcode_7z/__init__.py
@@ -33,19 +33,12 @@
 from plugincode.location_provider import location_provider_impl
 
 
-from plugincode.location_provider import LocationProviderPlugin
-from plugincode.location_provider import location_provider_impl
-
-
 class SevenzipPaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_EXE
-        from extractcode.sevenzip import EXTRACTCODE_7ZIP_LIBDIR
-
         curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'bin')
         locations = {
-            EXTRACTCODE_7ZIP_LIBDIR: lib_dir,
-            EXTRACTCODE_7ZIP_EXE: join(lib_dir, '7z.exe'),
+            'extractcode.sevenzip.libdir': lib_dir,
+            'extractcode.sevenzip.exe': join(lib_dir, '7z.exe'),
         }
         return locations
diff --git a/plugins/extractcode-libarchive-macosx_10_9_intel/src/extractcode_libarchive/__init__.py b/plugins/extractcode-libarchive-macosx_10_9_intel/src/extractcode_libarchive/__init__.py
@@ -33,15 +33,12 @@
 from plugincode.location_provider import location_provider_impl
 
 
-
 class LibarchivePaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_DLL
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_LIBDIR
-        curr_dir = dirname(dirname(abspath(__file__)))
+        curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            EXTRACTCODE_LIBARCHIVE_LIBDIR: lib_dir,
-            EXTRACTCODE_LIBARCHIVE_DLL: join(lib_dir, 'libarchive.dylib'),
+            'extractcode.libarchive.libdir': lib_dir,
+            'extractcode.libarchive.dll': join(lib_dir, 'libarchive.dylib'),
         }
         return locations
diff --git a/plugins/extractcode-libarchive-manylinux1_i686/src/extractcode_libarchive/__init__.py b/plugins/extractcode-libarchive-manylinux1_i686/src/extractcode_libarchive/__init__.py
@@ -35,12 +35,10 @@
 
 class LibarchivePaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_DLL
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_LIBDIR
         curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            EXTRACTCODE_LIBARCHIVE_LIBDIR: lib_dir,
-            EXTRACTCODE_LIBARCHIVE_DLL: join(lib_dir, 'libarchive.so'),
+            'extractcode.libarchive.libdir': lib_dir,
+            'extractcode.libarchive.libdir': join(lib_dir, 'libarchive.so'),
         }
         return locations
diff --git a/plugins/extractcode-libarchive-manylinux1_x86_64/src/extractcode_libarchive/__init__.py b/plugins/extractcode-libarchive-manylinux1_x86_64/src/extractcode_libarchive/__init__.py
@@ -33,15 +33,12 @@
 from plugincode.location_provider import location_provider_impl
 
 
-
 class LibarchivePaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_DLL
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_LIBDIR
         curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            EXTRACTCODE_LIBARCHIVE_LIBDIR: lib_dir,
-            EXTRACTCODE_LIBARCHIVE_DLL: join(lib_dir, 'libarchive.so'),
+            'extractcode.libarchive.libdir': lib_dir,
+            'extractcode.libarchive.dll': join(lib_dir, 'libarchive.so'),
         }
         return locations
diff --git a/plugins/extractcode-libarchive-win32/src/extractcode_libarchive/__init__.py b/plugins/extractcode-libarchive-win32/src/extractcode_libarchive/__init__.py
@@ -35,12 +35,10 @@
 
 class LibarchivePaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_DLL
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_LIBDIR
-        curr_dir = dirname(dirname(abspath(__file__)))
+        curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            EXTRACTCODE_LIBARCHIVE_LIBDIR: lib_dir,
-            EXTRACTCODE_LIBARCHIVE_DLL: join(lib_dir, 'libarchive.dll'),
+            'extractcode.libarchive.libdir': lib_dir,
+            'extractcode.libarchive.dll': join(lib_dir, 'libarchive.dll'),
         }
         return locations
diff --git a/plugins/extractcode-libarchive-win_amd64/src/extractcode_libarchive/__init__.py b/plugins/extractcode-libarchive-win_amd64/src/extractcode_libarchive/__init__.py
@@ -35,12 +35,10 @@
 
 class LibarchivePaths(LocationProviderPlugin):
     def get_locations(self):
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_DLL
-        from extractcode.libarchive2 import EXTRACTCODE_LIBARCHIVE_LIBDIR
-        curr_dir = dirname(dirname(abspath(__file__)))
+        curr_dir = dirname(abspath(__file__))
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            EXTRACTCODE_LIBARCHIVE_LIBDIR: lib_dir,
-            EXTRACTCODE_LIBARCHIVE_DLL: join(lib_dir, 'libarchive.dll'),
+            'extractcode.libarchive.libdir': lib_dir,
+            'extractcode.libarchive.dll': join(lib_dir, 'libarchive.dll'),
         }
         return locations
diff --git a/plugins/typecode-libmagic-macosx_10_9_intel/src/typecode_libmagic/__init__.py b/plugins/typecode-libmagic-macosx_10_9_intel/src/typecode_libmagic/__init__.py
@@ -35,15 +35,12 @@
 
 class LibmagicPaths(LocationProviderPlugin):
     def get_locations(self):
-        from typecode.magic2 import TYPECODE_LIBMAGIC_LIBDIR
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DLL
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DATABASE
         curr_dir = dirname(abspath(__file__))
         data_dir = join(curr_dir, 'data')
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            TYPECODE_LIBMAGIC_LIBDIR: lib_dir,
-            TYPECODE_LIBMAGIC_DLL: join(lib_dir, 'libmagic.so'),
-            TYPECODE_LIBMAGIC_DATABASE: join(data_dir, 'magic.mgc'),
+            'typecode.libmagic.libdir': lib_dir,
+            'typecode.libmagic.dll': join(lib_dir, 'libmagic.dylib'),
+            'typecode.libmagic.db': join(data_dir, 'magic.mgc'),
         }
         return locations
diff --git a/plugins/typecode-libmagic-manylinux1_i686/src/typecode_libmagic/__init__.py b/plugins/typecode-libmagic-manylinux1_i686/src/typecode_libmagic/__init__.py
@@ -35,15 +35,12 @@
 
 class LibmagicPaths(LocationProviderPlugin):
     def get_locations(self):
-        from typecode.magic2 import TYPECODE_LIBMAGIC_LIBDIR
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DLL
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DATABASE
         curr_dir = dirname(abspath(__file__))
         data_dir = join(curr_dir, 'data')
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            TYPECODE_LIBMAGIC_LIBDIR: lib_dir,
-            TYPECODE_LIBMAGIC_DLL: join(lib_dir, 'libmagic.so'),
-            TYPECODE_LIBMAGIC_DATABASE: join(data_dir, 'magic.mgc'),
+            'typecode.libmagic.libdir': lib_dir,
+            'typecode.libmagic.dll': join(lib_dir, 'libmagic.so'),
+            'typecode.libmagic.db': join(data_dir, 'magic.mgc'),
         }
         return locations
diff --git a/plugins/typecode-libmagic-manylinux1_x86_64/src/typecode_libmagic/__init__.py b/plugins/typecode-libmagic-manylinux1_x86_64/src/typecode_libmagic/__init__.py
@@ -35,15 +35,12 @@
 
 class LibmagicPaths(LocationProviderPlugin):
     def get_locations(self):
-        from typecode.magic2 import TYPECODE_LIBMAGIC_LIBDIR
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DLL
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DATABASE
         curr_dir = dirname(abspath(__file__))
         data_dir = join(curr_dir, 'data')
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            TYPECODE_LIBMAGIC_LIBDIR: lib_dir,
-            TYPECODE_LIBMAGIC_DLL: join(lib_dir, 'libmagic.so'),
-            TYPECODE_LIBMAGIC_DATABASE: join(data_dir, 'magic.mgc'),
+            'typecode.libmagic.libdir': lib_dir,
+            'typecode.libmagic.dll': join(lib_dir, 'libmagic.so'),
+            'typecode.libmagic.db': join(data_dir, 'magic.mgc'),
         }
         return locations
diff --git a/plugins/typecode-libmagic-win32/src/typecode_libmagic/__init__.py b/plugins/typecode-libmagic-win32/src/typecode_libmagic/__init__.py
@@ -35,15 +35,12 @@
 
 class LibmagicPaths(LocationProviderPlugin):
     def get_locations(self):
-        from typecode.magic2 import TYPECODE_LIBMAGIC_LIBDIR
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DLL
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DATABASE
         curr_dir = dirname(abspath(__file__))
         data_dir = join(curr_dir, 'data')
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            TYPECODE_LIBMAGIC_LIBDIR: lib_dir,
-            TYPECODE_LIBMAGIC_DLL: join(lib_dir, 'libmagic.so'),
-            TYPECODE_LIBMAGIC_DATABASE: join(data_dir, 'magic.mgc'),
+            'typecode.libmagic.libdir': lib_dir,
+            'typecode.libmagic.dll': join(lib_dir, 'libmagic.dll'),
+            'typecode.libmagic.db': join(data_dir, 'magic.mgc'),
         }
         return locations
diff --git a/plugins/typecode-libmagic-win_amd64/src/typecode_libmagic/__init__.py b/plugins/typecode-libmagic-win_amd64/src/typecode_libmagic/__init__.py
@@ -35,15 +35,12 @@
 
 class LibmagicPaths(LocationProviderPlugin):
     def get_locations(self):
-        from typecode.magic2 import TYPECODE_LIBMAGIC_LIBDIR
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DLL
-        from typecode.magic2 import TYPECODE_LIBMAGIC_DATABASE
         curr_dir = dirname(abspath(__file__))
         data_dir = join(curr_dir, 'data')
         lib_dir = join(curr_dir, 'lib')
         locations = {
-            TYPECODE_LIBMAGIC_LIBDIR: lib_dir,
-            TYPECODE_LIBMAGIC_DLL: join(lib_dir, 'libmagic.so'),
-            TYPECODE_LIBMAGIC_DATABASE: join(data_dir, 'magic.mgc'),
+            'typecode.libmagic.libdir': lib_dir,
+            'typecode.libmagic.dll': join(lib_dir, 'libmagic.dll'),
+            'typecode.libmagic.db': join(data_dir, 'magic.mgc'),
         }
         return locations