Remove concatenation and rev files. Simpler css/js file manipulation …

…and injection

assets/js/main.js

@@ -3,24 +3,28 @@ var request = require('request'),
 	fs = require('fs'),
 	path = require('path'),
     os = require('os'),
-    moment = require('moment');
-
-var gui = require('nw.gui');
+    moment = require('moment'),
+    express = require('express'),
+    i18n = require("i18n"),
+    gui = require('nw.gui');
 
+// Window
 var win = gui.Window.get();
 win.title = 'Cuevana Storm';
+var windows = [];
 
+// API endpoint
 var endpoint = 'http://api.cuevana.tv';
-// var endpoint = 'http://api.cuevana.local';
 
+// App version
+var version = '0.1b';
+
+// Platform 
 var isWin = /^win/.test(process.platform);
 var isMac = /^darwin/.test(process.platform);
 var isMaximized = false;
 
-// App version
-var version = '0.1b';
-
-var windows = [];
+// App extra variables
 var videoData = {};
 var languages = {
 	'ES': 'Español',
@@ -57,6 +61,7 @@ var genres = [
 	{ key: '28', name: 'Cortometraje'}
 ];
 
+// Scrollbar config
 var scrollbarOptions = {
 	verticalDragMinHeight: 30,
 	verticalGutter: 0,
@@ -65,10 +70,11 @@ var scrollbarOptions = {
 	mouseWheelSpeed: isWin ? 30 : 3
 }
 
-var tmpDir = path.join(os.tmpDir(), 'Cuevana');
+// Create tmp dir
+var tmpDir = path.join(os.tmpDir(), 'Cuevana Storm');
 if(!fs.existsSync(tmpDir)) { fs.mkdirSync(tmpDir); }
 
-
+// Debug
 var isDebug = gui.App.argv.indexOf('--debug') > -1;
 
 if (!isDebug) {

assets/js/playtorrent.js

@@ -1,21 +1,23 @@
-var
-    // Minimum percentage to open video
-    MIN_PERCENTAGE_LOADED = 0.5,
-
-    // Minimum bytes loaded to open video
-    MIN_SIZE_LOADED = 10 * 1024 * 1024;
-
 var peerflix = require('peerflix'),
     child_process = require('child_process'),
     address = require('network-address'),
     numeral = require('numeral'),
-    clivas = require('clivas'),
     readTorrent = require('read-torrent'),
     magnet = require('magnet-uri');
 
-var videos_last_id = 0;
+// Minimum percentage to open video
+var MIN_PERCENTAGE_LOADED = 0.5;
+
+// Minimum bytes loaded to open video
+var MIN_SIZE_LOADED = 10 * 1024 * 1024;
+
+// Video array (store open videos)
 var videos = [];
 
+// Last video id loaded
+var videos_last_id = 0;
+
+// Format bytes to readable format
 var bytes = function(num) {
     return numeral(num).format('0.0b');
 };
@@ -29,6 +31,7 @@ var playTorrent = function (torrent, callback, statsCallback) {
     tmpFilename = tmpFilename.replace(/([^a-zA-Z0-9-_])/g, '_') +'-'+ (new Date()*1) +'.mp4';
     var tmpFile = path.join(tmpDir, tmpFilename);
 
+    // Set new video ID
     videos_last_id++;
     var video_id = videos_last_id;
 
@@ -85,9 +88,11 @@ var playTorrent = function (torrent, callback, statsCallback) {
                 fire_start = true;
             }
             if (now < total && !timeout) {
+                // If download choked (no peers), send timeout for restart
                 if (runtime > 40 && !wires.length) {
                     timeout = true;
                 }
+                // Send streaming stats callback
                 typeof statsCallback == 'function' ? statsCallback( percent, fire_start, bytes(swarm.downloadSpeed()), swarm.wires.filter(active).length, wires.length, timeout, video_id) : null;
                 loadedTimeout = setTimeout(checkLoadingStats, 500);
             }
@@ -112,9 +117,11 @@ var playTorrent = function (torrent, callback, statsCallback) {
         }
     })
 
+    // Close video listener
     $(document).on('closeVideo'+video_id, function() {
         if (loadedTimeout) { clearTimeout(loadedTimeout); }
 
+        // Delete video ID
         for (var i in window.videos) {
             if (window.videos[i].id == video_id) {
                 window.videos.splice(i, 1);
@@ -123,7 +130,7 @@ var playTorrent = function (torrent, callback, statsCallback) {
 
         swarm.destroy();
 
-        // Clean dir
+        // Clean dir in tmp cache
         if (fs.existsSync(tmpFile)) {
             fs.readdir(tmpFile, function(err, files) {
                 if (!err) {
@@ -148,6 +155,7 @@ var playTorrent = function (torrent, callback, statsCallback) {
         delete engine;
     });
 
+    // Add new video to array
     videos.push({id: video_id, engine: engine});
 
 };

gulpfile.js

@@ -1,12 +1,8 @@
 var gulp = require('gulp'),
-	notify = require('gulp-notify'),
 	less = require('gulp-less'),
-	minifycss = require('gulp-minify-css'),
-	uglify = require('gulp-uglify'),
     clean = require('gulp-clean'),
     concat = require('gulp-concat'),
-    inject = require("gulp-inject"),
-    rev = require("gulp-rev");
+    inject = require("gulp-inject");
 
 var target_css = './css';
 var target_js = './js';
@@ -21,28 +17,26 @@ var paths = {
 // 1. Injectar referencias al HTML
 gulp.task('inject-index', ['styles', 'scripts', 'clean-tmp'], function() {
 	return gulp.src('./index.html')
-		.pipe(inject(gulp.src([target_css+'/*.css', target_js+'/*.js', '!./js/player.js'], {read:false})))
+		.pipe(inject(gulp.src([target_css+'/*.css', target_js+'/vendor/*.js', target_js+'/*.js', '!./js/player.js'], {read:false})))
 		.pipe(gulp.dest('./'));
 })
 
 gulp.task('inject-player', ['styles', 'scripts', 'clean-tmp'], function() {
 	return gulp.src('./player.html')
-		.pipe(inject(gulp.src([target_css+'/*.css', './js/lib-*.js', './js/player.js'], {read:false})))
+		.pipe(inject(gulp.src([target_css+'/*.css', './js/vendor/*.js', './js/player.js'], {read:false})))
 		.pipe(gulp.dest('./'));
 })
 
 // Estilos (autoprefixer, minify)
 gulp.task('styles', ['clean-old-styles','build-css', 'build-less'], function() {
 	return gulp.src('./assets/tmp/*.css')
 		.pipe(concat('main.css'))
-		.pipe(minifycss())
-   		.pipe(rev())
 		.pipe(gulp.dest(target_css))
 });
 
 // Limpia viejos CSS
 gulp.task('clean-old-styles', function() {
-	return gulp.src(target_css+'/main-*.css', {read:false})
+	return gulp.src(target_css+'/*.css', {read:false})
 		.pipe(clean({force: true}));
 });
 
@@ -70,24 +64,18 @@ gulp.task('clean-tmp', function() {
 // Scripts JS
 gulp.task('scripts', ['clean-old-scripts','vendor-scripts'], function() {
 	return gulp.src(paths.scripts)
-   		// .pipe(concat('main.js'))
-   		// .pipe(uglify())
-   		// .pipe(rev())
 		.pipe(gulp.dest(target_js));
 });
 
 // Limpiar viejos JS
 gulp.task('clean-old-scripts', function() {
-	return gulp.src([target_js+'/main-*.js',target_js+'/lib-*.js'], {read:false})
+	return gulp.src(target_js+'/**/*.js', {read:false})
 		.pipe(clean({force: true}));
 });
 
 gulp.task('vendor-scripts', function() {
   gulp.src(paths.vendorscripts)
-  	.pipe(concat('lib.js'))
-   	.pipe(uglify())
-   	.pipe(rev())
-    .pipe(gulp.dest(target_js));
+    .pipe(gulp.dest(target_js+'/vendor'));
 });
 
 // Watch

index.html

@@ -4,23 +4,8 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
 	<!-- inject:css -->
-	<link rel="stylesheet" href="/css/main-4f4b7fd6.css">
+	<link rel="stylesheet" href="/css/main.css">
 	<!-- endinject -->
-
-	<script type="text/javascript">
-
-	  var _gaq = _gaq || [];
-	  _gaq.push(['_setAccount', 'UA-2752072-3']);
-	  _gaq.push(['_setDomainName', 'none']);
-	  _gaq.push(['_trackPageview', '/app/index']);
-
-	  (function() {
-	    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-	    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-	    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	  })();
-
-	</script>
   </head>
   <body>
 
@@ -221,11 +206,18 @@ <h3>Temporada <span class="number"></span></h3>
 		<ul class="gap"></ul>
 	</div>
 
-    <script src="js/vendor/jquery-2.1.0.min.js"></script>
-    <script src="js/vendor/jquery-ui-1.10.4.custom.min.js"></script>
-
 	<!-- inject:js -->
-	<script src="/js/lib-1f33ad39.js"></script>
+	<script src="/js/vendor/1.1.jquery-2.1.0.min.js"></script>
+	<script src="/js/vendor/1.2.jquery-ui-1.10.4.custom.min.js"></script>
+	<script src="/js/vendor/2.1.jquery.mousewheel.js"></script>
+	<script src="/js/vendor/2.2.jquery.jscrollpane.min.js"></script>
+	<script src="/js/vendor/2.3.jquery.throttle-debounce.js"></script>
+	<script src="/js/vendor/3.moment.lang.js"></script>
+	<script src="/js/vendor/4.md5.js"></script>
+	<script src="/js/vendor/5.1.mediaelement-and-player.js"></script>
+	<script src="/js/vendor/5.2.mejs-feature-fontawesome.js"></script>
+	<script src="/js/vendor/5.3.mep-feature-torrentinfo.js"></script>
+	<script src="/js/vendor/5.4.mejs-feature-customtracks.js"></script>
 	<script src="/js/main.js"></script>
 	<script src="/js/playtorrent.js"></script>
 	<script src="/js/winstate.js"></script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Cuevana",
-  "version": "0.1.0",
+  "version": "0.2",
   "main": "app://cuevana/index.html",
   "window": {
     "title": "Cuevana Storm",
@@ -22,17 +22,13 @@
     "read-torrent": "~0.2.0",
     "magnet-uri": "~1.1.0",
     "numeral": "^1.5.3",
-    "clivas": "^0.1.4"
+    "i18n": "~0.4.1"
   },
   "devDependencies": {
     "gulp": "~3.5.6",
-    "gulp-minify-css": "~0.3.0",
-    "gulp-rev": "~0.3.0",
     "gulp-inject": "~0.4.1",
     "gulp-clean": "~0.2.4",
     "gulp-concat": "~2.2.0",
-    "gulp-uglify": "~0.2.1",
-    "gulp-notify": "~1.2.4",
     "gulp-less": "~1.2.3"
   }
 }

player.html

@@ -4,7 +4,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
 	<!-- inject:css -->
-    <link rel="stylesheet" href="/css/main-4f4b7fd6.css">
+    <link rel="stylesheet" href="/css/main.css">
     <!-- endinject -->
   </head>
   <body>
@@ -39,11 +39,18 @@
 		<div class="foot"><button class="button close">Cerrar</button></div>
 	</div>
 
-    <script src="js/vendor/jquery-2.1.0.min.js"></script>
-    <script src="js/vendor/jquery-ui-1.10.4.custom.min.js"></script>
-
     <!-- inject:js -->
-    <script src="/js/lib-1f33ad39.js"></script>
+    <script src="/js/vendor/1.1.jquery-2.1.0.min.js"></script>
+    <script src="/js/vendor/1.2.jquery-ui-1.10.4.custom.min.js"></script>
+    <script src="/js/vendor/2.1.jquery.mousewheel.js"></script>
+    <script src="/js/vendor/2.2.jquery.jscrollpane.min.js"></script>
+    <script src="/js/vendor/2.3.jquery.throttle-debounce.js"></script>
+    <script src="/js/vendor/3.moment.lang.js"></script>
+    <script src="/js/vendor/4.md5.js"></script>
+    <script src="/js/vendor/5.1.mediaelement-and-player.js"></script>
+    <script src="/js/vendor/5.2.mejs-feature-fontawesome.js"></script>
+    <script src="/js/vendor/5.3.mep-feature-torrentinfo.js"></script>
+    <script src="/js/vendor/5.4.mejs-feature-customtracks.js"></script>
     <script src="/js/player.js"></script>
     <!-- endinject -->
   </body>