DeCarabas/cry
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: DeCarabas:51049b4d3039906bdbfe6279dd54e8bfc20e31ab
Branches Tags
DeCarabas:main
..
compare: DeCarabas:03d420e412f11e50127177d69fd2fcde3f1a7059
Branches Tags
DeCarabas:main

No commits in common. "51049b4d3039906bdbfe6279dd54e8bfc20e31ab" and "03d420e412f11e50127177d69fd2fcde3f1a7059" have entirely different histories.
51049b4d30 ... 03d420e412

2 changed files with 5 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cry/feed.py
View file

@ -664,14 +664,14 @@ def classify_links(links, baseuri) -> typing.Tuple[list[str], list[str]]:
""" """
baseuri = baseuri.lower() baseuri = baseuri.lower()
local, remote = set(), set() local, remote = [], []
for link in links: for link in links:
if link.lower().startswith(baseuri): if link.lower().startswith(baseuri):
local.add(link) local.append(link)
else: else:
remote.add(link) remote.append(link)
return list(local), list(remote) return local, remote
def is_feed_link(link: str) -> bool: def is_feed_link(link: str) -> bool:
@ -687,27 +687,18 @@ def is_feed_link(link: str) -> bool:
def is_XML_related_link(link: str) -> bool: def is_XML_related_link(link: str) -> bool:
link = link.lower() link = link.lower()
return ( return "rss" in link or "rdf" in link or "xml" in link or "atom" in link
"rss" in link
or "rdf" in link
or "xml" in link
or "atom" in link
or "feed" in link
)
async def check_feed(url: str) -> Feed | None: async def check_feed(url: str) -> Feed | None:
"""Check to see if the given URL is a feed. If it is, return the feed, """Check to see if the given URL is a feed. If it is, return the feed,
otherwise return None. otherwise return None.
""" """
LOG.debug(f"Checking {url}: checking...")
meta = FeedMeta.from_url(url) meta = FeedMeta.from_url(url)
result, meta = await fetch_feed(meta) result, meta = await fetch_feed(meta)
if isinstance(result, Feed): if isinstance(result, Feed):
LOG.debug(f"Checking {url}: is a feed")
return result return result
LOG.debug(f"Checking {url}: is not a feed")
return None return None
@ -747,11 +738,6 @@ async def feed_search(uri: str) -> list[Feed]:
LOG.debug("No links, checking A tags...") LOG.debug("No links, checking A tags...")
local_links, remote_links = classify_links(parser.a_links, meta.url) local_links, remote_links = classify_links(parser.a_links, meta.url)
for link in local_links:
LOG.debug(f" LOCAL {link}")
for link in remote_links:
LOG.debug(f" REMOTE {link}")
outfeeds = await check_links(filter(is_feed_link, local_links)) outfeeds = await check_links(filter(is_feed_link, local_links))
if len(outfeeds) > 0: if len(outfeeds) > 0:
return outfeeds return outfeeds
@ -773,7 +759,6 @@ async def feed_search(uri: str) -> list[Feed]:
"rss.xml", # Dave Winer/Manila "rss.xml", # Dave Winer/Manila
"index.xml", # MT "index.xml", # MT
"index.rss", # Slash "index.rss", # Slash
"feed", # catandgirl.com and sometimes others.
] ]
outfeeds = await check_links([urllib.parse.urljoin(meta.url, x) for x in suffixes]) outfeeds = await check_links([urllib.parse.urljoin(meta.url, x) for x in suffixes])
return outfeeds return outfeeds

4
pyproject.toml
View file

@ -1,7 +1,3 @@
[build-system]
requires = ["pdm-backend"]
build-backend = "pdm.backend"
[project] [project]
name = "cry" name = "cry"
version = "0.1" version = "0.1"