first proposal download path selection

server/src/core/Process.ts

@@ -41,6 +41,12 @@ class Process {
     public async start(callback?: Function): Promise<this> {
         const sanitizedParams = this.params.filter((param: string) => availableParams.includes(param));
 
+        if (this.settings?.download_path) {
+            if (this.settings.download_path.charAt(this.settings.download_path.length - 1) !== '/') {
+                this.settings.download_path = `${this.settings.download_path}/`
+            }
+        }
+
         const ytldp = spawn(this.exePath,
             ['-o', `${this.settings?.download_path || 'downloads/'}%(title)s.%(ext)s`]
                 .concat(sanitizedParams)

server/src/core/downloader.ts

@@ -61,6 +61,9 @@ export async function download(socket: Socket, payload: IPayload) {
         payload.params.split(' ') :
         payload.params;
 
+    const scopedSettings = { ...settings }
+    scopedSettings.download_path = payload.path;
+
     let p = new Process(url, params, settings);
 
     p.start().then(downloader => {
@@ -111,7 +114,10 @@ function streamProcess(process: Process, socket: Socket) {
             map(stdout => formatter(String(stdout), process.getPid()))
         )
         .subscribe({
-            next: (stdout) => socket.emit('progress', stdout),
+            next: (stdout) => {
+                socket.emit('progress', stdout)
+                log.info(`proc-${stdout.pid}`, `${stdout.progress}\t${stdout.dlSpeed}`)
+            },
             complete: () => {
                 process.kill().then(() => {
                     emitAbort();

server/src/interfaces/IPayload.d.ts

@@ -5,6 +5,7 @@
 export interface IPayload {
     url: string
     params: Array<string> | string,
+    path: string,
     title?: string,
     thumbnail?: string,
     size?: string,

server/src/main.ts

@@ -2,7 +2,13 @@ import { splash } from './utils/logger';
 import { join } from 'path';
 import { Server } from 'socket.io';
 import { ytdlpUpdater } from './utils/updater';
-import { download, abortDownload, retrieveDownload, abortAllDownloads, getFormatsAndMetadata } from './core/downloader';
+import {
+    download,
+    abortDownload,
+    retrieveDownload,
+    abortAllDownloads,
+    getFormatsAndMetadata
+} from './core/downloader';
 import { getFreeDiskSpace } from './utils/procUtils';
 import { listDownloaded } from './core/downloadArchive';
 import { createServer } from 'http';
@@ -13,6 +19,7 @@ import * as serve from 'koa-static';
 import * as cors from '@koa/cors';
 import Logger from './utils/BetterLogger';
 import { ISettings } from './interfaces/ISettings';
+import { directoryTree } from './utils/directoryUtils';
 
 const app = new Koa();
 const server = createServer(app.callback());
@@ -56,6 +63,10 @@ router.get('/archive', (ctx, next) => {
 router.get('/stream/:filepath', (ctx, next) => {
     streamer(ctx, next)
 })
+router.get('/tree', (ctx, next) => {
+    ctx.body = directoryTree()
+    next()
+})
 
 // WebSocket listeners
 io.on('connection', socket => {

server/src/utils/directoryUtils.ts

@@ -0,0 +1,62 @@
+import { readdirSync, statSync } from "fs";
+import { ISettings } from "../interfaces/ISettings";
+
+let settings: ISettings;
+
+class Node {
+    public path: string
+    public children: Node[]
+
+    constructor(path: string) {
+        this.path = path
+        this.children = []
+    }
+}
+
+function buildTreeDFS(rootPath: string, directoryOnly: boolean) {
+    const root = new Node(rootPath)
+    const stack: Node[] = []
+    const flattened: string[] = []
+
+    stack.push(root)
+    flattened.push(rootPath)
+
+    while (stack.length) {
+        const current = stack.pop()
+        if (current) {
+            const children = readdirSync(current.path)
+            for (const it of children) {
+                const childPath = `${current.path}/${it}`
+                const childNode = new Node(childPath)
+
+                if (directoryOnly) {
+                    if (statSync(childPath).isDirectory()) {
+                        current.children.push(childNode)
+                        stack.push(childNode)
+                        flattened.push(childNode.path)
+                    }
+                } else {
+                    current.children.push(childNode)
+                    if (statSync(childPath).isDirectory()) {
+                        stack.push(childNode)
+                        flattened.push(childNode.path)
+                    }
+                }
+            }
+        }
+    }
+
+    return {
+        tree: root,
+        flat: flattened
+    }
+}
+
+try {
+    settings = require('../../settings.json');
+} catch (e) { }
+
+export function directoryTree() {
+    const tree = buildTreeDFS(settings.download_path || 'downloads', true)
+    return tree
+}

server/src/utils/logger.ts

@@ -17,8 +17,8 @@ export const splash = () => {
     const reset = "\u001b[0m"
     console.log(`${fg}        __         ____                  __   __  ______`)
     console.log("  __ __/ /________/ / /__    _    _____ / /  / / / /  _/")
-    console.log(" / // / __/___/ _  / / _ \  | |/|/ / -_) _ \/ /_/ // /  ")
-    console.log(" \_, /\__/    \_,_/_/ .__/  |__,__/\__/_.__/\____/___/  ")
+    console.log(" / // / __/___/ _  / / _ \\  | |/|/ / -_) _ \\/ /_/ // /  ")
+    console.log(" \\_, /\\__/    \\_,_/_/ .__/  |__,__/\\__/_.__/\\____/___/  ")
     console.log(`/___/              /_/                                \n${reset}`)
     console.log(" yt-dlp-webUI - A web-ui for yt-dlp, simply enough")
     console.log("---------------------------------------------------\n")