From e389065539a99759acbe56707447e468cc8115cb Mon Sep 17 00:00:00 2001 From: shuaikangzhou <863909694@qq.com> Date: Sun, 24 Dec 2023 22:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/DataBase/media_msg.py | 6 +- app/DataBase/output_pc.py | 15 +- app/analysis/analysis.py | 4 +- app/resources/ffmpeg.exe | Bin 36560896 -> 0 bytes app/resources/icons/file.png | Bin 568 -> 0 bytes app/resources/stopwords.txt | 2540 -------------------------- app/resources/template.html | 799 -------- app/resources/version_list.json | 394 ---- app/ui/tool/pc_decrypt/pc_decrypt.py | 4 +- app/util/emoji.py | 2 +- 10 files changed, 19 insertions(+), 3745 deletions(-) delete mode 100644 app/resources/ffmpeg.exe delete mode 100644 app/resources/icons/file.png delete mode 100644 app/resources/stopwords.txt delete mode 100644 app/resources/template.html delete mode 100644 app/resources/version_list.json diff --git a/app/DataBase/media_msg.py b/app/DataBase/media_msg.py index 1ed08f1..c34eeb4 100644 --- a/app/DataBase/media_msg.py +++ b/app/DataBase/media_msg.py @@ -16,7 +16,7 @@ def get_ffmpeg_path(): resource_dir = getattr(sys, '_MEIPASS', os.path.abspath(os.path.dirname(__file__))) # 构建 FFmpeg 可执行文件的路径 - ffmpeg_path = os.path.join(resource_dir, 'app', 'resources', 'ffmpeg.exe') + ffmpeg_path = os.path.join(resource_dir, 'app', 'resources','data', 'ffmpeg.exe') return ffmpeg_path @@ -92,11 +92,11 @@ class MediaMsg: else: # 源码运行的时候下面的有效 # 这里不知道怎么捕捉异常 - cmd = f'''{os.path.join(os.getcwd(), 'app', 'resources', 'ffmpeg.exe')} -loglevel quiet -y -f s16le -i {pcm_path} -ar 44100 -ac 1 {mp3_path}''' + cmd = f'''{os.path.join(os.getcwd(), 'app', 'resources', 'data','ffmpeg.exe')} -loglevel quiet -y -f s16le -i {pcm_path} -ar 44100 -ac 1 {mp3_path}''' system(cmd) except Exception as e: print(f"Error: {e}") - cmd = f'''{os.path.join(os.getcwd(), 'app', 'resources', 'ffmpeg.exe')} -loglevel quiet -y -f s16le -i {pcm_path} -ar 44100 -ac 1 {mp3_path}''' + cmd = f'''{os.path.join(os.getcwd(), 'app', 'resources', 'data', 'ffmpeg.exe')} -loglevel quiet -y -f s16le -i {pcm_path} -ar 44100 -ac 1 {mp3_path}''' system(cmd) system(f'del {silk_path}') system(f'del {pcm_path}') diff --git a/app/DataBase/output_pc.py b/app/DataBase/output_pc.py index 89bd7c2..311c838 100644 --- a/app/DataBase/output_pc.py +++ b/app/DataBase/output_pc.py @@ -31,6 +31,11 @@ def makedirs(path): os.makedirs(os.path.join(path, 'voice'), exist_ok=True) os.makedirs(os.path.join(path, 'file'), exist_ok=True) os.makedirs(os.path.join(path, 'avatar'), exist_ok=True) + file = './app/resources/data/file.png' + if not os.path.exists(file): + resource_dir = getattr(sys, '_MEIPASS', os.path.abspath(os.path.dirname(__file__))) + file = os.path.join(resource_dir, 'app', 'resources', 'data','file.png') + shutil.copy(file, path + '/file/file.png') def escape_js_and_html(input_str): @@ -383,7 +388,6 @@ class ChildThread(QThread): if self.output_type == Output.HTML: link = get_file(bytesExtra, thumb=True, output_path=origin_docx_path + '/file') file_name = '' - shutil.copy(f"{os.path.abspath('.')}/app/resources/icons/file.png", origin_docx_path + '/file/file.png') file_path = './file/file.png' if link != "": file_name = os.path.basename(link) @@ -544,16 +548,18 @@ class ChildThread(QThread): def to_html_(self): origin_docx_path = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}" makedirs(origin_docx_path) + if self.contact.is_chatroom: packagemsg = PackageMsg() messages = packagemsg.get_package_message_by_wxid(self.contact.wxid) else: messages = msg_db.get_messages(self.contact.wxid) filename = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}/{self.contact.remark}.html" - file_path = './app/resources/template.html' + file_path = './app/resources/data/template.html' if not os.path.exists(file_path): resource_dir = getattr(sys, '_MEIPASS', os.path.abspath(os.path.dirname(__file__))) - file_path = os.path.join(resource_dir, 'app', 'resources', 'template.html') + file_path = os.path.join(resource_dir, 'app', 'resources', 'data','template.html') + with open(file_path, "r", encoding="utf-8") as f: content = f.read() html_head, html_end = content.split('/*注意看这是分割线*/') @@ -688,7 +694,8 @@ class OutputEmoji(QThread): for message in messages: str_content = message[7] try: - emoji_path = get_emoji(str_content, thumb=True, output_path=origin_docx_path + '/emoji') + pass + # emoji_path = get_emoji(str_content, thumb=True, output_path=origin_docx_path + '/emoji') except: logger.error(traceback.format_exc()) finally: diff --git a/app/analysis/analysis.py b/app/analysis/analysis.py index 0ae2d21..a4d279b 100644 --- a/app/analysis/analysis.py +++ b/app/analysis/analysis.py @@ -96,10 +96,10 @@ def wordcloud_christmas(wxid, year='2023'): stopwords1 = set(stopword_file.read().splitlines()) # 构建 FFmpeg 可执行文件的路径 stopwords = set() - stopwords_file = './app/resources/stopwords.txt' + stopwords_file = './app/resources/data/stopwords.txt' if not os.path.exists(stopwords_file): resource_dir = getattr(sys, '_MEIPASS', os.path.abspath(os.path.dirname(__file__))) - stopwords_file = os.path.join(resource_dir, 'app', 'resources', 'stopwords.txt') + stopwords_file = os.path.join(resource_dir, 'app', 'resources', 'data','stopwords.txt') with open(stopwords_file, "r", encoding="utf-8") as stopword_file: stopwords = set(stopword_file.read().splitlines()) stopwords = stopwords.union(stopwords1) diff --git a/app/resources/ffmpeg.exe b/app/resources/ffmpeg.exe deleted file mode 100644 index e576a7ccc37687eb6d3183f3ec163eec5a12503e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36560896 zcmeFad3+Q_`aeFCbYOtdju
WcYs6&5HIblE5{Mc#+)+Vs7ZE?AM3_-r5fW!c
zX`8{gvL3taYD8UJ*!4mTsN^Ie9?0P;F@oUP;{bw32$%W2-&Nf+lS!iPcmMtI(sWPN
zQ%^ltJ@wR6)!kQJS7A%E*=!2_@941Es&M7MJn{GE|CFKn_`&Orx2^8;-jFJL(R)KC
z%)E83t8~unTjtz!yXy}(-EqfkkL&k0yXJWBaNT-`EB~7DuG?o%zj@ek$MtoasEZ41
zwjz6
zagrm2x$Be>@I7k4kWN|H$5EWri`vJG3Uz%MeL|=&J*>HZ0eq9l`841QKhu->oZc2S
zpBb1gjT0`#W0^hJ&&_q++0Wp?|Bd|&kvM*p{S-hnw4dLD53nQb=aJ|CpY7-QL*3fX
zi=y}!?B^788*e|oWLYQs`R+LZ*U5f%in7l3^R_JOWIt 7V>kw$0N%>)6TcBaRL(2
zd%l!$Jq9dh+vk`TjhSs9ds+nla7?PdFZjbNtcGL8mCjKFGGJEBgFifl_iQ9>2A{x$
zx9~0pCawzpiYxs2aHO&E7-k)JgoeYRq*Z oMvnP{Z{aUA7~gMHQd4yB_d!X}tf@TfABa`@=!l
z!QS$RQZ*hmw9H9Ix!-DsH9e$P?glKDIBGEHH<$RCD`kvYYhjEnAmpw{yOLa6n%M6^
zvIb4-+TTh~RX&JL3rvg|5Jd=fTpvn-^jY^)8H&fXddq0ODHMSW%~yScFoAfsHm(a7
z4JNt;Uw$nZsu3S2VVTln`6ILIG$0s6^GZW|AL_C$!j4XRi=tP|wyS<4l0Q`f2cjOm
zX6&Uv-D*01?etnghI8IWO#H|_wnXqfew!UP0XD(?wF)5Pux!TK7doEuom>fz`@`me
zPDXD^+JgMDP ssR$lqW1x95TdPu|hXGpDq9|B*g=6@1*L7N`bi4ZM
z(qkR$8H2FSAu1^&TUJhjhIRr7`!HH!oL>7vZ1xwT@xgL!LK6e;XobAa=$2i09f2!R
zB#-%^^p(g&CQsPMq^ro6RaCm6M)0dOd$A;aJ*W-pH(0gmdRQVytE*3}G$Wh-6@3YQ
zSFKHdGZ!8Q?57NpAtj*PC(nq}EtCw`*XjOb`La6wH_ml(@5ZP4=OOg*?-81;8VD}U
z*P)j2onjA9izGhHPy8z%DVyl`-hr+|+ d?K;D?mUUHaIpF`Z3}%kJGqzKl(%c-~p*r2=bg9Tb#=CA9fdiZNMo=PGS{
z1CEL1kzn~3@KyLwEJbJixlyakHp`)VA(bqvSF89eFmeWSUNS?cLjyV*(iWH9073|D&8fC6{b>
zIodJ&uQxhK6gF+okb=?%w>3gHeo*E647)D0a&5B+^dtE=+HB#mu}B?-P8Y*G-#v{p
zLJa?-2uv9lUrRNU%vrCz{S!$n0%1&DpdO7kMM2z
z?qcvCEVh>)24(~>htMm`N{BBRh_HV!!94*48r9=P5F;m$39A1JOzxE379s^Cn@td*
z3=F#v;fxi`e1(oM+KOSo6Bx;i=NXm4K(knatNFFsiA4X>L>bU*g8cL=V*;8J5zdTO
zv~9k6IC*RVfli1+Smk`Q!F)_D8krNIQ{2!8JVYHNqE+Y>Ku7&s5ZO2(cC&p(Sj
F?%owQ;_^lR_cX`aU8X2o
z@LHD<_ieT*s1>v=8f^uKT$Neu8K)Pdbl08gUj$f730pP@i7cu_nYTJt5wk7)uSfDh
z9E~dg_`i+D-~G!Rjho{}V}Yb)$pw~nXjJIV7NWk8?}?R5stN4q0?ebSJ=-r%HMMEm
z@n+tzQh}EsX-L@o*pv+q=;fR16fQ21^g*`yMYq_$!$MQ_e}z?nwmpkmfNA06h&-74
z%YWl2al9;X?9KT}4e%(bj;Dlx&$$`F8m
uKvtNz?f_3d5R5@tM`Q?13+U2TEji3FU&s
zcel@{SMnKHZJ@fPFZOWXej~K*Bsl1NowQDMQ)9`XBrmV4r`~-02yS*Y6?7j7UVghB
zRQ?4aY)ICkdJ}3zTanJ~d6VQsUlFvoBh+|i$1ZA|cru0B)ws4|3v4C-L>9s8yWdzb
z0y&8-emye0v7GThHUr|gc+NQvB;7hx`8|4gWb#
z6ss!aF^bH(&=miA2Qi6
z6X|2g19lB&4?gFGA;i+Er}*nF$OGpmHGSV-a-gQ$$LUWjIRJ$cD~kMGhzy*kgTh!{
zKm4-j#$}!Hb^f)Qavzv}Sav+go>4m&F@KX9J%`nd8z*S;{bR@g*T