merge(feature/lostfilm-fixes): fix lostfilm.tv issue

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.4.100" Manufacturer="Monitorrent Team" UpgradeCode="dd4cf505-1e44-4311-a8f2-efcf097175a7">
+	<Product Id="*" Name="Monitorrent" Language="1033" Version="1.1.5.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"/>

README.md

@@ -58,14 +58,14 @@ x86: https://hub.docker.com/r/werwolfby/alpine-monitorrent/
 [![](https://images.microbadger.com/badges/version/werwolfby/alpine-monitorrent.svg)](https://microbadger.com/images/werwolfby/alpine-monitorrent "Get your own version badge on microbadger.com")
 
 ### Windows Installer:
-https://github.com/werwolfby/monitorrent/releases/download/1.1.4/MonitorrentInstaller-1.1.4.msi
+https://github.com/werwolfby/monitorrent/releases/download/1.1.5/MonitorrentInstaller-1.1.5.msi
 
 ### Manual Install
 
 Requirements:
   - Python 3.x and pip
 
-Download latest build: https://github.com/werwolfby/monitorrent/releases/download/1.1.4/monitorrent-1.1.4.zip
+Download latest build: https://github.com/werwolfby/monitorrent/releases/download/1.1.5/monitorrent-1.1.5.zip
 Extract into **monitorent** folder
  * pip install -r requirements.txt
  * python server.py

monitorrent/__init__.py

@@ -1 +1 @@
-__version__ = '1.1.4'
+__version__ = '1.1.5'

monitorrent/plugins/trackers/lostfilm.py

@@ -478,7 +478,7 @@ def verify(self):
         my_settings_url = 'http://www.lostfilm.tv/my_settings'
         r1 = requests.get(my_settings_url, headers=self._headers, cookies=cookies,
                           **self.tracker_settings.get_requests_kwargs())
-        return r1.url == my_settings_url and 'location.replace' not in r1.text
+        return r1.url == my_settings_url and '<meta http-equiv="refresh" content="0; url=/">' not in r1.text
 
     def get_cookies(self):
         if not self.session:
@@ -498,7 +498,8 @@ def parse_url(self, url, parse_series=False):
 
         response = requests.get(url, headers=self._headers, allow_redirects=False,
                                 **self.tracker_settings.get_requests_kwargs())
-        if response.status_code != 200 or response.url != url or 'location.replace("/' in response.text:
+        if response.status_code != 200 or response.url != url \
+            or '<meta http-equiv="refresh" content="0; url=/">' in response.text:
             return response
         # lxml have some issue with parsing lostfilm on Windows, so replace it on html5lib for Windows
         soup = get_soup(response.text, 'html5lib' if sys.platform == 'win32' else None)
@@ -825,7 +826,7 @@ def _prepare_request(self, topic):
 
     def check_download(self, response):
         if response.status_code == 200:
-            if 'location.replace("' in response.text:
+            if '<meta http-equiv="refresh" content="0; url=/">' in response.text:
                 return Status.NotFound
             return Status.Ok
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "monitorrent",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "",
   "main": "index.js",
   "directories": {

tests/cassettes/test_lostfilmtracker.TestLostFilmTracker.test_download_info

@@ -5,15 +5,15 @@ interactions:
       Accept: ['*/*']
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Cookie: [!!python/unicode 'lf_session=1234567890abcdefghjklmnopqrstvwxyz']
+      Cookie: [lf_session=1234567890abcdefghjklmnopqrstvwxyz]
       User-Agent: ['Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML,
           like Gecko) " + "Chrome/48.0.2564.109 Safari/537.36']
     method: GET
     uri: https://www.lostfilm.tv/v_search.php?c=160&s=4&e=22
   response:
     body:
       string: !!binary |
-        H4sIAGl0llgC/61S0W7TMBR9Jl/hBalr0VK3adlDGxeJdhJIBfYQhHiaTOqSoCQOjlOtoElrK8ED
+        H4sIAGZeflkC/61S0W7TMBR9Jl/hBalr0VK3adlDGxeJdhJIBfYQhHiaTOqSoCQOjlOtoElrK8ED
         gwck/qMgFZVOa3/B/iOu00nwAbPka/vce8+9PrreweBF3399eoKe+M+G6PTl4+HTPrIdjF+1+hgP
         /MHe0a43kC9omkcy4imNMT55bvcsL5RJbA5GR3AkTFIUSpk57H0RTYgt2FiwPLRRwFPJUknsRhcV
         IiYmqIOxYFKwOhdv8aSFHwWkedyo5KRdYcR1KwVpuq32w+NKSHKesLOQ5uHZhMYFq6Skaarnchoz
@@ -23,12 +23,12 @@ interactions:
         1DO0v+/UCpwreCzLsKX6BWHXJgsgMHqhfhurvyE90/My5AbYPunFEfpHvwXnlfppUjamE7Amaa6v
         kAfTAiNC7kKonv4KnAvTykx/gUIbvfAwNXIZnUrZzLD+BZzcD/ryAgAA
     headers:
-      connection: [keep-alive]
-      content-encoding: [gzip]
-      content-type: [text/html;charset="utf-8"]
-      date: ['Sun, 05 Feb 2017 00:40:08 GMT']
-      server: [nginx]
-      x-powered-by: [PHP/5.6.22]
+      Connection: [keep-alive]
+      Content-Encoding: [gzip]
+      Content-Type: [text/html;charset="utf-8"]
+      Date: ['Sun, 30 Jul 2017 22:32:04 GMT']
+      Server: [nginx]
+      X-Powered-By: [PHP/5.6.22]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -43,50 +43,55 @@ interactions:
   response:
     body:
       string: !!binary |
-        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
+        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
+        kO/f5Z1P3iOTX0MWDfWr0H8ACwwgaSwaAAA=
     headers:
-      connection: [keep-alive]
-      content-encoding: [gzip]
-      content-type: [text/html]
-      date: ['Sun, 05 Feb 2017 00:40:08 GMT']
-      keep-alive: [timeout=10]
-      server: [nginx]
-      vary: [Accept-Encoding]
-      x-powered-by: [PHP/5.3.27]
+      Connection: [keep-alive]
+      Content-Encoding: [gzip]
+      Content-Type: [text/html]
+      Date: ['Sun, 30 Jul 2017 22:32:05 GMT']
+      Keep-Alive: [timeout=10]
+      Server: [nginx]
+      Vary: [Accept-Encoding]
+      X-Powered-By: [PHP/5.3.27]
     status: {code: 200, message: OK}
 version: 1