Fix Duplication Uri

WinUICommunity · Nov 10, 2023 · 495c9a8 · 495c9a8
1 parent b8723c9
commit 495c9a8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/dev/Tools/Common/AppHelper.cs b/dev/Tools/Common/AppHelper.cs
@@ -240,7 +240,7 @@ public static string FixTitle(string title)
         return title;
     }
 
-    public static string ConcatenateUrls(string baseUrl, string relativeUrl)
+    private static string ConcatenateUrls(string baseUrl, string relativeUrl)
     {
         // Ensure baseUrl ends with a slash
         if (!baseUrl.EndsWith("/"))
@@ -264,5 +264,23 @@ public static string ConcatenateUrls(string baseUrl, string relativeUrl)
 
         return resultUrl;
     }
+
+    public static string FixUriDuplication(string baseUrl, string relativeUrl)
+    {
+        var baseUrlUri = new Uri(baseUrl);
+
+        var baseUrlLeftPart = baseUrlUri.GetLeftPart(UriPartial.Authority);
+        var duplicateSection = baseUrl.Replace(baseUrlLeftPart, "");
+
+        if (duplicateSection.StartsWith("/"))
+        {
+            duplicateSection = duplicateSection.Substring(1);
+        }
+        if (relativeUrl.Contains(duplicateSection))
+        {
+            baseUrl = baseUrl.Replace(duplicateSection, "");
+        }
+        return ConcatenateUrls(baseUrl, relativeUrl);
+    }
 }
 
diff --git a/dev/TvTime.csproj b/dev/TvTime.csproj
@@ -10,7 +10,7 @@
 		<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
 		<UseWinUI>true</UseWinUI>
 		<EnableMsixTooling>true</EnableMsixTooling>
-		<Version>4.8.0</Version>
+		<Version>4.8.1</Version>
 		<ImplicitUsings>true</ImplicitUsings>
 		<LangVersion>Latest</LangVersion>
 		<AccelerateBuildsInVisualStudio>False</AccelerateBuildsInVisualStudio>

diff --git a/dev/ViewModels/Media/MediaDetailsViewModel.cs b/dev/ViewModels/Media/MediaDetailsViewModel.cs
@@ -143,7 +143,7 @@ public List<BaseMediaTable> GetAllServerDetails(string content, BaseMediaTable b
                         continue;
                     }
 
-                    var finalServer = ConcatenateUrls(baseMedia.Server, href);
+                    var finalServer = FixUriDuplication(baseMedia.Server, href);
 
                     if (finalServer.Contains("dl5.dl1acemovies", StringComparison.OrdinalIgnoreCase))
                     {

diff --git a/dev/ViewModels/Media/MediaViewModel.cs b/dev/ViewModels/Media/MediaViewModel.cs
@@ -384,7 +384,7 @@ public async Task GetAllServerDetails(string content, string server)
                         continue;
                     }
 
-                    var finalServer = ConcatenateUrls(server, href);
+                    var finalServer = FixUriDuplication(server, href);
                     if (finalServer.Contains("directadmin.com", StringComparison.OrdinalIgnoreCase) ||
                         finalServer.Contains("dl5.dl1acemovies") && (title.Equals("Home") ||
                         title.Equals("dl") || title.Equals("English") || title.Equals("Series") ||