2.0 - Fixing auto updater

quead · quead · commit 2766180ce0c0 · 2017-09-18T18:19:39.000+03:00
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ This player is compatible only with Chrome/webkit browsers because in future I w
 
 ## Usage
 
-**For angular2/typescript development**
+**For Angular and Typescript Development**
 1. Install [NodeJS 6.11.0+](https://nodejs.org/en/download/ "Node JS Download")
 2. Install [angular-cli 1.1.3+](https://github.com/angular/angular-cli "Angular Cli")
 
@@ -32,7 +32,6 @@ This player is compatible only with Chrome/webkit browsers because in future I w
 
 `npm start` in root folder
 
-------
 
 **For SASS development**
 
@@ -43,7 +42,21 @@ This player is compatible only with Chrome/webkit browsers because in future I w
 
 4. Start compiling the SCSS files by
 
-`gulp`
+`gulp sw` in root folder
+
+------
+
+**For building app**
+
+1. Build the src folder with
+`ng build` in root folder (you need to have angular-cli installed on global)
+
+2. Copy package.json from **/app** folder and paste it to **dist** folder
+3. Download [NWjs v0.25.0 +](https://nwjs.io/ "NWJS Download")
+4. Path your system enviroment to folder where you unarchived
+5. Run
+
+`gulp build` in root folder
 
 **For personal use**
 
diff --git a/dist/index.html b/dist/index.html
@@ -20,48 +20,49 @@
         </div>
     </app-yt>
     <script>
-    const AutoUpdater = require( "nw-autoupdater" ),
+        const AutoUpdater = require( "nw-autoupdater" ),
             updater = new AutoUpdater( require( "./package.json" ) ),
             output =  document.querySelector( "#output" );
-      async function main(){
-        try {
-           // Update copy is running to replace app with the update
-          if ( updater.isSwapRequest() ) {
-            output.innerHTML += `\nSwapping...`;
-            await updater.swap();
-            output.innerHTML += `\nDone...`;
-            await updater.restart();
-            return;
-          }
-          // Download/unpack update if any available
-          const rManifest = await updater.readRemoteManifest();
-          const needsUpdate = await updater.checkNewVersion( rManifest );
-          if ( !needsUpdate ) {
-            output.innerHTML += `\nApp is up to date...`;
-            return;
-          }
-          if ( !confirm( "New release is available. Do you want to upgrade?" ) ) {
-            return;
-          }
-          // Subscribe for progress events
-          updater.on( "download", ( downloadSize, totalSize ) => {
-            output.innerHTML = `Downloading...`;
-            console.log( "download progress", Math.floor( downloadSize / totalSize * 100 ), "%" );
-          });
-          updater.on( "install", ( installFiles, totalFiles ) => {
-            output.innerHTML = `Installing...\n`;
-            console.log( "install progress", Math.floor( installFiles / totalFiles * 100 ), "%" );
-          });
-          const updateFile = await updater.download( rManifest );
-          await updater.unpack( updateFile );
-          alert( `The application will automatically restart to finish installing the update` );
-          await updater.restartToSwap();
-        } catch ( e ) {
-          console.error( e );
+            
+        async function main(){
+            try {
+            // Update copy is running to replace app with the update
+            if ( updater.isSwapRequest() ) {
+                output.innerHTML += `\nSwapping...`;
+                await updater.swap();
+                output.innerHTML += `\nDone...`;
+                await updater.restart();
+                return;
+            }
+            // Download/unpack update if any available
+            const rManifest = await updater.readRemoteManifest();
+            const needsUpdate = await updater.checkNewVersion( rManifest );
+            if ( !needsUpdate ) {
+                output.innerHTML += `\nIs up to date...`;
+                return;
+            }
+            if ( !confirm( "New release is available. Do you want to upgrade?" ) ) {
+                return;
+            }
+            // Subscribe for progress events
+            updater.on( "download", ( downloadSize, totalSize ) => {
+                output.innerHTML = `Downloading...`;
+                console.log( "download progress", Math.floor( downloadSize / totalSize * 100 ), "%" );
+            });
+            updater.on( "install", ( installFiles, totalFiles ) => {
+                output.innerHTML = `Installing...\n`;
+                console.log( "install progress", Math.floor( installFiles / totalFiles * 100 ), "%" );
+            });
+            const updateFile = await updater.download( rManifest );
+            await updater.unpack( updateFile );
+            alert( `The application will automatically restart to finish installing the update` );
+            await updater.restartToSwap();
+            } catch ( e ) {
+            console.error( e );
+            }
         }
-      }
-      output.innerHTML = `${nw.App.manifest.version}\n`;
-      main();
+        output.innerHTML = `Application v${nw.App.manifest.version}\n`;
+        main();
 
     </script>
     <script type="text/javascript" src="inline.bundle.js"></script><script type="text/javascript" src="polyfills.bundle.js"></script><script type="text/javascript" src="styles.bundle.js"></script><script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="main.bundle.js"></script></body>
diff --git a/dist/package.json b/dist/package.json
@@ -22,7 +22,14 @@
   "webkit": {
     "plugin": true
   },
+  "scripts": {
+    "postversion": "npm run package",
+    "package": "nwb nwbuild -v 0.25.2-sdk . -o ../release --output-format=ZIP --output-name={name}-v{version}-{target}"    
+  },
   "dependencies": {
     "nw-autoupdater": "*"
+  },
+  "devDependencies": {
+    "nwjs-builder": "^1.14.0"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -3,13 +3,6 @@
 var gulp = require('gulp');
 var sass = require('gulp-sass');
 var exec = require('child_process').exec;
-var NwBuilder = require('nw-builder');
-
-var nw = new NwBuilder({
-    files: 'dist/**/**',
-    platforms: ['win64'],
-    version: '0.25.2'
-});
 
 gulp.task('sass', function() {
     return gulp.src('scss/main.scss')
@@ -26,25 +19,31 @@ gulp.task('sw', ['sass'], function() {
 });
 
 gulp.task('build', function() {
-    console.log('Not started');
+    console.log('Installing packages...');
     exec('npm install', { cwd: 'dist', stdio: 'inherit' }, function (error, stdout, stderr) {
         if (stderr !== null) {
-            console.log('stderr' + stderr);
+            console.log(stderr);
         }
         if (stdout !== null) {
-            console.log('stdout' + stdout);
+            console.log(stdout);
         }
         if (error !== null) {
-            console.log('error' + error);
+            console.log(error);
         }
     }).on('close', done);
 
     function done() {
-        nw.build().then(function () {
-            console.log('all done!');
-         }).catch(function (error) {
-             console.error(error);
-         });
+        exec('npm run package', { cwd: 'dist', stdio: 'inherit' }, function (error, stdout, stderr) {
+            if (stderr !== null) {
+                console.log(stderr);
+            }
+            if (stdout !== null) {
+                console.log(stdout);
+            }
+            if (error !== null) {
+                console.log(error);
+            }
+        });
     }
 });
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular2-youtube-player",
-  "version": "1.3.0",
+  "version": "1.0.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,6 +1,6 @@
 <header>
   <div class="header-bar">
-      <h1>YouTube Player v1.9.1</h1>
+      <h1>YouTube Player v2.0</h1>
       <div class="win-controls">
           <button id="win-minimize" (click)="winMinimize();"></button>
           <button id="win-maximize" (click)="winMaximize();"></button>
diff --git a/src/index.html b/src/index.html
@@ -2,19 +2,69 @@
 <html>
     <head>
         <base href="/">
-        <title>YouTube Player v1.9.2</title>
+        <title>YouTube Player v2.0</title>
         <link rel="icon" href="favicon.ico">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
         <link rel="stylesheet" href="assets/css/normalize.css">
         <link rel="stylesheet" href="assets/css/main.css">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />        
     </head>
-    <body>
+    <body class="application app-win">
+        <div class="updates" style="position: fixed; top: 0; z-index: 999; background-color: red; color: white">
+            <div id="output"></div>
+        </div>
     <app-yt>
         <div class="loading-app">
             <i class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
             <span class="sr-only">Loading...</span>
         </div>
     </app-yt>
-    </body>
+    <script>
+        const AutoUpdater = require( "nw-autoupdater" ),
+            updater = new AutoUpdater( require( "./package.json" ) ),
+            output =  document.querySelector( "#output" );
+            
+        async function main(){
+            try {
+            // Update copy is running to replace app with the update
+            if ( updater.isSwapRequest() ) {
+                output.innerHTML += `\nSwapping...`;
+                await updater.swap();
+                output.innerHTML += `\nDone...`;
+                await updater.restart();
+                return;
+            }
+            // Download/unpack update if any available
+            const rManifest = await updater.readRemoteManifest();
+            const needsUpdate = await updater.checkNewVersion( rManifest );
+            if ( !needsUpdate ) {
+                output.innerHTML += `\nApp is up to date...`;
+                return;
+            }
+            if ( !confirm( "New release is available. Do you want to upgrade?" ) ) {
+                return;
+            }
+            // Subscribe for progress events
+            updater.on( "download", ( downloadSize, totalSize ) => {
+                output.innerHTML = `Downloading...`;
+                console.log( "download progress", Math.floor( downloadSize / totalSize * 100 ), "%" );
+            });
+            updater.on( "install", ( installFiles, totalFiles ) => {
+                output.innerHTML = `Installing...\n`;
+                console.log( "install progress", Math.floor( installFiles / totalFiles * 100 ), "%" );
+            });
+            const updateFile = await updater.download( rManifest );
+            await updater.unpack( updateFile );
+            alert( `The application will automatically restart to finish installing the update` );
+            await updater.swap();
+            await updater.restart();
+            } catch ( e ) {
+            console.error( e );
+            }
+        }
+        output.innerHTML = `Application ver. ${nw.App.manifest.version}\n`;
+        main();
+
+    </script>
+    <script type="text/javascript" src="inline.bundle.js"></script><script type="text/javascript" src="polyfills.bundle.js"></script><script type="text/javascript" src="styles.bundle.js"></script><script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="main.bundle.js"></script></body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular2-youtube-player",`
`3`		`- "version": "1.3.0",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"ng": "ng",`