From ff3159f45476fefeb963c0c9c066ee5388985c74 Mon Sep 17 00:00:00 2001 From: jinye_huang Date: Sun, 27 Apr 2025 10:05:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B5=B7=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E6=A1=88=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE,=20?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E9=BB=98=E8=AE=A4=E5=85=A8=E9=83=A8=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/__pycache__/poster_gen.cpython-312.pyc | Bin 37636 -> 37572 bytes utils/content_generator.py | 46 ++++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/__pycache__/poster_gen.cpython-312.pyc b/core/__pycache__/poster_gen.cpython-312.pyc index 3cbbba7468c62bb96d423be230744e588a780565..fcd33a358b6d9f42b7737a6a86304565b7433ceb 100644 GIT binary patch delta 3372 zcmaJ@3s98T73S_60YR{W@>)@>Th|R(k%BN=MG-}LX|2wv%(}ZQ8}|Wsf5IyXm^i)_ z@R|lSCUp9WI<=2&O{*nRAIT)f6lzlAUptddO_7<5&7_lQHFc)vyNfKbY3>Xk_ndRj z}4g-Xq5y=v0T%h)}DwtsX4q6%kG#D(&z2fy=O}MM3WwC6Y-{V%qA|IYz5ngmJcl+Nv{~5wR-Q0gOwj-We+3| zY#-RrzqP-b80&7wPa96Q-i%*362I{C+lgtP#^^~uFLwG?=TP0yijnly!?V^r(o7lP z1FrsU!x`59QT-&2^d5wADd>G=DP@^4morn!nf7wtGTn+I?UkZQx#!!s0dpi;gEk#2VBD#oeaV zZ}-$Uczx~=&m(q7M_{JKlW4=M2|BEzIwM0oOil_LQ!Sbr8P9hiT>;nxh+5Z6>wGP^ zn+en@4Z(mi*@K?A@G$P8GTc4WqG21w>GU-lqqbMVK-BhPkTU#n2gP7W2XPJD;dg(9 zhjrmK85!{4$tu|t^-%sr50i~AoiLsdQoPO`ZvGYKtLSjYT$!WP>>gGh{z>-d8p9Tt z*eYJlsbO|;KS$XnlQrR8)%$|2Za(RTbD&U0pc=R%;0pRxgR?Q{b-Go9H-rMo>+{)k z!eWdhS(-!+_%?BE&McM}{`;IBmsA%7ZNd*GkTVoX;267ue`c{bxZrc`CCW&@sRGL*92*$x_G;Xn-Zp z7tP^HTvk&CFdt+SAOuhVEr3?BBR^xhtb!@hp?a_1;c@d$aU#EvJl@E^XEgY6v`f5M zwA*@^whwexb9*W8p>2zSz-s>J>|iPHjnZRh`b&9VxV?BkW3570vY;y(>1sMAFRmKh zfv3DY7*Mqyx58_{pQwj?Ns(Lq-{5yb<2e8>AdAG?uxlr<%!rh$llE$Sir?#U`P}tB zM?2LYk@7zA`;xclh6hS35+B|0*4hnOC!nBLyo%3FuND;@djKeeQczT`Q)Lq5^?4td zFgHqnv_7=+L-fz{O}YMN=K)b$wJ~Xsc&e!>81gFKV1Sc&W z*ARF*r=MN**N$CwzMrVkVscf+r%sW%o45bT0ar2kOy;@7EtX{Nm*73p#TixuLNDcob)Z%?^e=tzr?)K3m=0&2hE;A0@7%9Yg z(OdT|_Jnw=&Sr=dMLeuKz|M(%>vP$V_}TheDmB~itjTnVbS#WFi#=P4SMGoT^f3P; zKt>{4Ro(~DTeOjIWFV+k2$`K2q}PZL&5qP?=GH20*AP+s4FVb?Eg?!ek47k)?jQ~z zzOgCTp;!2u00FoRI0|^3z;pc_tlM^e0jz$oBCYW&J9XyEV9Hux0I0^6fOlR)kozrh zk$~?)j_&6u^mxx>Hxy2Cv>Cc4TGz9s=hA2MxBSD-uRweNAmjWOcHMxh03UGg4^A-+#3{U}) z{E6zuO!0PeYWVraC3?4_C*5MK!&7MSv0Di20INjc()`?ib;lp z04CMwHz0ot_*7&CQrW0j5?IczhuZ^x)>vO4eoG<&y&3#G`sk-G-We3d<|@j9>>1hd zInbUXx|_`lq;YwlXcr(8AtQ`LR^*HSZunaBh>Hni`_*RTq4X5U4&TI|?=sH>l(jTRt+z9=csm=5?F zU>cwrPzhKEr~=5bB4d}qM&rb|;12=s0Imbx1<2UHjthJPu#lw@&VVEtkOU}{AbJk$ zW`*Gy2cOii?}?pPkP>$rV67k{@|9=5Agi194 delta 3457 zcmb7`3v83u6~}%3%)=p10&5;PgAYmnF zV&R>nTts2C+oY}&4~?>!u@aUvEnym^oy=e=`bH(z1wy)MW8GjHXwuIAn#NJ3R@#;F z%em)1&bjBDdp{4orQi8eeae-Tlq4Os|Ex~-{PX82_w_6-VldodtU(MLms(O?X>PqM zT~wGRnxrg#XUbt2;xkjO*kMX3d-@eaCQGk20BJ9Ia4N_HEsCrrMl&q*v5H!bH_ zsSpW{&Oo%`<>>lAbftPVr!D%#rrkCBm*2>r^5gt7jzLGXvN4*sDw^9w+7&mg>Cudm zkFC?LTBkj_nL7D%ohh*t%B-^Ei;mBXW;}V_T5+qm2{AgRw> z0db}{mt4k5BcCSUHJNSD6o_bg0V@=rrypbUM0ds$Y`!>=p_-q;;I|_AnFWS#W1?p9 zd4nOBm-A=QOHcx?;1+Ml!wWI7oM1QdR1C3JEhVIE4K;6YH@A9yN{~B99W)Yb)OZ>R zd~c1^TM6;+-e(^$-S3AitqhRbfx=`4a|c=8c1&CPQUUs7M4dWxw)`Vl>gKk8`en+ zHIU*K#&14YN3wtbU z{FpX|dV40%hX#3-Y0@k$YGAX%Lz*$@?NE3%25f-zU@A#kdMy=1y&9@j!vWW`oU5Fd zh`nVFRxZw$)iTE~%J&)BMzO!*g{3kNGW{;>p#U}@b{++ey}}nSQU!-?gcFR<6>qQ1&fAVv2B-%Jnt6j73aNh05K`NCulRJOd(vy9m!E(cw&DH* zBmJir*tS-2A=Wo+&kkcD9tO==!<}1r1Nw#HUk$U_Q8B%7cHI#uP{^9mFDE% zaJ&qf*{8NReL=25vkI^QGL5YyX^Bc8>{qxmr100psYd%GnW}h}${%M*{H3vAkq2wf zV42mY_|-sjyW*qk$`KhYNj{oeysnT(OO~=n@wz=Bj*^T;{~fVn)jT#sbggojW0??r ztM;+8qPD4+4G3RTBUSW3)AodfL0V&HTopBI7cBN-0~9ik0@6cSukxHYmE90?Q#vS1 z1`!{7N-swS*Ln<{NB|!qXy%r1kg_n&HPi&(3&62a{A`ew!7o926?hLoZuzeX?vFl1 zyIIZ8Lv(2F(!Nl+yG*!6;@9k`yeviQ)lXw59}{7 zHb}7RW3^$V52-KawjN^$S-oAanYc4Rj~Q&+)5duuoq_pr89ImVuYh|5Eop-WXc$iWUf+b^bf%+SblZjHW14;;?d2pkC{nw&u9kKpC4% z%*IFtkOs__5Ow>y%n)02qHSGPAxPLmDK|8;7Tt zzXSA%gq}6@OT*dIwAcp4F+e6k8X^aDyaM=ArO3ocSI39>LC-An49vbJDtdF6L-bZ= uTa13EH^65_yuBTa*~IXxl~al^M 2: fixed_item["texts"] = fixed_item["texts"][:2] elif len(fixed_item["texts"]) < 2: while len(fixed_item["texts"]) < 2: - fixed_item["texts"].append("美景体验") + fixed_item["texts"].append(" ") fixed_data.append(fixed_item) @@ -394,39 +394,39 @@ class ContentGenerator: self.logger.warning(f"配置项 {i+1} 是字符串格式，将转换为标准格式") fixed_item = { "index": i + 1, - "main_title": f"景点风光 {i+1}", - "texts": [item, "美景体验"] + "main_title": f"", + "texts": [item, " "] } fixed_data.append(fixed_item) else: self.logger.warning(f"配置项 {i+1} 格式不支持: {type(item)}，将使用默认值") fixed_data.append({ "index": i + 1, - "main_title": f"景点风光 {i+1}", - "texts": ["自然美景", "人文体验"] + "main_title": f"", + "texts": [" ", " "] }) # 如果数据是字典 elif isinstance(data, dict): fixed_item = { "index": data.get("index", 1), - "main_title": data.get("main_title", "景点风光"), - "texts": data.get("texts", ["自然美景", "人文体验"]) + "main_title": data.get("main_title", ""), + "texts": data.get("texts", [" ", " "]) } # 确保texts是列表格式 if not isinstance(fixed_item["texts"], list): if isinstance(fixed_item["texts"], str): - fixed_item["texts"] = [fixed_item["texts"], "美景体验"] + fixed_item["texts"] = [fixed_item["texts"], " "] else: - fixed_item["texts"] = ["自然美景", "人文体验"] + fixed_item["texts"] = [" ", " "] # 限制texts最多包含两个元素 if len(fixed_item["texts"]) > 2: fixed_item["texts"] = fixed_item["texts"][:2] elif len(fixed_item["texts"]) < 2: while len(fixed_item["texts"]) < 2: - fixed_item["texts"].append("美景体验") + fixed_item["texts"].append(" ") fixed_data.append(fixed_item) @@ -435,16 +435,16 @@ class ContentGenerator: self.logger.warning(f"数据格式不支持: {type(data)}，将使用默认值") fixed_data.append({ "index": 1, - "main_title": "景点风光", - "texts": ["自然美景", "人文体验"] + "main_title": " ", + "texts": [" ", " "] }) # 确保至少有一个配置项 if not fixed_data: fixed_data.append({ "index": 1, - "main_title": "景点风光", - "texts": ["自然美景", "人文体验"] + "main_title": " ", + "texts": [" ", " "] }) return fixed_data @@ -506,8 +506,8 @@ class ContentGenerator: for i in range(poster_num): default_configs.append({ "index": i + 1, - "main_title": f"景点风光 {i+1}", - "texts": ["自然美景", "人文体验"] + "main_title": f" ", + "texts": [" ", " "] }) return default_configs