alihan/youtube-dl-gui
1
0
Fork 0
mirror of https://github.com/jely2002/youtube-dl-gui.git synced 2021-11-01 22:46:21 +03:00
Code Issues Projects Releases Wiki Activity

feat: add filepaths for Microsoft Store

Browse Source
This commit is contained in:
Jelle Glebbeek
2021-07-14 12:19:28 +02:00
parent 42b33b4e00
commit 02d54b7f73
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.js
View File

@@ -114,7 +114,7 @@ function startCriticalHandlers(env) {
let appUpdater = new AppUpdater(env, win);
env.appUpdater = appUpdater;
if(!env.paths.appPath.includes("\\AppData\\Local\\Temp\\")) {
if(!env.paths.appPath.includes("\\AppData\\Local\\Temp\\") && !env.paths.appPath.includes("WindowsApps")) {
//Don't check the app when it is in portable mode
appUpdater.checkUpdate();
}

1
modules/BinaryUpdater.js
View File

@@ -62,7 +62,6 @@ class BinaryUpdater {
//Returns an array containing the latest available remote version and the download link to it.
async getRemoteVersion() {
const url = (this.paths.platform === "win32") ? "https://yt-dl.org/downloads/latest/youtube-dl.exe" : "https://yt-dl.org/downloads/latest/youtube-dl";
try {
await axios.get(url, {maxRedirects: 0})

33
modules/Filepaths.js
View File

@@ -6,15 +6,15 @@ class Filepaths {
constructor(app, env) {
this.app = app;
this.env = env;
this.platform = process.platform;
this.appPath = this.app.getAppPath();
this.platform = this.detectPlatform();
}
async generateFilepaths() {
switch (this.detectPlatform()) {
case "win32":
this.unpackedPrefix = "resources/app.asar.unpacked";
this.packedPrefix = "resources/app.asar";
this.unpackedPrefix = path.join(path.dirname(this.appPath), "app.asar.unpacked");
this.packedPrefix = this.appPath;
this.ffmpeg = this.app.isPackaged ? path.join(this.unpackedPrefix, "binaries/ffmpeg.exe") : "binaries/ffmpeg.exe";
this.ytdl = this.app.isPackaged ? path.join(this.unpackedPrefix, "binaries/youtube-dl.exe") : "binaries/youtube-dl.exe";
this.icon = this.app.isPackaged ? path.join(this.packedPrefix, "renderer/img/icon.png") : "renderer/img/icon.png";
@@ -22,11 +22,26 @@ class Filepaths {
this.taskList = this.app.isPackaged ? path.join(this.unpackedPrefix, "taskList") : "taskList";
this.ytdlVersion = this.app.isPackaged ? path.join(this.unpackedPrefix, "binaries/ytdlVersion") :"binaries/ytdlVersion";
break;
case "win32app":
const appDir = path.basename(path.join(this.appPath, "../../..")).replace(/_(.*)_/g, "_");
console.log(appDir)
this.binaryPath = path.join(this.app.getPath('home'), "AppData/Local/Packages/" + appDir + "/LocalCache/Roaming/open-video-downloader-app");
this.persistentPath = path.join(this.app.getPath("appData"), "open-video-downloader-app");
this.unpackedPrefix = path.join(path.dirname(this.appPath), "app.asar.unpacked");
this.packedPrefix = this.appPath;
await this.createAppDataFolder();
this.ffmpeg = path.join(this.binaryPath, "ffmpeg.exe");
this.ytdl = path.join(this.binaryPath, "youtube-dl.exe");
this.icon = path.join(this.packedPrefix, "renderer/img/icon.png");
this.settings = path.join(this.binaryPath, "userSettings");
this.taskList = path.join(this.binaryPath, "taskList");
this.ytdlVersion = path.join(this.binaryPath, "ytdlVersion");
break;
case "win32portable":
this.persistentPath = path.join(this.app.getPath('appData'), "youtube-dl-gui-portable");
this.unpackedPrefix = "resources/app.asar.unpacked";
this.packedPrefix = "resources/app.asar";
await this.createPortableFolder();
this.unpackedPrefix = path.join(path.dirname(this.appPath), "app.asar.unpacked");
this.packedPrefix = this.appPath;
await this.createAppDataFolder();
this.ffmpeg = path.join(this.persistentPath, "ffmpeg.exe");
this.ytdl = path.join(this.persistentPath, "youtube-dl.exe");
this.icon = path.join(this.packedPrefix, "renderer/img/icon.png");
@@ -83,7 +98,8 @@ class Filepaths {
detectPlatform() {
if(this.appPath.includes("\\AppData\\Local\\Temp\\")) return "win32portable";
else return this.platform;
else if(this.appPath.includes("WindowsApps")) return "win32app"
else return process.platform;
}
setPermissions() {
@@ -95,12 +111,13 @@ class Filepaths {
});
}
async createPortableFolder() {
async createAppDataFolder() {
await new Promise((resolve) => {
mkdirp(this.persistentPath).then(made => {
if (made != null) {
fs.copyFileSync(path.join(this.unpackedPrefix, "binaries/youtube-dl.exe"), path.join(this.persistentPath, "youtube-dl.exe"));
fs.copyFileSync(path.join(this.unpackedPrefix, "binaries/ffmpeg.exe"), path.join(this.persistentPath, "ffmpeg.exe"));
fs.copyFileSync(path.join(this.unpackedPrefix, "binaries/AtomicParsley.exe"), path.join(this.persistentPath, "AtomicParsley.exe"));
fs.copyFileSync(path.join(this.unpackedPrefix, "binaries/ytdlVersion"), path.join(this.persistentPath, "ytdlVersion"));
}
resolve();