diff --git a/Program.cs b/Program.cs
index 8912058..ad62728 100644
--- a/Program.cs
+++ b/Program.cs
@@ -73,7 +73,7 @@ namespace TYTD
Route.Add("/api/Redownload", (HttpAction)Redownload);
Route.Add("/api/Redownload/{R}", (HttpAction)RedownloadRes);
Route.Add("/api/Watch/{VideoId}", (HttpAction)Watch);
- Route.Add("/api/Info/Video/{Id}",(HttpAction)VideoInfo);
+ Route.Add("/api/VideoInfo/{Id}",(HttpAction)VideoInfo);
/* Playlist */
Route.Add("/api/AddPlaylistOnly/{Id}", (HttpAction)AddPlaylistOnly);
Route.Add("/api/AddPlaylist/{Id}", (HttpAction)AddPlaylist);
@@ -81,7 +81,7 @@ namespace TYTD
Route.Add("/api/PersonalPlaylist/{PlaylistName}",(HttpAction)PersonalPlaylist);
Route.Add("/api/CreatePlaylist/{Ids}/playlist.{extension}", (HttpAction)CreatePlaylist);
Route.Add("/api/CreatePlaylistRes/{Ids}/playlist.{extension}", (HttpAction)CreatePlaylistRes);
- Route.Add("/api/Info/Playlist/{Id}", (HttpAction)PlaylistInfo);
+ Route.Add("/api/PlaylistInfo/{Id}", (HttpAction)PlaylistInfo);
Route.Add("/api/ListPlaylists.html", (HttpAction)ListPlaylists);
/* Search */
Route.Add("/api/SearchOnly/{text}", (HttpAction)SearchOnly);
@@ -102,7 +102,7 @@ namespace TYTD
/* Queue and Progress */
Route.Add("/api/QueueList", (HttpAction)QueueList);
- Route.Add("/api/QueueList.html", (HttpAction)QueueListHtml);
+ Route.Add("/api/QueueListPage/", (HttpAction)QueueListHtml);
Route.Add("/api/QueueMove/{From}/{To}", (HttpAction)QueueMove);
Route.Add("/api/QueueMove2/{To}/{Id}", (HttpAction)QueueMove2);
Route.Add("/api/Progress", (HttpAction)VideoProgress);
@@ -224,7 +224,7 @@ namespace TYTD
videos.AddEscapedHtml("Description", item.Description);
videos.AddEscapedHtml("UploadDate", DateTime.Parse(item.UploadDate).ToShortDateString());
- string res=ApiLoader.RenderFileOrDefault("WebSite/err/video_list/VideoInfo.html", "Information about {Title}Video Info for {Title}
Video Id: {Id}
Video Channel: {AuthorTitle}
Video Channel Id: {AuthorChannelId}
Likes: {Likes}, Dislikes: {Dislikes}, Views: {Views}
Upload Date: {UploadDate}
Duration: {DurationStringLong}
Description:
{Description}
", videos);
+ string res=ApiLoader.RenderFileOrDefault("WebSite/err/video_list/VideoInfo.html", "Information about {Title}Video Info for {Title}
Playback: SD HD Audio
Download: SD HD Audio
Video Id: {Id}
Video Channel: {AuthorTitle}
Video Channel Id: {AuthorChannelId}
Likes: {Likes}, Dislikes: {Dislikes}, Views: {Views}
Upload Date: {UploadDate}
Duration: {DurationStringLong}
Description:
{Description}
", videos);
response.AsText(res);
}
else
@@ -429,7 +429,7 @@ namespace TYTD
}
public static void ListPlaylists(HttpListenerRequest request,HttpListenerResponse resp,Dictionary args)
{
- string htmlBeforeProcessed = ApiLoader.ReadAllTextOrDefault("WebSite/err/playlist_list/element.html", "![\"\"](\"../File/Thumbnails/120x90/{Id}.jpg\") | {Title}{AuthorTitle} |
");
+ string htmlBeforeProcessed = ApiLoader.ReadAllTextOrDefault("WebSite/err/playlist_list/element.html", "![\"\"](\"../api/File/Thumbnails/120x90/{Id}.jpg\") | {Title}{AuthorTitle} |
");
StringBuilder builder = new StringBuilder();
foreach (var f in Directory.EnumerateFiles("Playlist","*.json"))
{
@@ -467,7 +467,7 @@ namespace TYTD
{
var plitem = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine("Playlist", $"{id.Value.Value}.json")));
- string htmlBeforeProcessed = ApiLoader.ReadAllTextOrDefault("WebSite/err/video_list/element.html", " | {Title}{AuthorTitle} |
");
+ string htmlBeforeProcessed = ApiLoader.ReadAllTextOrDefault("WebSite/err/video_list/element.html", " | {Title}{AuthorTitle} |
");
StringBuilder builder = new StringBuilder();
foreach (var v in plitem.Videos)
@@ -537,7 +537,7 @@ namespace TYTD
}
StringBuilder innerHtml = new StringBuilder();
- string htmlBeforeProcessed = ApiLoader.ReadAllTextOrDefault("WebSite/err/video_list/element.html", " | {Title}{AuthorTitle} |
");
+ string htmlBeforeProcessed = ApiLoader.ReadAllTextOrDefault("WebSite/err/video_list/element.html", " | {Title}{AuthorTitle} |
");
long i=0;
foreach (var item in Downloader.SearchFor(search))
{
@@ -620,7 +620,7 @@ namespace TYTD
public static void QueueListHtml(HttpListenerRequest req,HttpListenerResponse resp,Dictionary args)
{
StringBuilder innerHtml = new StringBuilder();
- string htmlBeforeProcessed = ApiLoader.ReadAllTextOrDefault("WebSite/err/video_list/element.html", " | {Title}{AuthorTitle} |
");
+ string htmlBeforeProcessed = ApiLoader.ReadAllTextOrDefault("WebSite/err/video_list/element.html", " | {Title}{AuthorTitle} |
");
long i = 0;
foreach (var item0 in Downloader.GetQueueItems())
{
@@ -906,7 +906,7 @@ namespace TYTD
#region Other
public static void Index(HttpListenerRequest rq, HttpListenerResponse rp, Dictionary args)
{
- string r = ApiLoader.ReadAllTextOrDefault(Path.Combine(webSitePath, "index.html"), "TYTDTYTD
Existing Videos:
Get Progress
List QueueList Playlists
");
+ string r = ApiLoader.ReadAllTextOrDefault(Path.Combine(webSitePath, "index.html"), "TYTDTYTD
Existing Videos:
Get Progress
List Queue
List Playlists
");
rp.AsText( r);
}
diff --git a/bin/Release/youtube-downloader.exe b/bin/Release/youtube-downloader.exe
index 0a39de2..9a795e6 100644
Binary files a/bin/Release/youtube-downloader.exe and b/bin/Release/youtube-downloader.exe differ
diff --git a/obj/x86/Release/youtube-downloader.exe b/obj/x86/Release/youtube-downloader.exe
index 0a39de2..9a795e6 100644
Binary files a/obj/x86/Release/youtube-downloader.exe and b/obj/x86/Release/youtube-downloader.exe differ