API+File: a special object for the fileWrappers

Author: mr21

api/file.js

@@ -0,0 +1,36 @@
+"use strict";
+
+(function() {
+
+var
+	extText = "srt-vtt",
+	extMedia = "mp3-mp4-mpeg-ogg-wav-webm-mpg-weba-ogm"
+;
+
+api.file = function( file ) {
+	var
+		name = file.name,
+		ind = name.lastIndexOf( "." ),
+		ext = name.substr( ind + 1 ).toLowerCase()
+	;
+
+	this.dataFile = file;
+	this.name = name.substr( 0, ind ),
+	this.extension = ext;
+	this.isText = extText.indexOf( ext ) > -1;
+	this.isMedia = extMedia.indexOf( ext ) > -1;
+	this.mediaType = file.type.substr( 0, file.type.indexOf( "/" ) );7
+};
+
+api.file.prototype = {
+	createURL: function() {
+		this.url = URL.createObjectURL( this.dataFile );
+		return this;
+	},
+	revokeURL: function() {
+		URL.revokeObjectURL( this.url );
+		return this;
+	}
+};
+
+})();

api/playlist.js

@@ -22,34 +22,24 @@ api.playlist = that = {
 		var
 			jqFilesAdded,
 			fMediaWraps = [],
-			fTextWraps = [],
-			extText = "srt-vtt",
-			extMedia = "mp3-mp4-mpeg-ogg-wav-webm-mpg-weba-ogm"
+			fTextWraps = []
 		;
 
 		$.each( files, function() {
 			var
-				name = this.name,
-				ind = name.lastIndexOf( "." ),
-				ext = name.substr( ind + 1 ).toLowerCase(),
-				debug = "[" + this.type + "] [" + ext + "]",
-				fileWrapper = {
-					file: this,
-					extension: ext,
-					name: name.substr( 0, ind ),
-					type: this.type.substr( 0, this.type.indexOf( "/" ) )
-				}
+				fileWrapper = new api.file( this ),
+				ext = fileWrapper.extension,
+				debug = "[" + fileWrapper.dataFile.type + "] [" + ext + "]"
 			;
-
-			if ( extMedia.indexOf( ext ) > -1 ) {
+			lg(fileWrapper)
+			if ( fileWrapper.isMedia ) {
 				fMediaWraps.push( fileWrapper );
-			} else if ( extText.indexOf( ext ) > -1 ) {
+			} else if ( fileWrapper.isText ) {
 				fTextWraps.push( fileWrapper );
 			} else {
 				lg( "DROP: not supported: " + debug );
 				return;
 			}
-
 			lg( "DROP: supported: " + debug );
 		});
 
@@ -115,18 +105,18 @@ api.playlist = that = {
 		} else {
 			var fWrap = elFile.fileWrapper;
 
-			fWrap.url = URL.createObjectURL( fWrap.file );
+			fWrap.createURL();
 			if ( jqFileSelected.length && jqFileSelected[ 0 ] !== elFile ) {
-				URL.revokeObjectURL( jqFileSelected[ 0 ].fileWrapper.url );
+				jqFileSelected[ 0 ].fileWrapper.revokeURL();
 				playlistUI.highlight( jqFileSelected, false );
 			}
 			playlistUI
 				.highlight( elFile.jqThis, true )
 				.updateIndex()
 			;
 			api.subtitles.disable();
-			if ( fWrap.type !== fileWrapper.type ) {
-				api.visualisations.toggle( fWrap.type === "audio" );
+			if ( fWrap.mediaType !== fileWrapper.mediaType ) {
+				api.visualisations.toggle( fWrap.mediaType === "audio" );
 				fileWrapper = fWrap;
 			}
 			if ( !noScroll ) {

api/subtitles.js

@@ -93,7 +93,7 @@ api.subtitles = that = {
 				src: blob.url,
 				srclang: "en",
 				label: "Subtitles " + ( tracksLen + 1 ),
-				name: fileWrapper.file.name,
+				name: fileWrapper.dataFile.name,
 			})
 				.appendTo( dom.screenVideo )
 				.on( "load", ( function( len ) {
@@ -111,7 +111,7 @@ api.subtitles = that = {
 
 			// Add file name in subtitles list
 			$( "<li>", {
-				text: fileWrapper.file.name,
+				text: fileWrapper.dataFile.name,
 				"class": "selected"
 			})
 				.appendTo( jqListSubtitles )
@@ -135,7 +135,7 @@ api.subtitles = that = {
 			}
 		};
 
-		reader.readAsText( fileWrapper.file );
+		reader.readAsText( fileWrapper.dataFile );
 
 		return that;
 	},

api/video.js

@@ -19,15 +19,15 @@ api.video = that = {
 	unLoad: function() {
 		isLoaded = false;
 		jqVideo.attr( "src", "" );
-		if ( api.playlist.selectedFile().type === "video" ) {
+		if ( api.playlist.selectedFile().mediaType === "video" ) {
 			jqVideoThumb.attr( "src", "" );
 		}
 		return that;
 	},
 	load: function( url ) {
 		oldSource = url;
 		jqVideo.attr( "src", url );
-		jqVideoThumb.attr( "src", api.playlist.selectedFile().type === "video" ? url : "" );
+		jqVideoThumb.attr( "src", api.playlist.selectedFile().mediaType === "video" ? url : "" );
 		isLoading = true;
 		return that;
 	},

index.html

@@ -196,6 +196,7 @@
 
 <!-- API (no DOM treatment here) -->
 <script src="api/main.js"></script>
+<script src="api/file.js"></script>
 <script src="api/fullscreen.js"></script>
 <script src="api/keyboard.js"></script>
 <script src="api/playlist.js"></script>

player/events/thumbnail.js

@@ -52,7 +52,7 @@ jqSliderTime
 					"data-tooltip-content",
 					utils.secondsToString( sec )
 				);
-				if ( api.playlist.selectedFile().type === "video" ) {
+				if ( api.playlist.selectedFile().mediaType === "video" ) {
 					loading( true );
 					if ( elVideo.paused ) {
 						elVideo.play();

player/player-ui.js

@@ -59,7 +59,7 @@ window.playerUI = that = {
 		var file = api.playlist.selectedFile();
 		dom.fileplayer
 			.removeClass( "audio video" )
-			.addClass( "playing " + file.type )
+			.addClass( "playing " + file.mediaType )
 		;
 		dom.screenFilenameText
 			.add( dom.title )

playlist/playlist-ui.js

@@ -180,7 +180,7 @@ window.playlistUI = that = {
 					"<a class='file' href='/' draggable='true'>" +
 						"<div class='content textOverflow'>"+
 							"<i class='fa fa-fw fa-" +
-								( this.type === "audio" ? "music" : "film" ) +
+								( this.mediaType === "audio" ? "music" : "film" ) +
 							"'></i>" +
 							"<span>" + this.name + "</span>" +
 						"</div>" +