From 6af721b79f9c7e534377aeccd8a7b4155d1917b0 Mon Sep 17 00:00:00 2001 From: Yoshiko2 Date: Fri, 21 May 2021 22:03:28 +0800 Subject: [PATCH 1/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aed9a5e..6deee06 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-latest] + os: [windows-2016, macos-latest, ubuntu-18.04] steps: - uses: actions/checkout@v2 From 878479cfdb425e2f4cee0f42c72833df4aa99e6c Mon Sep 17 00:00:00 2001 From: Yoshiko2 Date: Sat, 22 May 2021 01:56:07 +0800 Subject: [PATCH 2/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6deee06..e23363b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [windows-2016, macos-latest, ubuntu-18.04] + os: [windows-2016, macos-latest, ubuntu-16.04] steps: - uses: actions/checkout@v2 From d83dc61dd9fe1345a8426a6dfe04d1dde92b3fb6 Mon Sep 17 00:00:00 2001 From: Yoshiko2 Date: Sat, 22 May 2021 02:03:50 +0800 Subject: [PATCH 3/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e23363b..22f4a2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [windows-2016, macos-latest, ubuntu-16.04] + os: [windows-2016, macos-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 From be9aafdc5bf1f309837034a828f0c5b93c79c129 Mon Sep 17 00:00:00 2001 From: Yoshiko2 Date: Sat, 22 May 2021 02:07:21 +0800 Subject: [PATCH 4/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 22f4a2a..aed9a5e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [windows-2016, macos-latest, ubuntu-latest] + os: [windows-latest, macos-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 From fa14dcc492861add8bca6c990bb6baf4ca8e4092 Mon Sep 17 00:00:00 2001 From: lededev Date: Sat, 22 May 2021 15:13:01 +0800 Subject: [PATCH 5/8] cookies expiration warrning --- WebCrawler/javdb.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/WebCrawler/javdb.py b/WebCrawler/javdb.py index 7a09538..7737169 100644 --- a/WebCrawler/javdb.py +++ b/WebCrawler/javdb.py @@ -215,8 +215,12 @@ def main(number): cookie_json = './' + javdb_site + '.json' javdb_cookies = None # 不加载过期的cookie，javdb登录界面显示为7天免登录，故假定cookie有效期为7天 - if file_modification_days(cookie_json) < 7: + cdays = file_modification_days(cookie_json) + if cdays < 7: javdb_cookies = load_cookies(cookie_json) + elif cdays != 9999: + print('[!]Cookies file ' + cookie_json + ' was updated ' + str(cdays) + + ' days ago, it will not be used for HTTP requests.') try: javdb_url = 'https://' + javdb_site + '.com/search?q=' + number + '&f=all' query_result = get_html(javdb_url, cookies=javdb_cookies) From c57fe530730db148a68b9c9b27264ac325eca89e Mon Sep 17 00:00:00 2001 From: Yoshiko2 Date: Sat, 22 May 2021 16:15:14 +0800 Subject: [PATCH 6/8] Update config.ini --- config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.ini b/config.ini index 84a1b4a..a73a786 100644 --- a/config.ini +++ b/config.ini @@ -7,7 +7,7 @@ failed_move=0 auto_exit=0 transalte_to_sc=0 multi_threading=1 -;actor_gender value: female(♂) or male(♀) or both(♂ ♀) or all(♂ ♀ ⚧) +;actor_gender value: female(♀) or male(♂) or both(♀ ♂) or all(♂ ♀ ⚧) actor_gender=female [proxy] From d82e5915852ce51c2b844b6bd971010cd328ae15 Mon Sep 17 00:00:00 2001 From: Yoshiko2 Date: Sat, 22 May 2021 16:50:56 +0800 Subject: [PATCH 7/8] Update Linux.sh --- wrapper/Linux.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/wrapper/Linux.sh b/wrapper/Linux.sh index 4bf8546..251ed05 100755 --- a/wrapper/Linux.sh +++ b/wrapper/Linux.sh @@ -1,14 +1,14 @@ if [ '$(dpkg --print-architecture)' != 'amd64' ] || [ '$(dpkg --print-architecture)' != 'i386' ]; then apt install python3 python3-pip git sudo libxml2-dev libxslt-dev build-essential wget nano libcmocka-dev libcmocka0 -y apt install zlib* libjpeg-dev -y - wget https://files.pythonhosted.org/packages/82/96/21ba3619647bac2b34b4996b2dbbea8e74a703767ce24192899d9153c058/pyinstaller-4.0.tar.gz - tar -zxvf pyinstaller-4.0.tar.gz - cd pyinstaller-4.0/bootloader - sed -i "s/ '-Werror',//" wscript - python3 ./waf distclean all - cd ../ - python3 setup.py install - cd ../ + #wget https://files.pythonhosted.org/packages/82/96/21ba3619647bac2b34b4996b2dbbea8e74a703767ce24192899d9153c058/pyinstaller-4.0.tar.gz + #tar -zxvf pyinstaller-4.0.tar.gz + #cd pyinstaller-4.0/bootloader + #sed -i "s/ '-Werror',//" wscript + #python3 ./waf distclean all + #cd ../ + #python3 setup.py install + #cd ../ fi pip3 install -r requirements.txt pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py --add-data "$(python3 -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1):cloudscraper" From d99aa9baa21c918867a8b1552e9b78bf786a1c54 Mon Sep 17 00:00:00 2001 From: Yoshiko2 Date: Sat, 22 May 2021 20:27:15 +0800 Subject: [PATCH 8/8] Update FreeBSD.sh --- wrapper/FreeBSD.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wrapper/FreeBSD.sh b/wrapper/FreeBSD.sh index 111f255..146221f 100755 --- a/wrapper/FreeBSD.sh +++ b/wrapper/FreeBSD.sh @@ -1,4 +1,4 @@ -pkg install python37 py37-requests py37-pip py37-lxml py37-pillow py37-cloudscraper py37-pysocks git zip py37-pyinstaller py37-beautifulsoup448 -pip install pyquery -pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py --add-data "$(python3.7 -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1):cloudscraper" +pkg install python38 py38-requests py38-pip py38-lxml py38-pillow py38-cloudscraper py38-pysocks git zip py38-beautifulsoup448 +pip install pyquery pyinstaller +pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py --add-data "$(python3.8 -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1):cloudscraper" cp config.ini ./dist