Merge pull request #30 from noam09/feature/docker-build

Enable markdown for all messages, lint, add Dockerfile for builds

.dockerignore

@@ -0,0 +1 @@
+config2.glade

Dockerfile

@@ -0,0 +1,11 @@
+FROM python:2.7.18-alpine3.11 AS base
+
+RUN mkdir -p /usr/src/app
+RUN mkdir -p /output
+WORKDIR /usr/src/app
+
+COPY telegramer /usr/src/app/telegramer
+COPY setup.py /usr/src/app/setup.py
+COPY LICENSE /usr/src/app/LICENSE
+
+RUN python setup.py bdist_egg

build.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+docker build --no-cache -t telegramer.build . \
+    && docker run -v $(pwd)/out:/tmp/out --rm -i telegramer.build sh -s << COMMANDS
+python setup.py bdist_egg
+chown -R $(id -u):$(id -g) dist
+cp -ar dist/ /tmp/out/
+COMMANDS

setup.py

@@ -46,7 +46,7 @@
 __plugin_name__ = "Telegramer"
 __author__ = "Noam"
 __author_email__ = "[email protected]"
-__version__ = "1.2.1.7"
+__version__ = "1.3.1"
 __url__ = "https://github.com/noam09"
 __license__ = "GPLv3"
 __description__ = "Control Deluge using Telegram"

telegramer/core.py

@@ -1068,11 +1068,7 @@ def on_torrent_added(self, torrent_id):
                 message = "{}".format(user_message.replace("TORRENTNAME", torrent_status["name"]))
             log.info(prelog() + 'Sending torrent added message to ' +
                      str(self.notifylist))
-            # Disable Markdown for custom messages
-            if custom_message:
-                return self.telegram_send(message, to=self.notifylist)
-            else:
-                return self.telegram_send(message, to=self.notifylist, parse_mode='Markdown')
+            return self.telegram_send('{}'.format(message), to=self.notifylist, parse_mode='Markdown')
         except Exception as e:
             log.error(prelog() + 'Error in alert %s' % str(e))
 
@@ -1101,12 +1097,8 @@ def on_torrent_finished(self, torrent_id):
                 message = "{}".format(user_message.replace("TORRENTNAME", torrent_status["name"]))
             log.info(prelog() + 'Sending torrent finished message to ' +
                      str(self.notifylist))
-            # Disable Markdown for custom messages
-            if custom_message:
-                return self.telegram_send(message, to=self.notifylist)
-            else:
-                return self.telegram_send(message, to=self.notifylist, parse_mode='Markdown')
-        except Exception, e:
+            return self.telegram_send('{}'.format(message), to=self.notifylist, parse_mode='Markdown')
+        except Exception as e:
             log.error(prelog() + 'Error in alert %s' %
                       str(e) + '\n' + traceback.format_exc())