Parcourir la source

view video. must be mp4

David il y a 10 ans
Parent
commit
05845acb64
4 fichiers modifiés avec 14 ajouts et 11 suppressions
  1. 1 1
      back/db.py
  2. 9 1
      front/app.js
  3. 3 9
      front/controllers/cutCtrl.js
  4. 1 0
      front/views/cut.html

+ 1 - 1
back/db.py

@@ -36,7 +36,7 @@ class db():
 
 
     def insert_raw_list(self):
     def insert_raw_list(self):
         for fname in os.listdir(RAW_PATH):
         for fname in os.listdir(RAW_PATH):
-            if fname.endswith("flv"):
+            if fname.endswith("mp4"):
                 self.insert_raw(file_info(os.path.join(RAW_PATH,fname)))
                 self.insert_raw(file_info(os.path.join(RAW_PATH,fname)))
 
 
 
 

+ 9 - 1
front/app.js

@@ -9,7 +9,15 @@ app.config(['$routeProvider', '$locationProvider', function ($routeProvider, $lo
 	})
 	})
 	.when('/cut/:id', {
 	.when('/cut/:id', {
 		templateUrl: 'views/cut.html',
 		templateUrl: 'views/cut.html',
-		controller: 'cutCtrl'
+		controller: 'cutCtrl',
+		resolve:{
+			video: function($http,$route) {
+				return $http.get('/back/raw/' + $route.current.params.id).then(
+					function(data) {
+						return data.data; 
+					});
+			}
+			}
 	})
 	})
 	.when('/processed', {
 	.when('/processed', {
 		templateUrl: 'views/processed.html',
 		templateUrl: 'views/processed.html',

+ 3 - 9
front/controllers/cutCtrl.js

@@ -1,14 +1,10 @@
-app.controller('cutCtrl', ['$scope', '$http','$routeParams', function ($scope, $http,$routeParams) {
+app.controller('cutCtrl', function ($scope, $http,video) {
 	$scope.inicio=0;
 	$scope.inicio=0;
 	$scope.fin=0;
 	$scope.fin=0;
 	$scope.curso="";
 	$scope.curso="";
 	$scope.desc="";
 	$scope.desc="";
+	$scope.video = video; 
 
 
-	$scope.update = function() {
-		$http.get('/back/raw/' + $routeParams.id).success(function(data) {
-	   		$scope.video = data; 
-		});
-	};
 	$scope.post = function() {
 	$scope.post = function() {
 		var data = {
 		var data = {
 					curso: $scope.curso,
 					curso: $scope.curso,
@@ -23,7 +19,5 @@ app.controller('cutCtrl', ['$scope', '$http','$routeParams', function ($scope, $
 			});
 			});
 	};
 	};
 
 
-	$scope.update();
-
-}]);
+});
 
 

+ 1 - 0
front/views/cut.html

@@ -4,6 +4,7 @@
 		<div class="col-md-6">
 		<div class="col-md-6">
 			<video width="100%" controls preload>
 			<video width="100%" controls preload>
 				<source src="{{video.file}}" type="video/mp4"> 
 				<source src="{{video.file}}" type="video/mp4"> 
+				Error. Video no soportado
 			</video>
 			</video>
 		</div>
 		</div>
 		<div class="col-md-6">
 		<div class="col-md-6">