-
+
+
diff --git a/src/controller/download.js b/src/controller/download.js
index 10267e5..a35a236 100644
--- a/src/controller/download.js
+++ b/src/controller/download.js
@@ -1,7 +1,8 @@
const request = require('request');
const fs = require('fs')
const ipcMain = require('electron').ipcMain;
-const unzip = require('unzip')
+const unzip = require('unzip');
+const { spawn } = require('child_process');
var libsx = {
@@ -27,6 +28,7 @@ ipcMain
break;
default:
}
+
for (var lib in libsx) {
if (fs.existsSync(global.dir+"/lib/"+libsx[lib])) {
@@ -41,26 +43,65 @@ ipcMain
if(url === ''){
libs.checkNext('youtube-dl');
}else{
- libs.download(url,"ffmpeg",function(data,file){
- fs.createReadStream(file)
- .pipe(unzip.Parse())
- .on('entry', function (entry) {
- var fileName = entry.path;
- var type = entry.type; // 'Directory' or 'File'
- var size = entry.size;
- console.log(fileName)
- if (fileName === "ffmpeg-latest-win32-static/bin/ffmpeg.exe" || fileName === "ffmpeg-latest-win32-static/bin/ffprobe.exe" || fileName === "ffmpeg-latest-win32-static/bin/ffplay.exe") {
- entry.pipe(fs.createWriteStream(global.dir+'/lib/'+fileName.split('/')[2]));
- console.log('TEST')
- z++;
- if(z == 3){
- libs.checkNext('youtube-dl');
+ switch(process.platform){
+ case "win32":
+ libs.download(url,"ffmpeg",function(data,file){
+ fs.createReadStream(file)
+ .pipe(unzip.Parse())
+ .on('entry', function (entry) {
+ var fileName = entry.path;
+ var type = entry.type; // 'Directory' or 'File'
+ var size = entry.size;
+ console.log(fileName)
+ if (fileName === "ffmpeg-latest-win32-static/bin/ffmpeg.exe" || fileName === "ffmpeg-latest-win32-static/bin/ffprobe.exe" || fileName === "ffmpeg-latest-win32-static/bin/ffplay.exe") {
+ entry.pipe(fs.createWriteStream(global.dir+'/lib/'+fileName.split('/')[2]));
+ console.log('TEST')
+ z++;
+ if(z == 3){
+ libs.checkNext('youtube-dl');
+ }
+ } else {
+ entry.autodrain();
}
- } else {
- entry.autodrain();
- }
+ });
});
- });
+ break;
+ case "linux":
+ libs.download(url,"ffmpeg",function(data,file){
+ const ls = spawn('tar', ['xvf','./src/tmp/ffmpeg.x-xz','-C','./src/tmp']);
+
+ ls.stdout.on('data', (data) => {
+ console.log(`stdout: ${data}`);
+ });
+
+ ls.stderr.on('data', (data) => {
+ console.log(`stderr: ${data}`);
+ });
+
+ ls.on('close', (code) => {
+ var folder = "";
+ console.log(`child process exited with code ${code}`);
+ const ls = spawn('rm', ['./src/tmp/ffmpeg.x-xz']).on('close',()=>{
+ const ls = spawn('ls', ['./src/tmp/']).stdout.on(data,(data)=>{
+ console.log(data)
+ if(data.match('ffmpeg-') && data.match('-static')){
+ folder = data;
+ }
+ }).on('close',()=>{
+ const ls = spawn('cp', ['./src/tmp/'+folder+'/ffmpeg','./src/lib/ffmpeg']).on('close',()=>{
+ const ls = spawn('cp', ['./src/tmp/'+folder+'/ffprobe','./src/lib/ffprobe']).on('close',()=>{
+ libs.checkNext('youtube-dl');
+ });
+ });
+ });
+ });
+ });
+
+
+ })
+ break;
+ default:
+ }
}
}else{
libs.checkNext('youtube-dl');
@@ -86,8 +127,8 @@ libs.ff = (os)=>{
url = 'http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-latest-win32-static.zip';
break;
case "linux":
- url = ''
-
+ url = 'https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz'
+
default:
}
@@ -104,12 +145,15 @@ libs.yt_dl = (os,cb)=>{
})
break;
case "linux":
- url = ''
- cb();
+ url = 'https://yt-dl.org/downloads/latest/youtube-dl'
+ libs.download(url,"youtube-dl",function(data,file){
+ fs.renameSync(file,global.dir+'/lib/youtube-dl');
+ cb();
+ })
default:
-
+
}
-
+
}
libs.download = (url,data,cb)=>{
@@ -133,6 +177,8 @@ libs.download = (url,data,cb)=>{
});
}
+function win_ffmpeg(){
+}
module.exports = libs;
diff --git a/src/controller/tray.js b/src/controller/tray.js
index fd3d1a5..4540eb8 100644
--- a/src/controller/tray.js
+++ b/src/controller/tray.js
@@ -1,12 +1,20 @@
const {app, Menu, Tray} = require('electron')
const main_window = require('./windows.js/main.js')
+const path = require('path')
module.exports = ()=>{
+ switch(process.platform){
+ case 'win32':
- let tray = new Tray(global.dir+'/app.ico')
+ break;
+ case 'linux':
+
+ break;
+ }
+ let tray = new Tray(path.join(global.dir+'/app.png'))
const contextMenu = Menu.buildFromTemplate([
{label: 'Open', click(){ main_window.open() }},
/*{label: 'About',click() { console.log('item 1 clicked') }},
diff --git a/src/tmp/inst b/src/tmp/inst
new file mode 100644
index 0000000..c585e19
--- /dev/null
+++ b/src/tmp/inst
@@ -0,0 +1 @@
+out
\ No newline at end of file