pars-hitmotop 1.0.3__tar.gz → 1.0.4__tar.gz

{pars_hitmotop-1.0.3 → pars_hitmotop-1.0.4}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: pars_hitmotop
-Version: 1.0.3
+Version: 1.0.4
 Home-page: https://github.com/JoyHubN/pars_hitmos
-Download-URL: https://github.com/JoyHubN/pars_hitmos/arhive/v1.0.3.zip
+Download-URL: https://github.com/JoyHubN/pars_hitmos/arhive/v1.0.4.zip
 Author: JoyHubN
 Author-email: Prufu@yandex.ru
 Classifier: Programming Language :: Python

{pars_hitmotop-1.0.3 → pars_hitmotop-1.0.4}/pars_hitmotop.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: pars_hitmotop
-Version: 1.0.3
+Version: 1.0.4
 Home-page: https://github.com/JoyHubN/pars_hitmos
-Download-URL: https://github.com/JoyHubN/pars_hitmos/arhive/v1.0.3.zip
+Download-URL: https://github.com/JoyHubN/pars_hitmos/arhive/v1.0.4.zip
 Author: JoyHubN
 Author-email: Prufu@yandex.ru
 Classifier: Programming Language :: Python

{pars_hitmotop-1.0.3 → pars_hitmotop-1.0.4}/pars_hitmotop.egg-info/SOURCES.txt

@@ -11,4 +11,11 @@ parse_hitmos/entered_tracks.py
 parse_hitmos/excepts.py
 parse_hitmos/how_to_use.py
 parse_hitmos/rating_tracks_count.py
-parse_hitmos/rating_tracks_page.py
+parse_hitmos/rating_tracks_page.py
+parse_hitmos/config/__init__.py
+parse_hitmos/config/load_data.py
+parse_hitmos/tools/__init__.py
+parse_hitmos/tools/base_session.py
+parse_hitmos/tools/headers.py
+parse_hitmos/tools/replace_symbol.py
+parse_hitmos/tools/retry_func.py

pars_hitmotop-1.0.4/pars_hitmotop.egg-info/top_level.txt

@@ -0,0 +1,3 @@
+parse_hitmos
+parse_hitmos/config
+parse_hitmos/tools

pars_hitmotop-1.0.4/parse_hitmos/config/load_data.py

@@ -0,0 +1,37 @@
+import json
+import os.path
+
+class SID:
+    def __init__(self):
+        self.sid = None
+        self.path = os.path.join(os.path.dirname(__file__), 'data.json')
+        print(self.path)
+        self.__load_sid()
+
+    def __load_sid(self):
+        if not self.sid:
+            if not os.path.exists(self.path):  
+                with open(self.path, encoding='utf-8', mode='w') as data:
+                    json.dump({'sid': ''}, data, indent=4)
+
+            with open(self.path, 'r', encoding='utf-8') as f:
+                self.sid = json.load(f)['sid']
+    
+    def get_sid(self):
+        return self.sid
+    
+    def __load_config(self):
+        with open(self.path, 'r', encoding='utf-8') as f:
+            return json.load(f)
+
+    def write_sid(self, sid):
+        data = self.__update_sid(sid)
+        with open(self.path, 'w', encoding='utf-8') as f:
+            json.dump(data, f, indent=4)
+
+    def __update_sid(self, sid):
+        data = self.__load_config()
+        self.sid = sid['sid']
+        data['sid']=sid['sid']
+        return json.loads(json.dumps(data, indent=4))
+    

{pars_hitmotop-1.0.3 → pars_hitmotop-1.0.4}/parse_hitmos/rating_tracks_count.py

@@ -75,6 +75,7 @@ class RatingCount(BaseSessionHandlerRating):
             self.session.close()
             self.data = {"items": _items}
             return self.data
+        
     @property
     def get_author(self) -> list[str]:
         return [item['author'] for item in self.data['items']]    

pars_hitmotop-1.0.4/parse_hitmos/tools/base_session.py

@@ -0,0 +1,111 @@
+import requests
+from urllib.parse import urljoin
+from requests.exceptions import ReadTimeout
+
+from parse_hitmos.excepts import MaxAttempts
+from parse_hitmos.config.load_data import SID
+from parse_hitmos.tools.headers import get_headers
+from parse_hitmos.tools.retry_func import safe_get_main_url
+
+class BaseSessionHandlerRating:
+    def __init__(self):
+        self.__attempt = 0
+        self.max_attempt = 10
+        self.session = None
+        self.sid = SID()
+        self.base_url = ''
+        self.song_rated = ''
+        self.create_session()
+
+    def create_session(self):
+        
+        __headers = get_headers()
+        cookies = {'sid': self.sid.get_sid()}        
+        
+        self.session = requests.Session()
+        response = safe_get_main_url(self, 'https://hitmos.me', headers=__headers, cookies=cookies, timeout=5)
+        
+        if response.status_code == 403:
+            response = self.session.get('https://hitmos.me/', cookies={'sid':self.sid.get_sid()}, headers=__headers, allow_redirects=True)
+            self.sid.write_sid(self.session.cookies.get_dict())
+
+        self.base_url = response.url
+        self.song_rated = urljoin(response.url, 'songs/top-rated')
+
+
+
+class BaseSessionHandlerRatingPage:
+    def __init__(self):
+        self.__attempt = 0
+        self.max_attempt = 10
+        self.session = None
+        self.sid = SID()
+        self.base_url = ''
+        self.song_rated = ''
+        self.create_session()
+
+    def create_session(self):
+        
+        __headers = get_headers()
+        cookies = {'sid': self.sid.get_sid()}        
+    
+        self.session = requests.Session()
+        response = safe_get_main_url(self, 'https://hitmos.me', headers=__headers, cookies=cookies, timeout=5)
+
+        
+        self.base_url = response.url
+        self.song_rated_more1 = urljoin(response.url, 'songs/top-rated/start/')
+        self.song_rated = urljoin(response.url, 'songs/top-rated')
+
+
+class BaseSessionHandlerInputTracks:
+    def __init__(self):
+        self.__attempt = 0
+        self.max_attempt = 10
+        self.base_url = None
+        self.search_url = None
+        self.session = None
+        self.sid = SID()
+        self.create_session()
+
+    def create_session(self):
+        __headers = get_headers()
+        cookies = {'sid': self.sid.get_sid()}        
+    
+        while self.__attempt < self.max_attempt:
+            try:
+                self.session = requests.Session()
+                if len(cookies['sid']) == 0:
+                    response = self.session.get('https://hitmos.me/', headers=__headers, allow_redirects=True, timeout=(5, 15))    
+                else:
+                    self.session.cookies.update(cookies)
+                    response = self.session.get('https://hitmos.me/', headers=__headers, allow_redirects=True, timeout=(5, 15))
+                
+                if response.status_code == 200:
+                    response = self.session.get(response.url, headers=__headers)
+                    if len(self.session.cookies.get_dict()) == 0:
+                        continue
+                    else:
+                        self.sid.write_sid(self.session.cookies.get_dict())
+                        break
+                else:
+                    response = self.session.get('https://hitmos.me/', headers=__headers, allow_redirects=True, timeout=5)
+                    if response.status_code == 200:
+                        self.sid.write_sid(self.session.cookies.get_dict())
+                        break
+            except ReadTimeout as err:
+                self.__attempt +=1
+                cookies = {}
+                print(err)
+                self.session.cookies.clear()
+                cookies = {}
+                self.session.close()
+            else:
+                self.__attempt = 0
+                print('Произошла непредвиденная ситуация', __file__)
+                
+        else:
+            raise MaxAttempts(self.max_attempt)
+        
+        self.base_url = response.url
+        self.search_url = urljoin(self.base_url, 'search?q=')

pars_hitmotop-1.0.4/parse_hitmos/tools/headers.py

@@ -0,0 +1,23 @@
+import fake_useragent
+
+
+def get_headers():
+    user = fake_useragent.UserAgent().random
+    
+    headers = {
+        'User-Agent': user,
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        'Accept-Language': 'ru-RU,ru;q=0.8,en-US;q=0.5,en;q=0.3',
+        # 'DNT': '1',
+        # 'Sec-GPC': '1',
+        # 'Connection': 'keep-alive',
+        # 'Upgrade-Insecure-Requests': '1',
+        # 'Sec-Fetch-Dest': 'document',
+        # 'Sec-Fetch-Mode': 'navigate',
+        # 'Sec-Fetch-Site': 'none',
+        # 'Sec-Fetch-User': '?1',
+        # 'Priority': 'u=0, i',
+        # 'Pragma': 'no-cache',
+        # 'Cache-Control': 'no-cache',
+    }
+    return headers

pars_hitmotop-1.0.4/parse_hitmos/tools/replace_symbol.py

@@ -0,0 +1,11 @@
+def replace_symbol_in_title(title):
+    return (title.replace('/','')
+            .replace(':','')
+            .replace('*','')
+            .replace('?','')
+            .replace('"','')
+            .replace('<','')
+            .replace('>','')
+            .replace('|','')
+            .replace('\\','')
+            )

pars_hitmotop-1.0.4/parse_hitmos/tools/retry_func.py

@@ -0,0 +1,56 @@
+from requests.models import Response
+from tenacity import retry, stop_after_attempt, wait_fixed, retry_if_exception_type
+from requests.exceptions import ChunkedEncodingError, ConnectionError, ReadTimeout
+
+@retry(
+        stop=stop_after_attempt(5), 
+        wait=wait_fixed(2), 
+        retry=retry_if_exception_type((ChunkedEncodingError, ConnectionError)))
+def safe_get(self, url, headers, cookies=None, allow_redirects=False, timeout=15) -> Response:
+    try:
+        response = self.session.get(url, headers=headers, cookies=cookies, allow_redirects=allow_redirects, timeout=timeout, stream=True)
+    except ReadTimeout as err:
+        print(err)
+        self.create_session()
+        response = self.session.get(url, headers=headers, cookies=cookies, allow_redirects=allow_redirects, timeout=timeout, stream=True)
+        self.sid.write_sid(response.cookies.get_dict()['sid'])
+    return response
+
+
+@retry(
+        stop=stop_after_attempt(5), 
+        wait=wait_fixed(2), 
+        retry=retry_if_exception_type((ChunkedEncodingError, ConnectionError)))
+def safe_head(self, url, headers, cookies=None, allow_redirects=False, timeout=15) -> Response:
+    try:
+        response = self.session.head(url, headers=headers, cookies=cookies, allow_redirects=allow_redirects, timeout=timeout, stream=True)
+    except ReadTimeout as err:
+        print(err)
+        self.create_session()
+        response = self.session.head(url, headers=headers, cookies=cookies, allow_redirects=allow_redirects, timeout=timeout, stream=True)
+        self.sid.write_sid(response.cookies.get_dict()['sid'])
+    return response
+
+@retry(
+        stop=stop_after_attempt(10), 
+        wait=wait_fixed(2), 
+        retry=retry_if_exception_type((ReadTimeout)))
+def safe_get_main_url(self, url, headers, cookies=None, allow_redirects=False, timeout=15) -> Response:
+    if len(cookies['sid']) != 0:
+        response = self.session.get(url, headers=headers, cookies=cookies, allow_redirects=True, timeout=timeout)
+        if response.status_code == 200:
+            self.session.cookies.update(cookies)
+            self.sid.write_sid(self.session.cookies.get_dict())
+            return response
+        else:
+            self.session.close()
+    else:
+        response = self.session.get(url, headers=headers, allow_redirects=True, timeout=timeout)
+        if response.status_code == 200:
+            self.session.cookies.update(response.cookies.get_dict())
+            self.sid.write_sid(self.session.cookies.get_dict())
+            return response
+
+            
+                
+

{pars_hitmotop-1.0.3 → pars_hitmotop-1.0.4}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-version='1.0.3'
+version='1.0.4'
 
 with open('README.md', encoding='utf-8') as f:
     long_description=f.read()
@@ -21,7 +21,7 @@ setup(
                       'tenacity==9.1.2',
                       ],
     # license=...,
-    packages = ['parse_hitmos'],
+    packages = ['parse_hitmos', 'parse_hitmos/config', 'parse_hitmos/tools'],
     classifiers = [
         'Programming Language :: Python',
         'Programming Language :: Python :: 3.8',

pars_hitmotop-1.0.3/pars_hitmotop.egg-info/top_level.txt

@@ -1 +0,0 @@
-parse_hitmos