From 1035956e5f6b451e7286a83bcad27d49276a31f9 Mon Sep 17 00:00:00 2001 From: shuaikangzhou <863909694@qq.com> Date: Tue, 16 Jan 2024 21:28:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20version=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/DataBase/merge.py | 5 ++++- app/config.py | 2 +- app/ui/mainview.py | 5 ++++- app/ui/menu/about_dialog.cp310-win_amd64.pyd | Bin 126976 -> 126976 bytes app/ui/menu/about_dialog.cp311-win_amd64.pyd | Bin 125952 -> 125952 bytes app/ui/menu/about_dialog.cp312-win_amd64.pyd | Bin 124416 -> 124416 bytes 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/DataBase/merge.py b/app/DataBase/merge.py index 38caa70..c8798a7 100644 --- a/app/DataBase/merge.py +++ b/app/DataBase/merge.py @@ -1,5 +1,8 @@ import os import sqlite3 +import traceback + +from app.log import logger def merge_MediaMSG_databases(source_paths, target_path): @@ -71,7 +74,7 @@ def merge_databases(source_paths, target_path): "VALUES(?,?,?,?,?,?,?,?,?,?,?,?)", result) except: - pass + logger.error(f'数据库合并错误:\n{traceback.format_exc()}') cursor.close() db.close() # 提交事务 diff --git a/app/config.py b/app/config.py index 930a064..06083d6 100644 --- a/app/config.py +++ b/app/config.py @@ -1,4 +1,4 @@ -version = '1.0.4' +version = '1.0.5' contact = '701805520' github = 'https://github.com/LC044/WeChatMsg' website = 'https://memotrace.lc044.love/' diff --git a/app/ui/mainview.py b/app/ui/mainview.py index cb8661d..29fd4d5 100644 --- a/app/ui/mainview.py +++ b/app/ui/mainview.py @@ -18,7 +18,6 @@ from PyQt5.QtWidgets import QMainWindow, QLabel, QListWidgetItem, QMessageBox from app.DataBase import misc_db, micro_msg_db, close_db from app.ui.Icon import Icon from . import mainwindow -from app.ui.menu.about_dialog import AboutDialog from .chat import ChatWindow from .contact import ContactWindow from .menu.export import ExportDialog @@ -28,6 +27,10 @@ from ..components.QCursorGif import QCursorGif from ..log import logger from ..person import Me +try: + from app.ui.menu.about_dialog import AboutDialog +except ModuleNotFoundError: + logger.error(f'Python版本错误:Python>=3.10,仅支持3.10、3.11、3.12') # 美化样式表 Stylesheet = """ QWidget{ diff --git a/app/ui/menu/about_dialog.cp310-win_amd64.pyd b/app/ui/menu/about_dialog.cp310-win_amd64.pyd index 1eb8fffab3e2120023ad5a75313edc39bb93b7f9..7b395e3401b876a27da26c7ee0221a34e04286c4 100644 GIT binary patch delta 1626 zcmXAqaZHqD9LMjAylR0>Cl=%J&0}Q|3UZY@hTo6uTa#oCeH z;<9VfPp385U~7dF4STVpT6XqF6393d=>Sj9lM7@gasw1WR?q#Oe|~r0=ll76f6wiG z-sjwrW$wtb_LW$2^uYJ#YIOdca(j|`yLV-@CM*_*cYCYDx2-~cb~$|7Q7Y(J|Man0 zHmuU9mPU~@cFypULoT`G(q6e#NVPrNFh=KkZo^A$7X@_cx@f@nb+5n)TH9;DLuI|i zXrRVkJGPsl-p#-!TGO{1E~@GidJfO=WG<1}zPjZ|j__<^rIk@jpFjrvE^8SL$?Bxp zzC1LV*}*E{Gdk37=vi@Yai?-XsS0RjrM*Je`vrz+p}z;i=7me^flj)8+0ge*a?{GC z+|;a^3Rr2IY1@E+l`3VuNFNOdJ${Snc0~si9aQuTof*hOvl$+!0luYOg9bjO&j2T?V3P6m0z=Cz-+iy3HjUaT;Gi>dLd%qJ^Caf zpU*Id1s~xsXY$Ej{b*aCbON|Ay@1jgw04yo=7+8 zV+Jy*TvjXj#*D|`8sZTZt9gVYd7iu;7b~sfDn-X~5vLX7b{sKFWYyEvmgW?{SMiw{ z$!={ewcIi=N<+7VJb$zDyOZ)KL`v!<+A)!vV!1*eOgxXP=9!7-U^^S)QT1zhaHk4t zWu=`TV6RN^3Guf++Q$lhD=88K_ zNJ;6Ywy7-nl3bWF@D=?xCGanagushrBn;%zep%n79};%_WZq0{fo|zhqqCA>b?qwJ z%}Sf2Ez?3?D6dTmJy#~c$?PU6>>NBy9aR2{NwJskVij%&cJcnBkK`rnkz;%#paSPK=%FDfoG_8 zUf9b2RGVF=Hk-UEydF0zt>rIP^~&p1UaRtA6r4Bo@&FSSD|hon-Q|6+9FqJMAp~Gxg%saiba6`d{jTZl}Co!?y z-`0T~q;9oXEXP7;5zzLys@}I8JNh&B`_ugxPfh-9`0xD&?^EdV*G18i2Dkr-Nrdq~ DkwRKk delta 1628 zcmXAqeQZ-z7{>dIUB;)GFm&N~WmBho1TqrvQp;qE=!#)7Gl`XefdnEm8b(5};!HZV zx&{^*FA12iWHUym+jQh29Wi1xL_S8d4$AD@y4A9=kCf3m24!r~)A#g`w|&m@d!P3- z_uPA3kqlQPqcsyVs!P8%7ozQQ+S*C-U)hpXpRic$o|hZ#HAN2jeaT*<)lhzW-g940 zu#qE;3TYHdW8+<3vdbl>T-qy_mQiJU5&G$T`)yQF^HqUGbm^)A_c6af13lq4@G-sN zFNTLs`E4jLL;m$ZJ}v4fLj{$02t9}AxU*--?3$`sNR4o>W2J4Th7N&w^sB6!sasYD zO?0flaWgki4jiJxorb<3#x1UN4k%Rt^{lklsJ~O-8a?c6$2IffwLGAeZeKU_-DBL8 zIg^{}RZ~7IZ4DI#1+r;}tQY9RpwI_Km~K_HPtgHI$LMr$1x}jb;C|p3ZRs*_kiO{J zhgax+7vU50@Ly|z-Sm4%z(QeJWAq>-^vXfbbj;=**wa`!S!unry1NN3Gu*uaI8J(x zp*x}s_~tNvRN)a;S_SRz5pYtCtjFp59%1dh#q`d(Ot&i9#Y&s%XRlg$ZOUs@p52`8 z`2hNGFC&(D+#XO!4lC^d)rJL5QcL(SvdG#e;G(U4He5Ap`*uM7_dES%SU@jD47^Jp zMdbDQo5KQ+aM;e&mG!veth8Iy5wYQ4bM8L{z$w}k74XrXsDVd|O@#OYy9^qKXBkZa3K+rrr`aG;HAs$t|hzGZ+ zphi~OxgdM3%JV5NpgcF_!~}NH`k1ihbuhQ|G0q4n&dy5P6=1Jac@gDRD9=qtQyFG+ z>=bZ>HjN3r`a0uE~|A$!@ABlv(i)17WJVpCt-A3OfZ1};vnJ9psyrM=gPK8yq zs%RH0ElvgFLOxL58W(z-;zEkMq`0KwKBHR6IjCjaz&aWnw_zjY-nAjq+;R7H$bI}Y zA+Vg9DH1rZ56P6tA<_C?(ox@5Sp=Tbx ziE^{@VKMZ}=NYV5U|dD{6gZnAQvyXaC2I*~PaC*FrPGCIHfyI>{OG;VgyC5k8!Y_s zHl4vTr0;Q-A2<>E8NL(sXYt<5)vNMXt+9CLcrluudU1H~{{qjm@Oi7EXqXG9_vtZ& F@jr*2T8;n! diff --git a/app/ui/menu/about_dialog.cp311-win_amd64.pyd b/app/ui/menu/about_dialog.cp311-win_amd64.pyd index bf7f6db73f71ee36578cd724d414d6433a33ee25..b998fda037bbc7735e88b71b308960263ebff169 100644 GIT binary patch delta 1583 zcmX9WC?wAzAY18ns1BXEgESTh)`UIfqcsB5GbMT@_8$L*^!Mx z>gjM`nVI-!IuJ)&{kd?`w|=2dbF4dYflRL~i$ipX`vqp&8tV584AOmxYbYrokVn=jwo1RNmGfWR@T88DDSp@CePzhN*N&1T8q`#>X2{%s(O zp1vjQ?SF7e&ZC^!r!tF~X$|V|E~SN)c1&r@sPvY=ZmO18Lru4KqRzD5mb;fj`C$WL zIwEn5+QY`m=hd!xr-F!poeo8W{r-9Or7Y)+pz=AHY4%@P%TZdN(u$RqPyT3zITEP`ipVo6 z^n%~mp7|I@C1}hFm}!UT!l*zZg(PmF8R@q8SnpHrROPlLMtij;+At$7K2y z8Xgz&#}GSV;2p}C5crYambjb_%E~OAk@y_lo^aq}bM-%RIs8;ODbPY6N_5ikNugJr z<6*%S(fG0!HEf!hww(gfmr9XI0|{ii>p(IUN(`GP?!FE=ar9pi6Jt{R)Czn=Pfi)w zNbgPwIrxLAa(rg~H??iBIKoX@(v{Bx?fjX+1&%|LfFn_Oh(T4S@>(eaW%imxq&f8p%6fDfJ wSS&}w4e)6@T)Pigj@JBuecogf;f2xv0&i>+O4cIiExUnJi&5oWJ%kYc2a#b$egFUf delta 1585 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 Dt8_*y delta 1586 zcmXAqaZHqD9LMjA_X;XDGEL;+Et**|nvnxv>2#tS(|K7P zbgd-?=S=*$6ZnaCwHo@eL2fCwazKs>@UYT8p+8y$#;LEh4ddpiwk1G-{OyLme~6pn zW^$89HKnrB-l3QL0xM{hthebsztF8WnXXl|PtgHI$I>Bx3hK;ye-ZF2z0qOd2io58 zDL$s24#Ej@S0EkOPsck2lBizRSPFKE7s~rNGjA5(fjx?qgOxVbPxG#vhR3YGvKlx? z(^n1M5oE$QoB1-uhgfN4w6ROz2o=bBj@(^BpBi8~e-6{NiY{iQB~pXrc9;WQpF@x7 zV$c%HU_gOMthDc_s9T_pO1lprjTZF?cqqNchOk-Gvjy^JcJ$_A87&SP_?kWl%16=3 zVS#5jEI;xP-L8kMw3$>Bv|*lkFSrW0K*@aqA&tDx3EWM$L(^k(&DHglmaV_hHR)dlW*FfzwBq=iNbd% zJbr$pSxY15EhB2GlYYOIAZP8`Ekn-i+(CgvN*+u>JZ&1ZVZuB#xEvY&4$diA5b1Q* zshkQ{TCk11TIKna7f{~GZ-)e&lsF_ZvYHut?Rk#qRhXTX=Df^aj`BjvD^%V|DvV^9 z2ZzdmYD&H%^omx-GZ%7HoW?4jmDWgG?+E16K3U7@M@idT*bgZ>RneCCNUvt0PRZHL z(K|#0iC zX1aXez!&sXUauwb;7fFy#~u_wj`-X$1GSVTYc=f~%SH(`jYS3>66` ziToG&CipCHyNX$9=j+)kQC?l-WN^DGlsA2W&OTbM7kGKmlEm$Nc(`3jth8BVop={+ zbMr(t^x@wa^eFJ5%JL~NnS7H1Td7~x0(vrOV3JZFXQJIKdi-{!xA7S6#ze2S@W)$K zfn-=ea_s!k$^`xW@S&Tbr^3x{{{Z4BUl D2;fKz