Merge pull request #19 from d8ahazard/master

V2 Support!

.gitignore

@@ -1,9 +1,10 @@
 .DS_Store
 .AppleDouble
 .LSOverride
-
+.idea
 # Icon must end with two \r
-Icon
+Icon
+
 
 # Thumbnails
 ._*
@@ -72,3 +73,4 @@ docs/_build/
 
 # PyBuilder
 target/
+/venv*

README.md

@@ -1,14 +1,27 @@
 # deluge-extractor
-Plugin for the [deluge](http://deluge-torrent.org/) torrent client that extracts compressed files upon torrent completion.
+Plugin for the [deluge](http://deluge-torrent.org/) *V2* torrent client that extracts compressed files upon torrent completion.
+
+This is a modified version of the "Extractor" plugin, with the added option to extract in place.
+
+This is updated to work on Deluge V2. I'm not sure if it'll work with V1 versions...you tell me. I think it should.0
 
 * Target folder for extracting the torrent can be specified
 * A sub folder (name of torrent) can be created within the target folder
 * In-place extraction of the torrent in the torrent's download folder is possible as well
 
+# Features
+Optional download locations:
+* In-place: Extract each .rar file to it's exact location. If a file is in /downloads/TORRENTNAME/subs/subs.rar, it will be extracted to /downloads/TORRENTNAME/subs/.
+* Torrent root: Extract each rar to the root of the torrent download. If a file is in /downloads/TORRENTNAME/sub/subs.rar, it will be extracted to /downloads/TORRENTNAME/.
+* Selected Folder: Extract to a directory that you specify.
+
+Label filtering:
+Enter a comma-separated list of labels, only those labels will be extracted. Works with the default labels plugin, as well as labelplus.
+
 ## Has been tested on:
 
-* Deluge 1.3.x on macOS and Debian Linux / CentOS 7
-* Deluge 1.3.5 on Windows 7
+* Deluge 2.0.5
+
 
 ## Supported File formats:
 
@@ -70,3 +83,10 @@ For example in the setup below you will have to install the py2.6 egg on the des
 * Linux server with Python 2.7 running deluged
 
 #### Note: The Windows installer comes bundled with python: either python 2.6 or 2.7 depending on the intstaller you used.
+
+
+### Support my work?
+
+If you dig this plugin and want to say thanks, the best way to do it is by sending a paypal donation to [email protected]
+
+All donations are appreciated...but none are required :D

deluge_simpleextractor/__init__.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2009 Andrew Resch <[email protected]>
+#
+# Basic plugin template created by:
+# Copyright (C) 2008 Martijn Voncken <[email protected]>
+# Copyright (C) 2007-2009 Andrew Resch <[email protected]>
+#
+# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with
+# the additional special exception to link portions of this program with the OpenSSL library.
+# See LICENSE for more details.
+#
+
+from __future__ import unicode_literals
+
+from deluge.plugins.init import PluginInitBase
+
+
+class CorePlugin(PluginInitBase):
+    def __init__(self, plugin_name):
+        from .core import Core as _pluginCls
+
+        self._plugin_cls = _pluginCls
+        super(CorePlugin, self).__init__(plugin_name)
+
+
+class GtkUIPlugin(PluginInitBase):
+    def __init__(self, plugin_name):
+        from .gtkui import GtkUI as _pluginCls
+
+        self._plugin_cls = _pluginCls
+        super(GtkUIPlugin, self).__init__(plugin_name)
+
+
+class WebUIPlugin(PluginInitBase):
+    def __init__(self, plugin_name):
+        from .webui import WebUI as _pluginCls
+
+        self._plugin_cls = _pluginCls
+        super(WebUIPlugin, self).__init__(plugin_name)

deluge_simpleextractor/common.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+#
+# Basic plugin template created by:
+# Copyright (C) 2008 Martijn Voncken <[email protected]>
+#               2007-2009 Andrew Resch <[email protected]>
+#               2009 Damien Churchill <[email protected]>
+#               2010 Pedro Algarvio <[email protected]>
+#               2017 Calum Lind <[email protected]>
+#
+# This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with
+# the additional special exception to link portions of this program with the OpenSSL library.
+# See LICENSE for more details.
+#
+
+from __future__ import unicode_literals
+
+import os.path
+
+from pkg_resources import resource_filename
+
+
+def get_resource(filename):
+    return resource_filename(__package__, os.path.join('data', filename))