From b95ad1178aa9d06b1867a5597ac8d026815ae266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=B3=E7=A5=9E?= <3162475700@qq.com> Date: Sun, 22 Sep 2024 17:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=8A=E4=BF=AE=E5=A4=8D=E7=94=B1?= =?UTF-8?q?=E4=BA=8Erss=E5=80=92=E5=BA=8F=E5=AF=BC=E8=87=B4=E6=8A=93?= =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20#18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/get_info.cpython-311.pyc | Bin 18280 -> 18700 bytes friend_circle_lite/get_info.py | 7 +++++-- readme.md | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/friend_circle_lite/__pycache__/get_info.cpython-311.pyc b/friend_circle_lite/__pycache__/get_info.cpython-311.pyc index b813a54a4d361612d65002e13b888cbe8ebc7de6..04de5f4514709eeba05f9e1391805b56133535ce 100644 GIT binary patch delta 1398 zcmZ8hT}&KR6ux(6cNTV8q+JTEOSe$|I@I!4S+OA-SspA8dTu{Aw~ALy4oFW~GyjtU4(OVbX0 zBVWe{{?zvHbnBY3D_gyf7D(~Di!%TV=K0kz8olOJZWm+ z*;J}vN_bCrT$)GCBKAY53~6_LwtOWRR|75ksqVYi`8ah*aDheuz3=^W% zw8j!c(U=-y#EO2!a#bIL8T8{wCj9zp|G?@IlIb5_9hqDUr!wKx47$(4sCPjy#FHdt zWIKS26IQW@mij6L*-N{87jh&u0UA*ZF-FGdEgx)E*q#)-)jQ1g8MN-Np##O2b3NI$ z>xjYo`_padq`qZ)FCN^GkiYzD_(mX8-niPDVxM({I)wcKd-%JAzfF8#Vp>X{S<8C* zwkz+Gy%)zXoyZi*Yo6+ir}|e{^{T7-c4^fOXQp)TQh2FvDV!;NJ{`UoSj+KK;-B_) z+BzL*#o_F15?8kPIvd25XE5gt_D=nw|E`#Sl(pNlfMn4SYU*GoTfuRw7d=9qQ8~*<8Ine(UKQuvLQu>w9#=Qi>%byiuN6c zd2WCMH%N9H(lCsYF$MTc!7+NLqRsVW(Os3h?cB!i_5RB5Fz(iKca2HUnJoy0q$UUB zqZ;r8S+Y9P%sLE=EHX)kl3D_++DW=xa{#;P!5p;$@OC#-sHg?>kFt6C8|YXh~BMh$FsDmzQJX-!VAFLRH+Zz zFEP5V&)46xNwZvy)49e>8MnzCXXxVWB?eE-F&t!T`bCqB!}O=7(h}ZzFZ3{!1*_o! z&PBs!9zRG6n_KKxnAAY~nr||{idsGpbIvjWrWo|VEd93iO0i|2>6n4XRW_oi#QNdD zJ9H#ikE8VSU=@3jH-p`;oaehYIdp+(hAlR#YKAl(jU|aH+hLB2x$!6*Cy^6sVl0w` zm}QdF692O(653YCMa9@BQ3_KsW31E(bmofH_5l<+|7zx2Q XG!VX)AH>de^nW-XOQj!Xhyu3Is^3?7A~pWPi$;Sy%~F zV*7wUt;Q2WS~X2gtZDmXCO&C=&;(z6@h8#DgKwfQjYOa9Q}5X^O`CL*`R2@b&OP_L z-?`^6@i#y4lAC_NkBR59|M~cA^j67`%)4z}-dV~m`|5@cUb%9_!`Qq!@10ZUJd+C5 zf`_w=W4{X6eC_KwWq@sF)>do@R(Utfu`5gu;7~AJSw8Rk#y7z9!gq$xu)H+NX1G>i zUk(<_cq&vU^=U!;HS|4pR86fP6^&1d*IX3)EwI(|*!X*~QrxW#tzYJ6%1BZ|PJjE}W|{j~Ox z6gVVy==+UnlH=Ld44ddMN6_BV#vkIlExSGMncY(7=fN*ULX+Vr<%bD$w{obylRv?w z`Vk(-)%s{zQqYc?NLmxqh9-$t(eR#{1612eKxfkYjyet#Mn;Dw;tu0a;m)FeH(d!g zDp`@bZC5nh<~(jc(lY9ff&`DFnz>`?2@9w|Q(Z+T3Vj4PYmB^+%vo7*drxAvc|Z5z zo#x)6I29cy7`IDXns~UMV$$YFDI)_a{dx%oiBpZdMH&yH5vi%3B>phL040mv1DIoa z!b-phUXSeI3-~G$DJn>z1~7x0w(nLhi11Ha-~Lus7l=*b=&olKWE1!WXdaL#4p5B# z&?k5(+Q9eXY;@zcxZnmgk0VVQCmk;s(*~G^SWu9xnpv<6UCd1`Xc)#j(WvsHSkiz;R>jgqh8Z= count: - break if 'published' in entry: published = format_published_time(entry.published) @@ -168,6 +166,11 @@ def parse_feed(url, session, count=5): } result['articles'].append(article) + # 对文章按时间排序,并只取前 count 篇文章 + result['articles'] = sorted(result['articles'], key=lambda x: datetime.strptime(x['published'], '%Y-%m-%d %H:%M'), reverse=True) + if count < len(result['articles']): + result['articles'] = result['articles'][:count] + return result except Exception as e: print(f"不可链接的FEED地址:{url}: {e}") diff --git a/readme.md b/readme.md index 2210a30..53e8f6d 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,10 @@ ## 开发进度 +### 2024-09-22 + +* 修复 #18 提出的,由于rss倒序导致限制抓取错误的问题,改为先全部获取后,按照时间排序,再选择性获取 + ### 2024-09-05 * 更新部署方式,将静态文件放到page分支下,主分支不放数据文件