From 93c3a77a57ad9645ec2d6418ee41a66a24b57d4e Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:22:31 +0800
Subject: [PATCH 01/10] add counter
---
nhentai/parser.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/nhentai/parser.py b/nhentai/parser.py
index 1d8d7a6..6bf007a 100644
--- a/nhentai/parser.py
+++ b/nhentai/parser.py
@@ -103,7 +103,7 @@ def favorites_parser(page=None):
return result
-def doujinshi_parser(id_):
+def doujinshi_parser(id_, counter=0):
if not isinstance(id_, (int,)) and (isinstance(id_, (str,)) and not id_.isdigit()):
raise Exception(f'Doujinshi id({id_}) is not valid')
@@ -112,7 +112,6 @@ def doujinshi_parser(id_):
doujinshi = dict()
doujinshi['id'] = id_
url = f'{constant.DETAIL_URL}/{id_}/'
- counter = 0
try:
response = request('get', url)
@@ -126,11 +125,11 @@ def doujinshi_parser(id_):
if counter == 10:
logger.critical(f'Failed to fetch doujinshi information of id {id_}')
- sys.exit(1)
+ return None
logger.debug(f'Slow down and retry ({id_}) ...')
time.sleep(1)
- return doujinshi_parser(str(id_))
+ return doujinshi_parser(str(id_), counter)
except Exception as e:
logger.warning(f'Error: {e}, ignored')
From 0f54762229def29d32465851f8f7bdb9328e5d48 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:25:34 +0800
Subject: [PATCH 02/10] print cookie
---
tests/test_login.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/test_login.py b/tests/test_login.py
index 2303417..a07ba5e 100644
--- a/tests/test_login.py
+++ b/tests/test_login.py
@@ -13,6 +13,7 @@ class TestLogin(unittest.TestCase):
load_config()
constant.CONFIG['cookie'] = os.getenv('NHENTAI_COOKIE')
constant.CONFIG['useragent'] = os.getenv('NHENTAI_UA')
+ print(constant.CONFIG)
def test_cookie(self):
try:
From 0aa8e1d358f116f5f3d15572d00087ea49e6ccf8 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:27:42 +0800
Subject: [PATCH 03/10] update tests
---
tests/test_login.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/test_login.py b/tests/test_login.py
index a07ba5e..924a8bc 100644
--- a/tests/test_login.py
+++ b/tests/test_login.py
@@ -13,7 +13,9 @@ class TestLogin(unittest.TestCase):
load_config()
constant.CONFIG['cookie'] = os.getenv('NHENTAI_COOKIE')
constant.CONFIG['useragent'] = os.getenv('NHENTAI_UA')
- print(constant.CONFIG)
+
+ def test_cookie_set(self):
+ self.assertTrue(bool(constant.CONFIG['cookie']))
def test_cookie(self):
try:
From 66d0d91eae99b82efc9c037856f520296995a2d5 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:40:11 +0800
Subject: [PATCH 04/10] fix env
---
.github/workflows/python-app.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index 9af2ca1..acf8e6f 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -16,10 +16,13 @@ jobs:
build:
runs-on: ubuntu-latest
-
- environment: nhentai_test
-
+
steps:
+ - name: Set env
+ run: |
+ echo "NHENTAI_COOKIE='csrftoken=zV4qotZJrHKTeEc9uEg5uvXV5qwTcZIHRjF3TgbkvP6OoxZNj8I6RFQeGSSiZT04; sessionid=t2x0ke3u5i1azg2kvepe7w0ej89btc7t; cf_chl_2=eff13178a8d7814; cf_clearance=Gti8UaeKBbXj2A7V0XFSGydeWbLj2VnqP83FnGx_wIU-1675675191-0-160'" >> $GITHUB_ENV
+ echo "NHENTAI_UA='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36'" >> $GITHUB_ENV
+
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v3
From c66fa5f81611081df372edf14d7be71d0f3c2976 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:43:00 +0800
Subject: [PATCH 05/10] rename
---
.github/workflows/{python-app.yml => test.yml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename .github/workflows/{python-app.yml => test.yml} (100%)
diff --git a/.github/workflows/python-app.yml b/.github/workflows/test.yml
similarity index 100%
rename from .github/workflows/python-app.yml
rename to .github/workflows/test.yml
From 3de4159a398d5f5154661cb2d6024a9e9423ce49 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:44:28 +0800
Subject: [PATCH 06/10] update tests
---
tests/test_login.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test_login.py b/tests/test_login.py
index 924a8bc..a0bf48e 100644
--- a/tests/test_login.py
+++ b/tests/test_login.py
@@ -15,7 +15,7 @@ class TestLogin(unittest.TestCase):
constant.CONFIG['useragent'] = os.getenv('NHENTAI_UA')
def test_cookie_set(self):
- self.assertTrue(bool(constant.CONFIG['cookie']))
+ self.assertTrue(constant.CONFIG['useragent'].startswith('Mozilla'))
def test_cookie(self):
try:
From 6c5b83d5bea8d72aded9a2f82cb0c5113781ce16 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:46:03 +0800
Subject: [PATCH 07/10] update tests
---
.github/workflows/test.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index acf8e6f..4c2e9f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,8 +20,8 @@ jobs:
steps:
- name: Set env
run: |
- echo "NHENTAI_COOKIE='csrftoken=zV4qotZJrHKTeEc9uEg5uvXV5qwTcZIHRjF3TgbkvP6OoxZNj8I6RFQeGSSiZT04; sessionid=t2x0ke3u5i1azg2kvepe7w0ej89btc7t; cf_chl_2=eff13178a8d7814; cf_clearance=Gti8UaeKBbXj2A7V0XFSGydeWbLj2VnqP83FnGx_wIU-1675675191-0-160'" >> $GITHUB_ENV
- echo "NHENTAI_UA='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36'" >> $GITHUB_ENV
+ echo "NHENTAI_COOKIE=csrftoken=zV4qotZJrHKTeEc9uEg5uvXV5qwTcZIHRjF3TgbkvP6OoxZNj8I6RFQeGSSiZT04; sessionid=t2x0ke3u5i1azg2kvepe7w0ej89btc7t; cf_chl_2=eff13178a8d7814; cf_clearance=Gti8UaeKBbXj2A7V0XFSGydeWbLj2VnqP83FnGx_wIU-1675675191-0-160" >> $GITHUB_ENV
+ echo "NHENTAI_UA=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36" >> $GITHUB_ENV
- uses: actions/checkout@v3
- name: Set up Python 3.10
From 5a08981e89b50ff24ff5cd9902c491799cce7a17 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:47:23 +0800
Subject: [PATCH 08/10] update
---
.github/workflows/test.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4c2e9f3..62939e8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,8 +20,8 @@ jobs:
steps:
- name: Set env
run: |
- echo "NHENTAI_COOKIE=csrftoken=zV4qotZJrHKTeEc9uEg5uvXV5qwTcZIHRjF3TgbkvP6OoxZNj8I6RFQeGSSiZT04; sessionid=t2x0ke3u5i1azg2kvepe7w0ej89btc7t; cf_chl_2=eff13178a8d7814; cf_clearance=Gti8UaeKBbXj2A7V0XFSGydeWbLj2VnqP83FnGx_wIU-1675675191-0-160" >> $GITHUB_ENV
- echo "NHENTAI_UA=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36" >> $GITHUB_ENV
+ echo 'NHENTAI_COOKIE="csrftoken=zV4qotZJrHKTeEc9uEg5uvXV5qwTcZIHRjF3TgbkvP6OoxZNj8I6RFQeGSSiZT04; sessionid=t2x0ke3u5i1azg2kvepe7w0ej89btc7t; cf_chl_2=eff13178a8d7814; cf_clearance=Gti8UaeKBbXj2A7V0XFSGydeWbLj2VnqP83FnGx_wIU-1675675191-0-160"' >> $GITHUB_ENV
+ echo 'NHENTAI_UA="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36"' >> $GITHUB_ENV
- uses: actions/checkout@v3
- name: Set up Python 3.10
From cbff6496c357ef56e1942cad64ba5aca96f303c3 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:49:42 +0800
Subject: [PATCH 09/10] update
---
.github/workflows/test.yml | 4 ++--
tests/test_login.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 62939e8..4c2e9f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,8 +20,8 @@ jobs:
steps:
- name: Set env
run: |
- echo 'NHENTAI_COOKIE="csrftoken=zV4qotZJrHKTeEc9uEg5uvXV5qwTcZIHRjF3TgbkvP6OoxZNj8I6RFQeGSSiZT04; sessionid=t2x0ke3u5i1azg2kvepe7w0ej89btc7t; cf_chl_2=eff13178a8d7814; cf_clearance=Gti8UaeKBbXj2A7V0XFSGydeWbLj2VnqP83FnGx_wIU-1675675191-0-160"' >> $GITHUB_ENV
- echo 'NHENTAI_UA="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36"' >> $GITHUB_ENV
+ echo "NHENTAI_COOKIE=csrftoken=zV4qotZJrHKTeEc9uEg5uvXV5qwTcZIHRjF3TgbkvP6OoxZNj8I6RFQeGSSiZT04; sessionid=t2x0ke3u5i1azg2kvepe7w0ej89btc7t; cf_chl_2=eff13178a8d7814; cf_clearance=Gti8UaeKBbXj2A7V0XFSGydeWbLj2VnqP83FnGx_wIU-1675675191-0-160" >> $GITHUB_ENV
+ echo "NHENTAI_UA=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36" >> $GITHUB_ENV
- uses: actions/checkout@v3
- name: Set up Python 3.10
diff --git a/tests/test_login.py b/tests/test_login.py
index a0bf48e..c60befc 100644
--- a/tests/test_login.py
+++ b/tests/test_login.py
@@ -15,7 +15,7 @@ class TestLogin(unittest.TestCase):
constant.CONFIG['useragent'] = os.getenv('NHENTAI_UA')
def test_cookie_set(self):
- self.assertTrue(constant.CONFIG['useragent'].startswith('Mozilla'))
+ raise Exception(constant.CONFIG['useragent'])
def test_cookie(self):
try:
From 8972026456cbe895cefe9278bf67f7e56b366b95 Mon Sep 17 00:00:00 2001
From: Ricter Z <ricterzheng@gmail.com>
Date: Mon, 6 Feb 2023 17:50:51 +0800
Subject: [PATCH 10/10] update tests
---
tests/test_login.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tests/test_login.py b/tests/test_login.py
index c60befc..2303417 100644
--- a/tests/test_login.py
+++ b/tests/test_login.py
@@ -14,9 +14,6 @@ class TestLogin(unittest.TestCase):
constant.CONFIG['cookie'] = os.getenv('NHENTAI_COOKIE')
constant.CONFIG['useragent'] = os.getenv('NHENTAI_UA')
- def test_cookie_set(self):
- raise Exception(constant.CONFIG['useragent'])
-
def test_cookie(self):
try:
check_cookie()