From 7898ee9e64479db957560fbc469a2345a97ecafd Mon Sep 17 00:00:00 2001 From: Alexander Puzynia Date: Mon, 23 Jan 2017 09:13:47 +0300 Subject: [PATCH 1/4] chore(readme): update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 70192d8a..49383a22 100644 --- a/README.md +++ b/README.md @@ -27,16 +27,16 @@ This app can watch for torrent updates - support www.unionpeer.org topic tracking - support [nnmclub.to](http://nnmclub.to) topic tracking - support [tr.anidub.com](http://tr.anidub.com) topic tracking with topic quality support -- support [kinozal.tv](http://kinozal.tv) +- support [kinozal.tv](http://kinozal.tv) topic tracking -### Supported torrent clients +### Supported torrent clients: - support download torrent files to specified folder (downloader plugin) - support **transmission** over transmission-rpc - support **deluge** over deluge-rpc - support **uTorrent** over uTorrent web api - support **qbittorrent** over webui api -### Supported notifications: +### Supported notification services: - support notifications over [telegram.org](https://telegram.org/) - support notifications over [pushover.net](https://pushover.net) - support notifications over **email** From fff6dfa29ca7abfb0408b7c78e6fa197c6f9ff74 Mon Sep 17 00:00:00 2001 From: Alexander Puzynia Date: Tue, 24 Jan 2017 15:01:55 +0300 Subject: [PATCH 2/4] fix(plugin/trackers/lostfilm): fix #186, allow _ in lostfilm topic url --- monitorrent/plugins/trackers/lostfilm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitorrent/plugins/trackers/lostfilm.py b/monitorrent/plugins/trackers/lostfilm.py index a53b48f5..044ebdc5 100644 --- a/monitorrent/plugins/trackers/lostfilm.py +++ b/monitorrent/plugins/trackers/lostfilm.py @@ -127,7 +127,7 @@ def __init__(self, code, text, message): class LostFilmTVTracker(object): tracker_settings = None - _regex = re.compile(six.text_type(r'https?://www\.lostfilm\.tv/browse\.php\?cat=(?P\d+)')) + _regex = re.compile(six.text_type(r'https?://www\.lostfilm\.tv/browse\.php\?cat=_?(?P\d+)')) search_usess_re = re.compile(six.text_type(r'\(usess=([a-f0-9]{32})\)'), re.IGNORECASE) _rss_title = re.compile(six.text_type(r'(?P[^(]+)\s+\((?P[^(]+)\)\.\s+') + six.text_type(r'(?P[^([]+)(\s+\((?P<original_title>[^(]+)\))?') + From 6a9ecdaab9c62b01341cef99caa93a0c9d6477f7 Mon Sep 17 00:00:00 2001 From: Alexander Puzynia <werwolf.by@gmail.com> Date: Tue, 24 Jan 2017 23:44:30 +0300 Subject: [PATCH 3/4] fix(server): fix 185, replace cherrypy as WSGI server for it child project cheroot --- requirements.txt | 2 +- server.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3647072a..17af900e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ pytz -CherryPy>=3.8.0 +cheroot>=5.1.0 requests>=2.7.0 SQLAlchemy>=1.0.6 SQLAlchemy-Enum34 diff --git a/server.py b/server.py index 772b9b36..e2a746fe 100644 --- a/server.py +++ b/server.py @@ -7,7 +7,7 @@ import string import argparse import warnings -from cherrypy import wsgiserver +from cheroot import wsgi from monitorrent.engine import DBEngineRunner, DbLoggerWrapper, ExecuteLogManager from monitorrent.db import init_db_engine, create_db from monitorrent.plugin_managers import load_plugins, get_plugins, TrackersManager, DbClientsManager, NotifierManager @@ -184,9 +184,8 @@ def __init__(self, parsed_args): app = create_app(secret_key, token, tracker_manager, clients_manager, notifier_manager, settings_manager, engine_runner, log_manager, new_version_checker) - d = wsgiserver.WSGIPathInfoDispatcher({'/': app}) server_start_params = (config.ip, config.port) - server = wsgiserver.CherryPyWSGIServer(server_start_params, d) + server = wsgi.Server(server_start_params, app) print('Server started on {0}:{1}'.format(*server_start_params)) try: From 3b5eea6b6aca6a4420d6247df0c59b2bb91638bd Mon Sep 17 00:00:00 2001 From: Alexander Puzynia <werwolf.by@gmail.com> Date: Tue, 24 Jan 2017 23:48:44 +0300 Subject: [PATCH 4/4] chore(core): update version to 1.1.1 --- MonitorrentInstaller/MonitorrentInstaller/Product.wxs | 2 +- README.md | 4 ++-- monitorrent/__init__.py | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MonitorrentInstaller/MonitorrentInstaller/Product.wxs b/MonitorrentInstaller/MonitorrentInstaller/Product.wxs index 690da419..32a83f18 100644 --- a/MonitorrentInstaller/MonitorrentInstaller/Product.wxs +++ b/MonitorrentInstaller/MonitorrentInstaller/Product.wxs @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <Product Id="*" Name="Monitorrent" Language="1033" Version="1.1.0.100" Manufacturer="Monitorrent Team" UpgradeCode="dd4cf505-1e44-4311-a8f2-efcf097175a7"> + <Product Id="*" Name="Monitorrent" Language="1033" Version="1.1.1.100" Manufacturer="Monitorrent Team" UpgradeCode="dd4cf505-1e44-4311-a8f2-efcf097175a7"> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes"/> diff --git a/README.md b/README.md index 49383a22..234dec35 100644 --- a/README.md +++ b/README.md @@ -50,14 +50,14 @@ This app can watch for torrent updates - x86: https://hub.docker.com/r/werwolfby/alpine-monitorrent/ ### Windows Installer: -https://github.com/werwolfby/monitorrent/releases/download/1.1.0/MonitorrentInstaller-1.1.0.msi +https://github.com/werwolfby/monitorrent/releases/download/1.1.1/MonitorrentInstaller-1.1.1.msi ### Manual Install Requirements: - Python 2.7 or 3.x and pip -Download latest build: https://github.com/werwolfby/monitorrent/releases/download/1.1.0/monitorrent-1.1.0.zip +Download latest build: https://github.com/werwolfby/monitorrent/releases/download/1.1.1/monitorrent-1.1.1.zip Extract into **monitorent** folder * pip install -r requirements.txt * python server.py diff --git a/monitorrent/__init__.py b/monitorrent/__init__.py index 1a72d32e..b3ddbc41 100644 --- a/monitorrent/__init__.py +++ b/monitorrent/__init__.py @@ -1 +1 @@ -__version__ = '1.1.0' +__version__ = '1.1.1' diff --git a/package.json b/package.json index e9739ca9..512f9f53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monitorrent", - "version": "1.1.0", + "version": "1.1.1", "description": "", "main": "index.js", "directories": {