diff --git a/README.md b/README.md index 9f50625..af815a4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # FilebotTool: FileBot Integration for Deluge *requires [Filebot](http://www.filebot.net/)* -**Version 1.1.11** +**Version 1.1.12** ##### [Download Latest Release](https://github.com/Laharah/deluge-FilebotTool/releases/latest) diff --git a/filebottool/gtkui/common.py b/filebottool/gtkui/common.py index 9eb5393..88af98d 100644 --- a/filebottool/gtkui/common.py +++ b/filebottool/gtkui/common.py @@ -5,6 +5,14 @@ # noinspection PyUnresolvedReferences import gtk +import re + + +def version_tuple(s): + # if not re.match(r'\d+\.', s): + # raise ValueError("Cannot parse version {0}.".format(s)) + return tuple(int(x) for x in s.split('.')) + def inflate_list_store_combo(model_data, combo_widget): @@ -106,4 +114,4 @@ def replace_model(self, new_model): """ self.model = new_model - self.view.set_model(self.model) \ No newline at end of file + self.view.set_model(self.model) diff --git a/filebottool/pyfilebot.py b/filebottool/pyfilebot.py index 2fcc21a..ecaa2cc 100644 --- a/filebottool/pyfilebot.py +++ b/filebottool/pyfilebot.py @@ -2,7 +2,7 @@ FilebotHandler convenience class. """ __author__ = 'laharah' -__version__ = '0.3.0' +__version__ = '0.3.1' import re import os @@ -145,7 +145,8 @@ def rename(targets, exit_code, data, filebot_error = _execute(filebot_arguments, workaround) if exit_code != 0: - raise FilebotRuntimeError("FILEBOT OUTPUT DUMP:\n{0}".format(data)) + raise FilebotRuntimeError("FILEBOT OUTPUT DUMP:\n{0}\nstderr:\n{1}".format( + data, filebot_error)) return parse_filebot(data) diff --git a/setup.py b/setup.py index c972232..f66f12c 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.11" +__version__ = "1.1.12" __url__ = "https://github.com/Laharah/deluge-FileBotTool" __license__ = "GPLv3" __description__ = "Integrates FileBot functionality to Deluge"