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) 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] 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 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"