Aktualisieren README.md

README.md

@@ -1,15 +1,20 @@
 # Cyb3r Downloader
 
-![./current-preview.PNG](./current-preview.PNG)
+![./current-preview.PNG](https://gitlab.thee.moe/theenoro/cyb3r-downloader/raw/master/current-preview.PNG)
+
+# Download 1.5.2 release
+- Added WMA
+
+[Download Installer](https://cl.thee.moe/index.php/s/aACn3iNAMHCFwk7)
 
 # Download 1.5.1 release
 
 So I've changed a lot from 1.5.1, not program technically but for the install process and a bit the design
 The starter is a batch file, you have to keep it open to run it :( but you can minimize it.
 
-For the browser script located in "browser_out" or [Link](https://git.tooru.thee.moe/theenoro/electron-simple-youtube-downloader/blob/master/browser_out/tampermonkey_plugin.js) in the repo you can use it with "tampermonkey". Create a new script and  copy & paste the source code in. Now if you are on YT in the navbar is a new button.
+For the browser script located in "browser_out" or [Link](https://gitlab.thee.moe/theenoro/cyb3r-downloader/blob/master/browser_out/tampermonkey_plugin.js) in the repo you can use it with "tampermonkey". Create a new script and  copy & paste the source code in. Now if you are on YT in the navbar is a new button.
 
-[Download](https://cl.thee.moe/index.php/s/Z5YvrlHaPfvEdbu)
+~~[Download](https://cl.thee.moe/index.php/s/aACn3iNAMHCFwk7)~~
 
 > 24.09.2017 Fixed Installer
 
@@ -21,16 +26,16 @@ Checks if node is installed, if not it downloads it for you and you have only to
 # Download 1.5
 
 At the moment it have a few bugs. If you find some talk to me and I will list them here and fix it as soon as possible
-or if you have an git account just add them in the issues tab. [Issues](https://git.tooru.thee.moe/theenoro/electron-simple-youtube-downloader/issues)
+or if you have an git account just add them in the issues tab. [Issues](https://gitlab.thee.moe/theenoro/cyb3r-downloader/issues)
 
-[Download](https://cl.thee.moe/index.php/s/hd9ILsF2etPoa6r)
+~~[Download](https://cl.thee.moe/index.php/s/hd9ILsF2etPoa6r)~~
 
 # v 1.4.0 Alpha
 
-Preview [Video](https://cl.thee.moe/index.php/s/T8FEaFFxyhlxIj6)
+Preview [Video](https://cl.thee.moe/index.php/s/Grfn3gQMAEnB3t3)
 
 # Download 1.3.0
 
 Win32 / Win64 Install exe
 
-- [Download](https://www.dropbox.com/s/7eoo7yf3f7nwr8j/cyb3r-youtube-downloader-1.3.0%20Setup.exe?dl=0)
+- ~~[Download](https://www.dropbox.com/s/7eoo7yf3f7nwr8j/cyb3r-youtube-downloader-1.3.0%20Setup.exe?dl=0)~~

src/app/js/app.js

@@ -57,8 +57,16 @@ $(function() {
     });
     ipcRenderer.on('process-fin', function(event, arg) {
         console.log(arg); // prints "pong"
+        if(arg.percent==101){
+            $('#download-progress-' + arg.id).css("width", 100);
+            $('#download-progress-' + arg.id).html("CONVERTING");
+        }else{
             $('#download-progress-' + arg.id).css("width", arg.percent);
             $('#download-progress-' + arg.id).html("CONVERTED");
+        }
+        
+
+        
     });
     ipcRenderer.on('file', function(event, arg) {
         console.log('DOWNLOADED')

src/app/view/init.html

@@ -178,11 +178,10 @@
     <script>
         $(function(){
             var start = [
-                "whbex",
+                "1k7kx5",
-                "wf0jb",
+                "1nhvi0",
-                "ulak9",
+                "1qfipa",
-                "wcmxa",
+                "1kfn1h",
-                "wc5e2"
             ];
             var x = Math.floor(Math.random()*start.length)
             $('#coub').attr('src','https://coub.com/embed/'+start[x]+'?muted=false&autostart=true&originalSize=false&startWithHD=false')

src/app/view/layout.html

@@ -98,6 +98,7 @@
 
                                         <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
                                           <a class="dropdown-item format" href="#" data-format="mp3">MP3</a>
+                                          <a class="dropdown-item format" href="#" data-format="wma">WMA</a>
                                           <div class="dropdown-divider"></div>
                                           <a class="dropdown-item format" href="#" data-format="mp4">MP4</a>
                                         </div>

src/controller/download.js

@@ -97,7 +97,7 @@ libs.yt_dl = (os,cb)=>{
     var url = "";
     switch (os) {
         case "win32":
-            url = 'https://yt-dl.org/downloads/2017.08.13/youtube-dl.exe';
+            url = 'https://yt-dl.org/downloads/latest/youtube-dl.exe';
             libs.download(url,"youtube-dl",function(data,file){
                 fs.renameSync(file,global.dir+'/lib/youtube-dl.exe');
                 cb();

src/controller/youtube-dl.js

@@ -127,14 +127,42 @@ var yt_dl = class{
         });
         ls.on('close', (code) => {
           console.log(`child process exited with code ${code}`);
+
+          switch(format){
+              case "wma":
+                me.lwrite.sender.send('process-fin',{percent :101,id:me.id});
+                setTimeout(function(){
+                    var fo = log[log.length-2].split('[ffmpeg] Destination: ')[1].replace(/\\/g,'/').trim();
+                    var f = fo.replace('.mp3','.'+format);
+                    console.log(f)
+                    const bat = spawn(global.dir+'/lib/ffmpeg', ['-i',fo,f,'-loglevel','repeat+level+verbose']);
+                    console.dir(bat)
+                    bat.stdout.on('data', (data) => {
+                    console.log(data.toString());
+                    });
+    
+                    bat.stderr.on('data', (data) => {
+                    console.log(data.toString());
+                    });
+    
+                    bat.on('exit', (code) => {
+                        console.log(`Child exited with code ${code}`);
                         me.lwrite.sender.send('file',{id:me.id,file:log[log.length-2].split('[ffmpeg] Destination: ')[1]});
                         me.lwrite.sender.send('process-fin',{percent :me.percent,id:me.id});
+                    });
+                },2000)
+
+                break;
+              default:
+                me.lwrite.sender.send('file',{id:me.id,file:log[log.length-2].split('[ffmpeg] Destination: ')[1]});
+                me.lwrite.sender.send('process-fin',{percent :me.percent,id:me.id});
+                break;
+          }
 
 
 
 
-
+         /* if(this.url.match('youtube')){
-          if(this.url.match('youtube')){
               var url = this.url;
               var video_id = this.url.split('v=')[1];
               var ampersandPosition = video_id.indexOf('&');
@@ -157,9 +185,9 @@ var yt_dl = class{
                   image: body
                 }
                 var success = nodeID3.write(tags, log[log.length-2].split('[ffmpeg] Destination: ')[1]);
-                console.log(success);*/
+                console.log(success);
-            //});
+            });
-          }
+          }*/
         });
     }
 }

src/controller/youtube-dl.routine.js

@@ -11,6 +11,9 @@ module.exports = (path,url,format)=>{
             case "mp3":
                 param = ['-x','--audio-format','mp3','-i',url,'-o',path+'/%(title)s.%(ext)s'];
                 break;
+            case "wma":
+                param = ['-x','--audio-format','mp3','-i',url,'-o',path+'/%(title)s.%(ext)s'];
+                break;
             case "mp4":
                 param = ['-w','-f','bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4',url,'-o',path+'/%(title)s.%(ext)s'];
                 break;

src/tmp/inst

@@ -0,0 +1 @@
+out