diff options
| -rw-r--r-- | lib/class/catalog.class.php | 3 | ||||
| -rw-r--r-- | lib/class/vainfo.class.php | 3 | ||||
| -rw-r--r-- | lib/class/video.class.php | 3 | ||||
| -rw-r--r-- | templates/show_video_row.inc.php | 3 | ||||
| -rw-r--r-- | templates/show_videos.inc.php | 10 |
5 files changed, 21 insertions, 1 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 1cdddba3..8bd29204 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -2214,9 +2214,10 @@ class Catalog { $tag_name = vainfo::get_tag_type($vainfo->tags); $results = vainfo::clean_tag_info($vainfo->tags,$tag_name,$file); + $file = Dba::escape($file); $catalog_id = Dba::escape($this->id); - $title = Dba::escape(basename($file)); + $title = Dba::escape($results['title']); $vcodec = $results['video_codec']; $acodec = $results['audio_codec']; $rezx = $results['resolution_x']; diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php index 8e78bb97..ffbd1b92 100644 --- a/lib/class/vainfo.class.php +++ b/lib/class/vainfo.class.php @@ -608,6 +608,9 @@ class vainfo { $array = array(); + $info = pathinfo($this->filename); + + $array['title'] = $info['filename']; $array['video_codec'] = $tags['video']['fourcc']; $array['audio_codec'] = $tags['audio']['dataformat']; $array['resolution_x'] = $tags['video']['resolution_x']; diff --git a/lib/class/video.class.php b/lib/class/video.class.php index a19558b1..4bdd1a51 100644 --- a/lib/class/video.class.php +++ b/lib/class/video.class.php @@ -50,6 +50,9 @@ class Video extends database_object { $this->f_title = scrub_out($this->title); $this->f_link = scrub_out($this->title); + $this->f_codec = $this->video_codec . ' / ' . $this->audio_codec; + $this->f_resolution = $this->resolution_x . 'x' . $this->resolution_y; + $this->f_tags = ''; } // format diff --git a/templates/show_video_row.inc.php b/templates/show_video_row.inc.php index 16fed284..5618a60d 100644 --- a/templates/show_video_row.inc.php +++ b/templates/show_video_row.inc.php @@ -23,3 +23,6 @@ <?php echo Ajax::button('?action=basket&type=video&id=' . $video->id,'add',_('Add'),'add_video_' . $video->id); ?> </td> <td class="cel_title"><?php echo $video->f_title; ?></td> +<td class="cel_codec"><?php echo $video->f_codec; ?></td> +<td class="cel_resolution"><?php echo $video->f_resolution; ?></td> +<td class="cel_tags"><?php $video->f_tags; ?></td> diff --git a/templates/show_videos.inc.php b/templates/show_videos.inc.php index cad7ea19..b58f741d 100644 --- a/templates/show_videos.inc.php +++ b/templates/show_videos.inc.php @@ -26,10 +26,16 @@ $web_path = Config::get('web_path'); <colgroup> <col id="col_add" /> <col id="col_title" /> + <col id="col_codec" /> + <col id="col_resolution" /> + <col id="col_tags" /> </colgroup> <tr class="th-top"> <th class="cel_add"><?php echo _('Add'); ?></th> <th class="cel_title"><?php echo _('Title'); ?></th> + <th class="cel_codec"><?php echo _('Codec'); ?></th> + <th class="cel_resolution"><?php echo _('Resolution'); ?></th> + <th class="cel_tags"><?php echo _('Tags'); ?></th> </tr> <?php /* Foreach through every artist that has been passed to us */ @@ -49,6 +55,10 @@ foreach ($object_ids as $video_id) { <tr class="th-bottom"> <th class="cel_add"><?php echo _('Add'); ?></th> <th class="cel_title"><?php echo _('Title'); ?></th> + <th class="cel_codec"><?php echo _('Codec'); ?></th> + <th class="cel_resolution"><?php echo _('Resolution'); ?></th> + <th class="cel_tags"><?php echo _('Tags'); ?></th> + </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> |