michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Cleanup in QueryParamCollection

Browse Source
This commit is contained in:
Claus Vium 2019-02-27 12:45:06 +01:00
parent 333bd2107a
commit 91afaaf8fe
2 changed files with 2 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Dlna/PlayTo/PlayToController.cs
View File

@ -849,7 +849,7 @@ namespace Emby.Dlna.PlayTo
if (index == -1) return request; if (index == -1) return request;
var query = url.Substring(index + 1); var query = url.Substring(index + 1);
var values = QueryHelpers.ParseQuery(query); Dictionary<string, StringValues> values = QueryHelpers.ParseQuery(query);
request.DeviceProfileId = values["DeviceProfileId"].ToString(); request.DeviceProfileId = values["DeviceProfileId"].ToString();
request.DeviceId = values["DeviceId"].ToString(); request.DeviceId = values["DeviceId"].ToString();

59
MediaBrowser.Model/Services/QueryParamCollection.cs
View File

@ -16,7 +16,7 @@ namespace MediaBrowser.Model.Services
} }
public QueryParamCollection(IDictionary<string, string> headers) public QueryParamCollection(IHeaderDictionary headers)
{ {
foreach (var pair in headers) foreach (var pair in headers)
{ {
@ -24,38 +24,6 @@ namespace MediaBrowser.Model.Services
} }
} }
public QueryParamCollection(Microsoft.AspNetCore.Http.IHeaderDictionary headers)
{
foreach (var pair in headers)
{
Add(pair.Key, pair.Value);
}
}
// TODO remove this shit
public QueryParamCollection(WebHeaderCollection webHeaderCollection)
{
foreach (var key in webHeaderCollection.AllKeys)
{
foreach (var value in webHeaderCollection.GetValues(key) ?? Array.Empty<string>())
{
Add(key, value);
}
}
}
// TODO remove this shit
public QueryParamCollection(NameValueCollection nameValueCollection)
{
foreach (var key in nameValueCollection.AllKeys)
{
foreach (var value in nameValueCollection.GetValues(key) ?? Array.Empty<string>())
{
Add(key, value);
}
}
}
public QueryParamCollection(IQueryCollection queryCollection) public QueryParamCollection(IQueryCollection queryCollection)
{ {
foreach (var pair in queryCollection) foreach (var pair in queryCollection)
@ -74,21 +42,6 @@ namespace MediaBrowser.Model.Services
return StringComparer.OrdinalIgnoreCase; return StringComparer.OrdinalIgnoreCase;
} }
public string GetKey(int index)
{
return this[index].Name;
}
public string Get(int index)
{
return this[index].Value;
}
public virtual string[] GetValues(int index)
{
return new[] { Get(index) };
}
/// <summary> /// <summary>
/// Adds a new query parameter. /// Adds a new query parameter.
/// </summary> /// </summary>
@ -129,16 +82,6 @@ namespace MediaBrowser.Model.Services
Add(key, value); Add(key, value);
} }
/// <summary>
/// Removes all parameters of the given name.
/// </summary>
/// <returns>The number of parameters that were removed</returns>
/// <exception cref="ArgumentNullException"><paramref name="name" /> is null.</exception>
public virtual int Remove(string name)
{
return RemoveAll(p => p.Name == name);
}
public string Get(string name) public string Get(string name)
{ {
var stringComparison = GetStringComparison(); var stringComparison = GetStringComparison();