Merge branch 'master' of https://github.com/CAPESandbox/sflock

Author: doomedraven

.travis.yml

@@ -22,7 +22,7 @@ following packages alongside sflock. It is currently not possible to run the
 unpackers that require native tooling support on non-Linux platforms.
 
 ```bash
-$ sudo apt-get install p7zip-full rar unace-nonfree cabextract lzip libjpeg8-dev zlib1g-dev zpaq gnupg
+$ sudo apt-get install rar unace-nonfree cabextract lzip libjpeg8-dev zlib1g-dev zpaq gnupg
 ```
 
 Installation of sflock itself may be done as follows.

README.md

@@ -9,8 +9,9 @@
 
 
 def iter_passwords():
-    import pkg_resources
+    from importlib.resources import as_file
+    from pathlib import Path
 
-    filepath = pkg_resources.resource_filename("sflock", "data/password.txt")
-    for line in open(filepath, "rb"):
-        yield line.strip()
+    with as_file(Path("sflock/data/password.txt")) as passwd_file:
+        for line in passwd_file.read_text().splitlines():
+            yield line.strip()

sflock/config.py

@@ -7,11 +7,13 @@
 import tempfile
 
 from sflock.abstracts import Unpacker
+from sflock.misc import data_file
 
+zip7_binary = data_file(b"7zz.elf")
 
 class ZipFile(Unpacker):
     name = "zipfile"
-    exe = "/usr/bin/7z"
+    exe = zip7_binary
     exts = b".zip"
     magic = "Zip archive data"
 
@@ -56,7 +58,7 @@ def unpack(self, password="infected", duplicates=None):
 
 class Zip7File(Unpacker):
     name = "7zfile"
-    exe = "/usr/bin/7z"
+    exe = zip7_binary
     exts = b".7z", b".iso", b".udf", b".xz"
     # TODO Should we use "isoparser" (check PyPI) instead of 7z?
     magic = "7-zip archive", "ISO 9660", "UDF filesystem data", "XZ compressed data"
@@ -84,7 +86,7 @@ def unpack(self, password="infected", duplicates=None):
 
 class GzipFile(Unpacker):
     name = "gzipfile"
-    exe = "/usr/bin/7z"
+    exe = zip7_binary
     exts = b".gzip", b".gz"
     magic = "gzip compressed data, was"
 
@@ -110,7 +112,7 @@ def unpack(self, password=None, duplicates=None):
 
 class LzhFile(Unpacker):
     name = "lzhfile"
-    exe = "/usr/bin/7z"
+    exe = zip7_binary
     exts = b".lzh", b".lha"
     magic = "LHa ("
 
@@ -136,7 +138,7 @@ def unpack(self, password=None, duplicates=None):
 
 class VHDFile(Unpacker):
     name = "vhdfile"
-    exe = "/usr/bin/7z"
+    exe = zip7_binary
     exts = b".vhd", b".vhdx"
     magic = " Microsoft Disk Image"
 
@@ -163,7 +165,7 @@ def unpack(self, password=None, duplicates=None):
 
 class WimFile(Unpacker):
     name = "wimfile"
-    exe = "/usr/bin/7z"
+    exe = zip7_binary
     exts = b".wim"
     magic = "Windows imaging (WIM) image"
 
@@ -189,7 +191,7 @@ def unpack(self, password=None, duplicates=None):
 
 class XZFile(Unpacker):
     name = "xzfile"
-    exe = "/usr/bin/7z"
+    exe = zip7_binary
     exts = b".xz"
     magic = "XZ compressed data"
 
@@ -216,7 +218,7 @@ def unpack(self, password=None, duplicates=None):
 
 class NSIS(Unpacker):
     name = "nsis"
-    exe = "/usr/bin/7z"
+    exe = zip7_binary
     exts = b".exe"
     magic = "Nullsoft Installer self-extracting archive"