Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inferencer nullability enabled

Browse Source
This commit is contained in:
Justin Swanson
2020-04-09 16:12:32 -05:00
parent 4e1a32caac
commit a30bba2c0b
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Wabbajack.Lib/Downloaders/UrlDownloaders/BethesdaNetInferencer.cs
View File

@ -1,11 +1,12 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#nullable enable
namespace Wabbajack.Lib.Downloaders.UrlDownloaders namespace Wabbajack.Lib.Downloaders.UrlDownloaders
{ {
public class BethesdaNetInferencer : IUrlInferencer public class BethesdaNetInferencer : IUrlInferencer
{ {
public async Task<AbstractDownloadState> Infer(Uri uri) public async Task<AbstractDownloadState?> Infer(Uri uri)
{ {
return BethesdaNetDownloader.StateFromUrl(uri); return BethesdaNetDownloader.StateFromUrl(uri);
} }

3
Wabbajack.Lib/Downloaders/UrlDownloaders/IUrlInferencer.cs
View File

@ -1,10 +1,11 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
#nullable enable
namespace Wabbajack.Lib.Downloaders.UrlDownloaders namespace Wabbajack.Lib.Downloaders.UrlDownloaders
{ {
public interface IUrlInferencer public interface IUrlInferencer
{ {
Task<AbstractDownloadState> Infer(Uri uri); Task<AbstractDownloadState?> Infer(Uri uri);
} }
} }

10
Wabbajack.Lib/Downloaders/UrlDownloaders/YoutubeInferencer.cs
View File

@ -3,15 +3,15 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Wabbajack.Common; using Wabbajack.Common;
using YoutubeExplode; using YoutubeExplode;
#nullable enable
namespace Wabbajack.Lib.Downloaders.UrlDownloaders namespace Wabbajack.Lib.Downloaders.UrlDownloaders
{ {
public class YoutubeInferencer : IUrlInferencer public class YoutubeInferencer : IUrlInferencer
{ {
public async Task<AbstractDownloadState?> Infer(Uri uri)
public async Task<AbstractDownloadState> Infer(Uri uri)
{ {
var state = (YouTubeDownloader.State)YouTubeDownloader.UriToState(uri); var state = YouTubeDownloader.UriToState(uri) as YouTubeDownloader.State;
if (state == null) return null; if (state == null) return null;
var client = new YoutubeClient(Common.Http.ClientFactory.Client); var client = new YoutubeClient(Common.Http.ClientFactory.Client);
@ -24,13 +24,13 @@ namespace Wabbajack.Lib.Downloaders.UrlDownloaders
.Select(line => .Select(line =>
{ {
var segments = line.Split(' ', StringSplitOptions.RemoveEmptyEntries); var segments = line.Split(' ', StringSplitOptions.RemoveEmptyEntries);
if (segments.Length == 0) return (TimeSpan.Zero, null); if (segments.Length == 0) return (TimeSpan.Zero, string.Empty);
if (TryParseEx(segments.First(), out var s1)) if (TryParseEx(segments.First(), out var s1))
return (s1, string.Join(" ", segments.Skip(1))); return (s1, string.Join(" ", segments.Skip(1)));
if (TryParseEx(Enumerable.Last(segments), out var s2)) if (TryParseEx(Enumerable.Last(segments), out var s2))
return (s2, string.Join(" ", Utils.ButLast(segments))); return (s2, string.Join(" ", Utils.ButLast(segments)));
return (TimeSpan.Zero, null); return (TimeSpan.Zero, string.Empty);
}) })
.Where(t => t.Item2 != null) .Where(t => t.Item2 != null)
.ToList(); .ToList();