Feature/fix behondhd

medusa/providers/generic_provider.py

@@ -829,14 +829,25 @@ def add_cookies_from_ui(self):
             return {'result': False,
                     'message': 'Cookie is not correctly formatted: {0}'.format(self.cookies)}
 
-        if not all(req_cookie in [x.rsplit('=', 1)[0] for x in self.cookies.split(';')]
-                   for req_cookie in self.required_cookies):
-            return {
-                'result': False,
-                'message': "You haven't configured the requied cookies. Please login at {provider_url}, "
-                           'and make sure you have copied the following cookies: {required_cookies!r}'
-                           .format(provider_url=self.name, required_cookies=self.required_cookies)
-            }
+        if self.required_cookies:
+            if self.name != 'Beyond-HD':
+                if not all(req_cookie in [x.rsplit('=', 1)[0] for x in self.cookies.split(';')]
+                           for req_cookie in self.required_cookies):
+                    return {
+                        'result': False,
+                        'message': "You haven't configured the required cookies. Please login at {provider_url}, "
+                                   'and make sure you have copied the following cookies: {required_cookies!r}'
+                                   .format(provider_url=self.name, required_cookies=self.required_cookies)
+                    }
+
+            elif not any('remember_web_' in x.rsplit('=', 1)[0] for x in self.cookies.split(';')):
+                return {
+                    'result': False,
+                    'message': "You haven't configured the required cookies. Please login at {provider_url}, "
+                               'and make sure you have copied the following cookies: {required_cookies!r}'
+                               .format(provider_url=self.name, required_cookies=self.required_cookies)
+                }
+
 
         # cookie_validator got at least one cookie key/value pair, let's return success
         add_dict_to_cookiejar(self.session.cookies, dict(x.rsplit('=', 1) for x in self.cookies.split(';')))

medusa/providers/torrent/html/beyondhd.py

@@ -26,8 +26,9 @@ def __init__(self):
         """Initialize the class."""
         super(BeyondHDProvider, self).__init__('Beyond-HD')
 
-        self.username = None
-        self.password = None
+        self.enable_cookies = True
+        self.cookies = ''
+        self.required_cookies = ('remember_web_[**long_hash**]',)
 
         self.url = 'https://beyond-hd.me'
         self.urls = {
@@ -99,7 +100,7 @@ def parse(self, data, mode):
         items = []
 
         with BS4Parser(data, 'html5lib') as html:
-            torrent_table = html.find('table', class_='table-striped')
+            torrent_table = html.find('div', class_='table-torrents').find('table')
             torrent_rows = torrent_table('tr') if torrent_table else []
 
             # Continue only if one release is found
@@ -111,14 +112,17 @@ def parse(self, data, mode):
                 cells = result('td')
 
                 try:
-                    link = cells[1].find('div')
+                    if len(cells) < 2:
+                        continue
+
+                    link = cells[1].find('a')
                     download_url = urljoin(self.url, cells[2].find('a')['href'])
                     title = link.get_text(strip=True)
                     if not all([title, download_url]):
                         continue
 
-                    seeders = int(cells[5].find('span').get_text())
-                    leechers = int(cells[6].find('span').get_text())
+                    seeders = int(cells[6].find('span').get_text())
+                    leechers = int(cells[7].find('span').get_text())
 
                     # Filter unseeded torrent
                     if seeders < self.minseed:
@@ -128,10 +132,10 @@ def parse(self, data, mode):
                                       title, seeders)
                         continue
 
-                    torrent_size = cells[4].find('span').get_text()
+                    torrent_size = cells[5].find('span').get_text()
                     size = convert_size(torrent_size, units=units) or -1
 
-                    pubdate_raw = cells[3].find('span').get_text()
+                    pubdate_raw = cells[4].find('span').get_text()
                     pubdate = self.parse_pubdate(pubdate_raw, human_time=True)
 
                     item = {
@@ -154,33 +158,16 @@ def parse(self, data, mode):
 
     def login(self):
         """Login method used for logging in before doing search and torrent downloads."""
-        if any(dict_from_cookiejar(self.session.cookies).values()):
-            return True
-
-        if 'pass' in dict_from_cookiejar(self.session.cookies):
-            return True
+        return self.cookie_login('Login now')
 
-        login_html = self.session.get(self.urls['login'])
-        with BS4Parser(login_html.text, 'html5lib') as html:
-            token = html.find('input', attrs={'name': '_token'}).get('value')
-
-        login_params = {
-            '_token': token,
-            'username': self.username,
-            'password': self.password,
-            'remember': 'on',
-        }
-
-        response = self.session.post(self.urls['login'], data=login_params)
-        if not response or not response.text:
-            log.warning('Unable to connect to provider')
-            return False
-
-        if 'These credentials do not match our records.' in response.text:
-            log.warning('Invalid username or password. Check your settings')
-            return False
+    def check_required_cookies(self):
+        """
+        Check if we have the required cookies in the requests sessions object.
 
-        return True
+        Meaning that we've already successfully authenticated once, and we don't need to go through this again.
+        Note! This doesn't mean the cookies are correct!
+        """
+        return False
 
 
 provider = BeyondHDProvider()