Fixed: Correctly combine HttpUri paths with dot segment

(cherry picked from commit 7e48ea0231272ae56c30f5f43339f0dca7a27fb3)

README.md

@@ -62,6 +62,15 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 [![Mega Sponsors List](https://opencollective.com/Readarr/tiers/mega-sponsor.svg?width=890)](https://opencollective.com/readarr#mega-sponsor)
 
+## DigitalOcean
+
+This project is also supported by DigitalOcean
+<p>
+  <a href="https://www.digitalocean.com/">
+    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
+  </a>
+</p>
+
 ### License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)

frontend/src/Store/Actions/Creators/createSaveProviderHandler.js

@@ -54,7 +54,7 @@ function createSaveProviderHandler(section, url, options = {}, removeStale = fal
 
     request.done((data) => {
       lastSaveData = null;
-      
+
       if (!Array.isArray(data)) {
         data = [data];
       }

frontend/src/Utilities/String/translate.js

@@ -1,22 +1,18 @@
-import $ from 'jquery';
+import createAjaxRequest from 'Utilities/createAjaxRequest';
 
 function getTranslations() {
   let localization = null;
   const ajaxOptions = {
     async: false,
-    type: 'GET',
-    global: false,
     dataType: 'json',
-    url: `${window.Readarr.apiRoot}/localization`,
+    url: '/localization',
     success: function(data) {
       localization = data.Strings;
     }
   };
 
-  ajaxOptions.headers = ajaxOptions.headers || {};
-  ajaxOptions.headers['X-Api-Key'] = window.Readarr.apiKey;
+  createAjaxRequest(ajaxOptions);
 
-  $.ajax(ajaxOptions);
   return localization;
 }
 

src/NzbDrone.Common.Test/Http/HttpUriFixture.cs

@@ -52,6 +52,26 @@ namespace NzbDrone.Common.Test.Http
             newUri.FullUri.Should().Be(expected);
         }
 
+        [TestCase("", "./relative", "relative")]
+        [TestCase("/", "./relative", "/relative")]
+        [TestCase("/base", "./relative", "/relative")]
+        [TestCase("/base/sub", "./relative", "/base/relative")]
+        [TestCase("/base/sub/", "./relative", "/base/sub/relative")]
+        [TestCase("base/sub", "./relative", "base/relative")]
+        [TestCase("base/sub/", "./relative", "base/sub/relative")]
+        [TestCase("", "../relative", "relative")]
+        [TestCase("/", "../relative", "/relative")]
+        [TestCase("/base", "../relative", "/relative")]
+        [TestCase("/base/sub", "../relative", "/base/relative")]
+        [TestCase("/base/sub/", "../relative", "/base/sub/relative")]
+        [TestCase("base/sub", "../relative", "base/relative")]
+        [TestCase("base/sub/", "../relative", "base/sub/relative")]
+        public void should_combine_uri_with_dot_segment(string basePath, string relativePath, string expected)
+        {
+            var newUri = new HttpUri(basePath) + new HttpUri(relativePath);
+            newUri.FullUri.Should().Be(expected);
+        }
+
         [TestCase("", "", "")]
         [TestCase("/", "", "/")]
         [TestCase("base", "", "base")]

src/NzbDrone.Common/Http/HttpUri.cs

@@ -164,6 +164,37 @@ namespace NzbDrone.Common.Http
                 return relativePath;
             }
 
+            if (relativePath.StartsWith("./"))
+            {
+                relativePath = relativePath.TrimStart('.').TrimStart('/');
+
+                var lastIndex = basePath.LastIndexOf("/");
+
+                if (lastIndex > 0)
+                {
+                    basePath = basePath.Substring(0, lastIndex) + "/";
+                }
+            }
+
+            if (relativePath.StartsWith("../"))
+            {
+                relativePath = relativePath.TrimStart('.').TrimStart('/');
+
+                var lastIndex = basePath.LastIndexOf("/");
+
+                if (lastIndex > 0)
+                {
+                    basePath = basePath.Substring(0, lastIndex) + "/";
+                }
+
+                var secondLastIndex = basePath.LastIndexOf("/");
+
+                if (lastIndex > 0)
+                {
+                    basePath = basePath.Substring(0, secondLastIndex) + "/";
+                }
+            }
+
             var baseSlashIndex = basePath.LastIndexOf('/');
 
             if (baseSlashIndex >= 0)

src/NzbDrone.Core/Download/Clients/Flood/Flood.cs

@@ -125,22 +125,22 @@ namespace NzbDrone.Core.Download.Clients.Flood
                     item.RemainingTime = TimeSpan.FromSeconds(properties.Eta);
                 }
 
-                if (properties.Status.Contains("error"))
-                {
-                    item.Status = DownloadItemStatus.Warning;
-                }
-                else if (properties.Status.Contains("seeding") || properties.Status.Contains("complete"))
+                if (properties.Status.Contains("seeding") || properties.Status.Contains("complete"))
                 {
                     item.Status = DownloadItemStatus.Completed;
                 }
-                else if (properties.Status.Contains("downloading"))
-                {
-                    item.Status = DownloadItemStatus.Downloading;
-                }
                 else if (properties.Status.Contains("stopped"))
                 {
                     item.Status = DownloadItemStatus.Paused;
                 }
+                else if (properties.Status.Contains("error"))
+                {
+                    item.Status = DownloadItemStatus.Warning;
+                }
+                else if (properties.Status.Contains("downloading"))
+                {
+                    item.Status = DownloadItemStatus.Downloading;
+                }
 
                 if (item.Status == DownloadItemStatus.Completed)
                 {

src/Readarr.Http/REST/RestController.cs

@@ -74,7 +74,7 @@ namespace Readarr.Http.REST
             }
 
             var attributes = descriptor.MethodInfo.CustomAttributes;
-            if (attributes.Any(x => VALIDATE_ID_ATTRIBUTES.Contains(x.GetType())) && !skipValidate)
+            if (attributes.Any(x => VALIDATE_ID_ATTRIBUTES.Contains(x.AttributeType)) && !skipValidate)
             {
                 if (context.ActionArguments.TryGetValue("id", out var idObj))
                 {