Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3359 from sbwalker/dev

Browse Source 
optimize UrlCombine method
This commit is contained in:
Shaun Walker 2023-10-09 12:00:51 -04:00 committed by GitHub
commit 3b1819c68d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Oqtane.Shared/Shared/Utilities.cs
View File

@ -1,8 +1,6 @@
using Oqtane.Models; using Oqtane.Models;
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -390,14 +388,19 @@ namespace Oqtane.Shared
public static string UrlCombine(params string[] segments) public static string UrlCombine(params string[] segments)
{ {
segments = segments.Where(item => !string.IsNullOrEmpty(item) && item != "/" && item != "\\").ToArray(); var url = new List<string>();
for (int i = 0; i < segments.Length; i++) for (int i = 0; i < segments.Length; i++)
{ {
segments[i] = (segments[i].StartsWith("/") || segments[i].StartsWith("\\")) ? segments[i].Substring(1) : segments[i];
segments[i] = (segments[i].EndsWith("/") || segments[i].EndsWith("\\")) ? segments[i].Substring(0, segments[i].Length - 1) : segments[i];
segments[i] = segments[i].Replace("\\", "/"); segments[i] = segments[i].Replace("\\", "/");
if (!string.IsNullOrEmpty(segments[i]) && segments[i] != "/")
{
foreach (var segment in segments[i].Split('/', StringSplitOptions.RemoveEmptyEntries))
{
url.Add(segment);
} }
return string.Join("/", segments); }
}
return string.Join("/", url);
} }
public static bool IsPathValid(this Folder folder) public static bool IsPathValid(this Folder folder)