summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2016-07-16 16:53:38 +0200
committerGravatar GitHub <noreply@github.com> 2016-07-16 16:53:38 +0200
commit6b40f7eafa9d1a8784955bbfd0c622ec87c4c033 (patch)
tree1d96e62179b65503d868c514ad4697e714385c9f
parent[YoutubeCom] fix #2542 (diff)
parentincreased version number (diff)
downloadpyload-6b40f7eafa9d1a8784955bbfd0c622ec87c4c033.tar.xz
Merge pull request #2545 from EikeKre/fix_unpack_zip
Fix unpack zipfiles
-rw-r--r--module/plugins/internal/SevenZip.py4
-rw-r--r--module/plugins/internal/UnRar.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 5ad1156fe..beae76040 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.plugins.internal.misc import encode, fsjoin, renice
class SevenZip(UnRar):
__name__ = "SevenZip"
__type__ = "extractor"
- __version__ = "0.20"
+ __version__ = "0.21"
__status__ = "testing"
__description__ = """7-Zip extractor plugin"""
@@ -21,7 +21,7 @@ class SevenZip(UnRar):
CMD = "7z"
- EXTENSIONS = ["7z", "xz", "zip", "gz", "gzip", "tgz", "bz2", "bzip2", "tbz2",
+ EXTENSIONS = ["7z", "xz", "gz", "gzip", "tgz", "bz2", "bzip2", "tbz2",
"tbz", "tar", "wim", "swm", "lzma", "rar", "cab", "arj", "z",
"taz", "cpio", "rpm", "deb", "lzh", "lha", "chm", "chw", "hxs",
"iso", "msi", "doc", "xls", "ppt", "dmg", "xar", "hfs", "exe",
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 18416a4fe..f942d35a5 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -12,7 +12,7 @@ from module.plugins.internal.misc import decode, encode, fsjoin, renice
class UnRar(Extractor):
__name__ = "UnRar"
__type__ = "extractor"
- __version__ = "1.32"
+ __version__ = "1.33"
__status__ = "testing"
__description__ = """RAR extractor plugin"""
@@ -23,8 +23,8 @@ class UnRar(Extractor):
CMD = "unrar"
- EXTENSIONS = ["rar", "zip", "cab", "arj", "lzh", "tar", "gz", "ace", "uue",
- "bz2", "jar", "iso", "7z", "xz", "z"]
+ EXTENSIONS = ["rar", "cab", "arj", "lzh", "tar", "gz", "ace", "uue",
+ "bz2", "jar", "iso", "xz", "z"]
_RE_PART = re.compile(r'\.(part|r)\d+(\.rar|\.rev)?(\.bad)?', re.I)
_RE_FIXNAME = re.compile(r'Building (.+)')