Compare commits
No commits in common. "master" and "v1.0.6" have entirely different histories.
|
@ -1,3 +0,0 @@
|
|||
github: captn3m0
|
||||
ko_fi: captn3m0
|
||||
liberapay: captn3m0
|
|
@ -4,7 +4,7 @@ jobs:
|
|||
tests:
|
||||
strategy:
|
||||
matrix:
|
||||
node: ["18", "20", "21"]
|
||||
node: ['16', '14', '12']
|
||||
name: Run NPM Stuff
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
|
@ -13,5 +13,4 @@ jobs:
|
|||
with:
|
||||
node-version: ${{matrix.node}}
|
||||
- run: npm install
|
||||
- run: npm run lint
|
||||
- run: npm run test
|
||||
- run: npm test
|
||||
|
|
14
CHANGELOG.md
14
CHANGELOG.md
|
@ -7,20 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
|
||||
## Unreleased
|
||||
|
||||
## 1.0.9
|
||||
### Changed
|
||||
- Dependency Updates
|
||||
- Minimum NodeJS version is now v14
|
||||
|
||||
## 1.0.8
|
||||
### Added
|
||||
- Dependency Updates
|
||||
|
||||
## 1.0.7
|
||||
### Added
|
||||
- `--version` is now supported
|
||||
- An update notification is shown if the package isn't latest.
|
||||
|
||||
## 1.0.6 - 2021-07-29
|
||||
|
||||
### Added
|
||||
|
|
|
@ -52,12 +52,14 @@ You need to pass 2 parameters, a Youtube URL and a output CUE filename. YouTube
|
|||
very specific edge cases, they should not be required for most files.
|
||||
|
||||
Examples
|
||||
$ youtube-cue --audio-file audio.m4a "https://www.youtube.com/watch?v=WzpmVxvoBoc" "The Groovy Nobody - Solarium.cue"
|
||||
"The Groovy Nobody - Solarium.cue" saved
|
||||
$ youtube-cue --audio-file audio.m4a "https://www.youtube.com/watch?v=THzUassmQwE"
|
||||
"T A Y L O R S W I F T – Folklore [Full album].cue" saved
|
||||
$ youtube-cue "https://youtu.be/THzUassmQwE" folklore.cue
|
||||
folklore.cue saved
|
||||
|
||||
## Personal Usage
|
||||
|
||||
I have this in my `.bashrc` to download, split, tag, and import albums using beet:
|
||||
I have this in my `.bashrc` to download, split, tag, and import albums:
|
||||
|
||||
```shell
|
||||
function ytdl.album() {
|
||||
|
|
61
index.js
61
index.js
|
@ -1,22 +1,16 @@
|
|||
#!/usr/bin/env node
|
||||
import ytdl from "ytdl-core";
|
||||
import getArtistTitle from "get-artist-title";
|
||||
import { parse } from "./src/parser.js";
|
||||
import { generate } from "./src/cue.js";
|
||||
import minimist from "minimist";
|
||||
import exit from "process";
|
||||
import updateNotifier from "update-notifier";
|
||||
import pkg from "./src/package.js";
|
||||
|
||||
updateNotifier({ pkg }).notify();
|
||||
import ytdl from 'ytdl-core';
|
||||
import getArtistTitle from 'get-artist-title'
|
||||
import {parse} from './src/parser.js'
|
||||
import {generate} from './src/cue.js'
|
||||
import minimist from 'minimist'
|
||||
import exit from 'process'
|
||||
|
||||
let argv = minimist(process.argv.slice(2), {
|
||||
string: "audio-file",
|
||||
string: 'audio-file'
|
||||
});
|
||||
|
||||
if (argv.version) {
|
||||
console.log(pkg.version);
|
||||
} else if (argv._.length < 1 || argv.help) {
|
||||
if (argv._.length <1 || argv.help ){
|
||||
console.log(`Usage
|
||||
$ youtube-cue [--audio-file audio.m4a] <youtube_url> [output_file]
|
||||
|
||||
|
@ -38,45 +32,36 @@ if (argv.version) {
|
|||
The above 2 are only needed to force behaviour in very specific edge cases, they should
|
||||
not be required for most files.
|
||||
|
||||
--version Print version
|
||||
|
||||
Examples
|
||||
$ youtube-cue --audio-file audio.m4a "https://www.youtube.com/watch?v=THzUassmQwE"
|
||||
"T A Y L O R S W I F T – Folklore [Full album].cue" saved
|
||||
$ youtube-cue "https://youtu.be/THzUassmQwE" folklore.cue
|
||||
folklore.cue saved`);
|
||||
folklore.cue saved`)
|
||||
} else {
|
||||
let url = argv._[0];
|
||||
let url = argv._[0]
|
||||
|
||||
ytdl.getInfo(url).then((info) => {
|
||||
let audioFile = argv["audio-file"]
|
||||
? argv["audio-file"]
|
||||
: `${info.videoDetails.title}.m4a`;
|
||||
ytdl.getInfo(url).then(info=>{
|
||||
let audioFile = argv['audio-file']? argv['audio-file'] : `${info.videoDetails.title}.m4a`
|
||||
|
||||
let output_file = argv._[1] ? argv._[1] : `${info.videoDetails.title}.cue`;
|
||||
let output_file = argv._[1]? argv._[1] : `${info.videoDetails.title}.cue`
|
||||
|
||||
let forceTimestamps = argv["timestamps"] ? argv["timestamps"] : false;
|
||||
let forceTimestamps = argv['timestamps']? argv['timestamps'] : false;
|
||||
|
||||
let forceDurations = argv["durations"] ? argv["durations"] : false;
|
||||
let forceDurations = argv['durations']? argv['durations'] : false;
|
||||
|
||||
if (forceTimestamps && forceDurations) {
|
||||
console.error("You can't pass both --timestamps and durations");
|
||||
exit(1);
|
||||
exit(1)
|
||||
}
|
||||
|
||||
let res = getArtistTitle(info.videoDetails.title,{
|
||||
defaultArtist: "Unknown Artist",
|
||||
defaultTitle: info.videoDetails.title,
|
||||
});
|
||||
let [artist, album] = res;
|
||||
artist = info.videoDetails.media ? info.videoDetails.media.artist : artist;
|
||||
let tracks = parse(info.videoDetails.description, {
|
||||
artist,
|
||||
forceTimestamps,
|
||||
forceDurations,
|
||||
length: Number(info.videoDetails.lengthSeconds),
|
||||
});
|
||||
generate({ tracks, artist, audioFile, album }, output_file);
|
||||
console.log(`"${output_file}" saved`);
|
||||
defaultTitle: info.videoDetails.title
|
||||
});
|
||||
let [artist, album] = res
|
||||
artist = (info.videoDetails.media ? info.videoDetails.media.artist : artist)
|
||||
let tracks = parse(info.videoDetails.description, {artist, forceTimestamps, forceDurations})
|
||||
generate({tracks, artist, audioFile, album}, output_file)
|
||||
console.log(`"${output_file}" saved`)
|
||||
})
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
13
package.json
13
package.json
|
@ -1,25 +1,22 @@
|
|||
{
|
||||
"name": "youtube-cue",
|
||||
"version": "1.0.10",
|
||||
"version": "1.0.6",
|
||||
"description": "Generates Cue sheet from Youtube URL",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"test": "mocha",
|
||||
"lint": "prettier --check *.js src/*.js test/*.js"
|
||||
"test": "mocha"
|
||||
},
|
||||
"bin": "index.js",
|
||||
"author": "Nemo <npm@captnemo.in>",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"mocha": "^10.0.0",
|
||||
"prettier": "^3.1.0"
|
||||
"mocha": "^9.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"console-log-level": "^1.4.1",
|
||||
"get-artist-title": "^1.3.1",
|
||||
"minimist": "^1.2.8",
|
||||
"update-notifier": "^7.0.0",
|
||||
"ytdl-core": "^4.11.5"
|
||||
"minimist": "^1.2.5",
|
||||
"ytdl-core": "^4.8.2"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
14
src/cue.js
14
src/cue.js
|
@ -1,14 +1,9 @@
|
|||
import fs from "fs";
|
||||
|
||||
/** code to create a new CUE file, as per the standard
|
||||
* with a REM PERFORMER, TITLE, FILE attribute
|
||||
* and a list of tracks provided as input
|
||||
*/
|
||||
import fs from 'fs';
|
||||
|
||||
// https://en.wikipedia.org/wiki/Cue_sheet_(computing)
|
||||
export function generate(data, outputFile) {
|
||||
try {
|
||||
fs.truncateSync(outputFile);
|
||||
fs.truncateSync(outputFile)
|
||||
} catch {}
|
||||
fs.appendFileSync(outputFile, `REM Generated using youtube-cue\n`);
|
||||
fs.appendFileSync(outputFile, `PERFORMER "${data.artist}"\n`);
|
||||
|
@ -16,12 +11,11 @@ export function generate(data, outputFile) {
|
|||
fs.appendFileSync(outputFile, `FILE "${data.audioFile}" M4A\n`);
|
||||
for(var i in data.tracks) {
|
||||
let song = data.tracks[i];
|
||||
let minutes = String(song.start.hh * 60 + song.start.mm).padStart(2, "0");
|
||||
let seconds = String(song.start.ss).padStart(2, "0");
|
||||
let minutes = (song.start.hh * 60) + (song.start.mm)
|
||||
fs.appendFileSync(outputFile, ` TRACK ${song.track} AUDIO\n`);
|
||||
fs.appendFileSync(outputFile, ` TITLE "${song.title}"\n`);
|
||||
fs.appendFileSync(outputFile, ` PERFORMER "${song.artist}"\n`);
|
||||
// Cue File is always MINUTES:SECONDS:FRAME, where FRAME is 00
|
||||
fs.appendFileSync(outputFile, ` INDEX 01 ${minutes}:${seconds}:00\n`);
|
||||
fs.appendFileSync(outputFile, ` INDEX 01 ${minutes}:${song.start.ss}:00\n`);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
import { createRequire } from "module";
|
||||
const require = createRequire(import.meta.url);
|
||||
const data = require("../package.json");
|
||||
|
||||
export default data;
|
|
@ -20,8 +20,7 @@
|
|||
*
|
||||
* It is suggested to check their lengths and pick one to parse as the Track Title
|
||||
*/
|
||||
const TS_REGEX =
|
||||
/^((?<trackl>\d{1,3})\.)? *(?<text_1>.*?) *[\(\[]?(?<start_ts>((?<start_hh>\d{1,2}):)?(?<start_mm>\d{1,2}):(?<start_ss>\d{1,2})) *-? *[\)\]]?(?<end_ts>(?<end_hh>\d{1,2}:)?(?<end_mm>\d{1,2}):(?<end_ss>\d{1,2}))? *((?<trackr>\d{1,3})\.)? *(?<text_2>.*?)$/;
|
||||
const TS_REGEX = /^((?<trackl>\d{1,3})\.)? *(?<text_1>.*?) *[\(\[]?(?<start_ts>((?<start_hh>\d{1,2}):)?(?<start_mm>\d{1,2}):(?<start_ss>\d{1,2})) *-? *[\)\]]?(?<end_ts>(?<end_hh>\d{1,2}:)?(?<end_mm>\d{1,2}):(?<end_ss>\d{1,2}))? *((?<trackr>\d{1,3})\.)? *(?<text_2>.*?)$/;
|
||||
import getArtistTitle from "get-artist-title";
|
||||
var _options = {};
|
||||
|
||||
|
@ -153,19 +152,9 @@ var fixDurations = function (list) {
|
|||
}
|
||||
};
|
||||
|
||||
var dropInvalid = function (e) {
|
||||
// All tracks should start before the closing time
|
||||
if (_options.length) return e.start.calc < _options.length;
|
||||
return true;
|
||||
};
|
||||
|
||||
export function parse(
|
||||
text,
|
||||
options = {
|
||||
artist: "Unknown",
|
||||
forceTimestamps: false,
|
||||
forceDurations: false,
|
||||
},
|
||||
options = { artist: "Unknown", forceTimestamps: false, forceDurations: false }
|
||||
) {
|
||||
_options = options;
|
||||
let durations = false;
|
||||
|
@ -198,6 +187,5 @@ export function parse(
|
|||
.map(parseTitle)
|
||||
.map(parseArtist)
|
||||
.map(addTrack)
|
||||
.map(addEnd)
|
||||
.filter(dropInvalid);
|
||||
.map(addEnd);
|
||||
}
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
/*jshint esversion: 6 */
|
||||
import { strict as assert } from "assert";
|
||||
import { generate } from "../src/cue.js";
|
||||
import fs from "fs";
|
||||
|
||||
const DATA = {
|
||||
artist: "Dumbledore",
|
||||
album: "Curse of the Elder Wand",
|
||||
audioFile: "audio.m4a",
|
||||
tracks: [
|
||||
{
|
||||
artist: "Unknown",
|
||||
title: "the 1",
|
||||
track: 1,
|
||||
start: { ts: "00:00:00", hh: 0, mm: 0, ss: 0, calc: 0 },
|
||||
end: { ts: "00:3:9", hh: 0, mm: 3, ss: 9, calc: 189 },
|
||||
_: { left_text: "", right_text: "the 1" },
|
||||
},
|
||||
{
|
||||
artist: "Unknown",
|
||||
title: "cardigan",
|
||||
track: 2,
|
||||
start: { ts: "00:3:09", hh: 0, mm: 3, ss: 9, calc: 189 },
|
||||
end: { ts: "00:9:30", hh: 0, mm: 9, ss: 30, calc: 570 },
|
||||
_: { left_text: "", right_text: "cardigan" },
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
describe("CUE", function () {
|
||||
it("should generate with leading zeroes", function () {
|
||||
generate(DATA, "/tmp/test.cue");
|
||||
const CUE_EXPECTED = `REM Generated using youtube-cue
|
||||
PERFORMER "Dumbledore"
|
||||
TITLE "Curse of the Elder Wand"
|
||||
FILE "audio.m4a" M4A
|
||||
TRACK 1 AUDIO
|
||||
TITLE "the 1"
|
||||
PERFORMER "Unknown"
|
||||
INDEX 01 00:00:00
|
||||
TRACK 2 AUDIO
|
||||
TITLE "cardigan"
|
||||
PERFORMER "Unknown"
|
||||
INDEX 01 03:09:00
|
||||
`;
|
||||
assert.equal(CUE_EXPECTED, fs.readFileSync("/tmp/test.cue", "utf-8"));
|
||||
});
|
||||
});
|
|
@ -64,8 +64,7 @@ describe("Parser", function () {
|
|||
});
|
||||
|
||||
it("should parse timestamps with square brackets", function() {
|
||||
let result =
|
||||
parse(`[00:00:00] 1. Steve Kroeger x Skye Holland - Through The Dark
|
||||
let result = parse(`[00:00:00] 1. Steve Kroeger x Skye Holland - Through The Dark
|
||||
[00:02:53] 2. Gabri Ponte x Jerome - Lonely `);
|
||||
assert.deepEqual(result[0], {
|
||||
artist: "Steve Kroeger x Skye Holland",
|
||||
|
@ -141,10 +140,7 @@ describe("Parser", function () {
|
|||
track: 3,
|
||||
end: null,
|
||||
start: { ts: "00:02:00", hh: 0, mm: 2, ss: 0, calc: 120 },
|
||||
_: {
|
||||
left_text: "Yet Another Artist - Yet another title",
|
||||
right_text: "",
|
||||
},
|
||||
_: { left_text: "Yet Another Artist - Yet another title", right_text: "" },
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -152,7 +148,7 @@ describe("Parser", function () {
|
|||
let result = parse(
|
||||
`1. Artist - Title 5:00
|
||||
2. Another Artist - Another Title 4:20`,
|
||||
{ forceTimestamps: true },
|
||||
{ forceTimestamps: true }
|
||||
);
|
||||
assert.deepEqual(result[0].end, {
|
||||
ts: "00:4:20",
|
||||
|
@ -174,7 +170,7 @@ describe("Parser", function () {
|
|||
let result = parse(
|
||||
`1. Artist - Title 1:00
|
||||
2. Another Artist - Another Title 1:15`,
|
||||
{ forceDurations: true },
|
||||
{ forceDurations: true }
|
||||
);
|
||||
assert.deepEqual(result[0], {
|
||||
track: 1,
|
||||
|
|
Loading…
Reference in New Issue