From 66289cb3f3cc3fe1fb82a4845f9be9397f816240 Mon Sep 17 00:00:00 2001 From: kaso17 Date: Fri, 6 Apr 2018 16:47:59 +0200 Subject: [PATCH] fix indexer API XML support --- src/Jackett.Common/Models/DTO/Indexer.cs | 17 +++++++++++++++++ .../Models/DTO/ManualSearchResult.cs | 11 +++++++++++ src/Jackett.Common/Models/DTO/ServerConfig.cs | 19 +++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/src/Jackett.Common/Models/DTO/Indexer.cs b/src/Jackett.Common/Models/DTO/Indexer.cs index 278fef9f4..47c075af3 100644 --- a/src/Jackett.Common/Models/DTO/Indexer.cs +++ b/src/Jackett.Common/Models/DTO/Indexer.cs @@ -1,27 +1,44 @@ using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using Jackett.Common.Indexers; namespace Jackett.Common.Models.DTO { + [DataContract] public class Capability { + [DataMember] public string ID { get; set; } + [DataMember] public string Name { get; set; } } + [DataContract] public class Indexer { + [DataMember] public string id { get; private set; } + [DataMember] public string name { get; private set; } + [DataMember] public string description { get; private set; } + [DataMember] public string type { get; private set; } + [DataMember] public bool configured { get; private set; } + [DataMember] public string site_link { get; private set; } + [DataMember] public IEnumerable alternativesitelinks { get; private set; } + [DataMember] public string language { get; private set; } + [DataMember] public string last_error { get; private set; } + [DataMember] public bool potatoenabled { get; private set; } + + [DataMember] public IEnumerable caps { get; private set; } public Indexer(IIndexer indexer) diff --git a/src/Jackett.Common/Models/DTO/ManualSearchResult.cs b/src/Jackett.Common/Models/DTO/ManualSearchResult.cs index b390663d3..8e0598c2d 100644 --- a/src/Jackett.Common/Models/DTO/ManualSearchResult.cs +++ b/src/Jackett.Common/Models/DTO/ManualSearchResult.cs @@ -1,21 +1,32 @@ using System.Collections.Generic; +using System.Runtime.Serialization; namespace Jackett.Common.Models.DTO { + [DataContract] public enum ManualSearchResultIndexerStatus { Unknown = 0, Error = 1, OK = 2 }; + [DataContract] public class ManualSearchResultIndexer { + [DataMember] public string ID { get; set; } + [DataMember] public string Name { get; set; } + [DataMember] public ManualSearchResultIndexerStatus Status { get; set; } + [DataMember] public int Results { get; set; } + [DataMember] public string Error { get; set; } } + [DataContract] public class ManualSearchResult { + [DataMember] public IEnumerable Results { get; set; } + [DataMember] public IList Indexers { get; set; } } } diff --git a/src/Jackett.Common/Models/DTO/ServerConfig.cs b/src/Jackett.Common/Models/DTO/ServerConfig.cs index 460dd9846..3f4b18c93 100644 --- a/src/Jackett.Common/Models/DTO/ServerConfig.cs +++ b/src/Jackett.Common/Models/DTO/ServerConfig.cs @@ -1,27 +1,46 @@ using System.Collections.Generic; +using System.Runtime.Serialization; using Jackett.Common.Models.Config; namespace Jackett.Common.Models.DTO { + [DataContract] public class ServerConfig { + [DataMember] public IEnumerable notices { get; set; } + [DataMember] public int port { get; set; } + [DataMember] public bool external { get; set; } + [DataMember] public string api_key { get; set; } + [DataMember] public string blackholedir { get; set; } + [DataMember] public bool updatedisabled { get; set; } + [DataMember] public bool prerelease { get; set; } + [DataMember] public string password { get; set; } + [DataMember] public bool logging { get; set; } + [DataMember] public string basepathoverride { get; set; } + [DataMember] public string omdbkey { get; set; } + [DataMember] public string app_version { get; set; } + [DataMember] public ProxyType proxy_type { get; set; } + [DataMember] public string proxy_url { get; set; } + [DataMember] public int? proxy_port { get; set; } + [DataMember] public string proxy_username { get; set; } + [DataMember] public string proxy_password { get; set; } public ServerConfig()