kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #551 from chlupac/TryGetQueryValue

Browse Source 
Uri extensions for read query values
This commit is contained in:
Shaun Walker 2020-05-28 09:51:01 -04:00 committed by GitHub
commit fd249a7734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 74 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
using Oqtane.Models; using Oqtane.Models;
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -15,7 +16,7 @@ namespace Oqtane.Shared
{ {
if (type == null) return null; if (type == null) return null;
var assemblyFullName = type.Assembly.FullName; var assemblyFullName = type.Assembly.FullName;
var assemblyName = assemblyFullName.Substring(0, assemblyFullName.IndexOf(",", StringComparison.Ordinal)); var assemblyName = assemblyFullName.Substring(0, assemblyFullName.IndexOf(",", StringComparison.Ordinal));
return $"{type.Namespace}, {assemblyName}"; return $"{type.Namespace}, {assemblyName}";
} }
@ -24,10 +25,10 @@ namespace Oqtane.Shared
var uriBuilder = new UriBuilder var uriBuilder = new UriBuilder
{ {
Path = !string.IsNullOrEmpty(alias) Path = !string.IsNullOrEmpty(alias)
? (!string.IsNullOrEmpty(path)) ? (!string.IsNullOrEmpty(path))
? $"{alias}/{path}" ? $"{alias}/{path}"
: $"{alias}" : $"{alias}"
: $"{path}", : $"{path}",
Query = parameters Query = parameters
}; };
@ -44,6 +45,7 @@ namespace Oqtane.Shared
path += $"/{action}"; path += $"/{action}";
} }
} }
return NavigateUrl(alias, path, parameters); return NavigateUrl(alias, path, parameters);
} }
@ -98,6 +100,7 @@ namespace Oqtane.Shared
// remove assembly if fully qualified type // remove assembly if fully qualified type
typename = typename.Substring(0, typename.IndexOf(",")); typename = typename.Substring(0, typename.IndexOf(","));
} }
// segment 0 is the last segment, segment 1 is the second to last segment, etc... // segment 0 is the last segment, segment 1 is the second to last segment, etc...
string[] segments = typename.Split('.'); string[] segments = typename.Split('.');
string name = ""; string name = "";
@ -105,6 +108,7 @@ namespace Oqtane.Shared
{ {
name = segments[segments.Length - (segment + 1)]; name = segments[segments.Length - (segment + 1)];
} }
return name; return name;
} }
@ -142,11 +146,14 @@ namespace Oqtane.Shared
stringBuilder.Append('-'); stringBuilder.Append('-');
prevdash = true; prevdash = true;
} }
break; break;
} }
} }
result = stringBuilder.ToString().Trim('-'); result = stringBuilder.ToString().Trim('-');
} }
return result; return result;
} }
@ -236,25 +243,28 @@ namespace Oqtane.Shared
if (string.IsNullOrEmpty(email)) return false; if (string.IsNullOrEmpty(email)) return false;
return Regex.IsMatch(email, return Regex.IsMatch(email,
@"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))" + @"^(?("")("".+?(?<!\\)""@)|(([0-9a-z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-z])@))" +
@"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-0-9a-z]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$", @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-z][-0-9a-z]*[0-9a-z]*\.)+[a-z0-9][\-a-z0-9]{0,22}[a-z0-9]))$",
RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250)); RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250));
} }
public static string PathCombine(params string[] segments) public static string PathCombine(params string[] segments)
{ {
var separators = new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }; var separators = new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar};
for (int i =1;i < segments.Length; i++){ for (int i = 1; i < segments.Length; i++)
if(Path.IsPathRooted(segments[i])){ {
if (Path.IsPathRooted(segments[i]))
{
segments[i] = segments[i].TrimStart(separators); segments[i] = segments[i].TrimStart(separators);
if(String.IsNullOrEmpty(segments[i])){ if (String.IsNullOrEmpty(segments[i]))
segments[i]=" "; {
segments[i] = " ";
} }
} }
} }
return Path.Combine(segments).TrimEnd(); return Path.Combine(segments).TrimEnd();
} }
public static bool IsPathValid(this Folder folder) public static bool IsPathValid(this Folder folder)
@ -273,5 +283,54 @@ namespace Oqtane.Shared
!Constants.InvalidFileNameEndingChars.Any(name.EndsWith) && !Constants.InvalidFileNameEndingChars.Any(name.EndsWith) &&
!Constants.ReservedDevices.Split(',').Contains(name.ToUpper().Split('.')[0])); !Constants.ReservedDevices.Split(',').Contains(name.ToUpper().Split('.')[0]));
} }
public static bool TryGetQueryValue(
this Uri uri,
string key,
out string value,
string defaultValue = null)
{
value = defaultValue;
string query = uri.Query;
return !string.IsNullOrEmpty(query) && Utilities.ParseQueryString(query).TryGetValue(key, out value);
}
public static bool TryGetQueryValueInt(
this Uri uri,
string key,
out int value,
int defaultValue = 0)
{
value = defaultValue;
string s;
return uri.TryGetQueryValue(key, out s, (string) null) && int.TryParse(s, out value);
}
public static Dictionary<string, string> ParseQueryString(string query)
{
Dictionary<string, string> dictionary = new Dictionary<string, string>();
if (!string.IsNullOrEmpty(query))
{
query = query.Substring(1);
string str = query;
char[] separator = new char[1] {'&'};
foreach (string key in str.Split(separator, StringSplitOptions.RemoveEmptyEntries))
{
if (key != "")
{
if (key.Contains("="))
{
string[] strArray = key.Split('=', StringSplitOptions.None);
dictionary.Add(strArray[0], strArray[1]);
}
else
dictionary.Add(key, "true");
}
}
}
return dictionary;
}
} }
} }