Merge branch 'release/1.13.1'

Author: bbert

.npmignore

@@ -1,8 +1,11 @@
-samples
-docs
+app
 build
+samples
 test
+.gitignore
 .travis.yml
-reports
+release.js
+travis_deploy.enc
 
+reports
 .idea

RELEASES NOTES.txt

@@ -1,3 +1,7 @@
+### Release Notes v1.13.1 (2017/12/01)
+* Bugs fixing:
+* - Fix regression on segment download error management
+
 ### Release Notes v1.13.0 (2017/11/09)
 * [MSS] Enhanced support for live start-over streams, processed as 'static' streams) [#196]
 * [MSS] Add support for chunk 'r' (repeat) attribute [#198]

app/js/streaming/Stream.js

@@ -1046,7 +1046,7 @@ MediaPlayer.dependencies.Stream = function() {
 
             this.debug.log("[Stream] Segment loading failed: start time = " + segmentRequest.startTime + ", duration = " + segmentRequest.duration);
 
-            if ((this.manifestExt.getIsDynamic(manifest) || this.manifestExt.getIsstartOver(manifest)) && reloadTimeout === null) {
+            if ((this.manifestExt.getIsDynamic(manifest) || this.manifestExt.getIsStartOver(manifest)) && reloadTimeout === null) {
                 // For Live streams, then we try to reload the session
                 isReloading = true;
                 var delay = segmentRequest.duration;
@@ -1476,4 +1476,4 @@ MediaPlayer.dependencies.Stream = function() {
 
 MediaPlayer.dependencies.Stream.prototype = {
     constructor: MediaPlayer.dependencies.Stream
-};
+};

build/deploy.js

@@ -138,31 +138,32 @@ getBranchName().then(
 
 // 6 - Zip release files
 .then(function() {
-    var path = 'gh-pages/' + pkg.dir + '/';
-    var zipFile = 'hasplayer.js-v' + pkg.version + '.zip';
-    var output = fs.createWriteStream(zipFile);
-    var archive = archiver('zip', {
-        zlib: { level: 9 } // Sets the compression level.
-    });
+    return new Promise(function(resolve/*, reject*/) {
+        var path = 'gh-pages/' + pkg.dir + '/';
+        var zipFile = 'hasplayer.js-v' + pkg.version + '.zip';
+        var output = fs.createWriteStream(zipFile);
+        var archive = archiver('zip', {
+            zlib: { level: 9 } // Sets the compression level.
+        });
 
-    // archive.on('warning', function(err) {
-    //     console.log('warning: ' + err);
-    // });
-      
-    // archive.on('error', function(err) {
-    //     console.log('error: ' + err);
-    // });
-
-    output.on('close', function() {
-        console.log('done');
-        fs.moveSync(zipFile, path + zipFile, { overwrite: true })
-        return Promise.resolve();
-    });
+        // archive.on('warning', function(err) {
+        //     console.log('warning: ' + err);
+        // });
+        
+        // archive.on('error', function(err) {
+        //     console.log('error: ' + err);
+        // });
+
+        output.on('close', function() {
+            fs.moveSync(zipFile, path + zipFile, { overwrite: true })
+            resolve();
+        });
 
-    console.info('Zip folder ' + path + ' into file ' + zipFile);
-    archive.pipe(output);
-    archive.directory(path, false);
-    archive.finalize();
+        console.info('Zip folder ' + path + ' into file ' + zipFile);
+        archive.pipe(output);
+        archive.directory(path, false);
+        archive.finalize();
+    });
 })
 
 // 7 - Add, commit and push changes on gh-pages branch to repository
@@ -183,7 +184,7 @@ getBranchName().then(
             fs.writeFileSync(path, index);
 
             // Update 'latest' symbolic link
-            fs.removeSync('gh-pages/latest');
+            console.info('Update \'latest\' symbolic link');
             fs.ensureSymlinkSync('gh-pages/' + pkg.dir, 'gh-pages/latest');
         }
     }

build/gulpfile.js

@@ -135,9 +135,9 @@ gulp.task('build-src', function() {
         .pipe(header(umdHeader))
         .pipe(footer(umdFooter))
         .pipe(gulpif(minify, uglify()))
-        .pipe(header(comment, {pkg: pkg}))
         .pipe(gulpif(minify, header(jshint_ignore_start)))
         .pipe(gulpif(minify, footer(jshint_ignore_end)))
+        .pipe(header(comment, {pkg: pkg}))
         .pipe(sourcemaps.write('.'))
         .pipe(gulp.dest(config.distDir));
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hasplayer.js",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "scripts": {
     "build": "cd build && gulp",
     "doc": "cd build && gulp doc",

release.js

@@ -43,7 +43,7 @@ var child = require('child_process'),
     semver = require('semver'),
     yargs = require('yargs'),
     argv = yargs
-        .usage("$0 --start [--type major|minor|patch] [--version <version>] \n$0 --finish")
+        .usage("$0 --start [--type major|minor|patch] [--ver <version>] \n$0 --finish")
         .default('type', 'minor')
         .argv;
 
@@ -188,7 +188,7 @@ function startRelease() {
     // - else version number is incremented
     console.info("Current version: " + pkg.version);
     console.info("Release type: " + argv.type);
-    var version = argv.version ? argv.version : semver.inc(pkg.version, argv.type);
+    var version = argv.ver ? argv.ver : semver.inc(pkg.version, argv.type);
     pkg.version = version;
     console.info("=> Release version: " + pkg.version);