-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes #275
- Loading branch information
Showing
15 changed files
with
2,258 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| 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.indexers.exceptions.IndexerSearchAbortedException; | ||
| 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.core.annotation.Order; | ||
| import org.springframework.oxm.Unmarshaller; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.web.util.UriComponentsBuilder; | ||
|
|
||
| @Component | ||
| public class WtfNzb extends Newznab { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(WtfNzb.class); | ||
|
|
||
| public WtfNzb(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) { | ||
| super(configProvider, indexerRepository, searchResultRepository, indexerApiAccessRepository, indexerApiAccessShortRepository, indexerStatusRepository, indexerWebAccess, resultAcceptor, categoryProvider, infoProvider, eventPublisher, queryGenerator, titleMapping, unmarshaller, baseConfigHandler); | ||
| } | ||
|
|
||
| @Override | ||
| public IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit) { | ||
| if (searchRequest.getQuery().isEmpty() && searchRequest.getIdentifiers().isEmpty()) { | ||
| return new IndexerSearchResult(this, "Search without query and query generation not supported"); | ||
| } | ||
| return super.search(searchRequest, offset, limit); | ||
| } | ||
|
|
||
| @Override | ||
| protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { | ||
|
|
||
| UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(config.getHost()).path("/api_fast"); | ||
| String query = generateQueryIfApplicable(searchRequest, searchRequest.getQuery().get()); | ||
| builder.queryParam("q", query) | ||
| .queryParam("apikey", config.getApiKey()) | ||
| .queryParam("r", config.getApiKey()) | ||
| .queryParam("i", config.getUsername()) | ||
| ; | ||
| return builder; | ||
| } | ||
|
|
||
| protected void completeIndexerSearchResult(Xml response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { | ||
| NewznabXmlResponse newznabResponse = ((NewznabXmlRoot) response).getRssChannel().getNewznabResponse(); | ||
| super.completeIndexerSearchResult(response, indexerSearchResult, acceptorResult, searchRequest, offset, limit); | ||
|
|
||
| indexerSearchResult.setTotalResultsKnown(true); | ||
| if (newznabResponse != null) { | ||
| //Doesn't seem to support paging. No idea how big the page size is | ||
| indexerSearchResult.setTotalResultsKnown(true); | ||
| indexerSearchResult.setHasMoreResults(false); | ||
| indexerSearchResult.setTotalResults(newznabResponse.getTotal()); | ||
| indexerSearchResult.setPageSize(newznabResponse.getTotal()); | ||
| } else { | ||
| indexerSearchResult.setTotalResults(0); | ||
| indexerSearchResult.setHasMoreResults(false); | ||
| indexerSearchResult.setOffset(0); | ||
| indexerSearchResult.setPageSize(0); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean isSwitchToTSearchNeeded(SearchRequest request) { | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
| @Component | ||
| @Order(100) | ||
| public static class NewznabHandlingStrategy implements IndexerHandlingStrategy<WtfNzb> { | ||
|
|
||
| @Override | ||
| public boolean handlesIndexerConfig(IndexerConfig config) { | ||
| boolean isIndexerWtfNzb = config != null && config.getSearchModuleType() == SearchModuleType.WTFNZB; | ||
| if (isIndexerWtfNzb) { | ||
| logger.debug("Will use special WtfNzb limit handling for indexer with host {}", config.getHost()); | ||
| } | ||
| return isIndexerWtfNzb; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "WTFNZB"; | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
48 changes: 48 additions & 0 deletions
48
core/src/test/java/org/nzbhydra/mapping/WtfNzbMappingTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package org.nzbhydra.mapping; | ||
|
|
||
| import com.google.common.base.Charsets; | ||
| import com.google.common.io.Resources; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.nzbhydra.mapping.newznab.xml.NewznabXmlChannel; | ||
| import org.nzbhydra.mapping.newznab.xml.NewznabXmlRoot; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.test.context.junit.jupiter.SpringExtension; | ||
| import org.springframework.test.web.client.MockRestServiceServer; | ||
| import org.springframework.web.client.RestTemplate; | ||
|
|
||
| import java.io.IOException; | ||
| import java.time.Instant; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; | ||
| import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; | ||
|
|
||
| @ExtendWith(SpringExtension.class) | ||
| public class WtfNzbMappingTest { | ||
|
|
||
| @BeforeEach | ||
| public void setUp() throws Exception { | ||
|
|
||
| } | ||
|
|
||
|
|
||
| @Test | ||
| void testMappingFromXml() throws Exception { | ||
| NewznabXmlRoot rssRoot = getRssRootFromXml("wtfnzb.xml"); | ||
| NewznabXmlChannel channel = rssRoot.getRssChannel(); | ||
| assertThat(channel.getItems().get(0).getPubDate()).isEqualTo(Instant.ofEpochMilli(1720154595000L)); | ||
| } | ||
|
|
||
|
|
||
| private NewznabXmlRoot getRssRootFromXml(String xmlFileName) throws IOException { | ||
| RestTemplate restTemplate = new RestTemplate(); | ||
| MockRestServiceServer mockServer = MockRestServiceServer.createServer(restTemplate); | ||
| mockServer.expect(requestTo("/api")).andRespond(withSuccess(Resources.toString(Resources.getResource(WtfNzbMappingTest.class, xmlFileName), Charsets.UTF_8), MediaType.APPLICATION_XML)); | ||
|
|
||
| return restTemplate.getForObject("/api", NewznabXmlRoot.class); | ||
| } | ||
|
|
||
|
|
||
| } |
Oops, something went wrong.