From f1247f88d746cde3c45dcbe4b2434056602ba876 Mon Sep 17 00:00:00 2001 From: yuraisme Date: Mon, 16 Dec 2024 10:15:07 +0300 Subject: [PATCH 1/3] except KeyboardInterrupt added --- .gitignore | 8 +++++- parser_cls.py | 4 +++ requirements.txt | 72 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 79 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ede80b8..70469f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ # created by virtualenv automatically -* +venv/* +result/* + +database.db +downloaded_files/* +__pycache__/* + diff --git a/parser_cls.py b/parser_cls.py index 2758500..1ab5c56 100644 --- a/parser_cls.py +++ b/parser_cls.py @@ -1,4 +1,5 @@ import random +import sys import threading import time import re @@ -367,3 +368,6 @@ def change_ip(self) -> bool: 'Если ошибка повторится несколько раз - перезапустите скрипт.' 'Если и это не поможет - значит что-то сломалось') time.sleep(30) + except KeyboardInterrupt: + logger.info('Выход по требованию пользователя') + sys.exit(0) diff --git a/requirements.txt b/requirements.txt index 79770d5..8d7670d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,71 @@ +attrs==24.2.0 beautifulsoup4==4.12.3 -loguru==0.7.0 +behave==1.2.6 +certifi==2024.12.14 +cffi==1.17.1 +chardet==5.2.0 +charset-normalizer==3.4.0 +click==8.1.7 +colorama==0.4.6 +cssselect==1.2.0 +et_xmlfile==2.0.0 +exceptiongroup==1.2.2 +execnet==2.1.1 +fasteners==0.19 +filelock==3.16.1 +h11==0.14.0 +idna==3.10 +iniconfig==2.0.0 +Jinja2==3.1.4 +jsonschema==4.23.0 +jsonschema-specifications==2024.10.1 +loguru==0.7.3 +markdown-it-py==3.0.0 +MarkupSafe==3.0.2 +mdurl==0.1.2 +mycdp==1.1.0 notifiers==1.3.3 -python-dotenv==1.0.1 +openpyxl==3.1.5 +outcome==1.3.0.post0 +packaging==24.2 +parameterized==0.9.0 +parse==1.20.2 +parse_type==0.6.4 +pdbp==1.6.1 +platformdirs==4.3.6 +pluggy==1.5.0 +pycparser==2.22 +Pygments==2.18.0 +pynose==1.5.3 +pyotp==2.9.0 +pyreadline3==3.5.4 +PySocks==1.7.1 +pytest==8.3.4 +pytest-html==4.0.2 +pytest-metadata==3.1.1 +pytest-ordering==0.6 +pytest-rerunfailures==15.0 +pytest-xdist==3.6.1 +PyYAML==6.0.2 +referencing==0.35.1 requests==2.32.3 -seleniumbase -openpyxl +rich==13.9.4 +rpds-py==0.22.3 +sbvirtualdisplay==1.3.1 +selenium==4.27.1 +seleniumbase==4.33.11 +setuptools==75.6.0 +six==1.17.0 +sniffio==1.3.1 +sortedcontainers==2.4.0 +soupsieve==2.6 +tabcompleter==1.4.0 +trio==0.27.0 +trio-websocket==0.11.1 +typing_extensions==4.12.2 +urllib3==2.2.3 +websocket-client==1.8.0 +websockets==14.1 +wheel==0.45.1 +win32_setctime==1.2.0 +wsproto==1.2.0 From a4f1fc425070ecbdca77c1f913455d196e2e17ee Mon Sep 17 00:00:00 2001 From: yuraisme Date: Mon, 16 Dec 2024 10:19:46 +0300 Subject: [PATCH 2/3] requirements.txt changed --- requirements.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8d7670d..f3665fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +anyio==4.7.0 attrs==24.2.0 beautifulsoup4==4.12.3 behave==1.2.6 @@ -13,7 +14,11 @@ exceptiongroup==1.2.2 execnet==2.1.1 fasteners==0.19 filelock==3.16.1 +flet==0.25.2 +flet-desktop==0.25.2 h11==0.14.0 +httpcore==1.0.7 +httpx==0.28.1 idna==3.10 iniconfig==2.0.0 Jinja2==3.1.4 @@ -25,6 +30,7 @@ MarkupSafe==3.0.2 mdurl==0.1.2 mycdp==1.1.0 notifiers==1.3.3 +oauthlib==3.2.2 openpyxl==3.1.5 outcome==1.3.0.post0 packaging==24.2 @@ -48,6 +54,7 @@ pytest-rerunfailures==15.0 pytest-xdist==3.6.1 PyYAML==6.0.2 referencing==0.35.1 +repath==0.9.0 requests==2.32.3 rich==13.9.4 rpds-py==0.22.3 @@ -68,4 +75,4 @@ websocket-client==1.8.0 websockets==14.1 wheel==0.45.1 win32_setctime==1.2.0 -wsproto==1.2.0 +wsproto==1.2.0 \ No newline at end of file From 6c227f8acff92e04ce563955af424c110b984d47 Mon Sep 17 00:00:00 2001 From: yuraisme Date: Mon, 16 Dec 2024 10:27:00 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=20=D0=BF=D0=BE=20Ctrl+C=20?= =?UTF-8?q?=D0=B2=20=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parser_cls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser_cls.py b/parser_cls.py index 1ab5c56..aa01809 100644 --- a/parser_cls.py +++ b/parser_cls.py @@ -370,4 +370,4 @@ def change_ip(self) -> bool: time.sleep(30) except KeyboardInterrupt: logger.info('Выход по требованию пользователя') - sys.exit(0) + sys.exit(0)