Deprecate media directory.

This commit is contained in:
Dmitry Voronin 2024-08-26 11:23:50 +03:00
parent a17d93f31c
commit c2fc1dae3b
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
6 changed files with 22 additions and 22 deletions

View file

@ -40,5 +40,5 @@ in {
".parallel/will-cite".text = ""; ".parallel/will-cite".text = "";
".ssh/config".text = ssh.text; ".ssh/config".text = ssh.text;
".Wallpaper".source = config.module.wallpaper.path; ".Wallpaper".source = config.module.wallpaper.path;
"media/template".source = ./template; "template".source = ./template;
} }

View file

@ -5,11 +5,11 @@
desktop = "${homeDirectory}/"; desktop = "${homeDirectory}/";
documents = "${homeDirectory}/document/"; documents = "${homeDirectory}/document/";
download = "${homeDirectory}/download/"; download = "${homeDirectory}/download/";
music = "${homeDirectory}/media/music/"; music = "${homeDirectory}/music/";
pictures = "${homeDirectory}/media/picture/"; pictures = "${homeDirectory}/picture/";
publicShare = "${homeDirectory}/media/share/"; publicShare = "${homeDirectory}/share/";
templates = "${homeDirectory}/media/template/"; templates = "${homeDirectory}/template/";
videos = "${homeDirectory}/media/video/"; videos = "${homeDirectory}/video/";
extraConfig = { extraConfig = {
XDG_TMP_DIR = "${homeDirectory}/tmp/"; XDG_TMP_DIR = "${homeDirectory}/tmp/";
}; };

View file

@ -13,7 +13,7 @@
path_mount="/storage/cold_1" path_mount="/storage/cold_1"
path_backup="''${path_mount}/backup" path_backup="''${path_mount}/backup"
path_container="''${path_backup}/home" path_container="''${path_backup}/home"
path_media="/storage/cold_1/media /storage/cold_2/media" path_media="/storage/cold_1 /storage/cold_2"
# Check if backup drive is mounted. # Check if backup drive is mounted.
if [ ! -f "''${path_mount}"/.mount ]; then if [ ! -f "''${path_mount}"/.mount ]; then
@ -42,7 +42,7 @@
mv ''${container} ''${path_container}/ || report "Backup : Failed to save containers!" mv ''${container} ''${path_container}/ || report "Backup : Failed to save containers!"
# Backup some media. # Backup some media.
cd ''${path_src}/media/ cd ''${path_src}
paper=$(archive paper/) paper=$(archive paper/)
mv ''${paper} ''${path_backup}/paper/ || report "Backup : Failed to save paper!" mv ''${paper} ''${path_backup}/paper/ || report "Backup : Failed to save paper!"
cd - cd -

View file

@ -40,19 +40,19 @@
interface = "enp8s0"; interface = "enp8s0";
localAccess = "10.0.0.0/24"; localAccess = "10.0.0.0/24";
media = { media = {
anime = [ "/storage/cold_1/media/anime" "/storage/cold_2/media/anime" ]; anime = [ "/storage/cold_1/anime" "/storage/cold_2/anime" ];
book = [ "/storage/hot/media/book" ]; book = [ "/storage/hot/book" ];
download = [ "/storage/hot/download" ]; download = [ "/storage/hot/download" ];
manga = [ "/storage/cold_1/media/manga" "/storage/cold_2/media/manga" ]; manga = [ "/storage/cold_1/manga" "/storage/cold_2/manga" ];
movie = [ "/storage/cold_1/media/movie" "/storage/cold_2/media/movie" ]; movie = [ "/storage/cold_1/movie" "/storage/cold_2/movie" ];
music = [ "/storage/cold_2/media/music" "/storage/hot/media/music" ]; music = [ "/storage/cold_2/music" "/storage/hot/music" ];
paper = [ "/storage/hot/media/paper" ]; paper = [ "/storage/hot/paper" ];
porn = [ "/storage/cold_2/media/porn" ]; porn = [ "/storage/cold_2/porn" ];
photo = [ "/storage/hot/container/cloud/data/data/cakee/files/media/photo" "/storage/cold_1/backup/tmp/photo" ]; photo = [ "/storage/hot/container/cloud/data/data/cakee/files/photo" "/storage/cold_1/backup/tmp/photo" ];
show = [ "/storage/cold_1/media/show" "/storage/cold_2/media/show" ]; show = [ "/storage/cold_1/show" "/storage/cold_2/show" ];
study = [ "/storage/cold_1/media/study" "/storage/cold_2/media/study" ]; study = [ "/storage/cold_1/study" "/storage/cold_2/study" ];
work = [ "/storage/cold_2/media/work" ]; work = [ "/storage/cold_2/work" ];
youtube = [ "/storage/cold_1/media/youtube" "/storage/cold_2/media/youtube" ]; youtube = [ "/storage/cold_1/youtube" "/storage/cold_2/youtube" ];
}; };
}; };
} }

View file

@ -1,6 +1,6 @@
# Takes pictures from first photo dir, processes and stores to the second one. # Takes pictures from first photo dir, processes and stores to the second one.
{ util, pkgs, lib, ... } @args: let { util, pkgs, lib, ... } @args: let
imgInput = "/storage/hot/container/cloud/data/data/cakee/files/media/photo"; imgInput = "/storage/hot/container/cloud/data/data/cakee/files/photo";
imgOutput = "/storage/cold_1/backup/tmp/photo"; imgOutput = "/storage/cold_1/backup/tmp/photo";
in { in {
systemd.services.photosprocess = let systemd.services.photosprocess = let

View file

@ -1,5 +1,5 @@
{ pkgs, util, lib, __findFile, ... }: let { pkgs, util, lib, __findFile, ... }: let
storage = "/storage/hot/media/music"; storage = "/storage/hot/music";
package = import <package/yamusicdownload> { inherit pkgs; }; package = import <package/yamusicdownload> { inherit pkgs; };
pattern = "#album-artist/#year_#album/#number_#title"; pattern = "#album-artist/#year_#album/#number_#title";
in { in {