From 59607dcfafd765ae850d2f9fac6df2873f5eac0b Mon Sep 17 00:00:00 2001 From: cdhigh Date: Sun, 24 Nov 2024 09:48:17 -0300 Subject: [PATCH] add cover option --- application/back_end/db_models.py | 2 +- application/static/base.js | 1 + application/templates/adv_uploadcover.html | 27 +++++---- application/translations/messages.pot | 50 +++++++++------- .../tr_TR/LC_MESSAGES/messages.mo | Bin 30912 -> 30926 bytes .../tr_TR/LC_MESSAGES/messages.po | 54 ++++++++++-------- .../translations/zh/LC_MESSAGES/messages.mo | Bin 29079 -> 29101 bytes .../translations/zh/LC_MESSAGES/messages.po | 54 ++++++++++-------- application/view/adv.py | 7 ++- application/work/worker.py | 4 ++ 10 files changed, 119 insertions(+), 80 deletions(-) diff --git a/application/back_end/db_models.py b/application/back_end/db_models.py index dfc79772..51af8b1f 100644 --- a/application/back_end/db_models.py +++ b/application/back_end/db_models.py @@ -35,7 +35,7 @@ class KeUser(MyBaseModel): # kindleEar User book_config = JSONField(default=JSONField.dict_default) share_links = JSONField(default=JSONField.dict_default) #evernote/wiz/pocket/instapaper包含子字典，微博/facebook/twitter等仅包含0/1 - covers = JSONField(default=JSONField.dict_default) #保存封面图片数据库ID {'order':,'cover0':,...'cover6':} + covers = JSONField(default=JSONField.dict_default) #保存封面图片数据库ID {'enable':,'order':,'cover0':,...'cover6':} send_mail_service = JSONField(default=JSONField.dict_default) #{'service':,...} custom = JSONField(default=JSONField.dict_default) #留着扩展，避免后续一些小特性还需要升级数据表结构 diff --git a/application/static/base.js b/application/static/base.js index 3ea3e078..2da5e838 100644 --- a/application/static/base.js +++ b/application/static/base.js @@ -1310,6 +1310,7 @@ function SetCoverToDefaultImg(idx) { function startUploadCoversToServer(url) { var totalSize = 0; var fileDatas = new FormData(); + fileDatas.append('enable', $('#enableCover').val()); fileDatas.append('order', $('#coverOrder').val()); for (var idx = 0; idx < 7; idx++) { var coverName = 'cover' + idx; diff --git a/application/templates/adv_uploadcover.html b/application/templates/adv_uploadcover.html index 66fd6cdf..907031dc 100644 --- a/application/templates/adv_uploadcover.html +++ b/application/templates/adv_uploadcover.html @@ -4,21 +4,28 @@ {% endblock -%} {% block advcontent -%} -
+
{{_("Upload cover image")}} -

{{_("Upload cover images from local with an aspect ratio of approximately 0.65.")}}

+

{{_("Upload cover images from local with an aspect ratio of approximately 0.625.")}}

+
+ + +
+
+ + +
+
-
- - -
-
    {% for idx in range(7) -%} diff --git a/application/translations/messages.pot b/application/translations/messages.pot index 4ee3942b..4bbe525e 100644 --- a/application/translations/messages.pot +++ b/application/translations/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-11-23 21:29-0300\n" +"POT-Creation-Date: 2024-11-24 09:32-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -383,6 +383,7 @@ msgid "" msgstr "" #: application/templates/adv_inboundmail.html:16 +#: application/templates/adv_uploadcover.html:15 #: application/templates/book_summarizer.html:19 #: application/templates/book_translator.html:22 msgid "Disable" @@ -465,23 +466,35 @@ msgid "Upload cover image" msgstr "" #: application/templates/adv_uploadcover.html:10 -msgid "Upload cover images from local with an aspect ratio of approximately 0.65." +msgid "" +"Upload cover images from local with an aspect ratio of approximately " +"0.625." msgstr "" -#: application/templates/adv_uploadcover.html:15 -msgid "Rule to pick cover images" +#: application/templates/adv_uploadcover.html:13 +msgid "Include cover" +msgstr "" + +#: application/templates/adv_uploadcover.html:16 +#: application/templates/book_summarizer.html:18 +#: application/templates/book_translator.html:21 +msgid "Enable" msgstr "" -#: application/templates/adv_uploadcover.html:17 +#: application/templates/adv_uploadcover.html:20 +msgid "Rule for cover" +msgstr "" + +#: application/templates/adv_uploadcover.html:22 msgid "Random" msgstr "" -#: application/templates/adv_uploadcover.html:18 +#: application/templates/adv_uploadcover.html:23 #: application/templates/base.html:127 msgid "Weekday" msgstr "" -#: application/templates/adv_uploadcover.html:42 +#: application/templates/adv_uploadcover.html:49 msgid "Upload/Update" msgstr "" @@ -1150,11 +1163,6 @@ msgstr "" msgid "Your browser does not support the audio element." msgstr "" -#: application/templates/book_summarizer.html:18 -#: application/templates/book_translator.html:21 -msgid "Enable" -msgstr "" - #: application/templates/book_summarizer.html:29 msgid "Model" msgstr "" @@ -1688,8 +1696,8 @@ msgstr "" msgid "Word" msgstr "" -#: application/view/admin.py:48 application/view/adv.py:434 -#: application/view/adv.py:486 application/view/settings.py:66 +#: application/view/admin.py:48 application/view/adv.py:437 +#: application/view/adv.py:489 application/view/settings.py:66 #: application/view/translator.py:87 application/view/translator.py:171 #: application/view/translator.py:253 msgid "Settings Saved!" @@ -1803,34 +1811,34 @@ msgstr "" msgid "Append qrcode of url to article" msgstr "" -#: application/view/adv.py:378 application/view/share.py:54 +#: application/view/adv.py:381 application/view/share.py:54 #: application/view/subscribe.py:250 msgid "Unknown command: {}" msgstr "" -#: application/view/adv.py:436 application/view/adv.py:488 +#: application/view/adv.py:439 application/view/adv.py:491 msgid "The format is invalid." msgstr "" -#: application/view/adv.py:520 +#: application/view/adv.py:523 msgid "Authorization Error!
    {}" msgstr "" -#: application/view/adv.py:541 +#: application/view/adv.py:544 msgid "Success authorized by Pocket!" msgstr "" -#: application/view/adv.py:547 +#: application/view/adv.py:550 msgid "" "Failed to request authorization of Pocket!
    See details " "below:

    {}" msgstr "" -#: application/view/adv.py:568 +#: application/view/adv.py:571 msgid "The Instapaper service encountered an error. Please try again later." msgstr "" -#: application/view/adv.py:581 +#: application/view/adv.py:584 msgid "Request type [{}] unsupported" msgstr "" diff --git a/application/translations/tr_TR/LC_MESSAGES/messages.mo b/application/translations/tr_TR/LC_MESSAGES/messages.mo index a554048eee81499017d53ca9312fb0f379251c9a..b89746d934155dbca7bd8bd30ee5c32e9926a5e4 100644 GIT binary patch delta 8103 zcmYM&33OM*y}K%_n1n~LIvzs+$9o&TWJBS8&3~$1Zust?v7DcUaAU4MtSRYql zO?(XvWCvDb{^$b=8F&hl@iQObmso(`pfBb#nk(y!uDB=KzXZ)#DH_mNtb>!#_ZFbz zEk@s4jtm*C!GtgDqTsgg3sxdO(K-HbrRn)`Jqyi57i@_mu^leNPWURezz@+3e2)g) zoJPkfMCa*(W}try@^1iTG}OX-@Os4PUM|KOxD5G;R`Z7|-G%l)82lSL@Ry^I zqSVG{hFhcKcR{zLZ%gu@Lg7vtjIaz%)l@X{8JLU%Tptolu*2Vqk z!cL(9oJaeA73wLZrz!R91O+4N7%UE!qAMMPjqpBnpvTdbEJxpa9-U}Ic)m6GHa4Jr zKe~`J*cLwz?R8qm3s1DC;6z=~RQC@LhM_6FJv^U^?)_Z!I;}(lSdYVS8zy0L8_ofy zV?*46sklFQ1k7vC#W)0qqkH=+yaTtR zhb^-p?pJ{JE5>Ht|78^1m$5o-!+KbOZvOFhB*NW3PlIc{jIKSceY}>eU;{LOW>^#3U~Mc4?Ss&@ zk3jFiSoHYLM8{o*j{5?dvsciCZ)nd(IPex4%)p!Iz<&t!!{`gg(2N{M2Rehk_Zj-$ z1$4lFqy4`R^=nvzdP;}b9CVyqtcq~9W!wcy0Z7N zCVmpyFJc$!QOEcmbVV~f1bu%z8o&eSLKAZ-WKnn$4PZ4I(94*K73hkOpea3$p7XDe zxuT3t@kBk)Uq_?RPtpp^!`HD59>pQ}Et2OSchLSHqlfO(Q2!cT;CJXDOd?G+yoik`IB;w9#g6D9D#C0W zj5$~q>a)^*w0+Ludv+Lce|I(S<}e#_y$J4%KY5Ukfxd9Wmhqy(l!t2)v9e4w}fVZ$G?!ngh1A1m!{U}~>KXm*-Xa>jri2S>v2{gFE zS?J+;6pe5-x{_D0Ep80;N_3!;XumJeg?tmd8mw9r|BWFH?cW{^v=|LwKoR+Of>Ihx z&B)MUJlZ}L4Qv{EE9RqnybA5V1q*Q}dIrt~le)zdHA6GoHrNf#+yL|p{5V0uh(-p- zq61F~^@q?%=btkX%1@~wP zUcdL)fO-Ym;VTWF2+{)67mzh8`_h2YXJ2duq94Ge;GZ6POu5z!Gq}GT+Z@c z*ssxy?MC~b!_MCSG(KBK)C27>4fz{r^m81F<;X#fs`iPmS2uK`5txUwLi-AIrJK+* zu?IO0(Z52yRp0ni>ataTPlL#?bzIG=PJcuyB-uhwuY5fRoq&&tq-8h7M4>e{3%LULks@ zI)?Tlm2KWms#n;flE~DR->Nk^ruSe6H<5OLTuCx<+J&Mr*N)B|%0opGg)38lw?-cA6n}|v%*l|R7FdDr^6Vb!B z5Dn;Q^t-SE({XcX-;TcjHfG>%^!dS1uf(dYC*U^>r zMkl-(TVNUH;^XK*>(G_Gi}pW){6rt}M|*5OI6f1@u_yKC&~XlpzfH5{g97UGzoq2B{U;%U=7?6>if{!@*Wz{DfIrI!wmdBn99e)dNwBVC^Vtq z#Kq|S91t9f&8g2o2V8+>;FsuO-HEQ~1oDZ9u3{_fGc11Z9xR}~6kX6ZbmCp;7VjTM z{##QxO@kAp4UbQ4CgxGkMOWH4w3lEz>UW?k`x$29^O%LdMQ_bcG*f%9I#veHgy;W6 zGxxv4$$uV&IprpGMEbS~TKUF$dp7w`@P!??QN96ASS) zK8A%j?)EryPof!Kh0L3X)=+To*JEwmj1I6H4QOBR1FS>+6EvW2&`hO|j_dWX4fR$? zQlnw$%3sED_!hc=26x2c7UCrDe@_bD^R?)Tcc1}Pppm{CJcO?JSg4=HZ0et*8N7l9 zo_1$^2&)I{q6^7I$M1lSTcpe%^`_vd?H@V}4&D|V7oJZ+2bvz*7a@y^7NeOsiFNUF z?1Isl_(RkcH&C639_Ea(vGp+F%A1FVV)W4b7)|kg=)eonl`cV7x*A={I`q@K5j~7s z(f&Kp)W3^n@(h}p|3SCl3v7?q#*%*rZhu#}W@yJ!^u=LlW=01mpoi%JbfW)4Cw>JD zY%^ZpLNu@nG}Zfp@1f)WIXthti~JkFUuiHkU!VhjgT9!`$uT1}(7i82C+dxp@K&_n zYv}u1(SC1Z13ZLo$$501E7%P)$H#wrE=f@Eg_-EYKSd{4j-K}CL;LG!Ms}f}pXm(X#ppcB?CBS_50Je+`@m7ii$Jb}5GxJfIgx`+O)m(F zP+x$qC=uFMVq5APLi_t@V4q?Oyo65FaB3V#9-5iXXh!>>&j+AeGmijb`Q~8rav^68+884q9O@j=~h2a}WD($A@V! zbxSY_e}R5@)}Rx;iUzPbxFfXh3BHH+KZXYQH*{ftM<>d-H(ppRv|khS%(Y5TD5WqG zP1Ub(ByK|Y`Wm{oIrqiat^mDWJrw2BpW!epcpzTMBf(#zhw1>jf{)SfM~w&LiEqJP)W@J(vI;%*ThY`X z#J%_hR`>q@Zdx4aF7z;-M^}{eP<(&eU}x&%gUiv|vKvR^S?r6wrpKrHG4u?qLj(9j zXs<*Ucm*B5?hOBb1N+~TLNgj>qA#w%Wc)3TndoUf3pj&hT&EP-K_pTy8 zQPr98c(d_I>PxXI=FEx%sf+cQKk7gs4NK68hN6dXd~hN<;Z&@K)3FUMMECk-^u6tv zjr-8|kE8E>gr1eN*dPCmt+D%T^6v^JP#BJL(EGm^9ry(L;y*DJe+bW0=EUs{(To+K z0rW#NG#p*fICKl9U_K_$fYt>!%_098G`vZJE33eocmN&X1RB7{XlgHF7G6dtN}bDZ zM9e`0Jc?fD<7of0I0!$(+wsPE@jpnOLJ#qq^T_`r6yBrZVJw-?zuB>ZKMJwi0zOJO z8FTOqx`IpSim##zsIf2(ygs^+mZ9D;)Qi#gZVe7cGdHF$1qYakp8iL%4z5O5v^ls9 z9pEkWQ0_(d_&|BJ+(k7rrp=o&HE;5a`BP_?|7W|?snzb8F*{V}b$uYKN|*A}{r{Yj zc4JX8jYi-&DdRj!f}dtRuw#>zZzAKJTw_S=H} zf_EYP64B7mFb1pf;scn5v(X8k#QOLgI`Hf00(N2&zKN-L0A1*NXul7!Jf6V}`~)56 z3Oa6jw*3-Olu5ycY;@q}$WPRgKk~63@=i26xEk%Z2Yv4V-i(K_5K|gOQ7*Q}9J~)R zaUL4rf1(R{1*1MS5p5UL+fzO2c zS7@X^2UA(C8O}t<&q24ORa5fsL_KJ5g?-Re4MbOdA1342&^|Hv5LT!C5%j&K=J-JyNc%lIXCu)qQx;Q-OjHa|(cs>x_`%&n1dK6vwa_o!iF$u5Y z2K*lD;+p1hhIR(u#7eXuj7>yGDHzd-;3vTg!S90QS-x9S4X^EGFb7R-A@;@+bZ-~o zUHCG3*nUF$)oT&=E5t_L|5+5=8?1Lrfz>CoZEl2P5OV|Y8 z#wYP#=<^u`aR%mND)r@UGfe z0f>#U4zXO#kiho(8;xDMDp%E0~wUpzX)Jw2DE<*=efoZq_ zjchws!?#2GaV)0(DS8`fwTv^|5`DjOf`Sv=jz&5tbQq5=;9+z@^DzzAp%HIIQ@RU1 z?SDb$h%TTL)o&I5Qn~^CFipd3T!PJU8}`P;DGH`8uXUWdR+vKlhEOj-BkG2xbO73a zFuIUo=r5bGn1ORbeKGolTaWhNj~=>rLj6M|z(jPKf`{-dnv#E`16Lt$zL%WXaYL%D)bAu3(edy?2MmaLu}N>@!0<^6ioF1GN~JD_1$dVkMg53JN7e%=q=l5xnR=($iof_@jiMdpl}av)sDFVS0&m_~sc5iP|| z_$Rbua!0-a*a_?56wJk^k)LRLXupKrsHgI>dwU1^OXwkVf|a-*ccF)KHsKrCVkBdU z=yw!+;TUrDqpRqGa&L}PIvDwTXEX=<;9BG$M;Ea!Ht8HsbTejCABwgo&`4LJXJQL- z45HJaUZcdronWsicn0o8_i`9|ic8VMHW}UXS?F1K1pQDwh5jyBi7sq48sT}IfIp$n z$9IXZ??kLceI7dg3fq}KT2H|R>YFh!3E9cNmlKY-s-io!~OQhW|#l>Q%0e1OE<_ za5s8*|A532eT&|f4xCUA?+APV7vTN)eK+!d8->zaqZ~eI5G#E0}_t(dRoueIJ&megqqP|KFofpN1>w%F=tqFJz+iY&5dw z=!7k?3HHQ>I0+djT8#EDL;L?X@)Pank3vklJw6kikZ)X+K>z(2?WW-A{}>zKWvq(n zz2gD1&1{bb>4Bsr>=7F|}VDX#v_^j0JcL8rg%GhQGmdT!vL}1DdJVF%|a(|J*O!|C2PB zx_@FeUP2F1#vSp5wb6mI&;jy8dpq>Ko6rUHM86-y(A)AbX5m~kz*Xot+k*S?{#y$j(S_Py*qkn2csFBj;8e2=q*`*Zr$@}zisFi9Yq)TC7R(% zi2?C%r8M*#-whpbD7w;d=)^P8GqC_&@Di+!FQQwv9qo5IJpU3$Q~wdo#Hc$t;5ZiZ zvB$tTbBSpbJiU*g6F-iw>{+aVE71WqqYK&^{39CSd+37x2dm-LP%l3y{`6Kyk{NYG zBYzt2#f?Y+i75H5c;HMN!Gm1%o-aTnUXL#5HFTk6!Ch#?Z-)B&=+>M-1Nj_X_!aaJ zeitlvcRXJzR`UMWqu{_f!RF`-Mb|p;*QsDhut#{_56#Gs&^`_cDw>RD;tP3ZVr?{WVr?4ZE~>_+eR5p>|cqA#99Gjajl^Hffd6J?=irWx9AA^QF^ zXus812REZzaS)y7G`7R9?j`?u6mowVzt9hzcsM%2B=nR&9NHJ78F?Q46t71=Kz~9b z{tI5ahUkP}Vkb-*8h_YI&@(a|8{p0ag@zPPpey4L^G3z zwzo!8c{A3=JJ3vxMKduMop3oO;YRfNCNzM3*aZ(^F7rnzqvBMyMknfnetHLm`gk;= zDWUyw^w6#f?Qf$C`x`dF&(Mjgmc|RIfo7%&n$cqPd3#K_N1Z7&!yf1%dk{_CEUbW! z2cJftKZnV<23_z==s26O9&Sf7^B%gebJ!HGU;)-09UuBzN0a{wG>oRfj`yRf`xPeP zLUd~up%bk@7qB+CDYU;4`~%wmAiBW!(ZD`L=lKy0ENM*KFMSO8_t4d)p%->TQ?&&9 z;|u6se~s>Kg|YFqYk*#_0(8N*qN%?NZ^YT?mi-=^;}L9+-=MdqXk7ejzgL1n5e@Uu zFVj}^z8=65JdJ&^!T30miNR&)q1uZEa2)-9{ESZAZbJOe^xM%bc>+E4FJVJ`6W_wb z#}ra2tiL~A=@xW_C(($$#p|*D#Q2}*{ett*+p-I-@wYaAKjwEXa>)q?_ENEqHp-a z@k$>g3pg9gV};2sg#E8f!M$ySm9PUkQ5W9o6{**X^0oa%NX!QQSfe!pG`r^k}5if=3--Y(nsd0o^=mOfH z8S07#)Cb*yLD(24qYGMw*Y5us3Mn*fL?hdV)o>3wz`N)Ij-jdjC#K`)=tSS+UQC`A zFK|CrrTz}u{{;5LQ#cTFr^o*gnLVBSdx|&G@G$PhUt#+h{G|f7@kc)9J;e7M2V!+R zjz(|}jrbxOz)$GHtIUi8$wcdoLcJyWUWZ`Uncd^m^`gN6MxdvEBG$x(Xv$v*zKjmA z89kJ5pnJThtZu_O)ymcvoT^xJ+NA6U$BmqjJ#x~F(ka>FCJrA{I<@SHHsjOFu5|sN zLZvp@#jS5F?of8PN3V>soFT0$*PK#1b=<`JOQ(!`U|jap(gPbOmS#^V8!)2iy0Upw HZm;;ikZz`o diff --git a/application/translations/tr_TR/LC_MESSAGES/messages.po b/application/translations/tr_TR/LC_MESSAGES/messages.po index eb73df84..95b3587d 100644 --- a/application/translations/tr_TR/LC_MESSAGES/messages.po +++ b/application/translations/tr_TR/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-11-23 21:29-0300\n" +"POT-Creation-Date: 2024-11-24 09:32-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: tr_TR\n" @@ -386,6 +386,7 @@ msgstr "" "yapılandırmanız gerekmektedir." #: application/templates/adv_inboundmail.html:16 +#: application/templates/adv_uploadcover.html:15 #: application/templates/book_summarizer.html:19 #: application/templates/book_translator.html:22 msgid "Disable" @@ -470,25 +471,37 @@ msgid "Upload cover image" msgstr "Kapak resmi yükle" #: application/templates/adv_uploadcover.html:10 -msgid "Upload cover images from local with an aspect ratio of approximately 0.65." +msgid "" +"Upload cover images from local with an aspect ratio of approximately " +"0.625." msgstr "" -"Yaklaşık 0.65 en boy oranına sahip kapak resimlerini yerel olarak " +"Yaklaşık 0.625 en boy oranına sahip kapak resimlerini yerel olarak " "yükleyin." -#: application/templates/adv_uploadcover.html:15 -msgid "Rule to pick cover images" -msgstr "Kapak resimlerini seçme kuralı" +#: application/templates/adv_uploadcover.html:13 +msgid "Include cover" +msgstr "Kapak Dahil" + +#: application/templates/adv_uploadcover.html:16 +#: application/templates/book_summarizer.html:18 +#: application/templates/book_translator.html:21 +msgid "Enable" +msgstr "Etkinleştir" + +#: application/templates/adv_uploadcover.html:20 +msgid "Rule for cover" +msgstr "Kapak Kuralı" -#: application/templates/adv_uploadcover.html:17 +#: application/templates/adv_uploadcover.html:22 msgid "Random" msgstr "Rastgele" -#: application/templates/adv_uploadcover.html:18 +#: application/templates/adv_uploadcover.html:23 #: application/templates/base.html:127 msgid "Weekday" msgstr "Hafta içi gün" -#: application/templates/adv_uploadcover.html:42 +#: application/templates/adv_uploadcover.html:49 msgid "Upload/Update" msgstr "Yükle/Güncelle" @@ -1168,11 +1181,6 @@ msgstr "Metin" msgid "Your browser does not support the audio element." msgstr "Tarayıcınız ses öğesini desteklemiyor." -#: application/templates/book_summarizer.html:18 -#: application/templates/book_translator.html:21 -msgid "Enable" -msgstr "Etkinleştir" - #: application/templates/book_summarizer.html:29 msgid "Model" msgstr "Model" @@ -1722,8 +1730,8 @@ msgstr "Ek olarak ilet" msgid "Word" msgstr "Kelime" -#: application/view/admin.py:48 application/view/adv.py:434 -#: application/view/adv.py:486 application/view/settings.py:66 +#: application/view/admin.py:48 application/view/adv.py:437 +#: application/view/adv.py:489 application/view/settings.py:66 #: application/view/translator.py:87 application/view/translator.py:171 #: application/view/translator.py:253 msgid "Settings Saved!" @@ -1837,24 +1845,24 @@ msgstr "Tarayıcıda aç" msgid "Append qrcode of url to article" msgstr "Makaleye URL'nin QR kodunu ekle" -#: application/view/adv.py:378 application/view/share.py:54 +#: application/view/adv.py:381 application/view/share.py:54 #: application/view/subscribe.py:250 msgid "Unknown command: {}" msgstr "Bilinmeyen komut: {}" -#: application/view/adv.py:436 application/view/adv.py:488 +#: application/view/adv.py:439 application/view/adv.py:491 msgid "The format is invalid." msgstr "Format geçersiz." -#: application/view/adv.py:520 +#: application/view/adv.py:523 msgid "Authorization Error!
    {}" msgstr "Yetkilendirme Hatası!
    {}" -#: application/view/adv.py:541 +#: application/view/adv.py:544 msgid "Success authorized by Pocket!" msgstr "Pocket tarafından yetkilendirilen başarı!" -#: application/view/adv.py:547 +#: application/view/adv.py:550 msgid "" "Failed to request authorization of Pocket!
    See details " "below:

    {}" @@ -1862,13 +1870,13 @@ msgstr "" "Pocket yetkilendirme isteği başarısız oldu!
    Aşağıdaki ayrıntılara " "bakın:

    {}" -#: application/view/adv.py:568 +#: application/view/adv.py:571 msgid "The Instapaper service encountered an error. Please try again later." msgstr "" "Instapaper servisi bir hata ile karşılaştı. Lütfen daha sonra tekrar " "deneyin." -#: application/view/adv.py:581 +#: application/view/adv.py:584 msgid "Request type [{}] unsupported" msgstr "İstek türü [{}] desteklenmiyor" diff --git a/application/translations/zh/LC_MESSAGES/messages.mo b/application/translations/zh/LC_MESSAGES/messages.mo index 721eebcf3226f83472a9709ed2e9d44592634689..63f543789aec280ecbef7ccc9f7b7dab0a983a51 100644 GIT binary patch delta 8071 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 delta 8069 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 rWc!Cb4+n-9=I$<>ne)q6d#)_qcr~w}upnpq#LS\n" "Language: zh\n" @@ -384,6 +384,7 @@ msgid "" msgstr "为了使能入站邮件功能，还需要配置白名单列表。" #: application/templates/adv_inboundmail.html:16 +#: application/templates/adv_uploadcover.html:15 #: application/templates/book_summarizer.html:19 #: application/templates/book_translator.html:22 msgid "Disable" @@ -466,23 +467,35 @@ msgid "Upload cover image" msgstr "上传封面图像" #: application/templates/adv_uploadcover.html:10 -msgid "Upload cover images from local with an aspect ratio of approximately 0.65." -msgstr "从本机上传封面图像，建议宽高比为0.65左右。" +msgid "" +"Upload cover images from local with an aspect ratio of approximately " +"0.625." +msgstr "从本机上传封面图像，建议宽高比为0.625左右。" -#: application/templates/adv_uploadcover.html:15 -msgid "Rule to pick cover images" -msgstr "封面图像使用顺序" +#: application/templates/adv_uploadcover.html:13 +msgid "Include cover" +msgstr "推送封面" + +#: application/templates/adv_uploadcover.html:16 +#: application/templates/book_summarizer.html:18 +#: application/templates/book_translator.html:21 +msgid "Enable" +msgstr "启用" + +#: application/templates/adv_uploadcover.html:20 +msgid "Rule for cover" +msgstr "封面规则" -#: application/templates/adv_uploadcover.html:17 +#: application/templates/adv_uploadcover.html:22 msgid "Random" msgstr "随机" -#: application/templates/adv_uploadcover.html:18 +#: application/templates/adv_uploadcover.html:23 #: application/templates/base.html:127 msgid "Weekday" msgstr "周内日" -#: application/templates/adv_uploadcover.html:42 +#: application/templates/adv_uploadcover.html:49 msgid "Upload/Update" msgstr "上传/更新" @@ -1151,11 +1164,6 @@ msgstr "原文" msgid "Your browser does not support the audio element." msgstr "您的浏览器不支持audio标签。" -#: application/templates/book_summarizer.html:18 -#: application/templates/book_translator.html:21 -msgid "Enable" -msgstr "启用" - #: application/templates/book_summarizer.html:29 msgid "Model" msgstr "Model" @@ -1691,8 +1699,8 @@ msgstr "作为附件转发" msgid "Word" msgstr "单词" -#: application/view/admin.py:48 application/view/adv.py:434 -#: application/view/adv.py:486 application/view/settings.py:66 +#: application/view/admin.py:48 application/view/adv.py:437 +#: application/view/adv.py:489 application/view/settings.py:66 #: application/view/translator.py:87 application/view/translator.py:171 #: application/view/translator.py:253 msgid "Settings Saved!" @@ -1806,34 +1814,34 @@ msgstr "在浏览器打开" msgid "Append qrcode of url to article" msgstr "在每篇文章后附加文章链接的二维码" -#: application/view/adv.py:378 application/view/share.py:54 +#: application/view/adv.py:381 application/view/share.py:54 #: application/view/subscribe.py:250 msgid "Unknown command: {}" msgstr "未知命令：{}" -#: application/view/adv.py:436 application/view/adv.py:488 +#: application/view/adv.py:439 application/view/adv.py:491 msgid "The format is invalid." msgstr "格式非法。" -#: application/view/adv.py:520 +#: application/view/adv.py:523 msgid "Authorization Error!
    {}" msgstr "申请授权过程失败！
    {}" -#: application/view/adv.py:541 +#: application/view/adv.py:544 msgid "Success authorized by Pocket!" msgstr "已经成功获得Pocket的授权！" -#: application/view/adv.py:547 +#: application/view/adv.py:550 msgid "" "Failed to request authorization of Pocket!
    See details " "below:

    {}" msgstr "申请Pocket授权失败!
    错误信息参考如下：

    {}" -#: application/view/adv.py:568 +#: application/view/adv.py:571 msgid "The Instapaper service encountered an error. Please try again later." msgstr "Instapaper服务器异常，请稍候再试。" -#: application/view/adv.py:581 +#: application/view/adv.py:584 msgid "Request type [{}] unsupported" msgstr "不支持你请求的命令类型 [{}]" diff --git a/application/view/adv.py b/application/view/adv.py index 517d0933..7b5f97b1 100644 --- a/application/view/adv.py +++ b/application/view/adv.py @@ -277,6 +277,7 @@ def AdvUploadCoverImage(user: KeUser): covers = {} jsonCovers = '' if user: + covers['enable'] = user.covers.get('enable', '') covers['order'] = user.covers.get('order', 'random') for idx in range(7): coverName = f'cover{idx}' @@ -292,11 +293,13 @@ def AdvUploadCoverAjaxPost(user: KeUser): MAX_WIDTH = 832 MAX_HEIGHT = 1280 ret = {'status': 'ok'} + form = request.form covers = user.covers - covers['order'] = request.form.get('order', 'random') + covers['enable'] = form.get('enable', '') + covers['order'] = form.get('order', 'random') for idx in range(7): coverName = f'cover{idx}' - upload = request.files.get(coverName) or request.form.get(coverName) + upload = request.files.get(coverName) or form.get(coverName) if not upload: continue diff --git a/application/work/worker.py b/application/work/worker.py index aeae3ab2..590160f7 100644 --- a/application/work/worker.py +++ b/application/work/worker.py @@ -98,6 +98,10 @@ def WorkerImpl(userName: str, recipeId: Union[list,str,None]=None, reason='cron' ro.translator = bked.translator.copy() #设置网页翻译器信息 ro.tts = bked.tts.copy() #文本转语音设置，需要中途修改tts内容 ro.summarizer = bked.summarizer.copy() #AI摘要器的配置信息 + + #如果书籍没有设置封面，则使用用户全局设置 + if ro.cover_url is None and not user.covers.get('enable', ''): + ro.cover_url = False #如果需要登录网站 if ro.needs_subscription: