Skip to content

Commit

Permalink
Added fixes for #33 and #34
Browse files Browse the repository at this point in the history
- ubuntu doesen't like `snap` apps to share tmp files, workarounds are
  now limited to just windows os'
  • Loading branch information
Laharah committed Aug 2, 2017
1 parent ffeb8e5 commit cc61a50
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# FilebotTool: FileBot Integration for Deluge
*requires [Filebot](http://www.filebot.net/)*

**Version 1.1.8**
**Version 1.1.10**

##### [Download Latest Release](https://github.com/Laharah/deluge-FilebotTool/releases/latest)

Expand Down
7 changes: 4 additions & 3 deletions filebottool/pyfilebot.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
if not FILEBOT_EXE:
locations = [
r'C:\Program Files\FileBot\filebot.exe', r'/usr/bin/filebot',
r'/usr/local/bin/filebot'
r'/usr/local/bin/filebot', r'/snap/bin/filebot'
]
for loc in locations:
if os.path.exists(loc):
Expand Down Expand Up @@ -141,7 +141,8 @@ def rename(targets,
language_code=language_code)

# TODO:better error handling
exit_code, data, filebot_error = _execute(filebot_arguments)
workaround = True if os.name == 'nt' else False
exit_code, data, filebot_error = _execute(filebot_arguments, workaround)

if exit_code != 0:
raise FilebotRuntimeError("FILEBOT OUTPUT DUMP:\n{0}".format(data))
Expand Down Expand Up @@ -546,7 +547,7 @@ def _build_script_arguments(script_name, script_arguments):
return process_arguments


def _execute(process_arguments, workaround=True):
def _execute(process_arguments, workaround=False):
"""underlying execution method to call filebot as subprocess
Handles the actual execution and output capture
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
__plugin_name__ = "FileBotTool"
__author__ = "laharah"
__author_email__ = "laharah+fbt@gmail.com"
__version__ = "1.1.9"
__version__ = "1.1.10"
__url__ = "https://github.com/Laharah/deluge-FileBotTool"
__license__ = "GPLv3"
__description__ = "Integrates FileBot functionality to Deluge"
Expand Down

0 comments on commit cc61a50

Please sign in to comment.