Skip to content
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

Jump to bottom

Fix Torznab content type criteria #209

Merged
merged 1 commit into from
Mar 10, 2024
Merged

Fix Torznab content type criteria #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions internal/torznab/adapter/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ func (a adapter) searchRequestOptions(r torznab.SearchRequest) ([]query.Option,
case torznab.FunctionSearch:
break
case torznab.FunctionMovie:
options = append(options, query.Where(search.ContentTypeCriteria(model.ContentTypeMovie)))
options = append(options, query.Where(search.TorrentContentTypeCriteria(model.ContentTypeMovie)))
case torznab.FunctionTv:
options = append(options, query.Where(search.ContentTypeCriteria(model.ContentTypeTvShow)))
options = append(options, query.Where(search.TorrentContentTypeCriteria(model.ContentTypeTvShow)))
if r.Season.Valid {
episodes := make(model.Episodes)
if r.Episode.Valid {
Expand All @@ -44,9 +44,9 @@ func (a adapter) searchRequestOptions(r torznab.SearchRequest) ([]query.Option,
options = append(options, query.Where(search.TorrentContentEpisodesCriteria(episodes)))
}
case torznab.FunctionMusic:
options = append(options, query.Where(search.ContentTypeCriteria(model.ContentTypeMusic)))
options = append(options, query.Where(search.TorrentContentTypeCriteria(model.ContentTypeMusic)))
case torznab.FunctionBook:
options = append(options, query.Where(search.ContentTypeCriteria(
options = append(options, query.Where(search.TorrentContentTypeCriteria(
model.ContentTypeEbook,
model.ContentTypeComic,
model.ContentTypeAudiobook,
Expand All @@ -65,7 +65,7 @@ func (a adapter) searchRequestOptions(r torznab.SearchRequest) ([]query.Option,
var catCriteria []query.Criteria
if torznab.CategoryMovies.Has(cat) {
if r.Type != torznab.FunctionMovie {
catCriteria = append(catCriteria, search.ContentTypeCriteria(model.ContentTypeMovie))
catCriteria = append(catCriteria, search.TorrentContentTypeCriteria(model.ContentTypeMovie))
}
if torznab.CategoryMoviesSD.ID == cat {
catCriteria = append(catCriteria, search.VideoResolutionCriteria(model.VideoResolutionV480p))
Expand All @@ -87,7 +87,7 @@ func (a adapter) searchRequestOptions(r torznab.SearchRequest) ([]query.Option,
}
} else if torznab.CategoryTV.Has(cat) {
if r.Type != torznab.FunctionTv {
catCriteria = append(catCriteria, search.ContentTypeCriteria(model.ContentTypeTvShow))
catCriteria = append(catCriteria, search.TorrentContentTypeCriteria(model.ContentTypeTvShow))
}
if torznab.CategoryTVSD.ID == cat {
catCriteria = append(catCriteria, search.VideoResolutionCriteria(model.VideoResolutionV480p))
Expand All @@ -102,17 +102,17 @@ func (a adapter) searchRequestOptions(r torznab.SearchRequest) ([]query.Option,
catCriteria = append(catCriteria, search.VideoResolutionCriteria(model.VideoResolutionV2160p))
}
} else if torznab.CategoryXXX.Has(cat) {
catCriteria = append(catCriteria, search.ContentTypeCriteria(model.ContentTypeXxx))
catCriteria = append(catCriteria, search.TorrentContentTypeCriteria(model.ContentTypeXxx))
} else if torznab.CategoryPC.Has(cat) {
catCriteria = append(catCriteria, search.ContentTypeCriteria(model.ContentTypeSoftware, model.ContentTypeGame))
catCriteria = append(catCriteria, search.TorrentContentTypeCriteria(model.ContentTypeSoftware, model.ContentTypeGame))
} else if torznab.CategoryAudioAudiobook.Has(cat) {
catCriteria = append(catCriteria, search.ContentTypeCriteria(model.ContentTypeAudiobook))
catCriteria = append(catCriteria, search.TorrentContentTypeCriteria(model.ContentTypeAudiobook))
} else if torznab.CategoryAudio.Has(cat) {
catCriteria = append(catCriteria, search.ContentTypeCriteria(model.ContentTypeMusic))
catCriteria = append(catCriteria, search.TorrentContentTypeCriteria(model.ContentTypeMusic))
} else if torznab.CategoryBooksComics.Has(cat) {
catCriteria = append(catCriteria, search.ContentTypeCriteria(model.ContentTypeComic))
catCriteria = append(catCriteria, search.TorrentContentTypeCriteria(model.ContentTypeComic))
} else if torznab.CategoryBooks.Has(cat) {
options = append(options, query.Where(search.ContentTypeCriteria(
options = append(options, query.Where(search.TorrentContentTypeCriteria(
model.ContentTypeEbook,
model.ContentTypeComic,
model.ContentTypeAudiobook,
Expand Down
Loading