AutoExtractor Plugin fails to extract files with periods ( . )

[three18ti]

Hello,

Deluge Version: Client: 1.3.6 Server: 1.3.6

OS: Ubuntu, 12.04.1

Since upgrading to deluge 1.3.6 the auto extractor fails to extract files with periods.

Relevant log excerpt:

attached as deluge_auto_extractor_debug_log_20130304.log

Solution:

Cas suggested reverting this commit might fix the problem: ​http://git.deluge-torrent.org/deluge/commit/?h=1.3-stable&id=7fbe163c24de

[three18ti]

Deluge debug log of failed autoextractor attempt

[Calum]

Reverted commit plugin

[Andareed]

Cleaner extractor fix

[Andareed]

I attached a cleaner patch.

[Calum]

Although your code works, the result relies on the alphabetical order of the extensions which is not ideal.

This is the code that I put together a few days ago and was looking to commit:

diff --git a/deluge/plugins/extractor/extractor/core.py b/deluge/plugins/extractor/extractor/core.py
index 50f3faf..168fa7d 100644
--- a/deluge/plugins/extractor/extractor/core.py
+++ b/deluge/plugins/extractor/extractor/core.py
@@ -132,11 +132,14 @@ def _on_torrent_finished(self, torrent_id):
         files = tid.get_files()
         for f in files:
             cmd = ''
-            file_ext = os.path.splitext(os.path.splitext(f["path"])[0])[1] + os.path.splitext(f["path"])[1]
-            if file_ext in EXTRACT_COMMANDS:
+            file_ext = os.path.splitext(f["path"])[1]
+            file_ext_pair = os.path.splitext(os.path.splitext(f["path"])[0])[1] + file_ext
+            if file_ext_pair in EXTRACT_COMMANDS:
+                cmd = EXTRACT_COMMANDS[file_ext_pair]
+            elif file_ext in EXTRACT_COMMANDS:
                 cmd = EXTRACT_COMMANDS[file_ext]
             else:
-                log.error("EXTRACTOR: Can't extract unknown file type: %s", file_ext)
+                log.error("EXTRACTOR: Can't extract unknown file type: %s", f["path"])
                 continue
 
             # Now that we have the cmd, lets run it to extract the files

[Calum]

After much testing finally came up with a fix that works properly:

Fixed 1.3-stable: ​http://git.deluge-torrent.org/deluge/commit/?h=1.3-stable&id=f1074858716

@Andareed: My comment is incorrect, the EXTRACT_COMMANDS dict is not actually sorted so there is no way to know in advance whether for example '.lzma' will be after '.tar.lzma' if that extension is added at a later date and sorting the dict alphabetically would not help either due to the potential of '.xz' and '.tar.xz' co-existing.