Unverified Commit 32146f31 authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

Merge pull request #294517 from chewblacka/fix-ytdownloader

ytdownloader: add patch to set correct config dir
parents 469d04ae f48a35b0
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
--- a/main.js
+++ b/main.js
@@ -13,6 +13,15 @@
 const fs = require("fs");
 const path = require("path");
 autoUpdater.autoDownload = false;
+
+// Set the config directory to XDG_CONFIG_HOME/ytdownloader
+const xdgConfigHome = process.env.XDG_CONFIG_HOME;
+let configDir = app.getPath('home') + "/.config/ytdownloader";
+if (xdgConfigHome) {
+	configDir = xdgConfigHome + "/ytdownloader";
+}
+app.setPath ('userData', configDir);
+
 /**@type {BrowserWindow} */
 let win = null;
 let secondaryWindow = null;
+7 −3
Original line number Diff line number Diff line
@@ -25,19 +25,23 @@ buildNpmPackage rec {
  buildInputs = [ ffmpeg yt-dlp ];

  desktopItem = makeDesktopItem {
    name = "YTDownloader";
    name = "ytDownloader";
    exec = "ytdownloader %U";
    icon = "ytdownloader";
    desktopName = "YT Downloader";
    desktopName = "ytDownloader";
    comment = "A modern GUI video and audio downloader";
    categories = [ "Utility" ];
    startupWMClass = "YTDownloader";
    startupWMClass = "ytDownloader";
  };

  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

  dontNpmBuild = true;

  # Patch config dir to ~/.config/ytdownloader
  # Otherwise it stores config in ~/.config/Electron
  patches = [ ./config-dir.patch ];

  # Replace hardcoded ffmpeg and ytdlp paths
  # Also stop it from downloading ytdlp
  postPatch = ''