Skip to content

Commit

Permalink
Simplify indexer class initialization
Browse files Browse the repository at this point in the history
  • Loading branch information
@theotherp
theotherp committed Jan 4, 2025
1 parent e0f6f56 commit 04a99b5
Show file tree
Hide file tree
Showing 36 changed files with 183 additions and 264 deletions.
2 changes: 1 addition & 1 deletion core/src/main/java/org/nzbhydra/downloading/downloaders/torbox/Torbox.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
import java.util.List;

@Slf4j
@Component
@Component("torboxdownloader")
public class Torbox extends Downloader {

// TODO sist 14.12.2024: Try and parse error responses
Expand Down
17 changes: 4 additions & 13 deletions core/src/main/java/org/nzbhydra/indexers/Anizb.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,23 @@

import com.google.common.base.Joiner;
import joptsimple.internal.Strings;
import org.nzbhydra.config.BaseConfigHandler;
import org.nzbhydra.config.ConfigProvider;
import org.nzbhydra.config.downloading.DownloadType;
import org.nzbhydra.config.indexer.IndexerConfig;
import org.nzbhydra.config.indexer.SearchModuleType;
import org.nzbhydra.indexers.exceptions.IndexerAccessException;
import org.nzbhydra.indexers.exceptions.IndexerParsingException;
import org.nzbhydra.indexers.exceptions.IndexerSearchAbortedException;
import org.nzbhydra.indexers.status.IndexerLimitRepository;
import org.nzbhydra.mapping.newznab.xml.NewznabXmlItem;
import org.nzbhydra.mapping.newznab.xml.NewznabXmlRoot;
import org.nzbhydra.mediainfo.InfoProvider;
import org.nzbhydra.searching.CategoryProvider;
import org.nzbhydra.searching.CustomQueryAndTitleMappingHandler;
import org.nzbhydra.searching.SearchResultAcceptor;
import org.nzbhydra.searching.SearchResultAcceptor.AcceptorResult;
import org.nzbhydra.searching.db.SearchResultRepository;
import org.nzbhydra.searching.dtoseventsenums.IndexerSearchResult;
import org.nzbhydra.searching.dtoseventsenums.SearchResultItem;
import org.nzbhydra.searching.dtoseventsenums.SearchResultItem.HasNfo;
import org.nzbhydra.searching.searchrequests.SearchRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.util.UriComponentsBuilder;
Expand All @@ -34,14 +27,12 @@
import java.util.ArrayList;
import java.util.List;

@Component("aninzb")
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public class Anizb extends Indexer<NewznabXmlRoot> {

private static final Logger logger = LoggerFactory.getLogger(Anizb.class);

public Anizb(ConfigProvider configProvider, IndexerRepository indexerRepository, SearchResultRepository searchResultRepository, IndexerApiAccessRepository indexerApiAccessRepository, IndexerApiAccessEntityShortRepository indexerApiAccessShortRepository, IndexerLimitRepository indexerStatusRepository, IndexerWebAccess indexerWebAccess, SearchResultAcceptor resultAcceptor, CategoryProvider categoryProvider, InfoProvider infoProvider, ApplicationEventPublisher eventPublisher, QueryGenerator queryGenerator, CustomQueryAndTitleMappingHandler titleMapping, BaseConfigHandler baseConfigHandler, IndexerSearchResultPersistor searchResultPersistor) {
super(configProvider, indexerRepository, searchResultRepository, indexerApiAccessRepository, indexerApiAccessShortRepository, indexerStatusRepository, indexerWebAccess, resultAcceptor, categoryProvider, infoProvider, eventPublisher, queryGenerator, titleMapping, baseConfigHandler, searchResultPersistor);
}


@Override
protected void completeIndexerSearchResult(NewznabXmlRoot response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) {
Expand Down
16 changes: 4 additions & 12 deletions core/src/main/java/org/nzbhydra/indexers/Binsearch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,21 @@
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.nzbhydra.config.BaseConfigHandler;
import org.nzbhydra.config.ConfigProvider;
import org.nzbhydra.config.downloading.DownloadType;
import org.nzbhydra.config.indexer.IndexerConfig;
import org.nzbhydra.config.indexer.SearchModuleType;
import org.nzbhydra.indexers.exceptions.IndexerAccessException;
import org.nzbhydra.indexers.exceptions.IndexerParsingException;
import org.nzbhydra.indexers.exceptions.IndexerSearchAbortedException;
import org.nzbhydra.indexers.status.IndexerLimitRepository;
import org.nzbhydra.mediainfo.InfoProvider;
import org.nzbhydra.searching.CategoryProvider;
import org.nzbhydra.searching.CustomQueryAndTitleMappingHandler;
import org.nzbhydra.searching.SearchResultAcceptor;
import org.nzbhydra.searching.SearchResultAcceptor.AcceptorResult;
import org.nzbhydra.searching.db.SearchResultRepository;
import org.nzbhydra.searching.dtoseventsenums.IndexerSearchResult;
import org.nzbhydra.searching.dtoseventsenums.SearchResultItem;
import org.nzbhydra.searching.dtoseventsenums.SearchResultItem.HasNfo;
import org.nzbhydra.searching.searchrequests.SearchRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.util.UriComponentsBuilder;
Expand All @@ -54,6 +47,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@Component("binsearch")
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public class Binsearch extends Indexer<String> {

private static final Logger logger = LoggerFactory.getLogger(Binsearch.class);
Expand All @@ -72,9 +67,6 @@ public class Binsearch extends Indexer<String> {
.withDelay(Duration.ofMillis(500))
.withMaxRetries(2).build();

public Binsearch(ConfigProvider configProvider, IndexerRepository indexerRepository, SearchResultRepository searchResultRepository, IndexerApiAccessRepository indexerApiAccessRepository, IndexerApiAccessEntityShortRepository indexerApiAccessShortRepository, IndexerLimitRepository indexerStatusRepository, IndexerWebAccess indexerWebAccess, SearchResultAcceptor resultAcceptor, CategoryProvider categoryProvider, InfoProvider infoProvider, ApplicationEventPublisher eventPublisher, QueryGenerator queryGenerator, CustomQueryAndTitleMappingHandler titleMapping, BaseConfigHandler baseConfigHandler, IndexerSearchResultPersistor searchResultPersistor) {
super(configProvider, indexerRepository, searchResultRepository, indexerApiAccessRepository, indexerApiAccessShortRepository, indexerStatusRepository, indexerWebAccess, resultAcceptor, categoryProvider, infoProvider, eventPublisher, queryGenerator, titleMapping, baseConfigHandler, searchResultPersistor);
}

static Clock clock = Clock.systemUTC();

Expand Down
17 changes: 3 additions & 14 deletions core/src/main/java/org/nzbhydra/indexers/DevIndexer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,18 @@
import lombok.Getter;
import lombok.Setter;
import org.nzbhydra.NzbHydraException;
import org.nzbhydra.config.BaseConfigHandler;
import org.nzbhydra.config.ConfigProvider;
import org.nzbhydra.config.indexer.IndexerConfig;
import org.nzbhydra.config.indexer.SearchModuleType;
import org.nzbhydra.indexers.exceptions.IndexerAccessException;
import org.nzbhydra.indexers.status.IndexerLimitRepository;
import org.nzbhydra.mapping.newznab.mock.NewznabMockBuilder;
import org.nzbhydra.mapping.newznab.mock.NewznabMockRequest;
import org.nzbhydra.mapping.newznab.xml.NewznabAttribute;
import org.nzbhydra.mapping.newznab.xml.NewznabXmlItem;
import org.nzbhydra.mapping.newznab.xml.NewznabXmlRoot;
import org.nzbhydra.mapping.newznab.xml.Xml;
import org.nzbhydra.mediainfo.InfoProvider;
import org.nzbhydra.searching.CategoryProvider;
import org.nzbhydra.searching.CustomQueryAndTitleMappingHandler;
import org.nzbhydra.searching.SearchResultAcceptor;
import org.nzbhydra.searching.db.SearchResultRepository;
import org.nzbhydra.searching.dtoseventsenums.SearchResultItem;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Scope;
import org.springframework.core.annotation.Order;
import org.springframework.oxm.Unmarshaller;
import org.springframework.stereotype.Component;

import java.net.URI;
Expand All @@ -32,12 +23,10 @@

@Getter
@Setter
@Component
@Component("devindexer")
@Scope("prototype")
public class DevIndexer extends Newznab {

public DevIndexer(ConfigProvider configProvider, IndexerRepository indexerRepository, SearchResultRepository searchResultRepository, IndexerApiAccessRepository indexerApiAccessRepository, IndexerApiAccessEntityShortRepository indexerApiAccessShortRepository, IndexerLimitRepository indexerStatusRepository, IndexerWebAccess indexerWebAccess, SearchResultAcceptor resultAcceptor, CategoryProvider categoryProvider, InfoProvider infoProvider, ApplicationEventPublisher eventPublisher, QueryGenerator queryGenerator, CustomQueryAndTitleMappingHandler titleMapping, Unmarshaller unmarshaller, BaseConfigHandler baseConfigHandler, IndexerSearchResultPersistor searchResultPersistor) {
super(configProvider, indexerRepository, searchResultRepository, indexerApiAccessRepository, indexerApiAccessShortRepository, indexerStatusRepository, indexerWebAccess, resultAcceptor, categoryProvider, infoProvider, eventPublisher, queryGenerator, titleMapping, unmarshaller, baseConfigHandler, searchResultPersistor);
}

protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException {

Expand Down
17 changes: 3 additions & 14 deletions core/src/main/java/org/nzbhydra/indexers/DogNzb.java
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,26 @@
package org.nzbhydra.indexers;

import org.nzbhydra.config.BaseConfigHandler;
import org.nzbhydra.config.ConfigProvider;
import org.nzbhydra.config.indexer.IndexerConfig;
import org.nzbhydra.config.indexer.SearchModuleType;
import org.nzbhydra.config.searching.SearchType;
import org.nzbhydra.indexers.status.IndexerLimitRepository;
import org.nzbhydra.mapping.newznab.xml.NewznabXmlResponse;
import org.nzbhydra.mapping.newznab.xml.NewznabXmlRoot;
import org.nzbhydra.mapping.newznab.xml.Xml;
import org.nzbhydra.mediainfo.InfoProvider;
import org.nzbhydra.searching.CategoryProvider;
import org.nzbhydra.searching.CustomQueryAndTitleMappingHandler;
import org.nzbhydra.searching.SearchResultAcceptor;
import org.nzbhydra.searching.SearchResultAcceptor.AcceptorResult;
import org.nzbhydra.searching.db.SearchResultRepository;
import org.nzbhydra.searching.dtoseventsenums.IndexerSearchResult;
import org.nzbhydra.searching.searchrequests.SearchRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Scope;
import org.springframework.core.annotation.Order;
import org.springframework.oxm.Unmarshaller;
import org.springframework.stereotype.Component;

@Component
@Component("dognzb")
@Scope("prototype")
public class DogNzb extends Newznab {

private static final Logger logger = LoggerFactory.getLogger(DogNzb.class);

public DogNzb(ConfigProvider configProvider, IndexerRepository indexerRepository, SearchResultRepository searchResultRepository, IndexerApiAccessRepository indexerApiAccessRepository, IndexerApiAccessEntityShortRepository indexerApiAccessShortRepository, IndexerLimitRepository indexerStatusRepository, IndexerWebAccess indexerWebAccess, SearchResultAcceptor resultAcceptor, CategoryProvider categoryProvider, InfoProvider infoProvider, ApplicationEventPublisher eventPublisher, QueryGenerator queryGenerator, CustomQueryAndTitleMappingHandler titleMapping, Unmarshaller unmarshaller, BaseConfigHandler baseConfigHandler, IndexerSearchResultPersistor searchResultPersistor) {
super(configProvider, indexerRepository, searchResultRepository, indexerApiAccessRepository, indexerApiAccessShortRepository, indexerStatusRepository, indexerWebAccess, resultAcceptor, categoryProvider, infoProvider, eventPublisher, queryGenerator, titleMapping, unmarshaller, baseConfigHandler, searchResultPersistor);
}

protected void completeIndexerSearchResult(Xml response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) {
NewznabXmlResponse newznabResponse = ((NewznabXmlRoot) response).getRssChannel().getNewznabResponse();
Expand Down
41 changes: 21 additions & 20 deletions core/src/main/java/org/nzbhydra/indexers/Indexer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.slf4j.LoggerFactory;
import org.slf4j.Marker;
import org.springframework.aot.hint.annotation.Reflective;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.event.EventListener;
Expand Down Expand Up @@ -67,41 +68,41 @@ public abstract class Indexer<T> {

private final Object dbLock = "";

protected IndexerEntity indexer;
protected IndexerConfig config;
private Pattern cleanupPattern;


@Autowired
protected ConfigProvider configProvider;

@Autowired
protected IndexerRepository indexerRepository;

@Autowired
protected SearchResultRepository searchResultRepository;

@Autowired
protected IndexerApiAccessRepository indexerApiAccessRepository;

@Autowired
protected IndexerApiAccessEntityShortRepository indexerApiAccessShortRepository;


@Autowired
protected IndexerWebAccess indexerWebAccess;

@Autowired
protected SearchResultAcceptor resultAcceptor;

@Autowired
protected CategoryProvider categoryProvider;

@Autowired
protected InfoProvider infoProvider;

@Autowired
private ApplicationEventPublisher eventPublisher;

@Autowired
private QueryGenerator queryGenerator;

@Autowired
private CustomQueryAndTitleMappingHandler titleMapping;
@Autowired
protected BaseConfigHandler baseConfigHandler;
@Autowired
private IndexerSearchResultPersistor searchResultPersistor;

private BaseConfigHandler baseConfigHandler;

protected AutowireCapableBeanFactory beanFactory;
private IndexerSearchResultPersistor searchResultPersistor;
protected IndexerEntity indexer;
protected IndexerConfig config;
private Pattern cleanupPattern;

protected AutowireCapableBeanFactory beanFactory;


protected Indexer() {
Expand Down
30 changes: 11 additions & 19 deletions core/src/main/java/org/nzbhydra/indexers/Newznab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.nzbhydra.NzbHydra;
import org.nzbhydra.NzbHydraException;
import org.nzbhydra.config.BaseConfigHandler;
import org.nzbhydra.config.ConfigProvider;
import org.nzbhydra.config.category.CategoriesConfig;
import org.nzbhydra.config.category.Category.Subtype;
import org.nzbhydra.config.downloading.DownloadType;
Expand Down Expand Up @@ -36,14 +35,9 @@
import org.nzbhydra.mapping.newznab.xml.NewznabXmlResponse;
import org.nzbhydra.mapping.newznab.xml.NewznabXmlRoot;
import org.nzbhydra.mapping.newznab.xml.Xml;
import org.nzbhydra.mediainfo.InfoProvider;
import org.nzbhydra.searching.CategoryProvider;
import org.nzbhydra.searching.CustomQueryAndTitleMappingHandler;
import org.nzbhydra.searching.SearchResultAcceptor;
import org.nzbhydra.searching.SearchResultAcceptor.AcceptorResult;
import org.nzbhydra.searching.SearchResultIdCalculator;
import org.nzbhydra.searching.UnknownResponseException;
import org.nzbhydra.searching.db.SearchResultRepository;
import org.nzbhydra.searching.dtoseventsenums.IndexerSearchResult;
import org.nzbhydra.searching.dtoseventsenums.SearchResultItem;
import org.nzbhydra.searching.dtoseventsenums.SearchResultItem.HasNfo;
Expand All @@ -52,7 +46,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Scope;
import org.springframework.core.annotation.Order;
import org.springframework.oxm.Unmarshaller;
import org.springframework.stereotype.Component;
Expand All @@ -79,6 +73,9 @@

@Getter
@Setter
@Scope(value = "prototype")
@Component(value = "newznab")
@NoArgsConstructor
public class Newznab extends Indexer<Xml> {

private static final Logger logger = LoggerFactory.getLogger(Newznab.class);
Expand Down Expand Up @@ -106,16 +103,11 @@ public class Newznab extends Indexer<Xml> {
private Unmarshaller unmarshaller;
@Autowired
private IndexerLimitRepository indexerStatusRepository;
@Autowired
protected NewznabCategoryComputer newznabCategoryComputer;
@Autowired
private SearchRequestIdConverter searchRequestIdConverter;

private BaseConfigHandler baseConfigHandler;


public Newznab(ConfigProvider configProvider, IndexerRepository indexerRepository, SearchResultRepository searchResultRepository, IndexerApiAccessRepository indexerApiAccessRepository, IndexerApiAccessEntityShortRepository indexerApiAccessShortRepository, IndexerLimitRepository indexerStatusRepository, IndexerWebAccess indexerWebAccess, SearchResultAcceptor resultAcceptor, CategoryProvider categoryProvider, InfoProvider infoProvider, ApplicationEventPublisher eventPublisher, QueryGenerator queryGenerator, CustomQueryAndTitleMappingHandler titleMapping, Unmarshaller unmarshaller, BaseConfigHandler baseConfigHandler, IndexerSearchResultPersistor searchResultPersistor) {
super(configProvider, indexerRepository, searchResultRepository, indexerApiAccessRepository, indexerApiAccessShortRepository, indexerStatusRepository, indexerWebAccess, resultAcceptor, categoryProvider, infoProvider, eventPublisher, queryGenerator, titleMapping, baseConfigHandler, searchResultPersistor);
this.unmarshaller = unmarshaller;
this.indexerStatusRepository = indexerStatusRepository;
this.baseConfigHandler = baseConfigHandler;
}

protected UriComponentsBuilder getBaseUri() {
UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(config.getHost()).path(config.getApiPath().orElse("/api"));
Expand Down Expand Up @@ -319,7 +311,7 @@ protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchR
return componentsBuilder;
}

NzbHydra.getApplicationContext().getAutowireCapableBeanFactory().getBean(SearchRequestIdConverter.class).convertSearchIdsIfNeeded(searchRequest, config);
searchRequestIdConverter.convertSearchIdsIfNeeded(searchRequest, config);

for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) {
//We just add all IDs that we have (if the indexer supports them). Some indexers will find results under one ID but not the other
Expand Down Expand Up @@ -634,7 +626,7 @@ protected void parseAttributes(NewznabXmlItem item, SearchResultItem searchResul
if (attributes.containsKey("source")) {
searchResultItem.setSource(attributes.get("source"));
}
NzbHydra.getApplicationContext().getBean(NewznabCategoryComputer.class).computeCategory(searchResultItem, newznabCategories, config);
newznabCategoryComputer.computeCategory(searchResultItem, newznabCategories, config);

if (searchResultItem.getHasNfo() == HasNfo.MAYBE && (config.getBackend() == BackendType.NNTMUX || config.getBackend() == BackendType.NZEDB)) {
//For these backends if not specified it doesn't exist
Expand Down
Loading

0 comments on commit 04a99b5

Please sign in to comment.