Target crosslang v0.0.10, add /api/v1/progress_ex.json

Dockerfile

@@ -11,4 +11,4 @@ ENV TYTDDIR=/data
 
 EXPOSE 3255
 
-ENTRYPOINT ["crossvm","/app/tytd2025.crvm","--port=3255"]
+ENTRYPOINT ["crosslang","vm","/app/tytd2025.crvm","--port=3255"]

README.md

@@ -1,5 +1,5 @@
 # TYTD 2025
-My web based YouTube downloader that I created in 2025 writen in [CrossLang](https://crosslang.tesseslanguage.com/), my own language
+My web based YouTube downloader that I created in 2025 written in [CrossLang](https://crosslang.tesseslanguage.com/), my own language
 
 
 ![The Image](https://crosslang.tesseslanguage.com/images/tytdscreenshot.jpg)
@@ -14,8 +14,8 @@ My web based YouTube downloader that I created in 2025 writen in [CrossLang](htt
 - Search and browse your downloaded videos, playlists, or channels (the search is very basic though)
 - User accounts
 - Videos can be tagged based on your downloader's TYTD tag (to determine which instance downloaded it)
-- Plugins from [CPKG](https://cpkg.tesseslangauge.com/) or any CPKG compliant server
+- Plugins from [CPKG](https://cpkg.tesseslanguage.com/) or any CPKG compliant server
-- Can download YouTube videos either Low quality (but doesn't) require [ffmpeg](https://ffmpeg.org/), you can also download individual streams (also doesn't need [ffmpeg](https://ffmpeg.org/)), or to MP4 (doesn't work on wii due to libx264 having illegal instruction), MKV (so no transcode), MP3 or FLAC (these do need [ffmpeg](https://ffmpeg.org/) in your PATH however)
+- Can download YouTube videos either Low quality (but doesn't) require [ffmpeg](https://ffmpeg.org/), MP3, FLAC or AMV (these do need [ffmpeg](https://ffmpeg.org/) in your PATH however)
 - Runs on the Wii using the [Wii Linux Continuation Project](https://wiibrew.org/wiki/Wii-Linux#Wii_Linux_Continuation_Project) (albeit extremely slowly, despite this that's where I run it)
 
 # What this project uses (attribution)
@@ -37,7 +37,7 @@ Install [crosslang](https://crosslang.tesseslanguage.com/downloads/index.html)
 
 from source:
 ```bash
-git clone https://onedev.site.tesses.net/tytd2025
+git clone https://git.tesses.org/tesses50/tytd2025
 cd tytd2025/Tesses.YouTubeDownloader.Server
 crosslang install-webapp
 ```

Tesses.YouTubeDownloader.PluginTemplate/cross.json

@@ -28,6 +28,6 @@
 		"template_icon": "icon.png"
 	},
 	"name": "Tesses.YouTubeDownloader.PluginTemplate",
-	"version": "1.0.0.0-dev",
+	"version": "1.0.1.0-dev",
 	"icon": "icon.png"
 }

Tesses.YouTubeDownloader.Server/cross.json

@@ -14,6 +14,6 @@
 	"project_dependencies": [
 		"..\/Tesses.YouTubeDownloader"
 	],
-	"version": "1.0.0.0-dev",
+	"version": "1.0.1.0-dev",
     "compTime": "secure"
 }

Tesses.YouTubeDownloader.Server/src/components/progress.tcross

@@ -1,12 +1,12 @@
 
 func Components.Progress(tytd)
 {
-    var vid = tytd.CurrentVideo;
+    var progress = tytd.GetProgress();
 
     var html = <div hx-trigger="every 4500ms" hx-indicator="none" hx-get="./progress"  hx-swap="outerHTML">
-        <h2><a hx-target="body" hx-push-url="true" hx-get={$"./watch?v={Net.Http.UrlEncode(vid.VideoId)}"} href={$"./watch?v={Net.Http.UrlEncode(vid.VideoId)}"}>{vid.Title}</a></h2>
+        <h2><a hx-target="body" hx-push-url="true" hx-get={$"./watch?v={Net.Http.UrlEncode(progress.CurrentVideo.VideoId)}"} href={$"./watch?v={Net.Http.UrlEncode(progress.CurrentVideo.VideoId)}"}>{progress.CurrentVideo.Title}</a></h2>
-        <h4><a hx-target="body" hx-push-url="true" hx-get={$"./channel?id={Net.Http.UrlEncode(vid.ChannelId)}"} href={$"./channel?id={Net.Http.UrlEncode(vid.ChannelId)}"}>{vid.Channel}</a></h4>
+        <h4><a hx-target="body" hx-push-url="true" hx-get={$"./channel?id={Net.Http.UrlEncode(progress.CurrentVideo.ChannelId)}"} href={$"./channel?id={Net.Http.UrlEncode(progress.CurrentVideo.ChannelId)}"}>{progress.CurrentVideo.Channel}</a></h4>
-        <progress class="wavy light-green-text" value={tytd.CurrentVideoProgress * 100.0} max="100" min="0"></progress>
+        <progress class="wavy light-green-text" value={progress.CurrentVideoProgress * 100.0} max="100" min="0"></progress>
     </div>;
     return html;
 }

Tesses.YouTubeDownloader.Server/src/main.tcross

@@ -139,8 +139,8 @@ class TYTDApp {
         {
             var incorrect=false;
             const redirect = ctx.QueryParams.TryGetFirst("redirect") ?? "/";
-            const username = ctx.QueryParams.TryGetFirst("username") ?? "";
+            const username = ctx.BodyParams.TryGetFirst("username") ?? "";
-            const password = ctx.QueryParams.TryGetFirst("password") ?? "";
+            const password = ctx.BodyParams.TryGetFirst("password") ?? "";
            
             
 
@@ -218,16 +218,16 @@ class TYTDApp {
             {
                 if(ctx.Method == "POST")
                 {
-                    const from = ctx.QueryParams.TryGetFirstInt("from");
+                    const from = ctx.BodyParams.TryGetFirstInt("from");
                     switch(from)
                     {
                         case 1:
                         {
-                            const enablePlugins = ctx.QueryParams.GetFirstBoolean("enablePlugins");
+                            const enablePlugins = ctx.BodyParams.GetFirstBoolean("enablePlugins");
-                            const tag = ctx.QueryParams.TryGetFirst("tag") ?? "UnknownPC";
+                            const tag = ctx.BodyParams.TryGetFirst("tag") ?? "UnknownPC";
-                            const pollHours = ctx.QueryParams.TryGetFirstInt("pollHours") ?? 3;
+                            const pollHours = ctx.BodyParams.TryGetFirstInt("pollHours") ?? 3;
-                            const pollMinutes = ctx.QueryParams.TryGetFirstInt("pollMinutes") ?? 0;
+                            const pollMinutes = ctx.BodyParams.TryGetFirstInt("pollMinutes") ?? 0;
-                            const pollSeconds = ctx.QueryParams.TryGetFirstInt("pollSeconds") ?? 0;
+                            const pollSeconds = ctx.BodyParams.TryGetFirstInt("pollSeconds") ?? 0;
                             
 
                             this.OOBE_STATE.tag = tag;
@@ -248,7 +248,7 @@ class TYTDApp {
                         case 3:
                         {
                             
-                            const createUser = (ctx.QueryParams.TryGetFirst("user") ?? "no")=="yes";
+                            const createUser = (ctx.BodyParams.TryGetFirst("user") ?? "no")=="yes";
 
                             var seconds = this.OOBE_STATE.pollSeconds;
                             seconds += this.OOBE_STATE.pollMinutes * 60;
@@ -386,18 +386,38 @@ class TYTDApp {
         }
         else if(ctx.Path == "/passwd")
         {
-            var incorrect=false;
+            var result = {success=true};
             
-            const password = ctx.QueryParams.TryGetFirst("password") ?? "";
-            const newpassword = ctx.QueryParams.TryGetFirst("newpassword") ?? "";
 
-            const confirm = ctx.QueryParams.TryGetFirst("newpassword") ?? "";
+            const redirect = ctx.BodyParams.TryGetFirst("redirect") ?? "/login";
+            const password = ctx.BodyParams.TryGetFirst("password") ?? "";
+            const newpassword = ctx.BodyParams.TryGetFirst("newpassword") ?? "";
+
+            const confirm = ctx.BodyParams.TryGetFirst("confirm") ?? "";
+            const logout = ctx.BodyParams.GetFirstBoolean("logout");
             if(ctx.Method == "POST")
             {
-                this.TYTD.Passwd();
+                //public Passwd(ctx, oldPassword, newPassword, logout)
+                if(password != newpassword)
+                {
+                    result = {success = false, reason = "Passwords do not match"};
+                }
+                else
+                    result = this.TYTD.Passwd(ctx, password, newpassword,  logout);
+
+                if(result.success)
+                {
+                    ctx.StatusCode = 307;
+                    ctx.SendRedirect(redirect);
+                            
+                    return true;
+                }
+
             }
 
-            ctx.WithMimeType("text/html").SendText(Pages.ChangePassword(redirect, incorrect));
+           
+            ctx.WithMimeType("text/html").SendText(Pages.ChangePassword(redirect, result.success ? null : result.reason));
+            return true;
         }
         
         else if(ctx.Path == "/newuser")
@@ -405,14 +425,14 @@ class TYTDApp {
             var error = null;
             if(ctx.Method == "POST")
             {
-                const username = ctx.QueryParams.TryGetFirst("username");
+                const username = ctx.BodyParams.TryGetFirst("username");
-                const password = ctx.QueryParams.TryGetFirst("password");
+                const password = ctx.BodyParams.TryGetFirst("password");
-                const confirm = ctx.QueryParams.TryGetFirst("confirm");
+                const confirm = ctx.BodyParams.TryGetFirst("confirm");
-                const isAdmin = ctx.QueryParams.GetFirstBoolean("isAdmin");
+                const isAdmin = ctx.BodyParams.GetFirstBoolean("isAdmin");
-                const canUsePlugins = ctx.QueryParams.GetFirstBoolean("canUsePlugins");
+                const canUsePlugins = ctx.BodyParams.GetFirstBoolean("canUsePlugins");
-                const canManagePlugins = ctx.QueryParams.GetFirstBoolean("canManagePlugins");
+                const canManagePlugins = ctx.BodyParams.GetFirstBoolean("canManagePlugins");
-                const canDownloadDB = ctx.QueryParams.GetFirstBoolean("canDownloadDB");
+                const canDownloadDB = ctx.BodyParams.GetFirstBoolean("canDownloadDB");
-                const redirect = ctx.QueryParams.TryGetFirst("redirect") ?? "/";
+                
                 var flags = 0;
                 if(isAdmin) flags |= UserFlags.AdminFlag;
                 if(canUsePlugins) flags |= UserFlags.PluginFlag;
@@ -434,12 +454,6 @@ class TYTDApp {
                 else {
                     error = this.TYTD.CreateAccount(ctx, username, password, flags);
                 }
-
-                if(!TypeIsString(error))
-                {
-                    ctx.StatusCode=303;
-                    ctx.SendRedirect(redirect);
-                }
             }
             ctx.WithMimeType("text/html").SendText(Pages.NewUser(error));
             return true;
@@ -526,14 +540,14 @@ class TYTDApp {
             }
             return false;
         }
+        else if(ctx.Path == "/api/v1/progress_ex.json")
+        {
+            ctx.WithMimeType("application/json").SendJson(this.TYTD.GetProgressEx());
+            return true;
+        }
         else if(ctx.Path == "/api/v1/progress.json")
         {
-            var jo = {
+            ctx.WithMimeType("application/json").SendJson(this.TYTD.GetProgress());
-                CurrentVideoProgress = this.TYTD.CurrentVideoProgress,
-                CurrentVideo = this.TYTD.CurrentVideo
-                
-            };
-            ctx.WithMimeType("application/json").SendJson(jo);
             return true;
         }
         else if(ctx.Path == "/api/v1/add")
@@ -790,7 +804,7 @@ class TYTDApp {
             }
             else if(ctx.Method == "POST")
             {
-                var description =ctx.QueryParams.TryGetFirst("description");
+                var description =ctx.BodyParams.TryGetFirst("description");
                 this.TYTD.SetPersonalListDescription(name,description);
                 ctx.WithMimeType("text/html").SendText(Components.PersonalListDescription(this.TYTD,name,false));
 
@@ -848,10 +862,10 @@ class TYTDApp {
                 {
                     if(whoami.username != user)
                     {
-                        const isAdmin = ctx.QueryParams.GetFirstBoolean("isAdmin");
+                        const isAdmin = ctx.BodyParams.GetFirstBoolean("isAdmin");
-                        const canUsePlugins = ctx.QueryParams.GetFirstBoolean("canUsePlugins");
+                        const canUsePlugins = ctx.BodyParams.GetFirstBoolean("canUsePlugins");
-                        const canManagePlugins = ctx.QueryParams.GetFirstBoolean("canManagePlugins");
+                        const canManagePlugins = ctx.BodyParams.GetFirstBoolean("canManagePlugins");
-                        const canDownloadDB = ctx.QueryParams.GetFirstBoolean("canDownloadDB");
+                        const canDownloadDB = ctx.BodyParams.GetFirstBoolean("canDownloadDB");
                         var flags = 0;
                         if(isAdmin) flags |= UserFlags.AdminFlag;
                         if(canUsePlugins) flags |= UserFlags.PluginFlag;
@@ -926,11 +940,11 @@ class TYTDApp {
                     tag
                     enablePlugins
                 */
-                var enablePlugins = ctx.QueryParams.GetFirstBoolean("enablePlugins");
+                var enablePlugins = ctx.BodyParams.GetFirstBoolean("enablePlugins");
-                var tag = ctx.QueryParams.TryGetFirst("tag");
+                var tag = ctx.BodyParams.TryGetFirst("tag");
-                var hours = ctx.QueryParams.TryGetFirstInt("hours");
+                var hours = ctx.BodyParams.TryGetFirstInt("hours");
-                var minutes = ctx.QueryParams.TryGetFirstInt("minutes");
+                var minutes = ctx.BodyParams.TryGetFirstInt("minutes");
-                var seconds = ctx.QueryParams.TryGetFirstInt("seconds");
+                var seconds = ctx.BodyParams.TryGetFirstInt("seconds");
 
                 if(TypeOf(tag) == "String" && TypeOf(hours) == "Long" && TypeOf(minutes) == "Long" && TypeOf(seconds) == "Long")
                 {
@@ -953,32 +967,40 @@ class TYTDApp {
        
         else if(ctx.Path == "/watch_videos")
         {
-            const video_ids = ctx.QueryParams.TryGetFirst("video_ids");
+            
-            if(TypeIsString(video_ids))
+            if(ctx.Method=="GET")
             {
-                if(ctx.Method=="GET")
+                const video_ids = ctx.QueryParams.TryGetFirst("video_ids");
+            
+                if(TypeIsString(video_ids))
                 {
                     ctx.WithMimeType("text/html").SendText(Pages.YouTubeAnonyPlaylist(video_ids));
                     return true;
                 }
-                if(ctx.Method=="POST")
+            }
+            if(ctx.Method=="POST")
+            {
+                 const video_ids = ctx.BodyParams.TryGetFirst("video_ids");
+            
+                if(TypeIsString(video_ids))
                 {
-                    const name = ctx.QueryParams.TryGetFirst("name");
+                    const name = ctx.BodyParams.TryGetFirst("name");
                     if(TypeIsString(name))
                     {
                         const nameParts=video_ids.Split(",");
-                        Console.WriteLine(nameParts);
+                        //Console.WriteLine(nameParts);
                         each(var item : nameParts)
                         {
                             
                             this.TYTD.AddToPersonalList(name,item);
                         }
-                        Console.WriteLine(name);
+                        //Console.WriteLine(name);
                         ctx.SendRedirect($"/list?name={Net.Http.UrlEncode(name)}",303);
                         return true;
                     }
                 }
             }
+            
         }
         else if(ctx.Path == "/playlist")
         {
@@ -992,9 +1014,9 @@ class TYTDApp {
         }
         else if(ctx.Path == "/add")
         {
-            var url = ctx.QueryParams.TryGetFirst("url");
+            var url = ctx.BodyParams.TryGetFirst("url");
-            var action =ctx.QueryParams.TryGetFirst("action");
+            var action =ctx.BodyParams.TryGetFirst("action");
-            var res = ctx.QueryParams.TryGetFirst("res");
+            var res = ctx.BodyParams.TryGetFirst("res");
             if(action == "add")
             {
                 this.TYTD.DownloadItem(url,res);
@@ -1022,9 +1044,9 @@ class TYTDApp {
         }
         else if(ctx.Path == "/add-video")
         {
-            var url = ctx.QueryParams.TryGetFirst("url");
+            var url = ctx.BodyParams.TryGetFirst("url");
-            var action =ctx.QueryParams.TryGetFirst("action");
+            var action =ctx.BodyParams.TryGetFirst("action");
-            var res = ctx.QueryParams.TryGetFirst("res");
+            var res = ctx.BodyParams.TryGetFirst("res");
             if(action == "add")
             {
                 this.TYTD.DownloadItem(url,res);
@@ -1045,10 +1067,10 @@ class TYTDApp {
         }
         else if(ctx.Path == "/add-to-list")
         {
-            var id = ctx.QueryParams.TryGetFirst("id");
+            var id = ctx.BodyParams.TryGetFirst("id");
              if(TypeOf(id) != "String") id = "";
 
-            var name = ctx.QueryParams.TryGetFirst("name");
+            var name = ctx.BodyParams.TryGetFirst("name");
             if(TypeOf(name) != "String") name = "";
 
             if(name == "")
@@ -1089,9 +1111,9 @@ class TYTDApp {
         {
             if(!UserFlags.CanManagePlugins(this.TYTD.IsLoggedIn(ctx))) return false;
             var data = {
-                name = ctx.QueryParams.TryGetFirst("name"),
+                name = ctx.BodyParams.TryGetFirst("name"),
-                version = ctx.QueryParams.TryGetFirst("version"),
+                version = ctx.BodyParams.TryGetFirst("version"),
-                action = ctx.QueryParams.TryGetFirst("action")
+                action = ctx.BodyParams.TryGetFirst("action")
             };
 
             var mustConfirm = false;

Tesses.YouTubeDownloader.Server/src/pages/changepassword.tcross

@@ -1,14 +1,14 @@
-func Pages.ChangePassword(redirect,incorrect)
+func Pages.ChangePassword(redirect,error)
 {
 
 
 
   
 const html = <null>
-    <if(incorrect)>
+    <if(TypeIsString(error))>
         <true>
             <blockquote>
-                <h5>The password could not be changed</h5>
+                <h5>{error}</h5>
             </blockquote>
         </true>
     </if>

Tesses.YouTubeDownloader.Server/src/pages/oobe/page2.tcross

@@ -51,7 +51,7 @@ func Pages.OobePage2(tytd,ctx)
     <div class="small-margin">Security</div>
   </div>
 </nav>
-    <form hx-get="./oobe" hx-target="body" hx-push-url="true">
+    <form hx-post="./oobe" hx-target="body" hx-push-url="true">
           <input type="hidden" name="page" value="2">
          <div class="field suffix border round">
                 <select name="server">

Tesses.YouTubeDownloader/cross.json

@@ -14,6 +14,6 @@
 		}
 	],
 	"name": "Tesses.YouTubeDownloader",
-	"version": "1.0.0.0-dev",
+	"version": "1.0.1.0-dev",
 	"icon": "icon.png"
 }

Tesses.YouTubeDownloader/src/YouTubeDownloader.tcross

@@ -525,26 +525,21 @@ class TYTD.Downloader {
 		{
 			case Resolution.LowVideo:
 				return dir / "ytmux.mp4";
-				break;
 			case Resolution.VideoOnly:
 				return dir / "vo.bin";
-				break;
 			
 			case Resolution.AudioOnly:
 				return dir / "ao.bin";
-				break;
 			case Resolution.MP4:
 				return dir / "conv.mp4";
-				break;
 			case Resolution.MKV:
 				return dir / "conv.mkv";
-				break;
 			case Resolution.MP3:
 				return dir / "conv.mp3";
-				break;
 			case Resolution.FLAC:
 				return dir / "conv.flac";
-				break;
+			case Resolution.AMV:
+				return dir / "conv.amv";
 		}
 		throw $"Could not get file path for format {res}";
 	}
@@ -849,14 +844,14 @@ class TYTD.Downloader {
 
 	public BeforeQueued = new TYTD.Event();
 
-	public CurrentVideo = {
+	private CurrentVideo = {
 		Title = "N/A",
 		Channel = "N/A",
 		VideoId = "",
 		ChannelId = ""
 	};
 
-	public CurrentVideoProgress = 0.0;
+	private CurrentVideoProgress = 0.0;
 	
 	public VideoEnded = new TYTD.Event();
 	
@@ -874,6 +869,30 @@ class TYTD.Downloader {
 
 	private DownloaderThreadHandle;
 
+	public GetProgress() {
+		this.Mutex.Lock();
+		const progress = {CurrentVideoProgress,CurrentVideo };
+		this.Mutex.Unlock();
+		return progress;
+	}
+
+	public GetProgressEx() {
+		this.Mutex.Lock();
+		const db = OpenDB();
+		const resultVideos = Sqlite.Exec(db, "SELECT COUNT(*) FROM videos;");
+		const resultQueue = Sqlite.Exec(db, "SELECT COUNT(*) FROM queue;");
+		Sqlite.Close(db);
+
+		const videoCount = TypeIsList(resultVideos) ? (ParseLong(resultVideos[0].["COUNT(*)"])??0) : 0;
+
+		const queueCount = TypeIsList(resultQueue) ? (ParseLong(resultQueue[0].["COUNT(*)"])??0) : 0;
+		
+
+		const progress = {CurrentVideoProgress,CurrentVideo,QueueCount=queueCount, VideoCount=videoCount};
+		this.Mutex.Unlock();
+		return progress;
+	}
+
 	/^
 		Get Video Queue count
 	^/
@@ -1211,18 +1230,25 @@ class TYTD.Downloader {
 				//Console.WriteLine(res);
 
 				
+				
+			
 				if(TypeOf(res) != "Null")
 				{
 					if(TypeIsDefined(res.TYTD = this)){
 						res.Progress = (progress)=>{
+							this.Mutex.Lock();
 							this.CurrentVideoProgress = progress;
+							this.Mutex.Unlock();
 							this.VideoProgress.Invoke(this, {
 								Video = res.Video,
 								progress		
 							});
 						};
 
+						this.Mutex.Lock();
+
 						this.CurrentVideo = res.Video;
+						this.Mutex.Unlock();
 
 						this.VideoStarted.Invoke(this,{
 							Video = res.Video

changeme.md

@@ -1,4 +1,7 @@
 # Changelog
 
+## 1.0.1
+Target crosslang v0.0.10, add /api/v1/progress_ex.json
+
 ## 1.0.0
 Make it a little faster, queue is in sqlite now, fix db bug and more

nfpm.yaml

@@ -9,7 +9,7 @@
 name: "tytd2025"
 arch: "any"
 platform: "linux"
-version: "1.0.0"
+version: "1.0.1"
 section: "default"
 priority: "extra"