shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Misc Updates

Browse Source
This commit is contained in:
Qstick
2021-01-10 02:50:10 -05:00
parent 88d1a3db6f
commit 66f726bf6f
8 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/Search/Table/SearchIndexRow.js
View File

@@ -30,6 +30,7 @@ class SearchIndexRow extends Component {
publishDate,
title,
infoUrl,
downloadUrl,
indexer,
size,
files,
@@ -214,8 +215,9 @@ class SearchIndexRow extends Component {
className={styles[column.name]}
>
<IconButton
name={icons.EXTERNAL_LINK}
title={'Website'}
name={icons.DOWNLOAD}
title={'Grab'}
to={downloadUrl}
/>
</VirtualTableRowCell>
);
@@ -239,6 +241,7 @@ SearchIndexRow.propTypes = {
publishDate: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
infoUrl: PropTypes.string.isRequired,
downloadUrl: PropTypes.string.isRequired,
indexerId: PropTypes.number.isRequired,
indexer: PropTypes.string.isRequired,
size: PropTypes.number.isRequired,

2
src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs
View File

@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using NLog;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Instrumentation.Extensions;
using NzbDrone.Common.TPL;
using NzbDrone.Core.Indexers;

9
src/NzbDrone.Core/Indexers/NewznabStandardCategory.cs
View File

@@ -5,6 +5,10 @@ namespace NzbDrone.Core.Indexers
{
public static class NewznabStandardCategory
{
public static readonly IndexerCategory ZedOther = new IndexerCategory(0000, "Other");
public static readonly IndexerCategory ZedOtherMisc = new IndexerCategory(0010, "Other/Misc");
public static readonly IndexerCategory ZedOtherHashed = new IndexerCategory(0020, "Other/Hashed");
public static readonly IndexerCategory Console = new IndexerCategory(1000, "Console");
public static readonly IndexerCategory ConsoleNDS = new IndexerCategory(1010, "Console/NDS");
public static readonly IndexerCategory ConsolePSP = new IndexerCategory(1020, "Console/PSP");
@@ -86,6 +90,7 @@ namespace NzbDrone.Core.Indexers
public static readonly IndexerCategory[] ParentCats =
{
ZedOther,
Console,
Movies,
Audio,
@@ -98,6 +103,9 @@ namespace NzbDrone.Core.Indexers
public static readonly IndexerCategory[] AllCats =
{
ZedOther,
ZedOtherHashed,
ZedOtherMisc,
Console,
ConsoleNDS,
ConsolePSP,
@@ -173,6 +181,7 @@ namespace NzbDrone.Core.Indexers
static NewznabStandardCategory()
{
ZedOther.SubCategories.AddRange(new List<IndexerCategory> { ZedOtherMisc, ZedOtherHashed });
Console.SubCategories.AddRange(
new List<IndexerCategory>
{

2
src/NzbDrone.Core/Parser/UserAgentParser.cs
View File

@@ -4,7 +4,7 @@ namespace NzbDrone.Core.Parser
{
public static class UserAgentParser
{
private static readonly Regex AppSourceRegex = new Regex(@"(?<agent>.*)\/.*\(.*\)",
private static readonly Regex AppSourceRegex = new Regex(@"(?<agent>.*)\/.*(\(.*\))?",
RegexOptions.IgnoreCase | RegexOptions.Compiled);
public static string ParseSource(string userAgent)
{

3
src/NzbDrone.Host/Bootstrap.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Reflection;
using System.Text;
using System.Threading;
using NLog;
using NzbDrone.Common.Composition;
@@ -28,6 +29,8 @@ namespace Prowlarr.Host
throw new TerminateApplicationException("Missing system requirements");
}
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
_container = MainAppContainerBuilder.BuildContainer(startupContext);
_container.Resolve<InitializeLogger>().Initialize();
_container.Resolve<IAppFolderFactory>().Register();

1
src/NzbDrone.Host/Prowlarr.Host.csproj
View File

@@ -15,6 +15,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Common\Prowlarr.Common.csproj" />

6
src/Prowlarr.Api.V1/Indexers/IndexerModule.cs
View File

@@ -69,9 +69,9 @@ namespace Prowlarr.Api.V1.Indexers
case "music":
case "book":
case "movie":
Response movieResponse = _nzbSearchService.Search(request, new List<int> { indexer.Id }, false).ToXml(indexerInstance.Protocol);
movieResponse.ContentType = "application/rss+xml";
return movieResponse;
Response searchResponse = _nzbSearchService.Search(request, new List<int> { indexer.Id }, false).ToXml(indexerInstance.Protocol);
searchResponse.ContentType = "application/rss+xml";
return searchResponse;
default:
throw new BadRequestException("Function Not Available");
}

2
src/Prowlarr.Api.V1/Search/SearchModule.cs
View File

@@ -51,7 +51,7 @@ namespace Prowlarr.Api.V1.Search
{
try
{
var decisions = _nzbSearhService.Search(new NewznabRequest { q = query, t = "search", cat = string.Join(",", categories) }, indexerIds, true).Releases;
var decisions = _nzbSearhService.Search(new NewznabRequest { q = query, source = "Prowlarr", t = "search", cat = string.Join(",", categories) }, indexerIds, true).Releases;
return MapDecisions(decisions);
}