From 1e6130fcd3ed09a08e8e6abe9373a3a107fda375 Mon Sep 17 00:00:00 2001 From: EillesWan Date: Sun, 21 Nov 2021 19:08:04 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Musicreater.py | 27 ++++++++++-------- msctspt/__pycache__/transfer.cpython-38.pyc | Bin 8803 -> 9887 bytes msctspt/bugReporter.py | 2 +- .../CanyonTest/db/{000062.log => 000075.log} | 0 测试用/CanyonTest/db/CURRENT | 2 +- 测试用/CanyonTest/db/MANIFEST-000060 | Bin 266 -> 0 bytes 测试用/CanyonTest/db/MANIFEST-000073 | Bin 0 -> 135 bytes 测试用/test.RyStruct | 0 8 files changed, 17 insertions(+), 14 deletions(-) rename 测试用/CanyonTest/db/{000062.log => 000075.log} (100%) delete mode 100644 测试用/CanyonTest/db/MANIFEST-000060 create mode 100644 测试用/CanyonTest/db/MANIFEST-000073 create mode 100644 测试用/test.RyStruct diff --git a/Musicreater.py b/Musicreater.py index 731d91f..35d8695 100644 --- a/Musicreater.py +++ b/Musicreater.py @@ -226,6 +226,18 @@ def __main__(): if result: SaveProject() log("程序正常退出") + + try: + global dataset + del dataset + except: + pass; + + global root + root.destroy() + del root + + if clearLog : print("清除log（此句不载入日志）") try: @@ -242,16 +254,6 @@ def __main__(): pass; - - try: - global dataset - del dataset - except: - pass; - - global root - root.destroy() - del root exit() @@ -926,10 +928,11 @@ def __main__(): rys.World2Rys(outdir,begp,endp,isAir) try: with open(fileName,'w',encoding='utf-8') as f: - json.dump(rys,f) + json.dump(rys.RyStruct,f,sort_keys=True, indent=4, separators=(', ', ': '), ensure_ascii=False) tkinter.messagebox.showinfo("成功✔",'文件已生成\n'+fileName) except: - tkinter.messagebox.showerror("失败❌",'文件无法生成\n'+fileName) + tkinter.messagebox.showerror("失败❌",'文件无法生成\n'+fileName+'\n'+str(rys.RyStruct)) + def world2BDX(): diff --git a/msctspt/__pycache__/transfer.cpython-38.pyc b/msctspt/__pycache__/transfer.cpython-38.pyc index 66a071e5fb73881873a7b1772971ddbe7c74790d..3fdade7d7338027140ff33fde408dfe675d66ce7 100644 GIT binary patch delta 2461 zcmaJ@U2GIp6ux(6_J4N!OKG7LkOs4m6w8k>Qb~bQM5G`;A|rL2&YhN_v$NYfvp`{% zMN8synHOS+f^YS;#z%cI;YB07nHwKWeDK8(c|wheo^xkQm8f?z-<*5yx##cRb9R3m z`}kPtOtF|JFdlY)XszGASnBWo1ZIpFgso=^Q*Tm(vi`+=TQ+QPR7ZhFl~0Nl?qrzG ziZ@e6h7BxUAMHL&STF0lNm$>4ViefAQ>46c@vCpBh;Px|v=HB?Q?$6eO(|-$Eq*Ee z+=&jb#M=?N5V`@3TQu9)FtNL)R|< zkba`kwefd_i$iNcLg;?Q4(hd`kXwGhHv-G(sswfz)WV@DcI9}@;g)&u1m6_b^eypi zePH7ND#pE1nr{M1sCI=Js?9u}k00o33esfD?l1cB=Z8V)CwO6WkCsz>9T2=9K%|12 z<1oGf83W7H#qAm$jBj=PHueH?F#Ah6DVgk%axdb>%(Q(u@Z2db{n>-kyO6JiZpBGb zpvT{Ko@gGxrTub?70mm#TNU|M&|Y$AEAW7O1$%ZQ}kT?ec$JM z43v5s;XHtm4|bmNWG3wMZm-7M-URr@$HSv%{O5_ zURK7(%UvRERqCD-iuU9?WYyfEDNKBl#oiXX9=cvIbh*ksW=fi$1SKM$ESvsR$WH;o zD6Le#X4 z$DE6F5L!H}3C;0YP2^p_X?u0%?031H!p*JG1z)_7=wZ+c{zB};BaM{&(ncC{;VBih zk)gPzdRisb$Wjue?xrJpk2Z2)CW4Ihkw`^cP{zpQ*Nwd7YLW{G+$Nd)tWl8clw<=+ z;X4gI%r1~dG0H~yNMBISD~(d4Ey~@^MWv{XrSGYY_Ne`09^OKfXPKzfO?pXGh;*Ra zke*iiNFQl*L>&Ur8?kSDVuoQJH(5T4rBLwJ9 zNf$;)RE)^QHgH4Aj*z+9oG~|sJUA|Wf@9wKafCMzR%?A4r`Yw97NlA(myN1Z-+NM8L}9ml3c}@Ce}o0=8Bzn@~yWG95pJpFk%NDs-x(xivth z+{Le>s4Te~NWF*fJ_1;65-!b3i_#d@kDylsofq_~QCzu!vO)8UxNR1}12Ed^zKcH? zmS;*QjGkv0iC6Q_UfbMRY%V)b&IirMpeMk_NR%wiQl08bUhSdqC~2icOLQykqzdg; zaHU7R+WGWyKh;sDygoSCzoU1nwr#Ss^)H&YDO~^n delta 1368 zcmaJ=&u`pR5YF4Rz1{V0nr4@}_T;KDK+ZF){9D-3;DYd8=Ii zCdZ4sbXzrZytccupz-R(0b^qK!F^_mJ$8&0#6xDYV(+y~NnwMcrM<8+gtg%y!7xD? z!OX{=v&miGx&aj;pCeLt!hn0R7Y3FOhlnPXQ2NJ`t}gCr^K7K|NPD8N5%G(@(Hy~y zq!@IZXsg?d!3rXnM9M68A}5Zzant74m%A=l?b9nz7dyp<@;t`HUa@|h*2-+CQB1Fo)(v1dIht7#Rsp-f}z4F8ZeHKs8QE-In;=l z=*6X@3TueHLw_vJ5JT1POO6O?$2V2*et_Bw7VKo>s_uiSc@ zLJJhiS<#Ka@xr9gAA%pQ$(4!TCq8o_0xA!u5RBZuP+7b$lj5hJC8eKwi(DNc$p>NV z&TYGPQD6>OTKRGXY^V!+Hf z>sGMlavYOIHEbd?&UI5P)n>GQ#hu#c8J+3?m4$0UtDoSqg*V859RVAoeTGlSF3FzY zED;|Od`fVhK#t=AS#r0R$a;@}CY$chyJV$b7T?u-S1+R9GBT}}QBE|gv*o+7Ih4Me zR@ZCF6Dz-HR{Qi;?Dofj$I82Z-`Tw?!o5~~#b|8Zy^QjRXZI`Sq9 z#N+9sH)n~^5L$+wI_)+TiS-Hgw`Y@F`R~&ooT#gQXvILM83F=1>V1$uz=0E; XkmICJGR%l5sN@U9sj1pb^~Jvd;KnNf diff --git a/msctspt/bugReporter.py b/msctspt/bugReporter.py index 264539e..8de2c76 100644 --- a/msctspt/bugReporter.py +++ b/msctspt/bugReporter.py @@ -101,7 +101,7 @@ class version: libraries = ('mido','amulet','amulet-core','amulet-nbt','piano_transcription_inference','pypinyin','briefcase','toga','pyinstaller','kivy','py7zr') '''当前所需库，有一些是开发用的，用户不需要安装''' - version = ('0.0.4','Beta',) + version = ('0.0.4.1','Beta',) '''当前版本''' def __init__(self) -> None: diff --git a/测试用/CanyonTest/db/000062.log b/测试用/CanyonTest/db/000075.log similarity index 100% rename from 测试用/CanyonTest/db/000062.log rename to 测试用/CanyonTest/db/000075.log diff --git a/测试用/CanyonTest/db/CURRENT b/测试用/CanyonTest/db/CURRENT index 0556986..60f8f3c 100644 --- a/测试用/CanyonTest/db/CURRENT +++ b/测试用/CanyonTest/db/CURRENT @@ -1 +1 @@ -MANIFEST-000060 +MANIFEST-000073 diff --git a/测试用/CanyonTest/db/MANIFEST-000060 b/测试用/CanyonTest/db/MANIFEST-000060 deleted file mode 100644 index e7e7aff8d7f7cdba6351b80e22b719d3348d96ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmWI9drCTvfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfDV(31fItQoCmf?4d0 z){|QJMWMnBOhASXqoFF8FZdq{tQoB|!6Fl-99y^;7@2H28JO)@4s2pFY^*Ra0Sedw z1sqteZen6*us_koEXW8{4#GN&P7r(GBG!zK5Ru#~ci#j-wK{^d0-Xob23N$!V9&;A N&CcksrHN=q0stC=HTVDk diff --git a/测试用/CanyonTest/db/MANIFEST-000073 b/测试用/CanyonTest/db/MANIFEST-000073 new file mode 100644 index 0000000000000000000000000000000000000000..db7d0dd693d9b4d103e4949d51d6d8d2fe0232e5 GIT binary patch literal 135 zcmYc;?K~C7z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8F$jHFJ0K(Rcjx&K2 z0|Psw!9K MB;XAc@C69~05?1#_W%F@ literal 0 HcmV?d00001 diff --git a/测试用/test.RyStruct b/测试用/test.RyStruct new file mode 100644 index 0000000..e69de29