X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;ds=sidebyside;f=application%2Fmodels%2Fvideos_model.php;h=922efd490c971d895e122cd5dd9fcbc412ec2252;hb=ad7daf2de4288cff974e97ec9290533ba732df3b;hp=536c92dd3425692a460042ad68cca180cfb44546;hpb=e47a97763d745e654ab60c17a85d794b46734ddf;p=living-lab-site.git
diff --git a/application/models/videos_model.php b/application/models/videos_model.php
index 536c92d..922efd4 100644
--- a/application/models/videos_model.php
+++ b/application/models/videos_model.php
@@ -29,11 +29,13 @@ class Videos_model extends CI_Model {
* @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
+ *
+ * - 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($category_id, $offset, $count)
{
@@ -66,6 +68,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;
@@ -98,17 +103,19 @@ class Videos_model extends CI_Model {
* table. NULL means there is no name provided.
* @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
- * * formats content is moved in assets
- * * assets => list of associative lists where each one represents a
- * video asset having keys: "src", "def" and "ext". Value of key "src" is
- * the video torrent formated as
- * {name}_{format}.{default_video_ext}.{default_torrent_ext}
- * * user_name => TODO: user name from `users` table
- * * 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
+ *
+ * - all columns form DB with some exceptions that are overwritten or new
+ * - 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
+ * - 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
+ *
*/
public function get_video($id, $name = NULL)
{
@@ -134,16 +141,15 @@ class Videos_model extends CI_Model {
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['assets'] as & $asset)
{
- $ext = isset($asset['ext']) ?
- $asset['ext'] : $this->config->item('default_video_ext');
+ $def = substr($asset['res'], strpos($asset['res'], 'x') + 1) . 'p';
$asset['src'] = site_url('data/torrents/'. $video['name'] . '_'
- . $asset['def'] . '.'. $ext
+ . $def . '.'. $asset['ext']
. '.'. $this->config->item('default_torrent_ext'));
}
@@ -156,6 +162,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;
}