1
0

Indetation formatting and unnecessary usings cleanup

This commit is contained in:
Michael Gordeev
2020-05-10 13:47:42 +03:00
parent f968c95ab1
commit 1d636120cc
20 changed files with 684 additions and 702 deletions
+12 -12
View File
@@ -4,16 +4,16 @@ using YouTube.Models;
namespace YouTube.API.Test
{
public class ClosedCaptionsTest
{
[Test]
public void ValidCaptionsTest()
{
ExtendedYouTubeService service = new ExtendedYouTubeService();
ClosedCaptionInfo info = service.VideoPlayback.List("VC5-YkjMHuw").Execute().ClosedCaptions.FirstOrDefault();
ClosedCaptionTrack track = service.Captions.Load(info).Execute();
Assert.IsNotNull(track);
Assert.IsNotEmpty(track.Captions);
}
}
public class ClosedCaptionsTest
{
[Test]
public void ValidCaptionsTest()
{
ExtendedYouTubeService service = new ExtendedYouTubeService();
ClosedCaptionInfo info = service.VideoPlayback.List("VC5-YkjMHuw").Execute().ClosedCaptions.FirstOrDefault();
ClosedCaptionTrack track = service.Captions.Load(info).Execute();
Assert.IsNotNull(track);
Assert.IsNotEmpty(track.Captions);
}
}
}
+13 -19
View File
@@ -5,23 +5,17 @@ using YouTube.Models;
namespace YouTube.API.Test
{
public class DashManifestTest
{
[SetUp]
public void Setup()
{
}
[Test]
public void ValidManifestTest()
{
ExtendedYouTubeService service = new ExtendedYouTubeService();
IReadOnlyList<DashManifest> manifests = service.DashManifests.List("NkGbcQwWxqk").Execute();
foreach (var i in manifests)
Console.WriteLine(i.Label);
Assert.IsNotNull(manifests);
Assert.IsNotEmpty(manifests);
}
}
public class DashManifestTest
{
[Test]
public void ValidManifestTest()
{
ExtendedYouTubeService service = new ExtendedYouTubeService();
IReadOnlyList<DashManifest> manifests = service.DashManifests.List("NkGbcQwWxqk").Execute();
foreach (var i in manifests)
Console.WriteLine(i.Label);
Assert.IsNotNull(manifests);
Assert.IsNotEmpty(manifests);
}
}
}
+11 -14
View File
@@ -1,19 +1,16 @@
using System;
using System.Collections.Generic;
using System.Text;
using NUnit.Framework;
using NUnit.Framework;
using YouTube.Models;
namespace YouTube.API.Test
{
public class VideoPlaybackTest
{
[Test]
public void ValidVideoPlaybackTest()
{
ExtendedYouTubeService service = new ExtendedYouTubeService();
VideoPlayback info = service.VideoPlayback.List("VC5-YkjMHuw").Execute();
Assert.NotNull(info);
}
}
public class VideoPlaybackTest
{
[Test]
public void ValidVideoPlaybackTest()
{
ExtendedYouTubeService service = new ExtendedYouTubeService();
VideoPlayback info = service.VideoPlayback.List("VC5-YkjMHuw").Execute();
Assert.NotNull(info);
}
}
}
+36 -39
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using Google.Apis.Auth.OAuth2;
using Google.Apis.Services;
using Google.Apis.YouTube.v3.Data;
using Newtonsoft.Json;
@@ -11,44 +8,44 @@ using YouTube.Resources;
namespace YouTube.API.Test
{
public class WatchLaterTest
{
const string testVideoId = "NkGbcQwWxqk";
ExtendedYouTubeService service;
public class WatchLaterTest
{
const string testVideoId = "NkGbcQwWxqk";
ExtendedYouTubeService service;
[SetUp]
public void Setup()
{
var task = AuthorizationHelpers.ExchangeToken(new ClientSecrets
{
ClientId = "CLIENT_ID",
ClientSecret = "CLIENT_SECRET"
}, "SUCCESS_CODE");
task.Wait();
[SetUp]
public void Setup()
{
var task = AuthorizationHelpers.ExchangeToken(new Google.Apis.Auth.OAuth2.ClientSecrets
{
ClientId = "CLIENT_ID",
ClientSecret = "CLIENT_SECRET"
}, "SUCCESS_CODE");
task.Wait();
UserCredential credential = task.Result;
service = new ExtendedYouTubeService(new BaseClientService.Initializer
{
HttpClientInitializer = credential,
ApplicationName = "FoxTube"
});
}
UserCredential credential = task.Result;
service = new ExtendedYouTubeService(new BaseClientService.Initializer
{
HttpClientInitializer = credential,
ApplicationName = "FoxTube"
});
}
[Test]
public void AddVideoTest()
{
WatchLaterResource.InsertRequest request = service.WatchLater.Insert(testVideoId, "snippet");
PlaylistItem item = request.Execute();
Console.WriteLine(JsonConvert.SerializeObject(item));
Assert.IsNotNull(item);
}
[Test]
public void AddVideoTest()
{
WatchLaterResource.InsertRequest request = service.WatchLater.Insert(testVideoId, "snippet");
PlaylistItem item = request.Execute();
Console.WriteLine(JsonConvert.SerializeObject(item));
Assert.IsNotNull(item);
}
[Test]
public void DeleteVideoTest()
{
WatchLaterResource.DeleteRequest request = service.WatchLater.Delete(testVideoId);
request.Execute();
Assert.Pass();
}
}
[Test]
public void DeleteVideoTest()
{
WatchLaterResource.DeleteRequest request = service.WatchLater.Delete(testVideoId);
request.Execute();
Assert.Pass();
}
}
}
+10 -10
View File
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<MPD minBufferTime="PT2S" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" type="static">
<Period>
<AdaptationSet>
<ContentComponent contentType="video" id="1">
<Period>
<AdaptationSet>
<ContentComponent contentType="video" id="1">
</ContentComponent>
</AdaptationSet>
<AdaptationSet>
<ContentComponent contentType="audio" id="2">
</ContentComponent>
</AdaptationSet>
<AdaptationSet>
<ContentComponent contentType="audio" id="2">
</ContentComponent>
</AdaptationSet>
</Period>
</ContentComponent>
</AdaptationSet>
</Period>
</MPD>
+17 -17
View File
@@ -2,22 +2,22 @@
namespace YouTube
{
internal static class Extensions
{
internal static Uri ToUri(this string str)
{
try { return new Uri(str); }
catch { return null; }
}
internal static class Extensions
{
internal static Uri ToUri(this string str)
{
try { return new Uri(str); }
catch { return null; }
}
internal static int RangeOffset(int value, int min, int max)
{
if (value < min)
return -1;
else if (value > max)
return 1;
else
return 0;
}
}
internal static int RangeOffset(int value, int min, int max)
{
if (value < min)
return -1;
else if (value > max)
return 1;
else
return 0;
}
}
}
+165 -165
View File
@@ -17,210 +17,210 @@ using YoutubeExplode.Models.MediaStreams;
namespace YouTube.Generators
{
internal class ManifestGenerator
{
IClientService ClientService { get; }
YoutubeClient Client { get; }
string Id { get; }
Video Meta { get; set; }
MediaStreamInfoSet UrlsSet { get; set; }
internal class ManifestGenerator
{
IClientService ClientService { get; }
YoutubeClient Client { get; }
string Id { get; }
Video Meta { get; set; }
MediaStreamInfoSet UrlsSet { get; set; }
public ManifestGenerator(IClientService service, string id)
{
ClientService = service;
Id = id;
Client = new YoutubeClient(service.HttpClient);
}
public ManifestGenerator(IClientService service, string id)
{
ClientService = service;
Id = id;
Client = new YoutubeClient(service.HttpClient);
}
public async Task<IReadOnlyList<DashManifest>> GenerateManifestsAsync()
{
Meta = await Client.GetVideoAsync(Id);
public async Task<IReadOnlyList<DashManifest>> GenerateManifestsAsync()
{
Meta = await Client.GetVideoAsync(Id);
if (Meta == null)
throw new FileNotFoundException("Video not found. Check video ID and visibility preferences");
if (Meta == null)
throw new FileNotFoundException("Video not found. Check video ID and visibility preferences");
UrlsSet = await Client.GetVideoMediaStreamInfosAsync(Id);
UrlsSet = await Client.GetVideoMediaStreamInfosAsync(Id);
if (!string.IsNullOrWhiteSpace(UrlsSet.HlsLiveStreamUrl))
throw new NotSupportedException("This is livestream. Use 'YouTubeClient.VideoPlayback.List()' to get playback URLs");
if (!string.IsNullOrWhiteSpace(UrlsSet.HlsLiveStreamUrl))
throw new NotSupportedException("This is livestream. Use 'YouTubeClient.VideoPlayback.List()' to get playback URLs");
List<DashManifest> list = new List<DashManifest>
{
await GenerateManifest("Auto")
};
foreach (string i in UrlsSet.GetAllVideoQualityLabels())
list.Add(await GenerateManifest(i));
List<DashManifest> list = new List<DashManifest>
{
await GenerateManifest("Auto")
};
foreach (string i in UrlsSet.GetAllVideoQualityLabels())
list.Add(await GenerateManifest(i));
return list.AsReadOnly();
}
return list.AsReadOnly();
}
async Task<DashManifest> GenerateManifest(string quality)
{
XmlDocument manifest = new XmlDocument();
manifest.LoadXml(Properties.Resources.DashManifestTemplate);
async Task<DashManifest> GenerateManifest(string quality)
{
XmlDocument manifest = new XmlDocument();
manifest.LoadXml(Properties.Resources.DashManifestTemplate);
manifest["MPD"].SetAttribute("mediaPresentationDuration", XmlConvert.ToString(Meta.Duration));
manifest["MPD"].SetAttribute("mediaPresentationDuration", XmlConvert.ToString(Meta.Duration));
StreamInfo streamInfo = await GetInfoAsync(quality);
StreamInfo streamInfo = await GetInfoAsync(quality);
foreach (var i in streamInfo.Video)
{
string rep = GetVideoRepresentation(i);
manifest.GetElementsByTagName("ContentComponent")[0].InnerXml += rep;
}
foreach (var i in streamInfo.Video)
{
string rep = GetVideoRepresentation(i);
manifest.GetElementsByTagName("ContentComponent")[0].InnerXml += rep;
}
foreach (var i in streamInfo.Audio)
manifest.GetElementsByTagName("ContentComponent")[1].InnerXml += GetAudioRepresentation(i);
foreach (var i in streamInfo.Audio)
manifest.GetElementsByTagName("ContentComponent")[1].InnerXml += GetAudioRepresentation(i);
return new DashManifest(quality, manifest);
}
return new DashManifest(quality, manifest);
}
string GetVideoRepresentation(StreamInfo.VideoInfo info) =>
$@"<Representation bandwidth=""{GetBandwidth(info.Label)}"" id=""{info.Itag}"" mimeType=""{info.MimeType}"" codecs=""{info.Codecs}"" fps=""{info.Fps}"" height=""{info.Height}"" width=""{info.Width}"">
string GetVideoRepresentation(StreamInfo.VideoInfo info) =>
$@"<Representation bandwidth=""{GetBandwidth(info.Label)}"" id=""{info.Itag}"" mimeType=""{info.MimeType}"" codecs=""{info.Codecs}"" fps=""{info.Fps}"" height=""{info.Height}"" width=""{info.Width}"">
<BaseURL>{WebUtility.UrlEncode(info.Url)}</BaseURL>
<SegmentBase indexRange=""{info.IndexRange}"">
<Initialization range=""{info.InitRange}""/>
</SegmentBase>
</Representation>";
string GetAudioRepresentation(StreamInfo.AudioInfo info) =>
$@"<Representation bandwidth=""200000"" id=""{info.Itag}"" sampleRate=""{info.SampleRate}"" numChannels=""{info.ChannelsCount}"" mimeType=""{info.MimeType}"" codecs=""{info.Codecs}"">
string GetAudioRepresentation(StreamInfo.AudioInfo info) =>
$@"<Representation bandwidth=""200000"" id=""{info.Itag}"" sampleRate=""{info.SampleRate}"" numChannels=""{info.ChannelsCount}"" mimeType=""{info.MimeType}"" codecs=""{info.Codecs}"">
<BaseURL>{WebUtility.UrlEncode(info.Url)}</BaseURL>
<SegmentBase indexRange=""{info.IndexRange}"">
<Initialization range=""{info.InitRange}""/>
</SegmentBase>
</Representation>";
async Task<StreamInfo> GetInfoAsync(string quality)
{
StreamInfo info = new StreamInfo();
async Task<StreamInfo> GetInfoAsync(string quality)
{
StreamInfo info = new StreamInfo();
string response = await ClientService.HttpClient.GetStringAsync($"https://youtube.com/watch?v={Id}&disable_polymer=true&bpctr=9999999999&hl=en");
IHtmlDocument videoEmbedPageHtml = new HtmlParser().ParseDocument(response);
string response = await ClientService.HttpClient.GetStringAsync($"https://youtube.com/watch?v={Id}&disable_polymer=true&bpctr=9999999999&hl=en");
IHtmlDocument videoEmbedPageHtml = new HtmlParser().ParseDocument(response);
#region I don't know what the fuck is this
string playerConfigRaw = Regex.Match(videoEmbedPageHtml.Source.Text,
@"ytplayer\.config = (?<Json>\{[^\{\}]*(((?<Open>\{)[^\{\}]*)+((?<Close-Open>\})[^\{\}]*)+)*(?(Open)(?!))\})")
.Groups["Json"].Value;
JToken playerConfigJson = JToken.Parse(playerConfigRaw);
#region I don't know what the fuck is this
string playerConfigRaw = Regex.Match(videoEmbedPageHtml.Source.Text,
@"ytplayer\.config = (?<Json>\{[^\{\}]*(((?<Open>\{)[^\{\}]*)+((?<Close-Open>\})[^\{\}]*)+)*(?(Open)(?!))\})")
.Groups["Json"].Value;
JToken playerConfigJson = JToken.Parse(playerConfigRaw);
var playerResponseRaw = playerConfigJson.SelectToken("args.player_response").Value<string>();
JToken playerResponseJson = JToken.Parse(playerResponseRaw);
string errorReason = playerResponseJson.SelectToken("playabilityStatus.reason")?.Value<string>();
if (!string.IsNullOrWhiteSpace(errorReason))
throw new InvalidDataException($"Video [{Id}] is unplayable. Reason: {errorReason}");
var playerResponseRaw = playerConfigJson.SelectToken("args.player_response").Value<string>();
JToken playerResponseJson = JToken.Parse(playerResponseRaw);
string errorReason = playerResponseJson.SelectToken("playabilityStatus.reason")?.Value<string>();
if (!string.IsNullOrWhiteSpace(errorReason))
throw new InvalidDataException($"Video [{Id}] is unplayable. Reason: {errorReason}");
List<Dictionary<string, string>> adaptiveStreamInfosUrl = playerConfigJson.SelectToken("args.adaptive_fmts")?.Value<string>().Split(',').Select(SplitQuery).ToList();
List<Dictionary<string, string>> video =
quality == "Auto" ?
adaptiveStreamInfosUrl.FindAll(i => i.ContainsKey("quality_label")) :
adaptiveStreamInfosUrl.FindAll(i => i.ContainsValue(quality.Substring(0, quality.IndexOf('p'))));
List<Dictionary<string, string>> audio = adaptiveStreamInfosUrl.FindAll(i => i.ContainsKey("audio_sample_rate"));
#endregion
List<Dictionary<string, string>> adaptiveStreamInfosUrl = playerConfigJson.SelectToken("args.adaptive_fmts")?.Value<string>().Split(',').Select(SplitQuery).ToList();
List<Dictionary<string, string>> video =
quality == "Auto" ?
adaptiveStreamInfosUrl.FindAll(i => i.ContainsKey("quality_label")) :
adaptiveStreamInfosUrl.FindAll(i => i.ContainsValue(quality.Substring(0, quality.IndexOf('p'))));
List<Dictionary<string, string>> audio = adaptiveStreamInfosUrl.FindAll(i => i.ContainsKey("audio_sample_rate"));
#endregion
foreach (var i in video)
info.Video.Add(new StreamInfo.VideoInfo
{
IndexRange = i["index"],
Url = i["url"],
Itag = i["itag"],
Fps = i["fps"],
Height = i["size"].Split('x')[1],
Width = i["size"].Split('x')[0],
Codecs = i["type"].Split('"')[1],
MimeType = i["type"].Split(';')[0],
Label = i["quality_label"]
});
foreach (var i in video)
info.Video.Add(new StreamInfo.VideoInfo
{
IndexRange = i["index"],
Url = i["url"],
Itag = i["itag"],
Fps = i["fps"],
Height = i["size"].Split('x')[1],
Width = i["size"].Split('x')[0],
Codecs = i["type"].Split('"')[1],
MimeType = i["type"].Split(';')[0],
Label = i["quality_label"]
});
foreach (var i in audio)
info.Audio.Add(new StreamInfo.AudioInfo
{
ChannelsCount = i["audio_channels"],
IndexRange = i["index"],
SampleRate = i["audio_sample_rate"],
Codecs = i["type"].Split('"')[1],
MimeType = i["type"].Split(';')[0],
Url = i["url"],
Itag = i["itag"]
});
foreach (var i in audio)
info.Audio.Add(new StreamInfo.AudioInfo
{
ChannelsCount = i["audio_channels"],
IndexRange = i["index"],
SampleRate = i["audio_sample_rate"],
Codecs = i["type"].Split('"')[1],
MimeType = i["type"].Split(';')[0],
Url = i["url"],
Itag = i["itag"]
});
return info;
}
return info;
}
/// <summary>
/// I don't know what the fuck is this either
/// </summary>
public Dictionary<string, string> SplitQuery(string query)
{
Dictionary<string, string> dic = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
string[] paramsEncoded = query.TrimStart('?').Split('&');
foreach (string paramEncoded in paramsEncoded)
{
string param = WebUtility.UrlDecode(paramEncoded);
/// <summary>
/// I don't know what the fuck is this either
/// </summary>
public Dictionary<string, string> SplitQuery(string query)
{
Dictionary<string, string> dic = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
string[] paramsEncoded = query.TrimStart('?').Split('&');
foreach (string paramEncoded in paramsEncoded)
{
string param = WebUtility.UrlDecode(paramEncoded);
// Look for the equals sign
int equalsPos = param.IndexOf('=');
if (equalsPos <= 0)
continue;
// Look for the equals sign
int equalsPos = param.IndexOf('=');
if (equalsPos <= 0)
continue;
// Get the key and value
string key = param.Substring(0, equalsPos);
string value = equalsPos < param.Length
? param.Substring(equalsPos + 1)
: string.Empty;
// Get the key and value
string key = param.Substring(0, equalsPos);
string value = equalsPos < param.Length
? param.Substring(equalsPos + 1)
: string.Empty;
// Add to dictionary
dic[key] = value;
}
// Add to dictionary
dic[key] = value;
}
return dic;
}
return dic;
}
string GetBandwidth(string quality) =>
quality.Split('p')[0] switch
{
"4320" => "16763040",
"3072" => "11920384",
"2880" => "11175360",
"2160" => "8381520",
"1440" => "5587680",
"1080" => "4190760",
"720" => "2073921",
"480" => "869460",
"360" => "686521",
"240" => "264835",
_ => "100000",
};
string GetBandwidth(string quality) =>
quality.Split('p')[0] switch
{
"4320" => "16763040",
"3072" => "11920384",
"2880" => "11175360",
"2160" => "8381520",
"1440" => "5587680",
"1080" => "4190760",
"720" => "2073921",
"480" => "869460",
"360" => "686521",
"240" => "264835",
_ => "100000",
};
class StreamInfo
{
public class VideoInfo
{
public string IndexRange { get; set; }
public string InitRange => $"0-{int.Parse(IndexRange.Split('-')[0]) - 1}";
public string Itag { get; set; }
public string Fps { get; set; }
public string Url { get; set; }
public string Codecs { get; set; }
public string MimeType { get; set; }
public string Height { get; set; }
public string Width { get; set; }
public string Label { get; set; }
}
public class AudioInfo
{
public string IndexRange { get; set; }
public string InitRange => $"0-{int.Parse(IndexRange.Split('-')[0]) - 1}";
public string SampleRate { get; set; }
public string ChannelsCount { get; set; }
public string Codecs { get; set; }
public string MimeType { get; set; }
public string Url { get; set; }
public string Itag { get; set; }
}
class StreamInfo
{
public class VideoInfo
{
public string IndexRange { get; set; }
public string InitRange => $"0-{int.Parse(IndexRange.Split('-')[0]) - 1}";
public string Itag { get; set; }
public string Fps { get; set; }
public string Url { get; set; }
public string Codecs { get; set; }
public string MimeType { get; set; }
public string Height { get; set; }
public string Width { get; set; }
public string Label { get; set; }
}
public class AudioInfo
{
public string IndexRange { get; set; }
public string InitRange => $"0-{int.Parse(IndexRange.Split('-')[0]) - 1}";
public string SampleRate { get; set; }
public string ChannelsCount { get; set; }
public string Codecs { get; set; }
public string MimeType { get; set; }
public string Url { get; set; }
public string Itag { get; set; }
}
public List<VideoInfo> Video { get; } = new List<VideoInfo>();
public List<AudioInfo> Audio { get; } = new List<AudioInfo>();
}
}
public List<VideoInfo> Video { get; } = new List<VideoInfo>();
public List<AudioInfo> Audio { get; } = new List<AudioInfo>();
}
}
}
+7 -7
View File
@@ -3,12 +3,12 @@ using YoutubeExplode.Models.ClosedCaptions;
namespace YouTube.Models
{
public class ClosedCaptionInfo
{
public CultureInfo Language { get; set; }
public string Url { get; set; }
public bool AutoGenerated { get; set; }
public class ClosedCaptionInfo
{
public CultureInfo Language { get; set; }
public string Url { get; set; }
public bool AutoGenerated { get; set; }
internal ClosedCaptionTrackInfo TrackInfo { get; set; }
}
internal ClosedCaptionTrackInfo TrackInfo { get; set; }
}
}
+11 -11
View File
@@ -4,16 +4,16 @@ using System.Text;
namespace YouTube.Models
{
public class ClosedCaptionTrack
{
public ClosedCaptionInfo Info { get; set; }
public IReadOnlyList<ClosedCaption> Captions { get; set; }
public class ClosedCaptionTrack
{
public ClosedCaptionInfo Info { get; set; }
public IReadOnlyList<ClosedCaption> Captions { get; set; }
public class ClosedCaption
{
public TimeSpan Offset { get; set; }
public TimeSpan Duration { get; set; }
public string Content { get; set; }
}
}
public class ClosedCaption
{
public TimeSpan Offset { get; set; }
public TimeSpan Duration { get; set; }
public string Content { get; set; }
}
}
}
+17 -17
View File
@@ -4,22 +4,22 @@ using System.Xml;
namespace YouTube.Models
{
public class DashManifest
{
public string Label { get; }
public DateTime ValidUntil { get; }
public DashManifest(string label, XmlDocument doc)
{
Label = label;
Xml = doc;
}
public class DashManifest
{
public string Label { get; }
public DateTime ValidUntil { get; }
public DashManifest(string label, XmlDocument doc)
{
Label = label;
Xml = doc;
}
public string ManifestContent => Xml.OuterXml;
public XmlDocument Xml { get; }
public Uri WriteManifest(FileStream outStream)
{
Xml.Save(outStream);
return new Uri(outStream.Name);
}
}
public string ManifestContent => Xml.OuterXml;
public XmlDocument Xml { get; }
public Uri WriteManifest(FileStream outStream)
{
Xml.Save(outStream);
return new Uri(outStream.Name);
}
}
}
+42 -44
View File
@@ -1,48 +1,46 @@
using System.Drawing;
namespace YouTube.Models
namespace YouTube.Models
{
public enum VideoFormat
{
/// <summary>
/// MPEG-4 Part 2.
/// </summary>
Mp4V = 0,
H263 = 1,
/// <summary>
/// MPEG-4 Part 10, H264, Advanced Video Coding (AVC).
/// </summary>
H264 = 2,
Vp8 = 3,
Vp9 = 4,
Av1 = 5
}
public enum AudioFormat
{
/// <summary>
/// MPEG-4 Part 3, Advanced Audio Coding (AAC).
/// </summary>
Aac = 0,
Vorbis = 1,
Opus = 2
}
public enum AudioQuality { Low, Medium, High }
public enum VideoFormat
{
/// <summary>
/// MPEG-4 Part 2.
/// </summary>
Mp4V = 0,
H263 = 1,
/// <summary>
/// MPEG-4 Part 10, H264, Advanced Video Coding (AVC).
/// </summary>
H264 = 2,
Vp8 = 3,
Vp9 = 4,
Av1 = 5
}
public enum AudioFormat
{
/// <summary>
/// MPEG-4 Part 3, Advanced Audio Coding (AAC).
/// </summary>
Aac = 0,
Vorbis = 1,
Opus = 2
}
public enum AudioQuality { Low, Medium, High }
public class VideoPlaybackUrl
{
public string Quality { get; set; }
public VideoFormat Format { get; set; }
public string Url { get; set; }
public Size Resolution { get; set; }
public bool HasAudio { get; set; }
public int Bitrate { get; set; }
}
public class VideoPlaybackUrl
{
public string Quality { get; set; }
public VideoFormat Format { get; set; }
public string Url { get; set; }
public System.Drawing.Size Resolution { get; set; }
public bool HasAudio { get; set; }
public int Bitrate { get; set; }
}
public class AudioPlaybackUrl
{
public AudioQuality Quality { get; set; }
public AudioFormat Format { get; set; }
public string Url { get; set; }
public int Bitrate { get; set; }
}
public class AudioPlaybackUrl
{
public AudioQuality Quality { get; set; }
public AudioFormat Format { get; set; }
public string Url { get; set; }
public int Bitrate { get; set; }
}
}
+13 -13
View File
@@ -3,18 +3,18 @@ using System.Collections.Generic;
namespace YouTube.Models
{
public class VideoPlayback
{
public string Id { get; set; }
public PlaybackUrlsData PlaybackUrls { get; set; } = new PlaybackUrlsData();
public IReadOnlyList<ClosedCaptionInfo> ClosedCaptions { get; set; }
public class VideoPlayback
{
public string Id { get; set; }
public PlaybackUrlsData PlaybackUrls { get; set; } = new PlaybackUrlsData();
public IReadOnlyList<ClosedCaptionInfo> ClosedCaptions { get; set; }
public class PlaybackUrlsData
{
public IReadOnlyList<VideoPlaybackUrl> Video { get; set; }
public IReadOnlyList<AudioPlaybackUrl> Audio { get; set; }
public string LiveStreamUrl { get; set; }
public DateTime ValidUntil { get; set; }
}
}
public class PlaybackUrlsData
{
public IReadOnlyList<VideoPlaybackUrl> Video { get; set; }
public IReadOnlyList<AudioPlaybackUrl> Audio { get; set; }
public string LiveStreamUrl { get; set; }
public DateTime ValidUntil { get; set; }
}
}
}
+42 -42
View File
@@ -6,52 +6,52 @@ using YoutubeExplode;
namespace YouTube.Resources
{
public class CaptionsResource : Google.Apis.YouTube.v3.CaptionsResource
{
IClientService Service { get; }
public CaptionsResource(IClientService service) : base(service) =>
Service = service;
public class CaptionsResource : Google.Apis.YouTube.v3.CaptionsResource
{
IClientService Service { get; }
public CaptionsResource(IClientService service) : base(service) =>
Service = service;
public LoadRequest Load(ClosedCaptionInfo captionInfo) =>
new LoadRequest(Service, captionInfo);
public LoadRequest Load(ClosedCaptionInfo captionInfo) =>
new LoadRequest(Service, captionInfo);
public class LoadRequest
{
public ClosedCaptionInfo CaptionInfo { get; set; }
IClientService Service { get; set; }
public class LoadRequest
{
public ClosedCaptionInfo CaptionInfo { get; set; }
IClientService Service { get; set; }
public LoadRequest(IClientService service, ClosedCaptionInfo captionInfo)
{
CaptionInfo = captionInfo;
Service = service;
}
public LoadRequest(IClientService service, ClosedCaptionInfo captionInfo)
{
CaptionInfo = captionInfo;
Service = service;
}
public async Task<ClosedCaptionTrack> ExecuteAsync()
{
YoutubeClient client = new YoutubeClient(Service.HttpClient);
var response = await client.GetClosedCaptionTrackAsync(CaptionInfo.TrackInfo);
List<ClosedCaptionTrack.ClosedCaption> captions = new List<ClosedCaptionTrack.ClosedCaption>();
foreach (var i in response.Captions)
captions.Add(new ClosedCaptionTrack.ClosedCaption
{
Offset = i.Offset,
Duration = i.Duration,
Content = i.Text
});
public async Task<ClosedCaptionTrack> ExecuteAsync()
{
YoutubeClient client = new YoutubeClient(Service.HttpClient);
var response = await client.GetClosedCaptionTrackAsync(CaptionInfo.TrackInfo);
List<ClosedCaptionTrack.ClosedCaption> captions = new List<ClosedCaptionTrack.ClosedCaption>();
foreach (var i in response.Captions)
captions.Add(new ClosedCaptionTrack.ClosedCaption
{
Offset = i.Offset,
Duration = i.Duration,
Content = i.Text
});
return new ClosedCaptionTrack
{
Info = CaptionInfo,
Captions = captions.AsReadOnly()
};
}
return new ClosedCaptionTrack
{
Info = CaptionInfo,
Captions = captions.AsReadOnly()
};
}
public ClosedCaptionTrack Execute()
{
Task<ClosedCaptionTrack> task = ExecuteAsync();
task.Wait();
return task.Result;
}
}
}
public ClosedCaptionTrack Execute()
{
Task<ClosedCaptionTrack> task = ExecuteAsync();
task.Wait();
return task.Result;
}
}
}
}
+29 -29
View File
@@ -6,39 +6,39 @@ using YouTube.Models;
namespace YouTube.Resources
{
public class DashManifestsResource
{
IClientService Service { get; }
public DashManifestsResource(IClientService service) =>
Service = service;
public class DashManifestsResource
{
IClientService Service { get; }
public DashManifestsResource(IClientService service) =>
Service = service;
public ListRequest List(string videoId) =>
new ListRequest(Service, videoId);
public ListRequest List(string videoId) =>
new ListRequest(Service, videoId);
public class ListRequest
{
public string Id { get; set; }
IClientService Service { get; set; }
public class ListRequest
{
public string Id { get; set; }
IClientService Service { get; set; }
public ListRequest(IClientService service, string id)
{
Id = id;
Service = service;
}
public ListRequest(IClientService service, string id)
{
Id = id;
Service = service;
}
public async Task<IReadOnlyList<DashManifest>> ExecuteAsync()
{
ManifestGenerator generator = new ManifestGenerator(Service, Id);
public async Task<IReadOnlyList<DashManifest>> ExecuteAsync()
{
ManifestGenerator generator = new ManifestGenerator(Service, Id);
return await generator.GenerateManifestsAsync();
}
return await generator.GenerateManifestsAsync();
}
public IReadOnlyList<DashManifest> Execute()
{
Task<IReadOnlyList<DashManifest>> task = ExecuteAsync();
task.Wait();
return task.Result;
}
}
}
public IReadOnlyList<DashManifest> Execute()
{
Task<IReadOnlyList<DashManifest>> task = ExecuteAsync();
task.Wait();
return task.Result;
}
}
}
}
+23 -23
View File
@@ -6,31 +6,31 @@ using Google.Apis.YouTube.v3.Data;
namespace YouTube.Resources
{
public class HistoryResource
{
public class ListRequest { }
public class InsertRequest { }
public class DeleteRequest { }
public class ClearRequest { }
public class HistoryResource
{
public class ListRequest { }
public class InsertRequest { }
public class DeleteRequest { }
public class ClearRequest { }
public ListRequest List()
{
return new ListRequest();
}
public ListRequest List()
{
return new ListRequest();
}
public InsertRequest Insert(string videoId, TimeSpan? leftOn)
{
return new InsertRequest();
}
public InsertRequest Insert(string videoId, TimeSpan? leftOn)
{
return new InsertRequest();
}
public DeleteRequest Delete(string videoId)
{
return new DeleteRequest();
}
public DeleteRequest Delete(string videoId)
{
return new DeleteRequest();
}
public ClearRequest Clear()
{
return new ClearRequest();
}
}
public ClearRequest Clear()
{
return new ClearRequest();
}
}
}
+86 -86
View File
@@ -10,102 +10,102 @@ using YoutubeExplode.Models.MediaStreams;
namespace YouTube.Resources
{
public class VideoPlaybackResource
{
IClientService ClientService { get; }
public VideoPlaybackResource(IClientService clientService) =>
ClientService = clientService;
public class VideoPlaybackResource
{
IClientService ClientService { get; }
public VideoPlaybackResource(IClientService clientService) =>
ClientService = clientService;
public ListRequest List(string videoId) =>
new ListRequest(ClientService, videoId);
public ListRequest List(string videoId) =>
new ListRequest(ClientService, videoId);
public class ListRequest
{
IClientService Service { get; }
public class ListRequest
{
IClientService Service { get; }
public string Id { get; set; }
public string Id { get; set; }
public async Task<VideoPlayback> ExecuteAsync()
{
VideoPlayback item = new VideoPlayback();
YoutubeClient client = new YoutubeClient(Service.HttpClient);
MediaStreamInfoSet streamSet = await client.GetVideoMediaStreamInfosAsync(Id);
item.Id = Id;
item.PlaybackUrls.ValidUntil = streamSet.ValidUntil.DateTime;
public async Task<VideoPlayback> ExecuteAsync()
{
VideoPlayback item = new VideoPlayback();
YoutubeClient client = new YoutubeClient(Service.HttpClient);
MediaStreamInfoSet streamSet = await client.GetVideoMediaStreamInfosAsync(Id);
item.Id = Id;
item.PlaybackUrls.ValidUntil = streamSet.ValidUntil.DateTime;
if(!string.IsNullOrWhiteSpace(streamSet.HlsLiveStreamUrl))
{
item.PlaybackUrls.LiveStreamUrl = streamSet.HlsLiveStreamUrl;
return item;
}
if (!string.IsNullOrWhiteSpace(streamSet.HlsLiveStreamUrl))
{
item.PlaybackUrls.LiveStreamUrl = streamSet.HlsLiveStreamUrl;
return item;
}
List<AudioPlaybackUrl> audio = new List<AudioPlaybackUrl>();
foreach (AudioStreamInfo i in streamSet.Audio)
audio.Add(new AudioPlaybackUrl
{
Url = i.Url,
Bitrate = (int)i.Bitrate,
Format = (AudioFormat)i.AudioEncoding,
Quality = Extensions.RangeOffset((int)i.Bitrate / 1024, 128, 255) switch
{
-1 => AudioQuality.Low,
1 => AudioQuality.High,
_ => AudioQuality.Medium
}
});
item.PlaybackUrls.Audio = audio.AsReadOnly();
List<AudioPlaybackUrl> audio = new List<AudioPlaybackUrl>();
foreach (AudioStreamInfo i in streamSet.Audio)
audio.Add(new AudioPlaybackUrl
{
Url = i.Url,
Bitrate = (int)i.Bitrate,
Format = (AudioFormat)i.AudioEncoding,
Quality = Extensions.RangeOffset((int)i.Bitrate / 1024, 128, 255) switch
{
-1 => AudioQuality.Low,
1 => AudioQuality.High,
_ => AudioQuality.Medium
}
});
item.PlaybackUrls.Audio = audio.AsReadOnly();
List<VideoPlaybackUrl> video = new List<VideoPlaybackUrl>();
foreach (VideoStreamInfo i in streamSet.Video)
video.Add(new VideoPlaybackUrl
{
Format = (VideoFormat)i.VideoEncoding,
HasAudio = false,
Quality = i.VideoQualityLabel,
Url = i.Url,
Resolution = new Size(i.Resolution.Width, i.Resolution.Height),
Bitrate = (int)i.Bitrate
});
List<VideoPlaybackUrl> video = new List<VideoPlaybackUrl>();
foreach (VideoStreamInfo i in streamSet.Video)
video.Add(new VideoPlaybackUrl
{
Format = (VideoFormat)i.VideoEncoding,
HasAudio = false,
Quality = i.VideoQualityLabel,
Url = i.Url,
Resolution = new Size(i.Resolution.Width, i.Resolution.Height),
Bitrate = (int)i.Bitrate
});
foreach (MuxedStreamInfo i in streamSet.Muxed)
video.Add(new VideoPlaybackUrl
{
Format = (VideoFormat)i.VideoEncoding,
HasAudio = true,
Quality = i.VideoQualityLabel,
Url = i.Url,
Resolution = new Size(i.Resolution.Width, i.Resolution.Height),
Bitrate = 0
});
item.PlaybackUrls.Video = video.AsReadOnly();
foreach (MuxedStreamInfo i in streamSet.Muxed)
video.Add(new VideoPlaybackUrl
{
Format = (VideoFormat)i.VideoEncoding,
HasAudio = true,
Quality = i.VideoQualityLabel,
Url = i.Url,
Resolution = new Size(i.Resolution.Width, i.Resolution.Height),
Bitrate = 0
});
item.PlaybackUrls.Video = video.AsReadOnly();
var ccSet = await client.GetVideoClosedCaptionTrackInfosAsync(Id);
var ccSet = await client.GetVideoClosedCaptionTrackInfosAsync(Id);
List<ClosedCaptionInfo> captions = new List<ClosedCaptionInfo>();
foreach (ClosedCaptionTrackInfo i in ccSet)
captions.Add(new ClosedCaptionInfo
{
AutoGenerated = i.IsAutoGenerated,
Url = i.Url,
Language = new CultureInfo(i.Language.Code),
TrackInfo = i
});
item.ClosedCaptions = captions.AsReadOnly();
List<ClosedCaptionInfo> captions = new List<ClosedCaptionInfo>();
foreach (ClosedCaptionTrackInfo i in ccSet)
captions.Add(new ClosedCaptionInfo
{
AutoGenerated = i.IsAutoGenerated,
Url = i.Url,
Language = new CultureInfo(i.Language.Code),
TrackInfo = i
});
item.ClosedCaptions = captions.AsReadOnly();
return item;
}
return item;
}
public VideoPlayback Execute()
{
Task<VideoPlayback> task = ExecuteAsync();
task.Wait();
return task.Result;
}
public ListRequest(IClientService service, string id)
{
Id = id;
Service = service;
}
}
}
public VideoPlayback Execute()
{
Task<VideoPlayback> task = ExecuteAsync();
task.Wait();
return task.Result;
}
public ListRequest(IClientService service, string id)
{
Id = id;
Service = service;
}
}
}
}
+81 -81
View File
@@ -13,97 +13,97 @@ using System.Threading.Tasks;
namespace YouTube.Resources
{
public class WatchLaterResource
{
IClientService Service { get; }
public class WatchLaterResource
{
IClientService Service { get; }
public WatchLaterResource(IClientService service) =>
Service = service;
public WatchLaterResource(IClientService service) =>
Service = service;
public ListRequest List()
{
return new ListRequest();
}
public ListRequest List()
{
return new ListRequest();
}
public InsertRequest Insert(string videoId, string part) =>
new InsertRequest(Service, videoId, part);
public InsertRequest Insert(string videoId, string part) =>
new InsertRequest(Service, videoId, part);
public DeleteRequest Delete(string videoId) =>
new DeleteRequest(Service, videoId);
public DeleteRequest Delete(string videoId) =>
new DeleteRequest(Service, videoId);
public class ListRequest { }
public class InsertRequest
{
IClientService Service { get; set; }
public string Id { get; set; }
public string Part { get; set; }
public class ListRequest { }
public class InsertRequest
{
IClientService Service { get; set; }
public string Id { get; set; }
public string Part { get; set; }
public InsertRequest(IClientService service, string videoId, string part)
{
Service = service;
Id = videoId;
Part = part;
}
public InsertRequest(IClientService service, string videoId, string part)
{
Service = service;
Id = videoId;
Part = part;
}
public async Task<PlaylistItem> ExecuteAsync()
{
PlaylistItem playlist = new PlaylistItem
{
Snippet = new PlaylistItemSnippet
{
PlaylistId = "WL",
ResourceId = new ResourceId
{
VideoId = Id,
Kind = "youtube#video"
}
}
};
PlaylistItemsResource.InsertRequest request = (Service as YouTubeService).PlaylistItems.Insert(playlist, Part);
public async Task<PlaylistItem> ExecuteAsync()
{
PlaylistItem playlist = new PlaylistItem
{
Snippet = new PlaylistItemSnippet
{
PlaylistId = "WL",
ResourceId = new ResourceId
{
VideoId = Id,
Kind = "youtube#video"
}
}
};
PlaylistItemsResource.InsertRequest request = (Service as YouTubeService).PlaylistItems.Insert(playlist, Part);
return await request.ExecuteAsync();
}
return await request.ExecuteAsync();
}
public PlaylistItem Execute()
{
Task<PlaylistItem> task = ExecuteAsync();
task.Wait();
return task.Result;
}
}
public class DeleteRequest
{
IClientService Service { get; set; }
public string Id { get; set; }
public PlaylistItem Execute()
{
Task<PlaylistItem> task = ExecuteAsync();
task.Wait();
return task.Result;
}
}
public class DeleteRequest
{
IClientService Service { get; set; }
public string Id { get; set; }
public DeleteRequest(IClientService service, string videoId)
{
Service = service;
Id = videoId;
}
public DeleteRequest(IClientService service, string videoId)
{
Service = service;
Id = videoId;
}
public async Task ExecuteAsync()
{
ConfigurableHttpClient client = Service.HttpClient;
string data = await client.GetStringAsync($"https://youtube.com/watch?v={Id}&disable_polymer=true&bpctr=9999999999&hl=en");
string plid = Regex.Match(data, @"(?<=plid=).?\w+").Value;
IHtmlDocument html = await new HtmlParser().ParseDocumentAsync(data);
string sessionToken = html.GetElementsByTagName("input").FirstOrDefault(i => i.GetAttribute("name") == "session_token")?.GetAttribute("value");
Dictionary<string, string> body = new Dictionary<string, string>
{
{ "video_ids", Id },
{ "full_list_id", "WL" },
{ "plid", plid },
{ "session_token", sessionToken }
};
HttpResponseMessage response = await client.PostAsync("https://www.youtube.com/playlist_video_ajax?action_delete_from_playlist=1", new FormUrlEncodedContent(body));
string responseStr = await response.Content.ReadAsStringAsync();
if (!responseStr.Contains("SUCCESS"))
throw new Exception(responseStr);
}
public async Task ExecuteAsync()
{
ConfigurableHttpClient client = Service.HttpClient;
string data = await client.GetStringAsync($"https://youtube.com/watch?v={Id}&disable_polymer=true&bpctr=9999999999&hl=en");
string plid = Regex.Match(data, @"(?<=plid=).?\w+").Value;
IHtmlDocument html = await new HtmlParser().ParseDocumentAsync(data);
string sessionToken = html.GetElementsByTagName("input").FirstOrDefault(i => i.GetAttribute("name") == "session_token")?.GetAttribute("value");
Dictionary<string, string> body = new Dictionary<string, string>
{
{ "video_ids", Id },
{ "full_list_id", "WL" },
{ "plid", plid },
{ "session_token", sessionToken }
};
HttpResponseMessage response = await client.PostAsync("https://www.youtube.com/playlist_video_ajax?action_delete_from_playlist=1", new FormUrlEncodedContent(body));
string responseStr = await response.Content.ReadAsStringAsync();
if (!responseStr.Contains("SUCCESS"))
throw new Exception(responseStr);
}
public void Execute() =>
ExecuteAsync().Wait();
}
}
public void Execute() =>
ExecuteAsync().Wait();
}
}
}
+35 -39
View File
@@ -1,42 +1,38 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace YouTube
namespace YouTube
{
public static class VideoQuality
{
public static string Auto => QualityConstants.Auto;
public static string Low144 => QualityConstants.Low144;
public static string Low240 => QualityConstants.Low240;
public static string Medium360 => QualityConstants.Medium360;
public static string Meduim480 => QualityConstants.Meduim480;
public static string High720 => QualityConstants.High720;
public static string High720p60 => QualityConstants.High720p60;
public static string High1080 => QualityConstants.High1080;
public static string High1080p60 => QualityConstants.High1080p60;
public static string High1440 => QualityConstants.High1440;
public static string High2160 => QualityConstants.High2160;
public static string High2880 => QualityConstants.High2880;
public static string High3072 => QualityConstants.High3072;
public static string High4320 => QualityConstants.High4320;
public static class VideoQuality
{
public static string Auto => QualityConstants.Auto;
public static string Low144 => QualityConstants.Low144;
public static string Low240 => QualityConstants.Low240;
public static string Medium360 => QualityConstants.Medium360;
public static string Meduim480 => QualityConstants.Meduim480;
public static string High720 => QualityConstants.High720;
public static string High720p60 => QualityConstants.High720p60;
public static string High1080 => QualityConstants.High1080;
public static string High1080p60 => QualityConstants.High1080p60;
public static string High1440 => QualityConstants.High1440;
public static string High2160 => QualityConstants.High2160;
public static string High2880 => QualityConstants.High2880;
public static string High3072 => QualityConstants.High3072;
public static string High4320 => QualityConstants.High4320;
public static class QualityConstants
{
public const string Auto = "auto";
public const string Low144 = "144p";
public const string Low240 = "240p";
public const string Medium360 = "360p";
public const string Meduim480 = "480p";
public const string High720 = "720p";
public const string High720p60 = "720p60";
public const string High1080 = "1080p";
public const string High1080p60 = "1080p60";
public const string High1440 = "1440p";
public const string High2160 = "2160p";
public const string High2880 = "2880p";
public const string High3072 = "3072p";
public const string High4320 = "4320p";
}
}
public static class QualityConstants
{
public const string Auto = "auto";
public const string Low144 = "144p";
public const string Low240 = "240p";
public const string Medium360 = "360p";
public const string Meduim480 = "480p";
public const string High720 = "720p";
public const string High720p60 = "720p60";
public const string High1080 = "1080p";
public const string High1080p60 = "1080p60";
public const string High1440 = "1440p";
public const string High2160 = "2160p";
public const string High2880 = "2880p";
public const string High3072 = "3072p";
public const string High4320 = "4320p";
}
}
}
+1 -1
View File
@@ -26,7 +26,7 @@
<PackageReference Include="Google.Apis.Auth" Version="1.45.0" />
<PackageReference Include="Google.Apis.Core" Version="1.45.0" />
<PackageReference Include="Google.Apis.Oauth2.v2" Version="1.45.0.1869" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.45.0.1918" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.45.0.1929" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="YoutubeExplode" Version="4.7.16" />
+11 -11
View File
@@ -2,17 +2,17 @@
namespace YouTube
{
public partial class ExtendedYouTubeService : Google.Apis.YouTube.v3.YouTubeService
{
public DashManifestsResource DashManifests => new DashManifestsResource(this);
public VideoPlaybackResource VideoPlayback => new VideoPlaybackResource(this);
public new CaptionsResource Captions => new CaptionsResource(this);
public HistoryResource History { get; }
public WatchLaterResource WatchLater => new WatchLaterResource(this);
// TODO: Add Activities override for recomendations and subscriptions
public partial class ExtendedYouTubeService : Google.Apis.YouTube.v3.YouTubeService
{
public DashManifestsResource DashManifests => new DashManifestsResource(this);
public VideoPlaybackResource VideoPlayback => new VideoPlaybackResource(this);
public new CaptionsResource Captions => new CaptionsResource(this);
public HistoryResource History { get; }
public WatchLaterResource WatchLater => new WatchLaterResource(this);
// TODO: Add Activities override for recomendations and subscriptions
public ExtendedYouTubeService() : base() { }
public ExtendedYouTubeService() : base() { }
public ExtendedYouTubeService(Initializer initializer) : base(initializer) { }
}
public ExtendedYouTubeService(Initializer initializer) : base(initializer) { }
}
}