tesses50
/
tytd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added server sent events

This commit is contained in:
Michael Nolan 2022-09-01 00:51:49 -05:00
parent 96d2a358b4
commit f96764fd10
3 changed files with 69 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Tesses.YouTubeDownloader.Server/Class1.cs
View File

@ -30,7 +30,18 @@ namespace Tesses.Extensions
namespace Tesses.YouTubeDownloader.Server namespace Tesses.YouTubeDownloader.Server
{ {
using Tesses.YouTubeDownloader;
public class Progress
{
public long Length {get;set;}
public double Percent {get;set;}
public SavedVideo Video {get;set;}
public bool StartEvent {get;set;}
public bool StopEvent {get;set;}
}
internal static class B64 internal static class B64
{ {
public static string Base64UrlEncodes(string arg) public static string Base64UrlEncodes(string arg)
@ -850,6 +861,7 @@ internal static class B64
public ApiV2Server(IDownloader downloader) public ApiV2Server(IDownloader downloader)
{ {
this.Downloader=downloader; this.Downloader=downloader;
AddBoth("/event",Event);
AddBoth("/CancelDownload",Cancel); AddBoth("/CancelDownload",Cancel);
AddBoth("/Search",Search); AddBoth("/Search",Search);
AddBoth("/AddItem",AddItem); AddBoth("/AddItem",AddItem);
@ -903,7 +915,55 @@ internal static class B64
throw new NotImplementedException(); throw new NotImplementedException();
}*/ }*/
} }
public async Task Event(ServerContext ctx)
{
IStorage storage=Downloader as IStorage;
if(storage != null){
var _p=Downloader.GetProgress();
long len = _p.Length;
bool first=true;
SendEvents evts=new SendEvents();
storage.VideoStarted += (sender,e)=>
{
len=e.EstimatedLength;
Progress p=new Progress();
p.StartEvent=true;
p.StopEvent=false;
p.Length=e.EstimatedLength;
p.Percent=0;
p.Video=e.VideoInfo;
evts.SendEvent(p);
};
storage.VideoProgress += (sender,e)=>{
Progress p=new Progress();
p.StartEvent=false;
p.StopEvent=false;
p.Length=len;
p.Percent=e.Progress;
if(first)
p.Video=e.VideoInfo;
first=false;
evts.SendEvent(p);
};
storage.VideoFinished +=(sender,e)=>{
Progress p=new Progress();
p.StartEvent=false;
p.StopEvent=true;
p.Length=len;
p.Percent=1;
p.Video=e.VideoInfo;
evts.SendEvent(p);
};
ctx.ServerSentEvents(evts);
}else{
await ctx.SendTextAsync("Error no IStorage");
}
}
private async Task Cancel(ServerContext ctx) private async Task Cancel(ServerContext ctx)
{ {
bool restart=false; bool restart=false;

8
Tesses.YouTubeDownloader.Server/Tesses.YouTubeDownloader.Server.csproj
View File

@ -5,7 +5,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Tesses.WebServer" Version="1.0.3.5" /> <PackageReference Include="Tesses.WebServer" Version="1.0.3.8" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
@ -15,9 +15,9 @@
<PackageId>Tesses.YouTubeDownloader.Server</PackageId> <PackageId>Tesses.YouTubeDownloader.Server</PackageId>
<Author>Mike Nolan</Author> <Author>Mike Nolan</Author>
<Company>Tesses</Company> <Company>Tesses</Company>
<Version>1.1.6</Version> <Version>1.1.7</Version>
<AssemblyVersion>1.1.6</AssemblyVersion> <AssemblyVersion>1.1.7</AssemblyVersion>
<FileVersion>1.1.6</FileVersion> <FileVersion>1.1.7</FileVersion>
<Description>Adds WebServer to TYTD</Description> <Description>Adds WebServer to TYTD</Description>
<PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

6
Tesses.YouTubeDownloader/Tesses.YouTubeDownloader.csproj
View File

@ -7,9 +7,9 @@
<PackageId>Tesses.YouTubeDownloader</PackageId> <PackageId>Tesses.YouTubeDownloader</PackageId>
<Author>Mike Nolan</Author> <Author>Mike Nolan</Author>
<Company>Tesses</Company> <Company>Tesses</Company>
<Version>1.1.8</Version> <Version>1.1.9</Version>
<AssemblyVersion>1.1.8</AssemblyVersion> <AssemblyVersion>1.1.9</AssemblyVersion>
<FileVersion>1.1.8</FileVersion> <FileVersion>1.1.9</FileVersion>
<Description>A YouTube Downloader</Description> <Description>A YouTube Downloader</Description>
<PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>