Skip to content

fix: 删除Bangumi时未删除相关RSS #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KotaHv wants to merge 3 commits into
base: 3.1-dev
Choose a base branch
from
Open

fix: 删除Bangumi时未删除相关RSS #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e12464
fix: delete a bangumi did not remove associated RSS
KotaHv Jan 23, 2024
6b276b7
Revert "fix: delete a bangumi did not remove associated RSS"
KotaHv May 24, 2024
9de7ace
fix: Re-fixed delete a bangumi did not remove associated RSS, and pr…
KotaHv Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions backend/src/module/database/rss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ def search_aggregate(self) -> list[RSSItem]:
select(RSSItem).where(and_(RSSItem.aggregate, RSSItem.enabled))
).all()

def search_url(self, url: str) -> RSSItem | None:
return self.session.exec(select(RSSItem).where(RSSItem.url == url)).first()

def delete(self, _id: int) -> bool:
condition = delete(RSSItem).where(RSSItem.id == _id)
try:
Expand Down
7 changes: 6 additions & 1 deletion backend/src/module/manager/torrent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ def delete_rule(self, _id: int | str, file: bool = False):
data = self.bangumi.search_id(int(_id))
if isinstance(data, Bangumi):
with DownloadClient() as client:
self.rss.delete(data.official_title)
rss_links = filter(None, data.rss_link.split(","))
for rss_link in rss_links:
rss = self.rss.search_url(rss_link)
if rss is None or rss.aggregate:
continue
self.rss.delete(rss.id)
self.bangumi.delete_one(int(_id))
if file:
torrent_message = self.delete_torrents(data, client)
Expand Down