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

Merge pull request #538 from lededev/py3.8-ae

Browse Source 
simplified using assignment expressions, new feature in python 3.8
This commit is contained in:
Yoshiko2
2021-07-14 16:02:14 +08:00
committed by GitHub
parent 71d0adecf0 34b0d37748
commit 8c5d85298e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core.py
View File

@@ -599,11 +599,11 @@ def add_to_pic(pic_path, img_pic, size, count, mode):
print('[-]Error: watermark image param mode invalid!') print('[-]Error: watermark image param mode invalid!')
return return
# 先找pyinstaller打包的图片 # 先找pyinstaller打包的图片
if hasattr(sys, '_MEIPASS') and os.path.isfile(os.path.join(getattr(sys, '_MEIPASS'), pngpath)): if hasattr(sys, '_MEIPASS') and os.path.isfile(_p := os.path.join(getattr(sys, '_MEIPASS'), pngpath)):
mark_pic_path = os.path.join(getattr(sys, '_MEIPASS'), pngpath) mark_pic_path = _p
# 再找py脚本所在路径的图片 # 再找py脚本所在路径的图片
elif os.path.isfile(os.path.join(os.path.dirname(os.path.realpath(__file__)), pngpath)): elif os.path.isfile(_p := 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) mark_pic_path = _p
# 如果没有本地图片才通过网络下载 # 如果没有本地图片才通过网络下载
else: else:
mark_pic_path = BytesIO( mark_pic_path = BytesIO(