X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fmodels%2Fvideos_model.php;h=3a5ab05c86a39aa25e0d28f4ccfdb68d43b93fca;hb=74d7b5848a42e30e669cc05db22e83396b3cc107;hp=0ae47b1fe8e0ff4d1a7612dcfe1c55927524ffe7;hpb=6c67c9d74550575fbc96be0baad42260c2dbcb6a;p=living-lab-site.git

diff --git a/application/models/videos_model.php b/application/models/videos_model.php
index 0ae47b1..3a5ab05 100644
--- a/application/models/videos_model.php
+++ b/application/models/videos_model.php
@@ -15,9 +15,9 @@ class Videos_model extends CI_Model {
 		{
 			$this->load->library('singleton_db');
 			$this->db = $this->singleton_db->connect();
-			
-			$this->load->helper('url');
 		}
+		
+		$this->load->helper('url');
 	}
 	
 	/**
@@ -25,34 +25,67 @@ class Videos_model extends CI_Model {
 	 * displayed in the catalog.
 	 *
 	 * TODO: filter, limit, ordering parameters
+	 * @param		int $category_id	DB category ID
+	 * @param		int $offset
+	 * @param		int $count
 	 * @return		array	a list of videos, each one being an assoc array with:
 	 *   * id, name, title, duration, thumbs_count, default_thumb, views => from DB
+	 *   * shorted_title => ellipsized title
 	 *   * video_url => P2P-Tube video URl
 	 *   * TODO: user_id, user_name
 	 *   * thumbs => thumbnail images' URLs
 	 */
-	public function get_videos_summary()
+	public function get_videos_summary($category_id, $offset, $count)
 	{
+		$this->load->helper('text');
+		
 		$query = $this->db->query(
 			'SELECT id, name, title, duration, user_id, views, thumbs_count,
 				default_thumb
-			FROM `videos`');
-		$videos = $query->result_array();
+			FROM `videos`
+			WHERE category_id = ?
+			ORDER BY name
+			LIMIT ?, ?', // TODO summary order 
+			array(intval($category_id), $offset, $count)); 
+		
+		if ($query->num_rows() > 0)
+			$videos = $query->result_array();
+		else
+			return NULL;
 		
 		foreach ($videos as & $video)
 		{
 			// P2P-Tube Video URL
-			$video['video_url'] = site_url(sprintf("video/watch/%d/%s",
+			$video['video_url'] = site_url(sprintf("watch/%d/%s",
 				$video['id'], $video['name']));
 			
 			// Thumbnails
 			$video['thumbs'] = $this->get_thumbs($video['name'], 
 				$video['thumbs_count']);
+				
+			// Ellipsized title
+			//$video['shorted_title'] = ellipsize($video['title'], 45, 0.75);
+			$video['shorted_title'] = character_limiter($video['title'], 50);
 		}
 		
 		return $videos;
 	}
 	
+	public function get_videos_count($category_id)
+	{
+		$query = $this->db->query(
+			'SELECT COUNT(*) count
+			FROM `videos`
+			WHERE category_id = ?',
+			$category_id);
+		
+		if ($query->num_rows() > 0)
+			return $row = $query->row()->count;
+		
+		// Error
+		return NULL;
+	}
+	
 	/**
 	 * Retrieves information about a video.
 	 *
@@ -66,11 +99,13 @@ 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
-	 *   * torrents => list of torrent file names 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_name => TODO: human-friendly category name
+	 *   * category_title => a human-friendly category name
 	 *   * tags => associative list of "tag => score"
 	 *   * date => date and time when the video was created
 	 *   * thumbs => thumbnail images' URLs
@@ -95,22 +130,28 @@ 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['torrents'] = array();
-		foreach ($video['formats'] as $format)
+		$video['url'] = array();
+		foreach ($video['assets'] as & $asset)
 		{
-			$ext = isset($format['ext']) ? 
-				$format['ext'] : $this->config->item('default_video_ext');
- 			$video['torrents'][] = 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'));
 		}
 		
+		// Category title
+		$categories = $this->config->item('categories');
+		$category_name = $categories[ intval($video['category_id']) ];
+		$video['category_title'] = $category_name ?
+			$this->lang->line("ui_categ_$category_name") : $category_name;
+		
 		// Thumbnails
 		$video['thumbs'] = $this->get_thumbs($video['name'], $video['thumbs_count']);