X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fmodels%2Fvideos_model.php;h=5c975914ab3d5a1ccfd8be934deb9138325efaa8;hb=9e326b335014eac0c6c6476402654b19c57a396f;hp=afd8ca37f64f6ea42193977565fbc31cebeeb7a4;hpb=c3cb1c599db718a4fd81c7df57850fced9f64c02;p=living-lab-site.git

diff --git a/application/models/videos_model.php b/application/models/videos_model.php
index afd8ca3..5c97591 100644
--- a/application/models/videos_model.php
+++ b/application/models/videos_model.php
@@ -66,6 +66,9 @@ class Videos_model extends CI_Model {
 			// Ellipsized title
 			//$video['shorted_title'] = ellipsize($video['title'], 45, 0.75);
 			$video['shorted_title'] = character_limiter($video['title'], 50);
+			
+			// TODO: user information
+			$video['user_name'] = 'TODO';
 		}
 		
 		return $videos;
@@ -99,10 +102,12 @@ class Videos_model extends CI_Model {
 	 * @return		array	an associative list with information about a video
 	 * with the following keys:
 	 *   * all columns form DB with some exceptions that are overwritten or new
-	 *   * url => list of URLs for the video torrents formated as
-	 * {name}_{format}.{default_video_ext}.{default_torrent_ext}
+	 *   * formats content is moved in assets
+	 *   * assets => list of associative lists where each one represents a
+	 * video asset having keys: "src", "res", "par" and "ext". Value of key
+	 * "src" is the video torrent formated as
+	 * {name}_{format}.{video_ext}.{default_torrent_ext}
 	 *   * user_name => TODO: user name from `users` table
-	 *   * formats => list of formats like 1080p
 	 *   * category_title => a human-friendly category name
 	 *   * tags => associative list of "tag => score"
 	 *   * date => date and time when the video was created
@@ -128,19 +133,19 @@ class Videos_model extends CI_Model {
 		}
 		
 		// Convert JSON encoded string to arrays.
-		$video['formats'] = json_decode($video['formats'], TRUE);
+		$video['assets'] = json_decode($video['formats'], TRUE);
+		unset($video['formats']);
 		$video['tags'] = json_decode($video['tags'], TRUE);
 		asort($video['tags']);
-		$video['tags'] = array_reverse($video['tags'], true);
+		$video['tags'] = array_reverse($video['tags'], TRUE);
 		
 		// Torrents
 		$video['url'] = array();
-		foreach ($video['formats'] as $format)
+		foreach ($video['assets'] as & $asset)
 		{
-			$ext = isset($format['ext']) ? 
-				$format['ext'] : $this->config->item('default_video_ext');
- 			$video['url'][] = site_url('data/torrents/'. $video['name'] . '_'
- 				. $format['def'] . '.'. $ext
+			$def = substr($asset['res'], strpos($asset['res'], 'x') + 1) . 'p';
+ 			$asset['src'] = site_url('data/torrents/'. $video['name'] . '_'
+ 				. $def . '.'. $asset['ext']
  				. '.'. $this->config->item('default_torrent_ext'));
 		}
 		
@@ -153,6 +158,9 @@ class Videos_model extends CI_Model {
 		// Thumbnails
 		$video['thumbs'] = $this->get_thumbs($video['name'], $video['thumbs_count']);
 		
+		// TODO: user information
+		$video['user_name'] = 'TODO';
+		
 		return $video;
 	}