From ffeb8e5e8e02d0a99aa9384b3f47a3bb85a28aa8 Mon Sep 17 00:00:00 2001 From: laharah Date: Sat, 13 May 2017 10:19:19 -0700 Subject: [PATCH] Added some more debug logging for filebotfatalerror --- filebottool/core.py | 4 ++-- filebottool/pyfilebot.py | 4 ++-- setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/filebottool/core.py b/filebottool/core.py index 890578a..7c8f78c 100755 --- a/filebottool/core.py +++ b/filebottool/core.py @@ -94,8 +94,8 @@ def enable(self): self.filebot_version = pyfilebot.get_version() log.info("Filebot Found with version {0}".format( self.filebot_version)) - except pyfilebot.FilebotFatalError: - log.error("Filebot cannot be found!") + except pyfilebot.FilebotFatalError as e: + log.error('FilebotFatalError ' + str(e)) self.filebot_version = None self.torrent_manager = component.get("TorrentManager") diff --git a/filebottool/pyfilebot.py b/filebottool/pyfilebot.py index 10912f4..dd61f56 100644 --- a/filebottool/pyfilebot.py +++ b/filebottool/pyfilebot.py @@ -583,8 +583,8 @@ def _execute(process_arguments, workaround=True): stderr=killableprocess.subprocess.PIPE, stdin=killableprocess.subprocess.PIPE, startupinfo=startupinfo) - except OSError: - raise FilebotFatalError("Filebot could not be found!") + except OSError as e: + raise FilebotFatalError("Error running Filebot! {0}".format(str(e))) stdout, error = process.communicate() exit_code = process.returncode diff --git a/setup.py b/setup.py index f9832e4..6a0f651 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ __plugin_name__ = "FileBotTool" __author__ = "laharah" __author_email__ = "laharah+fbt@gmail.com" -__version__ = "1.1.8" +__version__ = "1.1.9" __url__ = "https://github.com/Laharah/deluge-FileBotTool" __license__ = "GPLv3" __description__ = "Integrates FileBot functionality to Deluge"