diff --git a/README.md b/README.md index f4493f128..fa4bf5248 100644 --- a/README.md +++ b/README.md @@ -350,8 +350,7 @@ Jackett is available as beta package from [SynoCommunity](https://synocommunity. Please supply as much information about the problem you are experiencing as possible. Your issue has a much greater chance of being resolved if logs are supplied so that we can see what is going on. Creating an issue with '### isn't working' doesn't help anyone to fix the problem. ## Contributing -All contributions are welcome just send a pull request. Jackett's framework allows our team (and any other volunteering dev) to implement new trackers in an hour or two. If you'd like support for a new tracker but are not a developer then feel free to leave a request on the [issues page](https://github.com/Jackett/Jackett/issues). It is recommended to use Visual studio 2015 when making code changes in this project. - +All contributions are welcome just send a pull request. Jackett's framework allows our team (and any other volunteering dev) to implement new trackers in an hour or two. If you'd like support for a new tracker but are not a developer then feel free to leave a request on the [issues page](https://github.com/Jackett/Jackett/issues). It is recommended to use Visual Studio 2017 when making code changes in this project. You can download the community version for free [here](https://www.visualstudio.com/downloads/). ## Screenshots diff --git a/src/CurlSharp/CurlSharp.csproj b/src/CurlSharp/CurlSharp.csproj index 7819e5ace..2c7551238 100644 --- a/src/CurlSharp/CurlSharp.csproj +++ b/src/CurlSharp/CurlSharp.csproj @@ -1,5 +1,5 @@  - + Debug @@ -10,8 +10,9 @@ CurlSharp CurlSharp 512 - v4.5 + v4.5.2 + true true diff --git a/src/Jackett.Console/App.config b/src/Jackett.Console/App.config index 1f868b54e..3c88dd4d8 100644 --- a/src/Jackett.Console/App.config +++ b/src/Jackett.Console/App.config @@ -1,46 +1,6 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Jackett.Console/Jackett.Console.csproj b/src/Jackett.Console/Jackett.Console.csproj index 4355d0799..53473972b 100644 --- a/src/Jackett.Console/Jackett.Console.csproj +++ b/src/Jackett.Console/Jackett.Console.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,12 +9,13 @@ Properties Jackett.Console JackettConsole - v4.5 + v4.5.2 512 true + true AnyCPU @@ -42,102 +43,14 @@ JackettConsole.Program - - ..\packages\Autofac.4.3.0\lib\net45\Autofac.dll - True - - - ..\packages\Autofac.Owin.4.0.0\lib\net45\Autofac.Integration.Owin.dll - True - - - ..\packages\Autofac.WebApi2.4.0.1\lib\net45\Autofac.Integration.WebApi.dll - True - - - ..\packages\Autofac.WebApi2.Owin.4.0.0\lib\net45\Autofac.Integration.WebApi.Owin.dll - True - - - ..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll - True - - - ..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll - True - - - ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll - True - - - ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll - True - - - ..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll - True - - - ..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll - True - - - ..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - True - - - ..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll - True - - - ..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll - True - - - ..\packages\Newtonsoft.Json.9.0.2-beta2\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\NLog.5.0.0-beta05-test\lib\net45\NLog.dll - True - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - True - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.3\lib\net45\System.Web.Http.Tracing.dll - True - @@ -152,7 +65,6 @@ - PreserveNewest @@ -170,14 +82,12 @@ + + + 1.9.71 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + \ No newline at end of file diff --git a/src/Jackett.Console/packages.config b/src/Jackett.Console/packages.config deleted file mode 100644 index 815413a4f..000000000 --- a/src/Jackett.Console/packages.config +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Jackett.Service/App.config b/src/Jackett.Service/App.config index b8dabaa16..3c88dd4d8 100644 --- a/src/Jackett.Service/App.config +++ b/src/Jackett.Service/App.config @@ -1,42 +1,6 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Jackett.Service/Jackett.Service.csproj b/src/Jackett.Service/Jackett.Service.csproj index 5f05c7eee..e59b38e4e 100644 --- a/src/Jackett.Service/Jackett.Service.csproj +++ b/src/Jackett.Service/Jackett.Service.csproj @@ -9,12 +9,13 @@ Properties Jackett.Service JackettService - v4.5 + v4.5.2 512 true + true AnyCPU @@ -39,86 +40,14 @@ jackett.ico - - ..\packages\Autofac.4.3.0\lib\net45\Autofac.dll - True - - - ..\packages\Autofac.Owin.4.0.0\lib\net45\Autofac.Integration.Owin.dll - True - - - ..\packages\Autofac.WebApi2.4.0.1\lib\net45\Autofac.Integration.WebApi.dll - True - - - ..\packages\Autofac.WebApi2.Owin.4.0.0\lib\net45\Autofac.Integration.WebApi.Owin.dll - True - - - ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll - True - - - ..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll - True - - - ..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll - True - - - ..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll - True - - - ..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll - True - - - ..\packages\Newtonsoft.Json.9.0.2-beta2\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\NLog.5.0.0-beta05-test\lib\net45\NLog.dll - True - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - True - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.3\lib\net45\System.Web.Http.Tracing.dll - True - @@ -139,7 +68,6 @@ - @@ -154,14 +82,12 @@ Jackett + + + 5.0.0-beta11 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Jackett.Test/Properties/AssemblyInfo.cs b/src/Jackett.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 1043cf17c..000000000 --- a/src/Jackett.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Jackett.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Jackett.Test")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e75d4f15-5da3-4332-adb1-28fb673dae56")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("0.0.0.0")] diff --git a/src/Jackett.Test/Services/ProtectionServiceTests.cs b/src/Jackett.Test/Services/ProtectionServiceTests.cs index e8fb274d5..c9e732da1 100644 --- a/src/Jackett.Test/Services/ProtectionServiceTests.cs +++ b/src/Jackett.Test/Services/ProtectionServiceTests.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using Autofac; -namespace JackettTest.Services +namespace Jackett.Test.Services { [TestFixture] class ProtectionServiceTests : TestBase diff --git a/src/Jackett.Test/TestBase.cs b/src/Jackett.Test/TestBase.cs index babb28d07..0a8202ed2 100644 --- a/src/Jackett.Test/TestBase.cs +++ b/src/Jackett.Test/TestBase.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace JackettTest +namespace Jackett.Test { abstract class TestBase { diff --git a/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs b/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs index b0f2e3846..61250626b 100644 --- a/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs +++ b/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Jackett.Indexers; using Newtonsoft.Json.Linq; -namespace JackettTest +namespace Jackett.Test { class TestIndexerManagerServiceHelper : IIndexerManagerService { diff --git a/src/Jackett.Test/TestUtil.cs b/src/Jackett.Test/TestUtil.cs index 480b2647e..941c4a6d5 100644 --- a/src/Jackett.Test/TestUtil.cs +++ b/src/Jackett.Test/TestUtil.cs @@ -11,7 +11,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace JackettTest +namespace Jackett.Test { class TestUtil { @@ -60,7 +60,7 @@ namespace JackettTest public static string GetResource(string item) { var assembly = Assembly.GetExecutingAssembly(); - var resourceName = "JackettTest." + item.Replace('/','.'); + var resourceName = "Jackett.Test." + item.Replace('/','.'); using (Stream stream = assembly.GetManifestResourceStream(resourceName)) { diff --git a/src/Jackett.Test/TestWebClient.cs b/src/Jackett.Test/TestWebClient.cs index d299175ae..653ef35ac 100644 --- a/src/Jackett.Test/TestWebClient.cs +++ b/src/Jackett.Test/TestWebClient.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace JackettTest +namespace Jackett.Test { public class TestWebClient : IWebClient { diff --git a/src/Jackett.Test/Util/ParseUtilTests.cs b/src/Jackett.Test/Util/ParseUtilTests.cs index a734e6e88..7945caa78 100644 --- a/src/Jackett.Test/Util/ParseUtilTests.cs +++ b/src/Jackett.Test/Util/ParseUtilTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; @@ -10,7 +11,7 @@ using FluentAssertions; using Jackett.Utils; using NUnit.Framework; -namespace JackettTest.Util +namespace Jackett.Test.Util { [TestFixture] public class ParseUtilTests @@ -19,7 +20,7 @@ namespace JackettTest.Util { get { - var type = typeof(ParseUtilTests); + var type = typeof(ParseUtilTests); using (var resourceStream = type.Assembly.GetManifestResourceStream($"{type.Namespace}.Invalid-RSS.xml")) using (var sr = new StreamReader(resourceStream)) { diff --git a/src/Jackett.Test/Util/ServerUtilTests.cs b/src/Jackett.Test/Util/ServerUtilTests.cs index c59b942e5..2f1f44cbb 100644 --- a/src/Jackett.Test/Util/ServerUtilTests.cs +++ b/src/Jackett.Test/Util/ServerUtilTests.cs @@ -7,13 +7,12 @@ using System.Text; using System.Threading.Tasks; using Autofac; using Jackett.Indexers; -using FluentAssertions; using Newtonsoft.Json.Linq; using Jackett; using Newtonsoft.Json; using Jackett.Utils; -namespace JackettTest.Indexers +namespace Jackett.Test.Indexers { [TestFixture] class ServerUtilTests : TestBase diff --git a/src/Jackett.Test/Util/TvCategoryParserTests.cs b/src/Jackett.Test/Util/TvCategoryParserTests.cs index 95d9c6f28..4076d3908 100644 --- a/src/Jackett.Test/Util/TvCategoryParserTests.cs +++ b/src/Jackett.Test/Util/TvCategoryParserTests.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using Jackett.Utils; -namespace JackettTest.Util +namespace Jackett.Test.Util { [TestFixture] internal class ParseTvShowQualityTest : TestBase diff --git a/src/Jackett.Test/app.config b/src/Jackett.Test/app.config deleted file mode 100644 index b888ab97b..000000000 --- a/src/Jackett.Test/app.config +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Jackett.Test/packages.config b/src/Jackett.Test/packages.config deleted file mode 100644 index 0637d1ea7..000000000 --- a/src/Jackett.Test/packages.config +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Jackett.Tray/App.config b/src/Jackett.Tray/App.config index 0845dbdd7..b1cfeefe7 100644 --- a/src/Jackett.Tray/App.config +++ b/src/Jackett.Tray/App.config @@ -1,46 +1,7 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/Jackett.Tray/Jackett.Tray.csproj b/src/Jackett.Tray/Jackett.Tray.csproj index acf9dac4c..381d5105f 100644 --- a/src/Jackett.Tray/Jackett.Tray.csproj +++ b/src/Jackett.Tray/Jackett.Tray.csproj @@ -9,12 +9,13 @@ Properties Jackett.Tray JackettTray - v4.5 + v4.5.2 512 true + true AnyCPU @@ -39,90 +40,14 @@ jackett.ico - - ..\packages\Autofac.4.3.0\lib\net45\Autofac.dll - True - - - ..\packages\Autofac.Owin.4.0.0\lib\net45\Autofac.Integration.Owin.dll - True - - - ..\packages\Autofac.WebApi2.4.0.1\lib\net45\Autofac.Integration.WebApi.dll - True - - - ..\packages\Autofac.WebApi2.Owin.4.0.0\lib\net45\Autofac.Integration.WebApi.Owin.dll - True - - - ..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll - True - - - ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll - True - - - ..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll - True - - - ..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll - True - - - ..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll - True - - - ..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll - True - - - ..\packages\Newtonsoft.Json.9.0.2-beta2\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\NLog.5.0.0-beta05-test\lib\net45\NLog.dll - True - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - True - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.3\lib\net45\System.Web.Http.Tracing.dll - True - @@ -155,7 +80,6 @@ Resources.resx True - SettingsSingleFileGenerator Settings.Designer.cs @@ -191,14 +115,12 @@ True + + + 5.0.0-beta11 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - -