mirror of
https://github.com/sphildreth/roadie
synced 2024-09-19 22:21:58 +00:00
Update NuGet packages
This commit is contained in:
Steven Hildreth
parent
744a6f6152
commit
38c9162fbd
4 changed files with 7 additions and 315 deletions
|
|
@ -211,8 +211,7 @@ namespace Roadie.Library.SearchEngines.MetaData.Discogs
|
|||
var client = new RestClient(new RestClientOptions("https://api.discogs.com/database")
|
||||
{
|
||||
UserAgent = WebHelper.UserAgent,
|
||||
Timeout = SafeParser.ToNumber<int>(Configuration.Integrations.DiscogsTimeout)
|
||||
|
||||
MaxTimeout = SafeParser.ToNumber<int>(Configuration.Integrations.DiscogsTimeout)
|
||||
});
|
||||
var response = await client.ExecuteAsync<DiscogsReleaseSearchResult>(request).ConfigureAwait(false);
|
||||
if (response?.ResponseStatus == null || response.ResponseStatus == ResponseStatus.Error)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.7" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.7" />
|
||||
<PackageReference Include="Pastel" Version="3.0.1" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
|
||||
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
|
||||
|
|
|
|||
|
|
@ -7,6 +7,12 @@
|
|||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="Thumbnails\**" />
|
||||
<EmbeddedResource Remove="Thumbnails\**" />
|
||||
<None Remove="Thumbnails\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Roadie.Api.Library\Roadie.Library.csproj" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,312 +0,0 @@
|
|||
using Microsoft.Extensions.Logging;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Roadie.Dlna.Utility
|
||||
{
|
||||
public class HttpStream : Stream, IDisposable
|
||||
{
|
||||
public static readonly string UserAgent = GenerateUserAgent();
|
||||
private const int BUFFER_SIZE = 1 << 10;
|
||||
|
||||
private const long SMALL_SEEK = 1 << 9;
|
||||
|
||||
private const int TIMEOUT = 30000;
|
||||
private readonly Uri Referrer;
|
||||
|
||||
private readonly Uri StreamUri;
|
||||
|
||||
private Stream bufferedStream;
|
||||
|
||||
private long? length;
|
||||
|
||||
private long position;
|
||||
|
||||
private HttpWebRequest request;
|
||||
|
||||
private HttpWebResponse response;
|
||||
|
||||
private Stream responseStream;
|
||||
|
||||
public override bool CanRead => true;
|
||||
|
||||
public override bool CanSeek
|
||||
{
|
||||
get
|
||||
{
|
||||
if (Length <= 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
EnsureResponse();
|
||||
var ranges = response.Headers.Get("Accept-Ranges");
|
||||
return string.IsNullOrEmpty(ranges)
|
||||
|| !string.Equals(ranges, "none", StringComparison.InvariantCultureIgnoreCase);
|
||||
}
|
||||
}
|
||||
|
||||
public override bool CanTimeout => true;
|
||||
public override bool CanWrite => false;
|
||||
|
||||
public string ContentType
|
||||
{
|
||||
get
|
||||
{
|
||||
EnsureResponse();
|
||||
return response.ContentType;
|
||||
}
|
||||
}
|
||||
|
||||
public DateTime LastModified
|
||||
{
|
||||
get
|
||||
{
|
||||
EnsureResponse();
|
||||
return response.LastModified;
|
||||
}
|
||||
}
|
||||
|
||||
public override long Length
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!length.HasValue)
|
||||
{
|
||||
OpenAt(0, HttpMethod.HEAD);
|
||||
length = response.ContentLength;
|
||||
}
|
||||
if (length.Value < 0)
|
||||
{
|
||||
throw new IOException("Stream does not feature a length");
|
||||
}
|
||||
return length.Value;
|
||||
}
|
||||
}
|
||||
|
||||
public override long Position
|
||||
{
|
||||
get { return position; }
|
||||
set { Seek(value, SeekOrigin.Begin); }
|
||||
}
|
||||
|
||||
public Uri Uri => new Uri(StreamUri.ToString());
|
||||
private ILogger Logger { get; }
|
||||
|
||||
public HttpStream(ILogger logger, Uri uri, Uri referrer)
|
||||
{
|
||||
if (uri == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(uri));
|
||||
}
|
||||
StreamUri = uri;
|
||||
Referrer = referrer;
|
||||
Logger = logger;
|
||||
}
|
||||
|
||||
public override void Close()
|
||||
{
|
||||
bufferedStream?.Close();
|
||||
responseStream?.Close();
|
||||
response?.Close();
|
||||
base.Close();
|
||||
}
|
||||
|
||||
public new void Dispose()
|
||||
{
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
|
||||
public override void Flush()
|
||||
{
|
||||
Dispose(true);
|
||||
}
|
||||
|
||||
public override int Read(byte[] buffer, int offset, int count)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (responseStream == null)
|
||||
{
|
||||
OpenAt(position, HttpMethod.GET);
|
||||
}
|
||||
var read = bufferedStream.Read(buffer, offset, count);
|
||||
if (read > 0)
|
||||
{
|
||||
position += read;
|
||||
}
|
||||
return read;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError("Failed to read", ex);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
public override long Seek(long offset, SeekOrigin origin)
|
||||
{
|
||||
Logger.LogDebug("Seek to {0}, {1} requested", offset, origin);
|
||||
var np = 0L;
|
||||
switch (origin)
|
||||
{
|
||||
case SeekOrigin.Begin:
|
||||
np = offset;
|
||||
break;
|
||||
|
||||
case SeekOrigin.Current:
|
||||
np = position + offset;
|
||||
break;
|
||||
|
||||
case SeekOrigin.End:
|
||||
np = Length + np;
|
||||
break;
|
||||
}
|
||||
if (np < 0 || np >= Length)
|
||||
{
|
||||
throw new IOException("Invalid seek; out of stream bounds");
|
||||
}
|
||||
var off = position - np;
|
||||
if (off == 0)
|
||||
{
|
||||
Logger.LogDebug("No seek required");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (response != null && off > 0 && off < SMALL_SEEK)
|
||||
{
|
||||
var buf = new byte[off];
|
||||
bufferedStream.Read(buf, 0, (int)off);
|
||||
Logger.LogDebug("Did a small seek of {0}", off);
|
||||
}
|
||||
else
|
||||
{
|
||||
OpenAt(np, HttpMethod.GET);
|
||||
Logger.LogDebug("Did a long seek of {0}", off);
|
||||
}
|
||||
}
|
||||
position = np;
|
||||
Logger.LogDebug("Successfully sought to {0}", position);
|
||||
return position;
|
||||
}
|
||||
|
||||
public override void SetLength(long value)
|
||||
{
|
||||
length = value;
|
||||
}
|
||||
|
||||
public override void Write(byte[] buffer, int offset, int count)
|
||||
{
|
||||
throw new NotSupportedException();
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing)
|
||||
{
|
||||
if (bufferedStream != null)
|
||||
{
|
||||
bufferedStream.Dispose();
|
||||
bufferedStream = null;
|
||||
}
|
||||
if (responseStream != null)
|
||||
{
|
||||
responseStream.Dispose();
|
||||
responseStream = null;
|
||||
}
|
||||
response = null;
|
||||
request = null;
|
||||
}
|
||||
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
protected void OpenAt(long offset, HttpMethod method)
|
||||
{
|
||||
if (offset < 0)
|
||||
{
|
||||
throw new IOException("Position cannot be negative");
|
||||
}
|
||||
if (offset > 0 && method == HttpMethod.HEAD)
|
||||
{
|
||||
throw new ArgumentException(
|
||||
"Cannot use a position (seek) with HEAD request");
|
||||
}
|
||||
Close();
|
||||
Dispose();
|
||||
|
||||
request = (HttpWebRequest)WebRequest.Create(Uri);
|
||||
request.Method = method.ToString();
|
||||
if (Referrer != null)
|
||||
{
|
||||
request.Referer = Referrer.ToString();
|
||||
}
|
||||
request.AllowAutoRedirect = true;
|
||||
request.Timeout = TIMEOUT * 1000;
|
||||
request.UserAgent = UserAgent;
|
||||
if (offset > 0)
|
||||
{
|
||||
request.AddRange(offset);
|
||||
}
|
||||
response = (HttpWebResponse)request.GetResponse();
|
||||
if (method != HttpMethod.HEAD)
|
||||
{
|
||||
responseStream = response.GetResponseStream();
|
||||
if (responseStream == null)
|
||||
{
|
||||
throw new IOException("Didn't get a response stream");
|
||||
}
|
||||
bufferedStream = new BufferedStream(responseStream, BUFFER_SIZE);
|
||||
}
|
||||
if (offset > 0 && response.StatusCode != HttpStatusCode.PartialContent)
|
||||
{
|
||||
throw new IOException(
|
||||
"Failed to open the http stream at a specific position");
|
||||
}
|
||||
if (offset == 0 && response.StatusCode != HttpStatusCode.OK)
|
||||
{
|
||||
throw new IOException("Failed to open the http stream");
|
||||
}
|
||||
Logger.LogInformation("Opened {0} {1} at {2}", method, Uri, offset);
|
||||
}
|
||||
|
||||
private static string GenerateUserAgent()
|
||||
{
|
||||
var os = Environment.OSVersion;
|
||||
string pstring;
|
||||
switch (os.Platform)
|
||||
{
|
||||
case PlatformID.Win32NT:
|
||||
case PlatformID.Win32S:
|
||||
case PlatformID.Win32Windows:
|
||||
pstring = "WIN";
|
||||
break;
|
||||
|
||||
default:
|
||||
pstring = "Unix";
|
||||
break;
|
||||
}
|
||||
return string.Format(
|
||||
"roadie/{4}.{5} ({0}{1} {2}.{3}) like curl/7.3 like wget/1.0",
|
||||
pstring,
|
||||
IntPtr.Size * 8,
|
||||
os.Version.Major,
|
||||
os.Version.Minor,
|
||||
Assembly.GetExecutingAssembly().GetName().Version.Major,
|
||||
Assembly.GetExecutingAssembly().GetName().Version.Minor
|
||||
);
|
||||
}
|
||||
|
||||
private void EnsureResponse()
|
||||
{
|
||||
if (response != null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
OpenAt(0, HttpMethod.HEAD);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue