bacow/AV_Data_Capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #519 from lededev/localpic

Browse Source 
improve processing speed by priority of using local watermark images
This commit is contained in:
Yoshiko2
2021-06-15 00:34:33 +08:00
committed by GitHub
parent a965b35fa0 fa49a14a0f
commit b13b85c057
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -16,7 +16,7 @@ make:
#export cloudscraper_path=$(python3 -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1) #export cloudscraper_path=$(python3 -c 'import cloudscraper as _; print(_.__path__[0])' | tail -n 1)
@echo "[+]Pyinstaller make" @echo "[+]Pyinstaller make"
pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py pyinstaller --onefile AV_Data_Capture.py --hidden-import ADC_function.py --hidden-import core.py --add-data "Img:Img"
@echo "[+]Move to bin" @echo "[+]Move to bin"
if [ ! -d "./bin" ];then mkdir bin; fi if [ ! -d "./bin" ];then mkdir bin; fi

22
core.py
View File

@@ -5,6 +5,7 @@ import re
import shutil import shutil
import platform import platform
import errno import errno
import sys
from PIL import Image from PIL import Image
from io import BytesIO from io import BytesIO
@@ -587,12 +588,27 @@ def add_mark_thread(pic_path, cn_sub, leak, uncensored, conf):
def add_to_pic(pic_path, img_pic, size, count, mode): def add_to_pic(pic_path, img_pic, size, count, mode):
mark_pic_path = '' mark_pic_path = ''
pngpath = ''
if mode == 1: if mode == 1:
mark_pic_path = BytesIO(get_html("https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/Img/SUB.png",return_type="content")) pngpath = "Img/SUB.png"
elif mode == 2: elif mode == 2:
mark_pic_path = BytesIO(get_html("https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/Img/LEAK.png",return_type="content")) pngpath = "Img/LEAK.png"
elif mode == 3: elif mode == 3:
mark_pic_path = BytesIO(get_html("https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/Img/UNCENSORED.png",return_type="content")) pngpath = "Img/UNCENSORED.png"
else:
print('[-]Error: watermark image param mode invalid!')
return
# 先找pyinstaller打包的图片
if hasattr(sys, '_MEIPASS') and os.path.isfile(os.path.join(getattr(sys, '_MEIPASS'), pngpath)):
mark_pic_path = os.path.join(getattr(sys, '_MEIPASS'), pngpath)
# 再找py脚本所在路径的图片
elif os.path.isfile(os.path.join(os.path.dirname(os.path.realpath(__file__)), pngpath)):
mark_pic_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), pngpath)
# 如果没有本地图片才通过网络下载
else:
mark_pic_path = BytesIO(
get_html("https://raw.githubusercontent.com/yoshiko2/AV_Data_Capture/master/" + pngpath,
return_type="content"))
img_subt = Image.open(mark_pic_path) img_subt = Image.open(mark_pic_path)
scroll_high = int(img_pic.height / size) scroll_high = int(img_pic.height / size)
scroll_wide = int(scroll_high * img_subt.width / img_subt.height) scroll_wide = int(scroll_high * img_subt.width / img_subt.height)

5
py_to_exe.ps1
View File

@@ -9,11 +9,12 @@ mkdir __pycache__
pyinstaller --onefile AV_Data_Capture.py ` pyinstaller --onefile AV_Data_Capture.py `
--hidden-import ADC_function.py ` --hidden-import ADC_function.py `
--hidden-import core.py ` --hidden-import core.py `
--add-data "$CLOUDSCRAPER_PATH;cloudscraper" --add-data "$CLOUDSCRAPER_PATH;cloudscraper" `
--add-data "Img;Img"
rmdir -Recurse -Force build rmdir -Recurse -Force build
rmdir -Recurse -Force __pycache__ rmdir -Recurse -Force __pycache__
rmdir -Recurse -Force AV_Data_Capture.spec rmdir -Recurse -Force AV_Data_Capture.spec
echo "[Make]Finish" echo "[Make]Finish"
pause pause

2
wrapper/FreeBSD.sh
View File

@@ -1,4 +1,4 @@
pkg install python38 py38-requests py38-pip py38-lxml py38-pillow py38-cloudscraper py38-pysocks git zip py38-beautifulsoup448 pkg install python38 py38-requests py38-pip py38-lxml py38-pillow py38-cloudscraper py38-pysocks git zip py38-beautifulsoup448
pip install pyquery pyinstaller 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" 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" --add-data "Img:Img"
cp config.ini ./dist cp config.ini ./dist

2
wrapper/Linux.sh
View File

@@ -11,5 +11,5 @@ if [ '$(dpkg --print-architecture)' != 'amd64' ] || [ '$(dpkg --print-architectu
#cd ../ #cd ../
fi fi
pip3 install -r requirements.txt 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" 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" --add-data "Img:Img"
cp config.ini ./dist cp config.ini ./dist