From 3411765be7ee335bde397448ec84b2b72427415e Mon Sep 17 00:00:00 2001 From: david-ajax Date: Fri, 25 Jul 2025 22:04:46 +0800 Subject: [PATCH] =?UTF-8?q?v0.2.4=20=E5=9F=BA=E6=9C=AC=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/auxiliary.cpython-313.pyc | Bin 337 -> 2423 bytes __pycache__/particles.cpython-313.pyc | Bin 9159 -> 9739 bytes __pycache__/reactor.cpython-313.pyc | Bin 5066 -> 5866 bytes auxiliary.py | 17 ++++++++---- config.toml | 8 ++++-- main.py | 24 ++++++++++------- particles.py | 27 ++++++++++++++----- generate_audio_cache.py => precaching.py | 0 reactor.py | 32 ++++++++++++++++++----- 9 files changed, 77 insertions(+), 31 deletions(-) rename generate_audio_cache.py => precaching.py (100%) diff --git a/__pycache__/auxiliary.cpython-313.pyc b/__pycache__/auxiliary.cpython-313.pyc index bcd17a10c9f84aca0d7f49987da9d76d8852bfc8..8fbc6f52a2db0240eb59365773f925b5b93a52ed 100644 GIT binary patch literal 2423 zcmbVO&2JM|5P$pO?=M132?>F92x%Q?tQJrSDzwl9DU>9|ODa^;t~T~MEVb9^+cm^g zsOhD`km96Ol&C%6D~C#)dWZf4L5@na_<+=2xKYvyiAy`P>vbFyE*&eg^WMyx_h#ld z?`1s{@)Mx`-@d){3rENwIB2mrgsrrA($g|%h({VC3)+qu@G&Z%(u}*Gxq>V2`%(g__+ye>=KgW+irbvt&ByTkqW*|pdRv>$c0KX}6 zoZCyXOq?5|m@<>0P!-R#Y+TBzlP3QO2quq1)2+;?x}lpcqfku4WJXOJz-2==`NFiK znY>ZR=S)6VkTZ8Vlh>78mLfV$CaYr^1wk+qiA#mNl8`UUGl`)>x|mlqLr;t<`62a+ zLKB)YV!G&!-lh0Ld|6x# z#j5A(9lP)Ne)3ggKL>9N&5gX^NVw-wDE50O_EHbRZubXwpW4Gc*yBHS(38f{96}lY z);|QcNG=FT_`XUL%$qO;^>1C-Fmf=1mAT7|#aS8#4J1>(qQp7cjsxyXrDVFU$ho58 zG zm8m1TZjQ`nmed8c+O`_phsf!!NVlbzI$jHRdQSSe`+on)4$s&o++cz%+#Ce~(!FJh zx5CSX?M{+<3Ec&Y9mH@`iqQZJ?SgsJlTosAF=uR!whvX|mS|xaVo65^!A9CErE;lq zy?lLHtVQ})y!~`9Xd1g%iH$Qf22=L#K5SS`&MVNcen|rK6>}&DCF!f8oNH(zl9W}c zZsb%=(F&485t_6c8K$3Fr`jP&x*;2CT9OTes*^=S(Ix3Fu?}DXo?_Z8hEIou@9)TS z*6rH=Jj}YHf4g~C?+ZWUI$$qBYtu~?qe!(h$W3Zy{{c+FI|DbQO=9y!(O%Q9BD?Wy zYRm*P3E2VobH}d23j*~>;mIr#`3WXW4mEFVcqy81(8kNv+cKMKHpN!$(LAyhN+Ru-S4h!R-4kwc%L&L*E!ufGQ zoju18XcsH3Rt;R!RMiZVL&l?*IBU9X*Yq6-OUDis1pE340(PW~T!N}Wd%Xvm4m9}; z7+lYxoy(zGsBiZ4lW6DCnT0dU-`rzs(L=MNPdw3w9-;dAy~*1Cqjhg+W!t{$X!V1Y z@S#=j;d*5I{P9{Ow&IQb83@lAmD0`9t*@6$4wXLc}xP2Nf`JGzKuEX7XkLH&&M2?Pya*UV|n=x D?&7^N delta 258 zcmew^bdgE$GcPX}0}yEbX~<{=(vK$=in<5^8B-a88G;$T8HyN!nWPws7}FUwnO}lb z`Xz%%7+?Z2n1T4S5s;Y55DgP&n7oi#Wb$uzZaGF>pc)khO(wt0hCoIJO~zX+C7HRY zD;Yk6)K1>OWK_YEo>~&0l2}<>l9*di!~qlr8Cfh0BpMi=@CfvKc6oMt&v3uUqjG^o zwTKNUuE|uy0;Ir-i&#M{kZ2J*khsNRlbfGXnv-f*#0lgw0&y`fkodsN$jEq`f%`KH J6QdefIRO3qGL--T diff --git a/__pycache__/particles.cpython-313.pyc b/__pycache__/particles.cpython-313.pyc index 3febeecf718f439774b3fb98b2cc456b0f8ce16e..4fd18652eb20ad617faf22495c9f1b5daccb09f2 100644 GIT binary patch delta 2089 zcmaKtX>3$g6oBuYz3uG#*6DPyb?71x3KURUpx8#J*xHIPaWd^p+ksi?ohd@orj;53 z+R`>x0u4s0{Gi2zA`?Sm@Q;5?NQ@Lv>e#phqrZ$@#76(%Id3{bNcBzL_s+ZLocr!Q z%bhQte`k++Nu|mra1{*?c3RA1>MQi-*k`Z0n$&i}G+u3!#!f0x4;RzHyVk33EapEM zO*}?5ipK{mdOJBJ`PbOgWMJkFqsNpyK_5!&G(Cqv1yBt4(uaUET;sCvKUHSlsWI~g zR~c>Q)lQS7nKUXn6&bTC ze8yS6piyYE=ZPYVX7hfTgYHP4mp!1|t60PB3S;tyqL<3n;}`Dp=d!;v&DosyY@XXT z&mCLoWMDcn6`8SZO*(Q;Q`&g(vXasR{3F$6>fz6ZU{V$0b#gihACrJh-U#QWjx_egxVs(L}x6(YWN2R zgRBL$KK`k};i^W_ionP-Nd__y;uCzyuvw8M&0aLSq}zCfaj&^-vST_t6<#7DY1xvP z$n;AhkocJKbDH2Uo8EUGK}RKEfIt$4RI?V>urmFHok_L1lgesA>B;7!7Q1~fh^zte zB4Qr`_sw47S1raoTxZJK(A^deLi$4yp(xr}EaGbqg@Zl3OxMDztOayGe^X}TH+2L3 z>;QUu0T5qpH0}9hctIP-f_1yo^~QYgk}_t#6Zanp`VukW8*ia)5n%Ns6yH^@Sr!v@ z?uhTS?{DVkudBE7D>jEo*hDq>Jr>&<{=LmgPw{2jQ~eB74IT|^MUyr}01-sABRUZw zgc)%NaTpOsq!Wlz4I+Z5Mm)--umVH^?l}6NAm2*z=OJBr6a2ira$V`1kt}I=pl^`I=)Ft-(S~NfXDqg1&Udge5&%VIArf*uddX zJR#JTN6d^cny&HV{JwJyJc0E^@;irR{|EgPSLd4Z?$AS21kWl(dV5q6u~! z2ZU5%4W>gQ0Vxx!X0(;#@epf0v{JPEx+{0%8BoN#0nlcfwqEbM)^|r=d#&$k{@JRr zs&oDek@3j+*lk1k$9*T|xAe7h3f0MuAvOQOW!`3)_Dp&1DmTpLXhyc2+H%f*C#P^u zX}qV*pHb#dluTDmRei0joEH;i(O-*M#IT#jG5#Y(JKPe!E^kOb0B>wJ09Gk%V32>6 zXNH6Rm%Q!tJznfSLkIZ{_gZ?9|K`r`7j};Iu#$O@8ay;5?~Wdh#@>iRY*y<6q3lnh z*AQY9v09z?q5?4tciaLvLH-cQq|J0uEt76sRBL2X{R1_X7No1V7pmCCKgnN5FY#aV zd)EpLv}(J;R4HvuA{MFW3j5oFow0Br$R;^2DBo2Lx(1JY)rAYK`k!t2E_gD;B`zr} z*oqPaK5t3=qXFh@1_7h35!?R>{p9TZASZi|*k zfNYUOH(}&Nv#~@+j9Kvy*;14J<&XIz{^cJ;6l@l=e~pP5Ai)?Dz2|o7M)3aex%b_3 z@44T5&bja6v){CsHVO)i0&9*xC;R(sv!;*8SF@kISlngqFgb)ew6I1k?AzQ`*zSWK zBHJwvVL<<{&HAtno+0Mkjv^}eSv6bw68TFHo2pD|(#G6PqCX|HTi|n1hF?T$y3sgB zL_hN${|P?J|JJgqmb~Y_>Q4CDMhk z5U~k$HAA52InoJ9^)%#Km;5a_*~*a72Sm}0*&u!mF31OUZo@(NQa+|sru>Wh7WQojIflv&ogfx%><^|kw9;#KNbmw=s3(eD<-1M z+@_i7ORT5eh#o`$@iGF_Mneb%aSqXk=tpETf+IYKh7sEYa8U>}#s?Utgdg=~_gNB3 zuS1=yPVuMgi>?J1Cdkhdgf>4+x*TK>?v<RAc`djz2~ht2ZVZg}uqG|2T7 zz}I%G(vicL?PbgO!^L$EEj#BidFg9xP7~=k>$0LcaWsKIy;KjxWP=rt^4Oc~Gk%=kVc-9N>k>9WW3L$LzcgpG9>eIk@h&=au7+eBty!233tU}|KL z%bnyMs4Xv>;9GcEbFp}fHjQLLbYlZhDj@V^+E#W_n7BXb=0wc+ABpjfll-0n4KMmK!Z^nH* zsxFh;Fcb@pL_$wefKMw*s{@2ot_jGkBRV@duqH5U?U#vnO<>rn(UGQgfq_ThZ|E;- AfdBvi diff --git a/__pycache__/reactor.cpython-313.pyc b/__pycache__/reactor.cpython-313.pyc index de9b7aa642d180e50bc7b3b540fcd3543c88c0bd..cb0f8e2598f913b09a15b1ab7c362703d65cce5b 100644 GIT binary patch delta 2601 zcmZ`*eQZ%;CugJ_fWjB5%_j%BN`~9Ea{NnPRiyz&YnZ9*u?#_pAet+?^TVGD! z`Niei$KLq<{BLgmY9{yKw|H1Pi!a~<+SAP1bw8WCd*;`rt&(}W@7Cv+Z+-kG#W?x4 zrZBDS%|HB7dzb09^Kb{ry> z!>B@3h_KZCuxAyg!bRBLeF(*Rz-JElcY$w*TW}Q{#a7XT7%XFv345svt-{9g5k6|j zb=1KXxWVTU8hjC;DhD=d%N95GX}{wdq$aen4At9<&=|yea2lZzW7E63S+P~BR}R*; z@U_@DcKZ*G9lTPC;4nn-fBhnmHN{;4`9V|z+5qpyZ4f8VR!~_9_W?*oDIw!1$Peiz zBB!T_8ZSF)AaOt`=KYI6w&3^BFr#5t4Q3%IVtpkhDvshfcsoMX>CmoJ)rgQD)Qu{o zPjw7qQHY{e&?zl4QAATkcl{`chk~4LlNC9hCP{U4ED=xZ>;XBgGm~ju*j|H&Mb96MJCNk;K z(at_48ILKcEuH`0j7BXL1@fYCvS&ZfMx>D;4vXKPVvC`h5a1ZH`uYsSjoa7)?UgqEH5Pd@G- zP+5r7Q$ovEJ8EjiG3|`0<0sZhB^H+tCY3Rn=vDD4LS!{P8cQc9f)?VX2DF3-O&4hf zqMPH%DK!nse95myL#R&06*;Nu9JNeYK=zU*nL9JjL*Bu;o6_3Te3pCLR%{4lxdoxV z=nc`?Q}p;j>{zV#o~{MPzS!V9y`!X2UHd^-t}AQ4(LY$|-+Qfp@4WXppr1{hoj5fy z7roZFA>Y3@?|sg|S>h~~`cKHGuU&ZUAp&-(7D@g>U8a4Zu06Z+JF#=_$fubLnR)Ta zD|J`hPiMCk9qyTd<3|dP=Def%+@X0#py>9@?$I_C+uCQg&AM_s7sLSM^W`#)g|fhVp7o|q5x{@LBT7-%a9 zm9-WU8cj7w>R6VvA)(tjfKlTgL~+;xJ*P%HS>^7FG8B6iWU#r^8uvNFD<76JDohGZoiU;)yvAsT4vMX@ zPAMbk{3J=J=~5u*+tWGdEh!QLw)B>0vx11k4$GB^i<{mMeFN z^?9k|+p5lG7FD<1XbBYrPhRjW2+fyXcUIx`+W^=o94LV%;B_;R4<}MdqO-BFF(cWA z7v)=%$Fwh8>v2N+yGzd4O7&z^7EOGq>lm$r7D=gajCNua4uvO1l^8_>;YLG2TsquN z=wAau{}T|}O$bc^u~I_2n7(EJ`b;9e10Du>oJ#u`%86820oN% z8hytdT4F-{hI8TbFMRaE5(4(hhOak&wfO;M@9o1pFWs{{dG`aqgLmC)GV@LUs22Dd zqlpqHU<3u-ls-C{P!H&q$rwo|pyj1X*D+7V(g&5qe%%tAdNrXWV&o`+e*lPZ&}@m@ uw`o5tXsM=xK$cjH@pWXoj%u$X`*l?Jkiqb&T1J#UG$k;uxrZn<&i)TACus8k delta 1870 zcmZuyYitx%6ux(MW_H?rO}n$(-9ENsA9S~Gu$4!t2@ip!w6@!^B zdtUdu=j`5V`nk@z=x`JQvabI%x^L8;b^74;Y+Xgr2dY3nQwsVm?F>Bz0I`OSB|2_J z$7QwMa6@)7RD9>uXSYs_-}(C7-1lR*-@15f^e}e9FX2{v37)CxA^vmky)$?D_}s+U z+}TTa&Yx_QZy!H>^YXiMpTB;4d`w;=<4>46*n+Pxt%rDGZXw@d6`}8gAxL;*wJ+}x zpswf!MRmDC00w21`Wb7mRb@?n$YyenMW9)X_1{ww0FuCJ9!D75%zDKa*bLJOGK?GS zasiOqj(b^2jIeu|?jiteKn6)J$>K)VU+_BsNj}1bJ$T+F;lC{bCR~PLap_AYY!SYV zNm?V;e#ns|;c_$6>fR4G4FV9Y1LP4*JJo5PM?lza@~eBe5+CN>P1g2hXk^g6pWMXE zBClGS+>jRsxN;_3ORIBk+5|wHK-ql)fG1As%^0fN^duFmRAcJMO^ga&e7u4`mavHs zeE#q2hXiTKj4)vk~$hGWnA1FbG+Cuqec2-7=zRI+NCP;W<@_ zX(*M{ZD}M$xMDG|LX@)4qQ z3XP&WjEw}_8&43?nmiCw6%v}Iz8Qg7;--S;z(xZ8D7fh>`(#i29FkadT(^>%6If#?dY5Kg$X@Z`)S2T6{oqY{-#_<-!aFOFMOk`LU*OqY7aV8D`?A&4nlNSSc%586lz`$u?623CvEfs^jkav z@OMR}_<6e*mrD|sc>&5e;3_dCe5u$MV|6Z#5=qVIGtzR=gNo5@A!ww|(CJ;y*+p~O z&79OSOf;DmLPo)L!7=3w%m|gUf;}(zbAmrF1abn=$QO>f?Qm@;F*9%_2$j%CR-_zE zWKu}CMB{M-3sg13IDj8Y%2xXl+y?Lzm!)~2@GU`V%!mOgjf@QZ3^?h? z^pLA~@Pwzbp^`{?;TAF>iP#R(7^sz6(^o^=D50PtdP~%Y?|If7q9a?b-m*dNwi>749*NZEzW9Oqkbik$mljf*Q8Q3(O}vcge}iF+Xk#z=;t8*7!vGQK8)ViH^1uQiyapWC afcF}3K4Kx<2Im2#kN5!yJqv(R!~0* int: + config = ConfigFile("config.toml") + + time_override = config.get("time_override", -1) + + if time_override is not None and time_override != -1: + print(f"TIME OVERRIDEED TO {time_override}") + return int(time_override) + + return int(time.time() // (24 * 3600)) diff --git a/config.toml b/config.toml index 4062be5..538c6d0 100644 --- a/config.toml +++ b/config.toml @@ -1,4 +1,8 @@ -# 将更改保存到文件 +# [调试] 将更改保存到文件 save = 1 +# [调试] 覆写时间 +time_override = 10 # 对于每个项目的新记忆核子数量 -tasked_number = 8 \ No newline at end of file +tasked_number = 12 +# 竖屏适配 +mobile_mode = 1 \ No newline at end of file diff --git a/main.py b/main.py index f4904a7..5a832e1 100644 --- a/main.py +++ b/main.py @@ -2,17 +2,19 @@ from textual.app import App, ComposeResult from textual.widgets import Header, Footer, ListView, ListItem, Label, Static, Button from textual.containers import Container, Horizontal from textual.screen import Screen -import particles as pt -from reactor import Reactor import pathlib import threading import edge_tts as tts from playsound import playsound from textual.logging import TextualHandler -ver = '0.2.1' +import particles as pt +from reactor import Reactor +import auxiliary as aux -debug = TextualHandler(stderr=True) +ver = '0.2.4' + +config = aux.ConfigFile("config.toml") class MemScreen(Screen): BINDINGS = [ @@ -37,7 +39,7 @@ class MemScreen(Screen): self, nucleon_file: pt.AtomicFile, electron_file: pt.AtomicFile, - tasked_num: int + tasked_num ): super().__init__(name=None, id=None, classes=None) self.reactor = Reactor(nucleon_file, electron_file, tasked_num) @@ -104,13 +106,16 @@ class MemScreen(Screen): ret = self.reactor.forward(1) if ret == -1: if self.reactor.round_set == 0: - if self.stage == 3: + if self.stage == 4: # NOTE # - #self.reactor.save() + if config.get("save"): + self.reactor.save() self._show_finished_screen("今日目标已完成") else: - self.stage += 1 self.reactor.set_round_templated(self.stage) + self.reactor.forward(1) + self._update_ui() + self.stage += 1 return #feedback_label.update("") # 清除反馈消息 self._update_ui() @@ -168,7 +173,7 @@ class PreparationScreen(Screen): pass if event.button.id == "start_memorizing_button": #init_file(Path(self.atom_file).name) - newscr = MemScreen(self.nucleon_file, self.electron_file, 8) + newscr = MemScreen(self.nucleon_file, self.electron_file, config.get("tasked_number", 8)) self.app.push_screen( newscr ) @@ -236,6 +241,5 @@ class AppLauncher(App): self.push_screen("file_selection_screen") if __name__ == "__main__": - css_path = pathlib.Path("styles_dashboard.tcss") app = AppLauncher() app.run() diff --git a/particles.py b/particles.py index 6b74aae..d54e2d4 100644 --- a/particles.py +++ b/particles.py @@ -36,6 +36,17 @@ class Electron(): setattr(self, var, value) self.last_modify = time.time() + def export_data(self): + return { + 'efactor': self.efactor, + 'real_rept': self.real_rept, + 'rept': self.rept, + 'interval': self.interval, + 'last_date': self.last_date, + 'next_date': self.next_date, + 'is_activated': self.is_activated + } + def revisor(self, quality): """SM-2 算法迭代决策机制实现 根据 quality(0 ~ 5) 进行参数迭代最佳间隔 @@ -66,7 +77,7 @@ class Electron(): self.interval = round(self.interval * self.efactor) self.last_date = aux.get_daystamp() - self.next_date = self.last_date + self.interval + self.next_date = aux.get_daystamp() + self.interval def __str__(self): return (f"记忆单元预览 \n" @@ -98,9 +109,9 @@ class Electron(): lst.append(Electron(i, all[i])) return (name, lst) @staticmethod - def save_to_file(electron_list, path: pathlib.Path): + def save_to_file(electron_dictized, path: pathlib.Path): with open(path, 'w') as f: - toml.dump(electron_list, f) + toml.dump(electron_dictized, f) class Nucleon(): """核子: 材料元数据""" @@ -119,9 +130,9 @@ class Nucleon(): return (name, lst) @staticmethod - def save_to_file(nucleon_list, path: pathlib.Path): + def save_to_file(nucleon_dictized, path: pathlib.Path): with open(path, 'w') as f: - toml.dump(nucleon_list, f) + toml.dump(nucleon_dictized, f) @staticmethod def placeholder(): @@ -136,10 +147,12 @@ class AtomicFile(): if type_ == "electron": self.name, self.datalist = Electron.import_from_file(pathlib.Path(path)) def save(self): + dictobj = {i.content: i.export_data() for i in self.datalist} + print(dictobj) if self.type_ == "nucleon": - Nucleon.save_to_file(self.datalist, self.path) + Nucleon.save_to_file(dictobj, self.path) if self.type_ == "electron": - Electron.save_to_file(self.datalist, self.path) + Electron.save_to_file(dictobj, self.path) def get_full_content(self): if self.type_ == "nucleon": text = "" diff --git a/generate_audio_cache.py b/precaching.py similarity index 100% rename from generate_audio_cache.py rename to precaching.py diff --git a/reactor.py b/reactor.py index 59db57c..038045a 100644 --- a/reactor.py +++ b/reactor.py @@ -3,10 +3,10 @@ import particles as pt import pathlib import auxiliary as aux class Parser(): - """轻量级版本文件解析器, 用于解析记忆状态""" + """轻量级版本文件解析器, 用于文件管理器的记忆状态解析""" class Reactor(): - """反应堆对象, 用于处理 & 分配一次文件记忆流程的资源/策略""" + """反应堆对象, 用于全面解析文件, 并处理和分配一次文件记忆流程的资源与策略""" def __init__(self, nucleon_file: pt.AtomicFile, electron_file: pt.AtomicFile, tasked_num): # 导入原子对象 self.reported = set() @@ -15,14 +15,28 @@ class Reactor(): self.tasked_num = tasked_num self.atoms_new = list() self.atoms_review = list() + counter = self.tasked_num - electron_dict = {elect.content: elect for elect in electron_file.datalist} + self.electron_dict = {elect.content: elect for elect in electron_file.datalist} + + def electron_dict_get_fallback(key) -> pt.Electron: + value = self.electron_dict.get(key) + + # 如果值不存在，则设置默认值 + if value is None: + value = pt.Electron(key, {}) # 获取默认值 + self.electron_dict[key] = value # 将默认值存入字典 + value = self.electron_dict[key] + + return value # 返回获取的值（可能是默认值） for nucleon in nucleon_file.datalist: - atom = (electron_dict.get(nucleon_file, pt.Electron.placeholder()), nucleon) + atom = (electron_dict_get_fallback(nucleon.content), nucleon) if atom[0].is_activated == 0: - atom[0].is_activated = 1 - self.atoms_new.append(atom) + if counter > 0: + atom[0].is_activated = 1 + self.atoms_new.append(atom) + counter -= 1 else: if atom[0].next_date <= aux.get_daystamp(): atom[0].last_date = aux.get_daystamp() @@ -81,7 +95,11 @@ class Reactor(): def save(self): print("Progress saved") - self.nucleon_file.save() + # self.nucleon_file.save() + temp = list() + for i in self.electron_dict.keys(): + temp.append(self.electron_dict[i]) + self.electron_file.datalist = temp self.electron_file.save() def report(self, atom, quality):