From d9edb40cd5c963850998a21689527b45b1bbd7ad Mon Sep 17 00:00:00 2001 From: Isaac Grynsztein Date: Fri, 13 Mar 2020 00:34:27 -0400 Subject: [PATCH 01/48] Added basic id3 tagging functionality and simplified mp3 downloading logic --- backend/app.js | 24 +++++++++++++++++++----- backend/package.json | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/backend/app.js b/backend/app.js index 027dd1d..b95ecb0 100644 --- a/backend/app.js +++ b/backend/app.js @@ -9,6 +9,7 @@ var express = require("express"); var bodyParser = require("body-parser"); var archiver = require('archiver'); const low = require('lowdb') +const NodeID3 = require('node-id3') var URL = require('url').URL; const shortid = require('shortid') const url_api = require('url'); @@ -658,11 +659,24 @@ app.post('/api/tomp3', function(req, res) { // if invalid, continue onto the next continue; } - var file_name = output_json['_filename'].replace(/^.*[\\\/]/, ''); - var file_path = output_json['_filename'].substring(audioFolderPath.length, output_json['_filename'].length); - var alternate_file_path = file_path.substring(0, file_path.length-4); - var alternate_file_name = file_name.substring(0, file_name.length-4); - if (alternate_file_path) file_names.push(alternate_file_path); + + var full_file_path = output_json['_filename'].substring(0, output_json['_filename'].length-5) + '.mp3'; + console.log(full_file_path); + if (fs.existsSync(full_file_path)) { + let tags = { + title: output_json['title'], + artist: output_json['artist'] ? output_json['artist'] : output_json['uploader'] + } + // NodeID3.create(tags, function(frame) { }) + let success = NodeID3.write(tags, full_file_path); + if (success) console.log('successfully tagged file'); + else console.log('failed to tag file'); + } else { + console.log('Output mp3 does not exist'); + } + + var file_path = output_json['_filename'].substring(audioFolderPath.length, output_json['_filename'].length-5); + if (file_path) file_names.push(file_path); } let is_playlist = file_names.length > 1; diff --git a/backend/package.json b/backend/package.json index 6da5631..f4c042f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -25,6 +25,7 @@ "exe": "^1.0.2", "express": "^4.17.1", "lowdb": "^1.0.0", + "node-id3": "^0.1.14", "shortid": "^2.2.15", "uuidv4": "^6.0.6", "youtube-dl": "^3.0.2" From 21797f39018e5ccfa6cfdb5cc17d2c466d9c28e6 Mon Sep 17 00:00:00 2001 From: Isaac Grynsztein Date: Sat, 14 Mar 2020 17:32:52 -0400 Subject: [PATCH 02/48] Added preliminary localization support to almost all strings in the program --- package.json | 1 + src/app/app.component.html | 8 +- .../create-playlist.component.html | 7 +- .../subscribe-dialog.component.html | 16 +-- .../subscription-info-dialog.component.html | 14 +- .../download-item.component.html | 2 +- src/app/file-card/file-card.component.html | 4 +- .../input-dialog/input-dialog.component.html | 1 + src/app/main/main.component.html | 122 +++++++++++++----- src/app/player/player.component.html | 2 +- src/app/settings/settings.component.html | 98 +++++++------- .../subscription-file-card.component.html | 6 +- .../subscription/subscription.component.html | 4 +- .../subscriptions.component.html | 20 +-- src/polyfills.ts | 4 + 15 files changed, 189 insertions(+), 120 deletions(-) diff --git a/package.json b/package.json index 73966f1..2801163 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "@angular/core": "^8.2.11", "@angular/forms": "^8.2.11", "@angular/http": "^7.2.15", + "@angular/localize": "^9.0.6", "@angular/material": "^8.2.3", "@angular/platform-browser": "^8.2.11", "@angular/platform-browser-dynamic": "^8.2.11", diff --git a/src/app/app.component.html b/src/app/app.component.html index fb2927b..9403aeb 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -14,12 +14,12 @@ @@ -30,8 +30,8 @@ - Home - Subscriptions + Home + Subscriptions diff --git a/src/app/create-playlist/create-playlist.component.html b/src/app/create-playlist/create-playlist.component.html index 5447200..c361625 100644 --- a/src/app/create-playlist/create-playlist.component.html +++ b/src/app/create-playlist/create-playlist.component.html @@ -1,13 +1,14 @@ -

Create a playlist

+

Create a playlist

- +
- {{(type === 'audio') ? 'Audio files' : 'Videos'}} + Audio files + Videos {{file.id}} diff --git a/src/app/dialogs/subscribe-dialog/subscribe-dialog.component.html b/src/app/dialogs/subscribe-dialog/subscribe-dialog.component.html index 7e8d004..10f81b7 100644 --- a/src/app/dialogs/subscribe-dialog/subscribe-dialog.component.html +++ b/src/app/dialogs/subscribe-dialog/subscribe-dialog.component.html @@ -1,25 +1,25 @@ -

Subscribe to playlist or channel

+

Subscribe to playlist or channel

- - The playlist or channel URL + + The playlist or channel URL
- - This is optional + + This is optional
- Download all uploads + Download all uploads
- Download videos uploaded in the last + Download videos uploaded in the last @@ -34,7 +34,7 @@ - +