From 66f535df978697f3de7a763861b1202b352a9d85 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 3 Oct 2022 16:43:26 +0800 Subject: [PATCH] tasks/multimedia-archive: clean up --- modules/nixos/tasks/multimedia-archive/README.adoc | 4 ++-- modules/nixos/tasks/multimedia-archive/default.nix | 2 +- ...convert-newpipe-db-to-json => create-jobs-from-newpipe-db} | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) rename modules/nixos/tasks/multimedia-archive/scripts/{convert-newpipe-db-to-json => create-jobs-from-newpipe-db} (99%) diff --git a/modules/nixos/tasks/multimedia-archive/README.adoc b/modules/nixos/tasks/multimedia-archive/README.adoc index 11079cc1..78eea16d 100644 --- a/modules/nixos/tasks/multimedia-archive/README.adoc +++ b/modules/nixos/tasks/multimedia-archive/README.adoc @@ -28,7 +28,7 @@ This is used to easily import them from a process that is used to externally gen Some of the data may have a schema available (e.g., link:./data/jobs.schema.json[`./data/jobs.schema.json`] for the jobs database). * link:./scripts/[`./scripts/`] contains a bunch of scripts specific for this tasks. -Mainly, it contains scripts to generate data found in `./data/` such as link:./scripts/convert-newpipe-db-to-json[a script that is used to generate a jobs database suitable for this task from a NewPipe database]. +Mainly, it contains scripts to generate data found in `./data/` such as link:./scripts/create-jobs-from-newpipe-db[a script that is used to generate a jobs database suitable for this task from a NewPipe database]. * link:./default.nix[`./default.nix`], the entry point for this module. @@ -39,7 +39,7 @@ Mainly, it contains scripts to generate data found in `./data/` such as link:./s In this task, I usually just download videos from YouTube. While I could note every preferred creator manually, I could automate them by getting a list of subscriptions from my Newpipe config which I use surprisingly more often than I thought. -This is done by running the link:./convert-newpipe-db-to-json[`./convert-newpipe-db-to-json`] script and specifying the exported Newpipe database (as a ZIP file). +This is done by running the link:./scripts/create-jobs-from-newpipe-db[`./scripts/create-jobs-from-newpipe-db`] script and specifying the exported Newpipe database (as a ZIP file). [CAUTION] ==== diff --git a/modules/nixos/tasks/multimedia-archive/default.nix b/modules/nixos/tasks/multimedia-archive/default.nix index ce3584eb..08274910 100644 --- a/modules/nixos/tasks/multimedia-archive/default.nix +++ b/modules/nixos/tasks/multimedia-archive/default.nix @@ -30,7 +30,7 @@ in # The global output for all of the jobs. "--output" - "%(uploader,artist,creator|Unknown)s/%(release_date>%F,upload_date>%F|Unknown)s-%(title).%(ext)s" + "%(uploader,artist,creator|Unknown)s/%(release_date>%F,upload_date>%F|Unknown)s-%(title)s.%(ext)s" # Select only the most optimal format for my usecases. "--format" diff --git a/modules/nixos/tasks/multimedia-archive/scripts/convert-newpipe-db-to-json b/modules/nixos/tasks/multimedia-archive/scripts/create-jobs-from-newpipe-db similarity index 99% rename from modules/nixos/tasks/multimedia-archive/scripts/convert-newpipe-db-to-json rename to modules/nixos/tasks/multimedia-archive/scripts/create-jobs-from-newpipe-db index 5d792c90..697d013f 100755 --- a/modules/nixos/tasks/multimedia-archive/scripts/convert-newpipe-db-to-json +++ b/modules/nixos/tasks/multimedia-archive/scripts/create-jobs-from-newpipe-db @@ -10,10 +10,8 @@ import sys import sqlite3 import json import re -import os import shutil import tempfile -import fileinput from pathlib import Path