yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00
Code Issues Releases Wiki Activity

Improve video browsing and metadata parsing

Browse source 
Add TheMovieDB metadata plugin
This commit is contained in:
Afterster 2014-07-06 00:54:48 +02:00
parent d5d84d6462
commit 3fc08b17d4
64 changed files with 1506 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/catalog.php
View file

@ -275,7 +275,7 @@ switch ($_REQUEST['action']) {
$catalog->format();
require_once AmpConfig::get('prefix') . '/templates/show_edit_catalog.inc.php';
break;
case 'gather_album_art':
case 'gather_media_art':
toggle_visible('ajax-loading');
ob_end_flush();
@ -289,7 +289,7 @@ switch ($_REQUEST['action']) {
$catalog->gather_art();
}
$url = AmpConfig::get('web_path') . '/admin/catalog.php';
$title = T_('Album Art Search Finished');
$title = T_('Media Art Search Finished');
$body = '';
show_confirmation($title,$body,$url);
break;

4
bin/catalog_update.inc
View file

@ -127,8 +127,8 @@ while ($row = Dba::fetch_row($db_results)) {
$catalog->add_to_catalog($options);
echo "----------------\n\n";
} elseif ($artadd == 1) {
// Look for album art
echo T_('Starting Album Art Search');
// Look for media art
echo T_('Starting Media Art Search');
echo "\n";
$catalog->gather_art();
echo "----------------\n\n";

1
bin/sort_files.inc
View file

@ -65,7 +65,6 @@ while ($r = Dba::fetch_row($db_results)) {
foreach ($songs as $song) {
/* Find this poor song a home */
$song->format();
$song->format_pattern();
$directory = sort_find_home($song,$catalog->sort_pattern,$catalog->path);
$filename = $song->f_file;
$fullpath = $directory . "/" . $filename;

11
browse.php
View file

@ -53,6 +53,8 @@ switch ($_REQUEST['action']) {
case 'tvshow_season':
case 'tvshow_episode':
case 'movie':
case 'clip':
case 'personal_video':
$browse->set_type($_REQUEST['action']);
$browse->set_simple_browse(true);
break;
@ -156,17 +158,12 @@ switch ($_REQUEST['action']) {
$browse->show_objects();
break;
case 'tvshow_episode':
if (AmpConfig::get('catalog_disable')) {
$browse->set_filter('catalog_enabled', '1');
}
$browse->set_sort('title','ASC');
$browse->show_objects();
break;
case 'movie':
case 'clip':
case 'personal_video':
if (AmpConfig::get('catalog_disable')) {
$browse->set_filter('catalog_enabled', '1');
}
$browse->set_sort('title','ASC');
$browse->show_objects();
break;
default:

13
config/ampache.cfg.php.dist
View file

@ -7,7 +7,7 @@
; if this config file is up to date
; this is compared against a value hard-coded
; into the init script
config_version = 16
config_version = 17
;###################
; Path Vars #
@ -128,7 +128,7 @@ catalog_file_pattern = "mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx|ra|ape|s
; You can specify any file extension you want in here seperating them with
; a | but ampache may not be able to parse them
; DEAFULT: avi|mpg|flv|m4v|webm
catalog_video_pattern = "avi|mpg|flv|m4v|webm"
catalog_video_pattern = "avi|mpg|flv|m4v|webm|mkv"
; Playlist Pattern
; This defines which playlist types Ampache will attempt to catalog
@ -266,7 +266,14 @@ getid3_tag_order = "id3v2,id3v1,vorbiscomment,quicktime,matroska,ape,asf,avi,mpe
; POSSIBLE VALUES (builtins): filename and getID3
; POSSIBLE VALUES (plugins): MusicBrainz, plus any others you've installed.
; DEFAULT: getID3 filename
metadata_order = "getID3,filename,MusicBrainz,TMDb"
metadata_order = "getID3,filename"
; This determines the order in which metadata sources are used (and in the
; case of plugins, checked) for video files
; POSSIBLE VALUES (builtins): filename and getID3
; POSSIBLE VALUES (plugins): Tmdb, plus any others you've installed.
; DEFAULT: filename getID3
metadata_order_video = "filename,getID3"
; Un comment if don't want ampache to follow symlinks
; DEFAULT: false

3
lib/class/artist.class.php
View file

@ -102,7 +102,8 @@ class Artist extends database_object
Dba::write('DELETE FROM `artist` USING `artist` LEFT JOIN `song` ON `song`.`artist` = `artist`.`id` ' .
'LEFT JOIN `song` AS `song2` ON `song2`.`album_artist` = `artist`.`id` ' .
'LEFT JOIN `wanted` ON `wanted`.`artist` = `artist`.`id` ' .
'WHERE `song`.`id` IS NULL AND `song2`.`id` IS NULL AND `wanted`.`id` IS NULL');
'LEFT JOIN `clip` ON `clip`.`artist` = `artist`.`id` ' .
'WHERE `song`.`id` IS NULL AND `song2`.`id` IS NULL AND `wanted`.`id` IS NULL AND `clip`.`id` IS NULL');
}
/**

16
lib/class/browse.class.php
View file

@ -245,11 +245,23 @@ class Browse extends Query
break;
case 'tvshow_episode':
$box_title = T_('Episodes');
$box_req = AmpConfig::get('prefix') . '/templates/show_tvshow_episodes.inc.php';
$video_type = 'TVShow_Episode';
$box_req = AmpConfig::get('prefix') . '/templates/show_videos.inc.php';
break;
case 'movie':
$box_title = T_('Movies');
$box_req = AmpConfig::get('prefix') . '/templates/show_movies.inc.php';
$video_type = 'Movie';
$box_req = AmpConfig::get('prefix') . '/templates/show_videos.inc.php';
break;
case 'clip':
$box_title = T_('Clips');
$video_type = 'Clip';
$box_req = AmpConfig::get('prefix') . '/templates/show_videos.inc.php';
break;
case 'personal_video':
$box_title = T_('Personal Videos');
$video_type = 'Personal_Video';
$box_req = AmpConfig::get('prefix') . '/templates/show_videos.inc.php';
break;
default:
// Rien a faire

51
lib/class/catalog.class.php
View file

@ -398,10 +398,9 @@ abstract class Catalog extends database_object
*/
public static function get_stats($catalog_id = null)
{
$results = self::count_songs($catalog_id);
$results = self::count_medias($catalog_id);
$results = array_merge(User::count(), $results);
$results['tags'] = self::count_tags();
$results['videos'] = self::count_videos($catalog_id);
$hours = floor($results['time'] / 3600);
@ -431,6 +430,7 @@ abstract class Catalog extends database_object
$type = $data['type'];
$rename_pattern = $data['rename_pattern'];
$sort_pattern = $data['sort_pattern'];
$gather_types = $data['gather_media'];
$insert_id = 0;
$filename = AmpConfig::get('prefix') . '/modules/catalog/' . $type . '.catalog.php';
@ -438,12 +438,13 @@ abstract class Catalog extends database_object
if ($include) {
$sql = 'INSERT INTO `catalog` (`name`, `catalog_type`, ' .
'`rename_pattern`, `sort_pattern`) VALUES (?, ?, ?, ?)';
'`rename_pattern`, `sort_pattern`, `gather_types`) VALUES (?, ?, ?, ?, ?)';
Dba::write($sql, array(
$name,
$type,
$rename_pattern,
$sort_pattern
$sort_pattern,
$gather_types
));
$insert_id = Dba::insert_id();
@ -465,16 +466,16 @@ abstract class Catalog extends database_object
return $insert_id;
}
public static function insert_video($id, $gtypes, $results) {
public static function insert_video($gtypes, $results)
{
if (count($gtypes) > 0) {
$gtype = $gtypes[0];
switch ($gtype) {
case 'tvshow':
TVShow::insert($id, $results);
TVShow_Episode::insert($results);
break;
case 'movie':
Movie::insert($id, $results);
Movie::insert($results);
break;
default:
// Do nothing, video entry already created and no additional data for now
@ -483,23 +484,6 @@ abstract class Catalog extends database_object
}
}
/**
* count_videos
*
* This returns the current number of video files in the database.
*/
public static function count_videos($id = null)
{
$sql = 'SELECT COUNT(`id`) FROM `video` ';
if ($id) {
$sql .= 'WHERE `catalog` = ?';
}
$db_results = Dba::read($sql, $id ? array($id) : null);
$row = Dba::fetch_assoc($db_results);
return $row[0];
}
/**
* count_tags
*
@ -516,25 +500,32 @@ abstract class Catalog extends database_object
}
/**
* count_songs
* count_medias
*
* This returns the current number of songs, albums, and artists
* This returns the current number of songs, videos, albums, and artists
* in this catalog.
*/
public static function count_songs($id = null)
public static function count_medias($id = null)
{
$where_sql = $id ? 'WHERE `catalog` = ?' : '';
$params = $id ? array($id) : null;
$sql = 'SELECT COUNT(`id`), SUM(`time`), SUM(`size`) FROM `song` ' .
$where_sql;
$db_results = Dba::read($sql, $params);
$data = Dba::fetch_row($db_results);
$songs = $data[0];
$time = $data[1];
$size = $data[2];
$sql = 'SELECT COUNT(`id`), SUM(`time`), SUM(`size`) FROM `video` ' .
$where_sql;
$db_results = Dba::read($sql, $params);
$data = Dba::fetch_row($db_results);
$videos = $data[0];
$time += $data[1];
$size += $data[2];
$sql = 'SELECT COUNT(DISTINCT(`album`)) FROM `song` ' . $where_sql;
$db_results = Dba::read($sql, $params);
$data = Dba::fetch_row($db_results);
@ -557,6 +548,7 @@ abstract class Catalog extends database_object
$results = array();
$results['songs'] = $songs;
$results['videos'] = $videos;
$results['albums'] = $albums;
$results['artists'] = $artists;
$results['playlists'] = $playlists;
@ -1187,6 +1179,7 @@ abstract class Catalog extends database_object
Song::gc();
Album::gc();
Artist::gc();
Video::gc();
Art::gc();
Stats::gc();
Rating::gc();

114
lib/class/clip.class.php Normal file
View file

@ -0,0 +1,114 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
class Clip extends Video
{
public $artist;
public $song;
public $video;
public $f_artist;
public $f_song;
/**
* Constructor
* This pulls the clip information from the database and returns
* a constructed object
*/
public function __construct($id)
{
parent::__construct($id);
$info = $this->get_info($id);
foreach ($info as $key=>$value) {
$this->$key = $value;
}
return true;
} // Constructor
/**
* gc
*
* This cleans out unused clips
*/
public static function gc()
{
$sql = "DELETE FROM `clip` USING `clip` LEFT JOIN `video` ON `video`.`id` = `clip`.`id` " .
"WHERE `video`.`id` IS NULL";
Dba::write($sql);
}
/**
* create
* This takes a key'd array of data as input and inserts a new clip entry, it returns the record id
*/
public static function insert($data)
{
$sql = "INSERT INTO `clip` (`id`,`artist`,`song`) " .
"VALUES (?, ?, ?)";
Dba::write($sql, array($data['id'], $data['artist'], $data['song']));
return $data['id'];
} // create
/**
* update
* This takes a key'd array of data as input and updates a clip entry
*/
public static function update($data)
{
$sql = "UPDATE `clip` SET `artist` = ?, `song` = ? WHERE `id` = ?";
Dba::write($sql, array($data['artist'], $data['song'], $data['id']));
return true;
} // update
/**
* format
* this function takes the object and reformats some values
*/
public function format()
{
parent::format();
if ($this->artist) {
$artist = new Artist($this->artist);
$artist->format();
$this->f_artist = $artist->f_link;
}
if ($this->song) {
$song = new Song($this->song);
$song->format();
$this->f_song = $song->f_link;
}
return true;
} //format
} // Clip class

2
lib/class/daap_api.class.php
View file

@ -262,7 +262,7 @@ class Daap_Api
$r = self::tlv('dmap.itemid', 1);
$r .= self::tlv('dmap.itemname', 'Ampache');
$counts = Catalog::count_songs();
$counts = Catalog::count_medias();
$r .= self::tlv('dmap.itemcount', $counts['songs']);
$r .= self::tlv('dmap.containercount', count(Playlist::get_playlists()));
$r = self::tlv('dmap.listingitem', $r);

40
lib/class/movie.class.php
View file

@ -27,9 +27,6 @@ class Movie extends Video
public $year;
public $video;
public $f_link;
public $f_date;
/**
* Constructor
* This pulls the movie information from the database and returns
@ -49,16 +46,28 @@ class Movie extends Video
} // Constructor
/**
* create
* This takes a key'd array of data as input and inserts a new movie entry, it returns the auto_inc id
* gc
*
* This cleans out unused movies
*/
public static function create($data)
public static function gc()
{
$sql = "INSERT INTO `movie` (`id`, `name`,`original_name`,`description`, `year`, `release_date`) " .
"VALUES (?, ?, ?, ?, ?, ?)";
Dba::write($sql, array($data['id'], $data['name'], $data['original_name'], $data['description'], $data['year'], $data['release_date']));
$sql = "DELETE FROM `movie` USING `movie` LEFT JOIN `video` ON `video`.`id` = `movie`.`id` " .
"WHERE `video`.`id` IS NULL";
Dba::write($sql);
}
return $insert_id;
/**
* create
* This takes a key'd array of data as input and inserts a new movie entry, it returns the record id
*/
public static function insert($data)
{
$sql = "INSERT INTO `movie` (`id`,`original_name`,`description`, `year`) " .
"VALUES (?, ?, ?, ?)";
Dba::write($sql, array($data['id'], $data['original_name'], $data['description'], $data['year']));
return $data['id'];
} // create
@ -68,12 +77,12 @@ class Movie extends Video
*/
public static function update($data)
{
$sql = "UPDATE `movie` SET `name` = ?, `original_name` = ?, `description` = ?, `year` = ?, `release_date` = ? WHERE `id` = ?";
Dba::write($sql, array($data['name'], $data['original_name'], $data['description'], $data['year'], $data['release_date'], $data['id']));
$sql = "UPDATE `movie` SET `original_name` = ?, `description` = ?, `year` = ? WHERE `id` = ?";
Dba::write($sql, array($data['original_name'], $data['description'], $data['year'], $data['id']));
return true;
} // create
} // update
/**
* format
@ -83,8 +92,11 @@ class Movie extends Video
public function format()
{
parent::format();
$this->f_link = '<a href="' . $this->link . '">' . ($this->original_name ?: $this->f_title) . '</a>';
return true;
} //format
} // License class
} // Movie class

103
lib/class/personal_video.class.php Normal file
View file

@ -0,0 +1,103 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
class Personal_Video extends Video
{
public $location;
public $description;
public $video;
public $f_location;
/**
* Constructor
* This pulls the personal video information from the database and returns
* a constructed object
*/
public function __construct($id)
{
parent::__construct($id);
$info = $this->get_info($id);
foreach ($info as $key=>$value) {
$this->$key = $value;
}
return true;
} // Constructor
/**
* gc
*
* This cleans out unused personal videos
*/
public static function gc()
{
$sql = "DELETE FROM `personal_video` USING `personal_video` LEFT JOIN `video` ON `video`.`id` = `personal_video`.`id` " .
"WHERE `video`.`id` IS NULL";
Dba::write($sql);
}
/**
* create
* This takes a key'd array of data as input and inserts a new personal video entry, it returns the record id
*/
public static function insert($data)
{
$sql = "INSERT INTO `personal_video` (`id`,`location`,`description`) " .
"VALUES (?, ?, ?)";
Dba::write($sql, array($data['id'], $data['location'], $data['description']));
return $data['id'];
} // create
/**
* update
* This takes a key'd array of data as input and updates a personal video entry
*/
public static function update($data)
{
$sql = "UPDATE `personal_video` SET `location` = ?, `description` = ? WHERE `id` = ?";
Dba::write($sql, array($data['location'], $data['description'], $data['id']));
return true;
} // update
/**
* format
* this function takes the object and reformats some values
*/
public function format()
{
parent::format();
$this->f_location = $this->location;
return true;
} //format
} // Personal_Video class

2
lib/class/preference.class.php
View file

@ -363,7 +363,7 @@ class Preference extends database_object
public static function fix_preferences($results)
{
$arrays = array('auth_methods', 'getid3_tag_order',
'metadata_order', 'art_order', 'amazon_base_urls');
'metadata_order', 'metadata_order_video', 'art_order', 'amazon_base_urls');
foreach ($arrays as $item) {
$results[$item] = trim($results[$item])

124
lib/class/query.class.php
View file

@ -310,7 +310,24 @@ class Query
'title',
'resolution',
'length',
'codec'
'codec',
'release_date'
),
'clip' => array(
'title',
'artist',
'resolution',
'length',
'codec',
'release_date'
),
'personal_video' => array(
'title',
'location',
'resolution',
'length',
'codec',
'release_date'
)
);
}
@ -652,6 +669,8 @@ class Query
case 'tvshow_season':
case 'tvshow_episode':
case 'movie':
case 'personal_video':
case 'clip':
// Set it
$this->_state['type'] = $type;
$this->set_base_sql(true, $custom_base);
@ -969,6 +988,14 @@ class Query
$this->set_select("`movie`.`id`");
$sql = "SELECT %%SELECT%% FROM `movie` ";
break;
case 'clip':
$this->set_select("`clip`.`id`");
$sql = "SELECT %%SELECT%% FROM `clip` ";
break;
case 'personal_video':
$this->set_select("`personal_video`.`id`");
$sql = "SELECT %%SELECT%% FROM `personal_video` ";
break;
case 'playlist_song':
case 'song':
default:
@ -1720,17 +1747,8 @@ class Query
break;
case 'video':
switch ($field) {
case 'title':
$sql = "`video`.`title`";
break;
case 'resolution':
$sql = "`video`.`resolution_x`";
break;
case 'length':
$sql = "`video`.`time`";
break;
case 'codec':
$sql = "`video`.`video_codec`";
default:
$sql = $this->sql_sort_video('video', $field);
break;
} // end switch
break;
@ -1852,22 +1870,6 @@ class Query
break;
case 'tvshow_episode':
switch ($field) {
case 'title':
$sql = "`video`.`title`";
$this->set_join('left', '`video`', '`tvshow_episode`.`id`', '`video`.`id`', 100);
break;
case 'resolution':
$sql = "`video`.`resolution`";
$this->set_join('left', '`video`', '`tvshow_episode`.`id`', '`video`.`id`', 100);
break;
case 'length':
$sql = "`video`.`length`";
$this->set_join('left', '`video`', '`tvshow_episode`.`id`', '`video`.`id`', 100);
break;
case 'codec':
$sql = "`video`.`codec`";
$this->set_join('left', '`video`', '`tvshow_episode`.`id`', '`video`.`id`', 100);
break;
case 'season':
$sql = "`tvshow_season`.`season_number`";
$this->set_join('left', '`tvshow_season`', '`tvshow_episode`.`season`', '`tvshow_season`.`id`', 100);
@ -1877,25 +1879,35 @@ class Query
$this->set_join('left', '`tvshow_season`', '`tvshow_episode`.`season`', '`tvshow_season`.`id`', 100);
$this->set_join('left', '`tvshow`', '`tvshow_season`.`tvshow`', '`tvshow`.`id`', 100);
break;
default:
$sql = $this->sql_sort_video('tvshow_episode', $field);
break;
}
break;
case 'movie':
switch ($field) {
case 'title':
$sql = "`video`.`title`";
$this->set_join('left', '`video`', '`movie`.`id`', '`video`.`id`', 100);
default:
$sql = $this->sql_sort_video('movie', $field);
break;
case 'resolution':
$sql = "`video`.`resolution`";
$this->set_join('left', '`video`', '`movie`.`id`', '`video`.`id`', 100);
}
break;
case 'length':
$sql = "`video`.`length`";
$this->set_join('left', '`video`', '`movie`.`id`', '`video`.`id`', 100);
case 'clip':
switch ($field) {
case 'location':
$sql = "`clip`.`artist`";
break;
case 'codec':
$sql = "`video`.`codec`";
$this->set_join('left', '`video`', '`movie`.`id`', '`video`.`id`', 100);
default:
$sql = $this->sql_sort_video('clip', $field);
break;
}
break;
case 'personal_video':
switch ($field) {
case 'location':
$sql = "`personal_video`.`location`";
break;
default:
$sql = $this->sql_sort_video('personal_video', $field);
break;
}
break;
@ -1904,12 +1916,42 @@ class Query
break;
} // end switch
if (isset($sql)) { return "$sql $order,"; }
if (isset($sql) && !empty($sql)) { return "$sql $order,"; }
return "";
} // sql_sort
private function sql_sort_video($field, $table)
{
$sql = "";
switch ($field) {
case 'title':
$sql = "`video`.`title`";
break;
case 'resolution':
$sql = "`video`.`resolution`";
break;
case 'length':
$sql = "`video`.`length`";
break;
case 'codec':
$sql = "`video`.`codec`";
break;
case 'release_date':
$sql = "`video`.`release_date`";
break;
}
if (!empty($sql)) {
if ($table != 'video') {
$this->set_join('left', '`video`', '`' . $table . '`.`id`', '`video`.`id`', 100);
}
}
return $sql;
}
/**
* resort_objects
* This takes the existing objects, looks at the current

52
lib/class/song.class.php
View file

@ -901,12 +901,6 @@ class Song extends database_object implements media
{
$this->fill_ext_info();
// Format the filename
preg_match("/^.*\/(.*?)$/", $this->file, $short);
if (is_array($short) && isset($short[1])) {
$this->f_file = htmlspecialchars($short[1]);
}
// Format the album name
$this->f_album_full = $this->get_album_name();
$this->f_album = $this->f_album_full;
@ -927,7 +921,9 @@ class Song extends database_object implements media
$this->f_link = "<a href=\"" . scrub_out($this->link) . "\" title=\"" . scrub_out($this->f_artist) . " - " . scrub_out($this->title) . "\"> " . scrub_out($this->f_title) . "</a>";
$this->f_album_link = "<a href=\"" . AmpConfig::get('web_path') . "/albums.php?action=show&amp;album=" . $this->album . "\" title=\"" . scrub_out($this->f_album_full) . "\"> " . scrub_out($this->f_album) . "</a>";
$this->f_artist_link = "<a href=\"" . AmpConfig::get('web_path') . "/artists.php?action=show&amp;artist=" . $this->artist . "\" title=\"" . scrub_out($this->f_artist_full) . "\"> " . scrub_out($this->f_artist) . "</a>";
if (!empty($this->album_artist)) {
$this->f_album_artist_link = "<a href=\"" . AmpConfig::get('web_path') . "/artists.php?action=show&amp;artist=" . $this->album_artist . "\" title=\"" . scrub_out($this->f_album_artist_full) . "\"> " . scrub_out($this->f_album_artist_full) . "</a>";
}
// Format the Bitrate
$this->f_bitrate = intval($this->bitrate/1000) . "-" . strtoupper($this->mode);
@ -952,48 +948,16 @@ class Song extends database_object implements media
$this->f_lyrics = "<a title=\"" . scrub_out($this->title) . "\" href=\"" . AmpConfig::get('web_path') . "/song.php?action=show_lyrics&song_id=" . $this->id . "\">" . T_('Show Lyrics') . "</a>";
$this->f_file = $this->f_artist . ' - ';
if ($this->track) {
$this->f_file .= $this->track . ' - ';
}
$this->f_file .= $this->f_title . '.' . $this->type;
return true;
} // format
/**
* format_pattern
* This reformats the song information based on the catalog
* rename patterns
*/
public function format_pattern()
{
$extension = ltrim(substr($this->file,strlen($this->file)-4,4),".");
$catalog = Catalog::create_from_id($this->catalog);
// If we don't have a rename pattern then just return it
if (!trim($catalog->rename_pattern)) {
$this->f_pattern = $this->title;
$this->f_file = $this->title . '.' . $extension;
return;
}
/* Create the filename that this file should have */
$album = $this->f_album_full;
$artist = $this->f_artist_full;
$track = sprintf('%02d', $this->track);
$title = $this->title;
$year = $this->year;
/* Start replacing stuff */
$replace_array = array('%a','%A','%t','%T','%y','/','\\');
$content_array = array($artist,$album,$title,$track,$year,'-','-');
$rename_pattern = str_replace($replace_array,$content_array,$catalog->rename_pattern);
$rename_pattern = preg_replace("[\-\:\!]","_",$rename_pattern);
$this->f_pattern = $rename_pattern;
$this->f_file = $rename_pattern . "." . $extension;
} // format_pattern
/**
* get_fields
* This returns all of the 'data' fields for this object, we need to filter out some that we don't

4
lib/class/song_preview.class.php
View file

@ -194,10 +194,6 @@ class Song_Preview extends database_object implements media
*/
public function format()
{
// Format the filename
preg_match("/^.*\/(.*?)$/",$this->file, $short);
$this->f_file = htmlspecialchars($short[1]);
// Format the artist name
if ($this->artist) {
$this->f_artist_full = $this->get_artist_name();

14
lib/class/tvshow.class.php
View file

@ -67,7 +67,9 @@ class TVShow extends database_object
*/
public static function gc()
{
$sql = "DELETE FROM `tvshow` USING `tvshow` LEFT JOIN `tvshow_season` ON `tvshow_season`.`tvshow` = `tvshow`.`id` " .
"WHERE `tvshow_season`.`id` IS NULL";
Dba::write($sql);
}
/**
@ -142,12 +144,18 @@ class TVShow extends database_object
if (parent::is_cached('tvshow_extra', $this->id) ) {
$row = parent::get_from_cache('tvshow_extra', $this->id);
} else {
$sql = "SELECT DISTINCT(`tvshow_season`.`id`), COUNT(`tvshow_season`.`id`) AS `season_count`, COUNT(`tvshow_episode`.`id`) AS `episode_count` FROM `tvshow_season` " .
$sql = "SELECT COUNT(`tvshow_episode`.`id`) AS `episode_count` FROM `tvshow_season` " .
"LEFT JOIN `tvshow_episode` ON `tvshow_episode`.`season` = `tvshow_season`.`id` " .
"WHERE `tvshow_season`.`tvshow` = ?";
$db_results = Dba::read($sql, array($this->id));
$row = Dba::fetch_assoc($db_results);
$sql = "SELECT COUNT(`tvshow_season`.`id`) AS `season_count` FROM `tvshow_season` " .
"WHERE `tvshow_season`.`tvshow` = ?";
$db_results = Dba::read($sql, array($this->id));
$row2 = Dba::fetch_assoc($db_results);
$row['season_count'] = $row2['season_count'];
parent::add_to_cache('tvshow_extra',$this->id,$row);
}

73
lib/class/tvshow_episode.class.php
View file

@ -28,8 +28,9 @@ class TVShow_Episode extends Video
public $description;
public $f_link;
public $f_season;
public $f_season_link;
public $f_tvshow;
public $f_tvshow_link;
/**
* Constructor
@ -47,22 +48,52 @@ class TVShow_Episode extends Video
return true;
} // Constructor
}
/**
* gc
*
* This cleans out unused tv shows episodes
*/
public static function gc()
{
$sql = "DELETE FROM `tvshow_episode` USING `tvshow_episode` LEFT JOIN `video` ON `video`.`id` = `tvshow_episode`.`id` WHERE `video`.`id` IS NULL";
Dba::write($sql);
}
/**
* insert
* Insert a new tv show episode and related entities.
*/
public static function insert($data)
{
if (empty($data['tvshow'])) {
$data['tvshow'] = T_('Unknown');
}
$tvshow = TVShow::check($data['tvshow'], $data['tvshow_year']);
$tvshow_season = TVShow_Season::check($tvshow, $data['tvshow_season']);
$sdata = $data;
// Replace relation name with db ids
$sdata['tvshow'] = $tvshow;
$sdata['tvshow_season'] = $tvshow_season;
return self::create($sdata);
}
/**
* create
* This takes a key'd array of data as input and inserts a new tv show episode entry, it returns the auto_inc id
* This takes a key'd array of data as input and inserts a new tv show episode entry, it returns the record id
*/
public static function create($data)
{
$sql = "INSERT INTO `tvshow_episode` (`id`, `season`,`episode_number`,`description`) " .
"VALUES (?, ?, ?, ?)";
Dba::write($sql, array($data['id'], $data['season'], $data['episode_number'], $data['description']));
$insert_id = Dba::insert_id();
$sql = "INSERT INTO `tvshow_episode` (`id`, `original_name`, `season`, `episode_number`, `description`) " .
"VALUES (?, ?, ?, ?, ?)";
Dba::write($sql, array($data['id'], $data['original_name'], $data['tvshow_season'], $data['tvshow_episode'], $data['description']));
return $insert_id;
return $data['id'];
} // create
}
/**
* update
@ -70,12 +101,12 @@ class TVShow_Episode extends Video
*/
public static function update($data)
{
$sql = "UPDATE `tvshow_episode` SET `season` = ?, `episode_number` = ?, `description` = ? WHERE `id` = ?";
Dba::write($sql, array($data['season'], $data['episode_number'], $data['description'], $data['id']));
$sql = "UPDATE `tvshow_episode` SET `original_name` = ?, `season` = ?, `episode_number` = ?, `description` = ? WHERE `id` = ?";
Dba::write($sql, array($data['original_name'], $data['tvshow_season'], $data['tvshow_episode'], $data['description'], $data['id']));
return true;
} // create
}
/**
* format
@ -87,11 +118,21 @@ class TVShow_Episode extends Video
$season = new TVShow_Season($this->season);
$season->format();
$this->f_season = $season->f_link;
$this->f_tvshow = $season->f_tvshow;
$this->f_title = ($this->original_name ?: $this->f_title);
$this->f_link = '<a href="' . $this->link . '">' . $this->f_title . '</a>';
$this->f_season_link = $season->f_link;
$this->f_tvshow = $tvshow->f_tvshow;
$this->f_tvshow_link = $season->f_tvshow_link;
$this->f_file = $this->f_tvshow;
if ($this->episode_number) {
$this->f_file .= ' - S'. sprintf('%02d', $season->season_number) . 'E'. sprintf('%02d', $this->episode_number);
}
$this->f_file .= ' - ' . $this->f_title;
return true;
} //format
}
} // License class
}

61
lib/class/tvshow_season.class.php
View file

@ -29,6 +29,7 @@ class TVShow_Season extends database_object
public $episodes;
public $f_name;
public $f_tvshow;
public $f_tvshow_link;
public $link;
public $f_link;
@ -64,7 +65,9 @@ class TVShow_Season extends database_object
*/
public static function gc()
{
$sql = "DELETE FROM `tvshow_season` USING `tvshow_season` LEFT JOIN `tvshow_episode` ON `tvshow_episode`.`season` = `tvshow_season`.`id` " .
"WHERE `tvshow_episode`.`id` IS NULL";
Dba::write($sql);
}
/**
@ -129,6 +132,7 @@ class TVShow_Season extends database_object
$tvshow = new TVShow($this->tvshow);
$tvshow->format();
$this->f_tvshow = $tvshow->f_name;
$this->f_tvshow_link = $tvshow->f_link;
$this->link = AmpConfig::get('web_path') . '/tvshow_seasons.php?action=show&season=' . $this->id;
@ -139,6 +143,61 @@ class TVShow_Season extends database_object
return true;
}
/**
* check
*
* Checks for an existing tv show season; if none exists, insert one.
*/
public static function check($tvshow, $season_number, $readonly = false)
{
$name = $tvshow . '_' . $season_number;
// null because we don't have any unique id like mbid for now
if (isset(self::$_mapcache[$name]['null'])) {
return self::$_mapcache[$name]['null'];
}
$id = 0;
$exists = false;
if (!$exists) {
$sql = 'SELECT `id` FROM `tvshow_season` WHERE `tvshow` = ? AND `season_number` = ?';
$db_results = Dba::read($sql, array($tvshow, $season_number));
$id_array = array();
while ($row = Dba::fetch_assoc($db_results)) {
$key = 'null';
$id_array[$key] = $row['id'];
}
if (count($id_array)) {
$id = array_shift($id_array);
$exists = true;
}
}
if ($exists) {
self::$_mapcache[$name]['null'] = $id;
return $id;
}
if ($readonly) {
return null;
}
$sql = 'INSERT INTO `tvshow_season` (`tvshow`, `season_number`) ' .
'VALUES(?, ?)';
$db_results = Dba::write($sql, array($tvshow, $season_number));
if (!$db_results) {
return null;
}
$id = Dba::insert_id();
self::$_mapcache[$name]['null'] = $id;
return $id;
}
/**
* update
* This takes a key'd array of data and updates the current tv show

16
lib/class/update.class.php
View file

@ -2656,7 +2656,6 @@ class Update
Dba::write($sql);
return true;
}
<<<<<<< HEAD
/**
* update_370007
@ -2746,6 +2745,7 @@ class Update
$sql = "CREATE TABLE `tvshow_episode` (" .
"`id` int(11) unsigned NOT NULL," .
"`original_name` varchar(80) NULL," .
"`season` int(11) unsigned NOT NULL," .
"`episode_number` int(11) unsigned NOT NULL," .
"`description` varchar(256) NULL," .
@ -2760,6 +2760,20 @@ class Update
"PRIMARY KEY (`id`)) ENGINE = MYISAM";
Dba::write($sql);
$sql = "CREATE TABLE `personal_video` (" .
"`id` int(11) unsigned NOT NULL," .
"`location` varchar(256) NULL," .
"`description` varchar(256) NULL," .
"PRIMARY KEY (`id`)) ENGINE = MYISAM";
Dba::write($sql);
$sql = "CREATE TABLE `clip` (" .
"`id` int(11) unsigned NOT NULL," .
"`artist` int(11) NULL," .
"`song` int(11) NULL," .
"PRIMARY KEY (`id`)) ENGINE = MYISAM";
Dba::write($sql);
$sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
"VALUES ('allow_video','1','Allow video features',25,'integer','system')";
Dba::write($sql);

12
lib/class/upnp_api.class.php
View file

@ -298,7 +298,7 @@ class Upnp_Api
case 'artists':
switch (count($pathreq)) {
case 1:
$counts = Catalog::count_songs();
$counts = Catalog::count_medias();
$meta = array(
'id' => $root . '/artists',
'parentID' => $root,
@ -322,7 +322,7 @@ class Upnp_Api
case 'albums':
switch (count($pathreq)) {
case 1:
$counts = Catalog::count_songs();
$counts = Catalog::count_medias();
$meta = array(
'id' => $root . '/albums',
'parentID' => $root,
@ -346,7 +346,7 @@ class Upnp_Api
case 'songs':
switch (count($pathreq)) {
case 1:
$counts = Catalog::count_songs();
$counts = Catalog::count_medias();
$meta = array(
'id' => $root . '/songs',
'parentID' => $root,
@ -370,7 +370,7 @@ class Upnp_Api
case 'playlists':
switch (count($pathreq)) {
case 1:
$counts = Catalog::count_songs();
$counts = Catalog::count_medias();
$meta = array(
'id' => $root . '/playlists',
'parentID' => $root,
@ -394,7 +394,7 @@ class Upnp_Api
case 'smartplaylists':
switch (count($pathreq)) {
case 1:
$counts = Catalog::count_songs();
$counts = Catalog::count_medias();
$meta = array(
'id' => $root . '/smartplaylists',
'parentID' => $root,
@ -559,7 +559,7 @@ class Upnp_Api
break;
default:
$counts = Catalog::count_songs();
$counts = Catalog::count_medias();
$mediaItems[] = self::_musicMetadata('artists');
$mediaItems[] = self::_musicMetadata('albums');

169
lib/class/vainfo.class.php
View file

@ -203,7 +203,7 @@ class vainfo
/* Figure out what type of file we are dealing with */
$this->type = $this->_get_type();
$enabled_sources = (array) AmpConfig::get('metadata_order');
$enabled_sources = (array) $this->get_metadata_order();
if (in_array('filename', $enabled_sources)) {
$this->tags['filename'] = $this->_parse_filename($this->filename);
@ -282,6 +282,8 @@ class vainfo
$info['time'] = $info['time'] ?: intval($tags['time']);
$info['channels'] = $info['channels'] ?: $tags['channels'];
// This because video title are almost always bad...
$info['original_name'] = $info['original_name'] ?: stripslashes(trim($tags['original_name']));
$info['title'] = $info['title'] ?: stripslashes(trim($tags['title']));
$info['year'] = $info['year'] ?: intval($tags['year']);
@ -328,6 +330,12 @@ class vainfo
$info['resolution_y'] = $info['resolution_y'] ?: intval($tags['resolution_y']);
$info['audio_codec'] = $info['audio_codec'] ?: trim($tags['audio_codec']);
$info['video_codec'] = $info['video_codec'] ?: trim($tags['video_codec']);
$info['tvshow'] = $info['tvshow'] ?: trim($tags['tvshow']);
$info['tvshow_year'] = $info['tvshow_year'] ?: trim($tags['tvshow_year']);
$info['tvshow_season'] = $info['tvshow_season'] ?: trim($tags['tvshow_season']);
$info['tvshow_episode'] = $info['tvshow_episode'] ?: trim($tags['tvshow_episode']);
$info['release_date'] = $info['release_date'] ?: trim($tags['release_date']);
}
// Some things set the disk number even though there aren't multiple
@ -442,6 +450,19 @@ class vainfo
return $cleaned;
}
private function get_metadata_order_key()
{
if (!in_array('music', $this->gather_types))
return 'metadata_order_video';
return 'metadata_order';
}
private function get_metadata_order()
{
return (array) AmpConfig::get($this->get_metadata_order_key());
}
/**
* _get_plugin_tags
*
@ -449,7 +470,7 @@ class vainfo
*/
private function _get_plugin_tags()
{
$tag_order = AmpConfig::get('metadata_order');
$tag_order = $this->get_metadata_order();
if (!is_array($tag_order)) {
$tag_order = array($tag_order);
}
@ -461,7 +482,7 @@ class vainfo
$installed_version = Plugin::get_plugin_version($plugin->_plugin->name);
if ($installed_version) {
if ($plugin->load($GLOBALS['user'])) {
$this->tags[$tag_source] = $plugin->_plugin->get_metadata($this->gather_types, self::clean_tag_info($this->tags, self::get_tag_type($this->tags), $this->filename));
$this->tags[$tag_source] = $plugin->_plugin->get_metadata($this->gather_types, self::clean_tag_info($this->tags, self::get_tag_type($this->tags, $this->get_metadata_order_key()), $this->filename));
}
}
}
@ -790,6 +811,7 @@ class vainfo
$origin = $filename;
$results = array();
if (in_array('music', $this->gather_types) || in_array('clip', $this->gather_types)) {
// Correctly detect the slash we need to use here
if (strpos($filename, '/') !== false) {
$slash_type = '/';
@ -840,10 +862,151 @@ class vainfo
$results['size'] = filesize(Core::conv_lc_file($origin));
}
}
}
if (in_array('tvshow', $this->gather_types)) {
$pathinfo = pathinfo($filename);
$filetitle = $pathinfo['filename'];
$results = array_merge($results, $this->parseEpisodeName($filetitle));
if (!$results['tvshow']) {
// Try to identify the show information from parent folder
$filetitle = basename($pathinfo['dirname']);
$results = array_merge($results, $this->parseEpisodeName($filetitle));
if (!$results['tvshow']) {
if ($results['tvshow_season'] && $results['tvshow_episode']) {
// We have season and episode, we assume parent folder is the tvshow name
$pathinfo = pathinfo($pathinfo['dirname']);
$filetitle = basename($pathinfo['dirname']);
$results['tvshow'] = $this->fixSerieName($filetitle);
} else {
// Or we assume each parent folder contains one missing information
if (preg_match('/[\/\\\\]([^\/\\\\]*)[\/\\\\]Season (\d{1,2})[\/\\\\]((E|Ep|Episode)\s?(\d{1,2})[\/\\\\])?/i', $filename, $matches)) {
$results['tvshow'] = $this->fixSerieName($matches[1]);
$results['tvshow_season'] = $matches[2];
if (isset($matches[5])) {
$results['tvshow_episode'] = $matches[5];
}
}
}
}
}
}
if (in_array('movie', $this->gather_types)) {
$pathinfo = pathinfo($filename);
$filetitle = $pathinfo['filename'];
$results['title'] = $this->fixVideoReleaseName($filetitle);
if (!$results['title']) {
// Try to identify the movie information from parent folder
$filetitle = basename($pathinfo['dirname']);
$results['title'] = $this->fixVideoReleaseName($filetitle);
}
}
return $results;
}
private function parseEpisodeName($filetitle)
{
$patterns = array(
'/(.*)s(\d\d)e(\d\d)(\D.*)/i',
'/(.*)s(\d\d)(\D)(.*)/i',
'/(.*)\D(\d{1,2})x(\d\d)(\D)(.*)/i',
'/(.*)\D(\d{1,2})x(\d\d)$/i',
'/(\D*)[\.|\-|_](\d)(\d\d)([\.|\-|_]\D.*)/i',
'/(\D*)(\d)[^0-9](\d\d)(\D.*)/i'
);
$results = array();
for ($i=0;$i<count($patterns);$i++) {
if (preg_match($patterns[$i], $filetitle, $matches)) {
$name = $this->fixSerieName($matches[1]);
if(empty($name))
continue;
$season = floatval($matches[2]);
if ($season == 0)
continue;
$episode = floatval($matches[3]);
$leftover = $matches[4];
if ($episode == 0) {
// Some malformed string
$leftover = $filetitle;
}
$results['tvshow'] = $name;
$results['tvshow_season'] = $season;
$results['tvshow_episode'] = $episode;
$results['title'] = $this->fixVideoReleaseName($leftover);
break;
}
}
return $results;
}
private function fixSerieName($name)
{
$name = str_replace('_', ' ', $name);
$name = str_replace('.', ' ', $name);
$name = str_replace(' ', ' ', $name);
$name = $this->removeStartingDashesAndSpaces($name);
$name = $this->removeEndingDashesAndSpaces($name);
return ucwords($name);
}
private function fixVideoReleaseName($name)
{
$commonabbr = array(
'divx', 'xvid', 'dvdrip', 'hdtv', 'lol', 'axxo', 'repack', 'xor',
'pdtv', 'real', 'vtv', 'caph', '2hd', 'proper', 'fqm', 'uncut',
'topaz', 'tvt', 'notv', 'fpn', 'fov', 'orenji', '0tv', 'omicron',
'dsr', 'ws', 'sys', 'crimson', 'wat', 'hiqt', 'internal', 'brrip',
'boheme', 'vost', 'vostfr', 'fastsub', 'addiction'
);
for ($i=0; $i<count($commonabbr); $i++) {
$name = preg_replace('/[\W|_]' . $commonabbr[$i] . '[\W|_](.*)/i', '.', $name);
}
while (strpos($name, '..') !== false) {
$name = preg_replace('/\.\./', '.', $name);
}
$name = preg_replace('/\.\w*$/', ' ', $name);
$name = preg_replace('/\[.*$/', '', $name);
return $this->fixSerieName($name);
}
private function removeStartingDashesAndSpaces($name)
{
if (empty($name))
return $name;
while (strpos($name, ' ') === 0 || strpos($name, '-') === 0) {
$name = preg_replace('/^ /', '', $name);
$name = preg_replace('/^-/', '', $name);
}
return $name;
}
private function removeEndingDashesAndSpaces($name)
{
if (empty($name))
return $name;
while (strrpos($name, ' ') === strlen($name) - 1 || strrpos($name, '-') === strlen($name) - 1) {
$name = preg_replace('/ $/', '', $name);
$name = preg_replace('/-$/', '', $name);
}
return $name;
}
/**
* set_broken
*

35
lib/class/video.class.php
View file

@ -44,16 +44,18 @@ class Video extends database_object implements media
public $f_resolution;
public $f_tags;
public $f_length;
public $f_file;
public $f_release_date;
/**
* Constructor
* This pulls the shoutbox information from the database and returns
* a constructed object, uses user_shout table
* This pulls the information from the database and returns
* a constructed object
*/
public function __construct($id)
{
// Load the data from the database
$info = $this->get_info($id);
$info = $this->get_info($id, 'video');
foreach ($info as $key=>$value) {
$this->$key = $value;
}
@ -89,11 +91,18 @@ class Video extends database_object implements media
{
$this->f_title = scrub_out($this->title);
$this->link = AmpConfig::get('web_path') . "/video.php?action=show_video&video_id=" . $this->id;
if (strtolower(get_class($this)) != 'video') {
$this->link .= '&type=' . get_class($this);
}
$this->f_link = "<a href=\"" . $this->link . "\" title=\"" . scrub_out($this->f_title) . "\"> " . scrub_out($this->f_title) . "</a>";
$this->f_codec = $this->video_codec . ' / ' . $this->audio_codec;
$this->f_resolution = $this->resolution_x . 'x' . $this->resolution_y;
$this->f_tags = '';
$this->f_length = floor($this->time/60) . ' ' . T_('minutes');
$this->f_file = $this->f_title . '.' . $this->type;
if ($this->release_date) {
$this->f_release_date = date('Y-m-d', $this->release_date);
}
} // format
@ -104,9 +113,12 @@ class Video extends database_object implements media
*/
public static function gc()
{
Dba::write('DELETE FROM `movie` USING `movie` LEFT JOIN `video` ON `video`.`id` = `movie`.`id` WHERE `video`.`id` IS NULL');
Dba::write('DELETE FROM `tvshow_episode` USING `tvshow_episode` LEFT JOIN `video` ON `video`.`id` = `tvshow_episode`.`id` WHERE `video`.`id` IS NULL');
Movie::gc();
TVShow_Episode::gc();
TVShow_Season::gc();
TVShow::gc();
Personal_Video::gc();
Clip::gc();
}
public function get_stream_types()
@ -145,4 +157,17 @@ class Video extends database_object implements media
return false;
}
public static function validate_type($type)
{
switch (strtolower($type)) {
case 'tvshow_episode':
case 'movie':
case 'clip':
case 'personal_video':
return $type;
default:
return 'Video';
}
}
} // end Video class

2
lib/init.php
View file

@ -66,7 +66,7 @@ if (!empty($link)) {
$results['load_time_begin'] = $load_time_begin;
/** This is the version.... fluf nothing more... **/
$results['version'] = '3.7.1-develop';
$results['int_config_version'] = '16';
$results['int_config_version'] = '17';
if (!empty($results['force_ssl'])) {
$http_type = 'https://';

2
lib/preferences.php
View file

@ -125,7 +125,7 @@ function create_preference_input($name,$value)
} elseif ($value == '0') {
echo "Disabled";
} else {
if (preg_match('/_pass$/', $name)) {
if (preg_match('/_pass$/', $name) || preg_match('/_api_key$/', $name)) {
echo "******";
} else {
echo $value;

4
modules/catalog/dropbox.catalog.php
View file

@ -280,10 +280,10 @@ class Catalog_dropbox extends Catalog
$this->add_files($client, $this->path);
echo "\n<br />" .
printf(T_('Catalog Update Finished. Total Songs: [%s]'), $this->count);
printf(T_('Catalog Update Finished. Total Media: [%s]'), $this->count);
echo '<br />';
if ($this->count == 0) {
echo T_('No songs updated, do you respect the patterns?') . '<br />';
echo T_('No media updated, do you respect the patterns?') . '<br />';
}
echo '<br />';
} else {

11
modules/catalog/local.catalog.php
View file

@ -362,13 +362,13 @@ class Catalog_local extends Catalog
if (count($this->get_gather_types('music')) > 0) {
$this->_insert_local_song($full_file, $file_size, $options);
} else {
debug_event('read', $full_file] . " ignored, bad media type for this catalog.", 5);
debug_event('read', $full_file . " ignored, bad media type for this catalog.", 5);
}
} else {
if (count($this->get_gather_types('video')) > 0) {
$this->insert_local_video($full_file,$file_size);
} else {
debug_event('read', $full_file] . " ignored, bad media type for this catalog.", 5);
debug_event('read', $full_file . " ignored, bad media type for this catalog.", 5);
}
}
@ -462,7 +462,7 @@ class Catalog_local extends Catalog
UI::show_box_top();
echo "\n<br />" .
printf(T_('Catalog Update Finished. Total Time: [%s] Total Songs: [%s] Songs Per Second: [%s]'),
printf(T_('Catalog Update Finished. Total Time: [%s] Total Media: [%s] Media Per Second: [%s]'),
date('i:s', $time_diff), $this->count, $rate);
echo '<br /><br />';
UI::show_box_bottom();
@ -703,7 +703,7 @@ class Catalog_local extends Catalog
$vainfo = new vainfo($file, $gtypes,'','','',$this->sort_pattern,$this->rename_pattern);
$vainfo->get_info();
$tag_name = vainfo::get_tag_type($vainfo->tags);
$tag_name = vainfo::get_tag_type($vainfo->tags, 'metadata_order_video');
$results = vainfo::clean_tag_info($vainfo->tags,$tag_name,$file);
$rezx = intval($results['resolution_x']);
@ -716,7 +716,8 @@ class Catalog_local extends Catalog
Dba::write($sql, $params);
$vid = Dba::insert_id();
Catalog::insert_video($vid, $gtypes, $results);
$results['id'] = $vid;
Catalog::insert_video($gtypes, $results);
return true;

18
modules/plugins/Bitly.plugin.php
View file

@ -25,14 +25,14 @@ class AmpacheBitly {
public $name = 'Bit.ly';
public $description = 'Url shorteners on shared links with Bit.ly';
public $url = 'http://bitly.com/';
public $version = '000001';
public $version = '000002';
public $min_ampache = '360037';
public $max_ampache = '999999';
// These are internal settings used by this class, run this->load to
// fill them out
private $bitly_username;
private $bitly_api;
private $bitly_api_key;
/**
* Constructor
@ -54,8 +54,8 @@ class AmpacheBitly {
// Check and see if it's already installed (they've just hit refresh, those dorks)
if (Preference::exists('bitly_username')) { return false; }
Preference::insert('bitly_username','Bit.ly username','','25','string','plugins');
Preference::insert('bitly_api','Bit.ly api key','','25','string','plugins');
Preference::insert('bitly_username','Bit.ly username','','75','string','plugins');
Preference::insert('bitly_api_key','Bit.ly api key','','75','string','plugins');
return true;
@ -69,7 +69,7 @@ class AmpacheBitly {
public function uninstall() {
Preference::delete('bitly_username');
Preference::delete('bitly_api');
Preference::delete('bitly_api_key');
} // uninstall
@ -83,14 +83,14 @@ class AmpacheBitly {
public function shortener($url) {
if (empty($this->bitly_username) || empty($this->bitly_api)) {
if (empty($this->bitly_username) || empty($this->bitly_api_key)) {
debug_event($this->name, 'Bit.ly username or api key missing', '3');
return false;
}
$shorturl = '';
$apiurl = 'http://api.bit.ly/v3/shorten?login=' . $this->bitly_username . '&apiKey=' . $this->bitly_api . '&longUrl=' . urlencode($url) . '&format=json';
$apiurl = 'http://api.bit.ly/v3/shorten?login=' . $this->bitly_username . '&apiKey=' . $this->bitly_api_key . '&longUrl=' . urlencode($url) . '&format=json';
try {
debug_event($this->name, 'Bit.ly api call: ' . $apiurl, '5');
$request = Requests::get($apiurl);
@ -120,8 +120,8 @@ class AmpacheBitly {
debug_event($this->name,'No Bit.ly username, shortener skipped','3');
return false;
}
if (strlen(trim($data['bitly_api']))) {
$this->bitly_api = trim($data['bitly_api']);
if (strlen(trim($data['bitly_api_key']))) {
$this->bitly_api_key = trim($data['bitly_api_key']);
}
else {
debug_event($this->name,'No Bit.ly api key, shortener skipped','3');

2
modules/plugins/Flickr.plugin.php
View file

@ -46,7 +46,7 @@ class Ampacheflickr {
*/
public function install() {
if (Preference::exists('flickr_api_key')) { return false; }
Preference::insert('flickr_api_key','Flickr api key','','25','string','plugins');
Preference::insert('flickr_api_key','Flickr api key','','75','string','plugins');
return true;
} // install

2
modules/plugins/MusicBrainz.plugin.php
View file

@ -70,7 +70,7 @@ class AmpacheMusicBrainz {
*/
public function get_metadata($gather_types, $song_info) {
// Music metadata only
if (!in_array($gather_types, 'music')) {
if (!in_array('music', $gather_types)) {
return null;
}

159
modules/plugins/Tmdb.plugin.php Normal file
View file

@ -0,0 +1,159 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
class AmpacheTmdb {
public $name = 'Tmdb';
public $description = 'Tmdb metadata integration';
public $version = '000001';
public $min_ampache = '370009';
public $max_ampache = '999999';
// These are internal settings used by this class, run this->load to
// fill them out
private $api_key;
/**
* Constructor
* This function does nothing
*/
public function __construct() {
return true;
}
/**
* install
* This is a required plugin function
*/
public function install() {
if (Preference::exists('tmdb_api_url')) { return false; }
Preference::insert('tmdb_api_key','Tmdb api key','','75','string','plugins');
return true;
} // install
/**
* uninstall
* This is a required plugin function
*/
public function uninstall() {
Preference::delete('tmdb_api_url');
return true;
} // uninstall
/**
* load
* This is a required plugin function; here it populates the prefs we
* need for this object.
*/
public function load($user) {
$user->set_preferences();
$data = $user->prefs;
if (strlen(trim($data['tmdb_api_key']))) {
$this->api_key = trim($data['tmdb_api_key']);
}
else {
debug_event($this->name,'No Tmdb api key, metadata plugin skipped','3');
return false;
}
return true;
} // load
/**
* get_metadata
* Returns song metadata for what we're passed in.
*/
public function get_metadata($gather_types, $media_info) {
debug_event('tmdb', 'Getting metadata from Tmdb...', '5');
// TVShow / Movie metadata only
if (!in_array('tvshow', $gather_types) && !in_array('movie', $gather_types)) {
debug_event('tmdb', 'Not a valid media type, skipped.', '5');
return null;
}
$token = new \Tmdb\ApiToken($this->api_key);
$client = new \Tmdb\Client($token);
$title = $media_info['original_name'] ?: $media_info['title'];
$results = array();
try {
if (in_array('movie', $gather_types)) {
if (!empty($title)) {
$apires = $client->getSearchApi()->searchMovies($title);
if (count($apires['results']) > 0) {
$release = $apires['results'][0];
$results['tmdb_id'] = $release['id'];
$results['original_name'] = $release['original_title'];
if (!empty($release['release_date'])) {
$results['release_date'] = strtotime($release['release_date']);
$results['year'] = date("Y", $results['release_date']); // Production year shouldn't be the release date
}
}
}
}
if (in_array('tvshow', $gather_types)) {
if (!empty($media_info['tvshow'])) {
$apires = $client->getSearchApi()->searchTv($media_info['tvshow']);
if (count($apires['results']) > 0) {
// Get first match
$release = $apires['results'][0];
$results['tmdb_tvshow_id'] = $release['id'];
$results['tvshow'] = $release['original_name'];
if (!empty($release['first_air_date'])) {
$results['tvshow_year'] = date("Y", strtotime($release['first_air_date']));
}
if ($media_info['tvshow_season'] && $media_info['tvshow_episode']) {
$release = $client->getTvEpisodeApi()->getEpisode($results['tmdb_tvshow_id'], $media_info['tvshow_season'], $media_info['tvshow_episode']);
if ($release['id']) {
$results['tmdb_id'] = $release['id'];
$results['tvshow_season'] = $release['season_number'];
$results['tvshow_episode'] = $release['episode_number'];
$results['original_name'] = $release['name'];
if (!empty($release['air_date'])) {
$results['release_date'] = strtotime($release['release_date']);
$results['year'] = date("Y", $results['release_date']);
}
$results['description'] = $release['overview'];
}
}
}
}
}
} catch (Exception $e) {
debug_event('tmdb', 'Error getting metadata: ' . $e->getMessage(), '1');
}
return $results;
} // get_metadata
} // end AmpacheTmdb
?>

20
modules/plugins/Yourls.plugin.php
View file

@ -25,7 +25,7 @@ class AmpacheYourls {
public $name = 'YOURLS';
public $description = 'Url shorteners on shared links with YOURLS';
public $url = 'http://yourls.org/';
public $version = '000001';
public $version = '000002';
public $min_ampache = '360037';
public $max_ampache = '999999';
@ -33,7 +33,7 @@ class AmpacheYourls {
// fill them out
private $yourls_domain;
private $yourls_use_idn;
private $yourls_api;
private $yourls_api_key;
/**
* Constructor
@ -55,9 +55,9 @@ class AmpacheYourls {
// Check and see if it's already installed (they've just hit refresh, those dorks)
if (Preference::exists('yourls_domain')) { return false; }
Preference::insert('yourls_domain','YOURLS domain name','','25','string','plugins');
Preference::insert('yourls_use_idn','YOURLS use IDN','0','25','boolean','plugins');
Preference::insert('yourls_api','YOURLS api key','','25','string','plugins');
Preference::insert('yourls_domain','YOURLS domain name','','75','string','plugins');
Preference::insert('yourls_use_idn','YOURLS use IDN','0','75','boolean','plugins');
Preference::insert('yourls_api_key','YOURLS api key','','75','string','plugins');
return true;
@ -72,7 +72,7 @@ class AmpacheYourls {
Preference::delete('yourls_domain');
Preference::delete('yourls_use_idn');
Preference::delete('yourls_api');
Preference::delete('yourls_api_key');
} // uninstall
@ -86,14 +86,14 @@ class AmpacheYourls {
public function shortener($url) {
if (empty($this->yourls_domain) || empty($this->yourls_api)) {
if (empty($this->yourls_domain) || empty($this->yourls_api_key)) {
debug_event($this->name, 'YOURLS domain or api key missing', '3');
return false;
}
$shorturl = '';
$apiurl = 'http://' . $this->yourls_domain . '/yourls-api.php?signature=' . $this->yourls_api . '&action=shorturl&format=simple&url=' . urlencode($url);
$apiurl = 'http://' . $this->yourls_domain . '/yourls-api.php?signature=' . $this->yourls_api_key . '&action=shorturl&format=simple&url=' . urlencode($url);
try {
debug_event($this->name, 'YOURLS api call: ' . $apiurl, '5');
$request = Requests::get($apiurl);
@ -130,8 +130,8 @@ class AmpacheYourls {
debug_event($this->name,'No YOURLS domain, shortener skipped','3');
return false;
}
if (strlen(trim($data['yourls_api']))) {
$this->yourls_api = trim($data['yourls_api']);
if (strlen(trim($data['yourls_api_key']))) {
$this->yourls_api_key = trim($data['yourls_api_key']);
}
else {
debug_event($this->name,'No YOURLS api key, shortener skipped','3');

1
play/index.php
View file

@ -295,7 +295,6 @@ if ($_GET['action'] == 'download' AND AmpConfig::get('download')) {
debug_event('play', 'Downloading file...', 5);
// STUPID IE
$media->format_pattern();
$media_name = str_replace(array('?','/','\\'),"_",$media->f_file);
$browser->downloadHeaders($media_name,$media->mime,false,$media->size);

7
stream.php
View file

@ -159,10 +159,17 @@ switch ($_REQUEST['action']) {
$urls = array($democratic->play_url());
break;
case 'download':
if (isset($_REQUEST['song_id'])) {
$media_ids[] = array(
'object_type' => 'song',
'object_id' => scrub_in($_REQUEST['song_id'])
);
} else if (isset($_REQUEST['video_id'])) {
$media_ids[] = array(
'object_type' => 'video',
'object_id' => scrub_in($_REQUEST['video_id'])
);
}
break;
case 'live_stream':
$object = new Radio($_REQUEST['stream_id']);

2
templates/footer.inc.php
View file

@ -27,8 +27,10 @@
<?php
$count_temp_playlist = 1;
if (!isset($_SESSION['login']) || !$_SESSION['login']) {
if ($GLOBALS['user']->playlist) {
$count_temp_playlist = count($GLOBALS['user']->playlist->get_items());
}
}
?>
<div id="footer" class="<?php echo (($count_temp_playlist || AmpConfig::get('play_type') == 'localplay') ? '' : 'footer-wild'); ?>">
<?php if (AmpConfig::get('show_donate')) { ?>

5
templates/show_add_catalog.inc.php
View file

@ -57,7 +57,7 @@ $default_sort = "%a/%A";
<td valign="top"><input type="text" name="sort_pattern" value="<?php echo $default_sort; ?>" /></td>
</tr>
<tr>
<td valign="top"><?php echo T_('Gather Album Art'); ?>:</td>
<td valign="top"><?php echo T_('Gather Art'); ?>:</td>
<td><input type="checkbox" name="gather_art" value="1" checked /></td>
</tr>
<tr>
@ -69,9 +69,10 @@ $default_sort = "%a/%A";
<td>
<input type="radio" name="gather_media" value="music" checked /> <?php echo T_('Music'); ?>
<?php if (AmpConfig::get('allow_video')) { ?>
<input type="radio" name="gather_media" value="clip" /> <?php echo T_('Music Clip'); ?>
<input type="radio" name="gather_media" value="tvshow" /> <?php echo T_('TV Show'); ?>
<input type="radio" name="gather_media" value="movie" /> <?php echo T_('Movie'); ?>
<input type="radio" name="gather_media" value="video" /> <?php echo T_('Other Video'); ?>
<input type="radio" name="gather_media" value="video" /> <?php echo T_('Personal Video'); ?>
<?php } ?>
</td>
</tr>

4
templates/show_adds_catalog.inc.php
View file

@ -20,9 +20,9 @@
*
*/
UI::show_box_top(T_('Starting New Song Search'), 'box box_adds_catalog');
UI::show_box_top(T_('Starting New Media Search'), 'box box_adds_catalog');
/* HINT: Catalog Name */
printf(T_('Starting New Song Search on %s catalog'), "<strong>[ $this->name ]</strong>");
printf(T_('Starting New Media Search on %s catalog'), "<strong>[ $this->name ]</strong>");
echo "<br />\n";
echo T_('Found') . ': <span id="add_count_' . $this->id . '">' . T_('None') . '</span><br />';
echo T_('Reading') . ':<span id="add_dir_' . $this->id . '"></span><br />';

2
templates/show_catalog_row.inc.php
View file

@ -35,7 +35,7 @@ $button_flip_state_id = 'button_flip_state_' . $catalog->id;
| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Verify'); ?></a>
| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Clean'); ?></a>
| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Update'); ?></a>
| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Gather Art'); ?></a>
| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_media_art&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Gather Art'); ?></a>
| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_delete_catalog&amp;catalog_id=<?php echo $catalog->id; ?>"><?php echo T_('Delete'); ?></a>
<?php if (AmpConfig::get('catalog_disable')) { ?>
| <span id="<?php echo($button_flip_state_id); ?>">

2
templates/show_manage_catalogs.inc.php
View file

@ -24,7 +24,7 @@
<div id="information_actions">
<ul style="float: left;">
<li>
<a class="option-list" href="<?php echo AmpConfig::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo T_('Gather All Art'); ?></a>
<a class="option-list" href="<?php echo AmpConfig::get('web_path'); ?>/admin/catalog.php?action=gather_media_art"><?php echo T_('Gather All Art'); ?></a>
</li>
<li>
<a class="option-list" href="<?php echo AmpConfig::get('web_path'); ?>/admin/catalog.php?action=show_disabled"><?php echo T_('Show disabled songs'); ?></a>

71
templates/show_movies.inc.php
View file

@ -1,71 +0,0 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
$web_path = AmpConfig::get('web_path');
if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php';
?>
<table class="tabledata" cellpadding="0" cellspacing="0" data-objecttype="movie">
<thead>
<tr class="th-top">
<th class="cel_play essential"></th>
<th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=movie&sort=title', T_('Title'),'sort_video_title'); ?></th>
<th class="cel_add essential"></th>
<th class="cel_year optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=movie&sort=year', T_('Year'),'sort_video_year'); ?></th>
<th class="cel_codec optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=movie&sort=codec', T_('Codec'),'sort_video_codec'); ?></th>
<th class="cel_resolution optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=movie&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th>
<th class="cel_length optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=movie&sort=length', T_('Time'),'sort_video_length'); ?></th>
<th class="cel_tags optional"><?php echo T_('Tags'); ?></th>
<th class="cel_action essential"><?php echo T_('Action'); ?></th>
</tr>
</thead>
<tbody>
<?php
foreach ($object_ids as $video_id) {
$video = new Movie($video_id);
$video->format();
?>
<tr id="video_<?php echo $video->id; ?>" class="<?php echo UI::flip_class(); ?>">
<?php require AmpConfig::get('prefix') . '/templates/show_movie_row.inc.php'; ?>
</tr>
<?php } //end foreach ?>
<?php if (!count($object_ids)) { ?>
<tr class="<?php echo UI::flip_class(); ?>">
<td colspan="9"><span class="nodata"><?php echo T_('No movie found'); ?></span></td>
</tr>
<?php } ?>
</tbody>
<tfoot>
<tr class="th-bottom">
<th class="cel_play"></th>
<th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th>
<th class="cel_add"></th>
<th class="cel_year optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=movie&sort=year', T_('Year'),'sort_video_year'); ?></th>
<th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th>
<th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th>
<th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th>
<th class="cel_tags"><?php echo T_('Tags'); ?></th>
<th class="cel_action"><?php echo T_('Action'); ?></th>
</tr>
</tfoot>
</table>
<script src="<?php echo AmpConfig::get('web_path'); ?>/lib/javascript/tabledata.js" language="javascript" type="text/javascript"></script>
<?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>

24
templates/show_partial_clip.inc.php Normal file
View file

@ -0,0 +1,24 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
$videoprops[gettext_noop('Artist')] = $video->f_artist;
$videoprops[gettext_noop('Song')] = $video->f_song;

23
templates/show_partial_clip_row.inc.php Normal file
View file

@ -0,0 +1,23 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>
<td class="cel_artist"><?php echo $video->f_artist; ?></td>

23
templates/show_partial_clips.inc.php Normal file
View file

@ -0,0 +1,23 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>
<th class="cel_artist optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=clip&sort=artist', T_('Artist'),'sort_video_artist'); ?></th>

21
templates/show_partial_movie.inc.php Normal file
View file

@ -0,0 +1,21 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/

22
templates/show_partial_movie_row.inc.php Normal file
View file

@ -0,0 +1,22 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>

23
templates/show_partial_movies.inc.php Normal file
View file

@ -0,0 +1,23 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>

24
templates/show_partial_personal_video.inc.php Normal file
View file

@ -0,0 +1,24 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
$videoprops[gettext_noop('Location')] = $video->f_location;
$videoprops[gettext_noop('Description')] = scrub_out($video->description);

23
templates/show_partial_personal_video_row.inc.php Normal file
View file

@ -0,0 +1,23 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>
<td class="cel_location"><?php echo $video->f_location; ?></td>

23
templates/show_partial_personal_videos.inc.php Normal file
View file

@ -0,0 +1,23 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>
<th class="cel_location optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=personal_video&sort=location', T_('Location'),'sort_video_location'); ?></th>

26
templates/show_partial_tvshow_episode.inc.php Normal file
View file

@ -0,0 +1,26 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
$videoprops[gettext_noop('TV Show')] = $video->f_tvshow_link;
$videoprops[gettext_noop('Season')] = $video->f_season_link;
$videoprops[gettext_noop('Episode')] = $video->episode_number;
$videoprops[gettext_noop('Summary')] = $video->description;

25
templates/show_partial_tvshow_episode_row.inc.php Normal file
View file

@ -0,0 +1,25 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>
<td class="cel_episode"><?php echo $video->episode_number; ?></td>
<td class="cel_season"><?php echo $video->f_season_link; ?></td>
<td class="cel_tvshow"><?php echo $video->f_tvshow_link; ?></td>

25
templates/show_partial_tvshow_episodes.inc.php Normal file
View file

@ -0,0 +1,25 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>
<th class="cel_episode optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=episode', T_('Episode'),'sort_video_episode'); ?></th>
<th class="cel_season optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=season', T_('Season'),'sort_video_season'); ?></th>
<th class="cel_tvshow optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=tvshow', T_('TV Show'),'sort_video_tvshow'); ?></th>

2
templates/show_song.inc.php
View file

@ -24,7 +24,7 @@ $icon = $song->enabled ? 'disable' : 'enable';
$button_flip_state_id = 'button_flip_state_' . $song->id;
?>
<?php UI::show_box_top($song->title . ' ' . T_('Details'), 'box box_song_details'); ?>
<dl class="song_details">
<dl class="media_details">
<?php if (AmpConfig::get('ratings')) { ?>
<?php $rowparity = UI::flip_class(); ?>

75
templates/show_tvshow_episodes.inc.php
View file

@ -1,75 +0,0 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
$web_path = AmpConfig::get('web_path');
if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php';
?>
<table class="tabledata" cellpadding="0" cellspacing="0" data-objecttype="tvshow_episode">
<thead>
<tr class="th-top">
<th class="cel_play essential"></th>
<th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=title', T_('Title'),'sort_video_title'); ?></th>
<th class="cel_add essential"></th>
<th class="cel_episode optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=episode', T_('Episode'),'sort_video_episode'); ?></th>
<th class="cel_season optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=season', T_('Season'),'sort_video_season'); ?></th>
<th class="cel_tvshow optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=tvshow', T_('TV Show'),'sort_video_tvshow'); ?></th>
<th class="cel_codec optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=codec', T_('Codec'),'sort_video_codec'); ?></th>
<th class="cel_resolution optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th>
<th class="cel_length optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=length', T_('Time'),'sort_video_length'); ?></th>
<th class="cel_tags optional"><?php echo T_('Tags'); ?></th>
<th class="cel_action essential"><?php echo T_('Action'); ?></th>
</tr>
</thead>
<tbody>
<?php
foreach ($object_ids as $video_id) {
$video = new TVShow_Episode($video_id);
$video->format();
?>
<tr id="video_<?php echo $video->id; ?>" class="<?php echo UI::flip_class(); ?>">
<?php require AmpConfig::get('prefix') . '/templates/show_tvshow_episode_row.inc.php'; ?>
</tr>
<?php } //end foreach ?>
<?php if (!count($object_ids)) { ?>
<tr class="<?php echo UI::flip_class(); ?>">
<td colspan="11"><span class="nodata"><?php echo T_('No episode found'); ?></span></td>
</tr>
<?php } ?>
</tbody>
<tfoot>
<tr class="th-bottom">
<th class="cel_play"></th>
<th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th>
<th class="cel_add"></th>
<th class="cel_episode"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=episode', T_('Episode'),'sort_video_episode'); ?></th>
<th class="cel_season"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=season', T_('Season'),'sort_video_season'); ?></th>
<th class="cel_tvshow"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=tvshow', T_('TV Show'),'sort_video_tvshow'); ?></th>
<th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th>
<th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th>
<th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th>
<th class="cel_tags"><?php echo T_('Tags'); ?></th>
<th class="cel_action"><?php echo T_('Action'); ?></th>
</tr>
</tfoot>
</table>
<script src="<?php echo AmpConfig::get('web_path'); ?>/lib/javascript/tabledata.js" language="javascript" type="text/javascript"></script>
<?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>

94
templates/show_video.inc.php Normal file
View file

@ -0,0 +1,94 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
?>
<?php UI::show_box_top($video->f_title . ' ' . T_('Details'), 'box box_video_details'); ?>
<dl class="media_details">
<?php if (AmpConfig::get('ratings')) { ?>
<?php $rowparity = UI::flip_class(); ?>
<dt class="<?php echo $rowparity; ?>"><?php echo T_('Rating'); ?></dt>
<dd class="<?php echo $rowparity; ?>">
<div id="rating_<?php echo $video->id; ?>_video"><?php Rating::show($video->id,'video'); ?>
</div>
</dd>
<?php } ?>
<?php if (AmpConfig::get('userflags')) { ?>
<?php $rowparity = UI::flip_class(); ?>
<dt class="<?php echo $rowparity; ?>"><?php echo T_('Fav.'); ?></dt>
<dd class="<?php echo $rowparity; ?>">
<div id="userflag_<?php echo $video->id; ?>_video"><?php Userflag::show($video->id,'video'); ?>
</div>
</dd>
<?php } ?>
<?php $rowparity = UI::flip_class(); ?>
<dt class="<?php echo $rowparity; ?>"><?php echo T_('Action'); ?></dt>
<dd class="<?php echo $rowparity; ?>">
<?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=video&video_id=' . $video->id, 'play', T_('Play'),'play_video_' . $video->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=video&video_id=' . $video->id . '&append=true','play_add', T_('Play last'),'addplay_video_' . $video->id); ?>
<?php } ?>
<?php } ?>
<?php if (AmpConfig::get('sociable')) { ?>
<a href="<?php echo AmpConfig::get('web_path'); ?>/shout.php?action=show_add_shout&type=video&id=<?php echo $video->id; ?>">
<?php echo UI::get_icon('comment', T_('Post Shout')); ?>
</a>
<?php } ?>
<?php if (AmpConfig::get('share')) { ?>
<a href="<?php echo AmpConfig::get('web_path'); ?>/share.php?action=show_create&type=video&id=<?php echo $video->id; ?>"><?php echo UI::get_icon('share', T_('Share')); ?></a>
<?php } ?>
<?php if (Access::check_function('download')) { ?>
<a href="<?php echo Video::play_url($video->id); ?>"><?php echo UI::get_icon('link', T_('Link')); ?></a>
<a href="<?php echo AmpConfig::get('web_path'); ?>/stream.php?action=download&video_id=<?php echo $video->id; ?>"><?php echo UI::get_icon('download', T_('Download')); ?></a>
<?php } ?>
</dd>
<?php
$videoprops[gettext_noop('Title')] = scrub_out($video->f_title);
$videoprops[gettext_noop('Length')] = scrub_out($video->f_time);
if (!strtolower(get_class($video)) != 'video') {
require AmpConfig::get('prefix') . '/templates/show_partial_' . strtolower(get_class($video)) . '.inc.php';
}
$videoprops[gettext_noop('Release Date')] = scrub_out($video->f_release_date);
$videoprops[gettext_noop('Codec')] = scrub_out($video->f_codec);
$videoprops[gettext_noop('Resolution')] = scrub_out($video->f_resolution);
if (Access::check('interface','75')) {
$videoprops[gettext_noop('Filename')] = scrub_out($video->file) . " " . $video->f_size;
}
if ($video->update_time) {
$videoprops[gettext_noop('Last Updated')] = date("d/m/Y H:i",$video->update_time);
}
$videoprops[gettext_noop('Added')] = date("d/m/Y H:i",$video->addition_time);
if (AmpConfig::get('show_played_times')) {
$videoprops[gettext_noop('# Played')] = scrub_out($video->object_cnt);
}
foreach ($videoprops as $key => $value) {
if (trim($value)) {
$rowparity = UI::flip_class();
echo "<dt class=\"".$rowparity."\">" . T_($key) . "</dt><dd class=\"".$rowparity."\">" . $value . "</dd>";
}
}
?>
</dl>
<?php UI::show_box_bottom(); ?>

15
templates/show_video_row.inc.php
View file

@ -31,18 +31,29 @@
<?php } ?>
</div>
</td>
<td class="cel_title"><?php echo $video->f_title; ?></td>
<td class="cel_title"><?php echo $video->f_link; ?></td>
<td class="cel_add">
<span class="cel_item_add">
<?php echo Ajax::button('?action=basket&type=video&id=' . $video->id,'add', T_('Add to temporary playlist'),'add_video_' . $video->id); ?>
</span>
</td>
<?php
if (isset($video_type)) {
require AmpConfig::get('prefix') . '/templates/show_partial_' . $video_type . '_row.inc.php';
}
?>
<td class="cel_codec"><?php echo $video->f_codec; ?></td>
<td class="cel_resolution"><?php echo $video->f_resolution; ?></td>
<td class="cel_length"><?php echo $video->f_length; ?></td>
<td class="cel_tags" title="<?php echo $video->f_tags; ?>"><?php $video->f_tags; ?></td>
<?php if (AmpConfig::get('ratings')) { ?>
<td class="cel_rating" id="rating_<?php echo $video->id; ?>_video"><?php Rating::show($video->id, 'video'); ?></td>
<?php } ?>
<?php if (AmpConfig::get('userflags')) { ?>
<td class="cel_userflag" id="userflag_<?php echo $video->id; ?>_video"><?php Userflag::show($video->id, 'video'); ?></td>
<?php } ?>
<td class="cel_action">
<?php if (Access::check_function('download')) { ?>
<a href="<?php echo AmpConfig::get('web_path'); ?>/stream.php?action=download&type=video&oid=<?php echo $video->id; ?>"><?php echo UI::get_icon('download', T_('Download')); ?></a>
<a href="<?php echo AmpConfig::get('web_path'); ?>/stream.php?action=download&video_id=<?php echo $video->id; ?>"><?php echo UI::get_icon('download', T_('Download')); ?></a>
<?php } ?>
</td>

28
templates/show_videos.inc.php
View file

@ -29,10 +29,21 @@ if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/l
<th class="cel_play essential"></th>
<th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th>
<th class="cel_add essential"></th>
<?php
if (isset($video_type)) {
require AmpConfig::get('prefix') . '/templates/show_partial_' . $video_type . 's.inc.php';
}
?>
<th class="cel_codec optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th>
<th class="cel_resolution optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th>
<th class="cel_length optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th>
<th class="cel_tags optional"><?php echo T_('Tags'); ?></th>
<?php if (AmpConfig::get('ratings')) { ?>
<th class="cel_rating optional"><?php echo T_('Rating'); ?></th>
<?php } ?>
<?php if (AmpConfig::get('userflags')) { ?>
<th class="cel_userflag optional"><?php echo T_('Fav.'); ?></th>
<?php } ?>
<th class="cel_action essential"><?php echo T_('Action'); ?></th>
</tr>
</thead>
@ -40,7 +51,11 @@ if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/l
<?php
/* Foreach through every artist that has been passed to us */
foreach ($object_ids as $video_id) {
if (isset($video_type)) {
$video = new $video_type($video_id);
} else {
$video = new Video($video_id);
}
$video->format();
?>
<tr id="video_<?php echo $video->id; ?>" class="<?php echo UI::flip_class(); ?>">
@ -49,7 +64,7 @@ if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/l
<?php } //end foreach ?>
<?php if (!count($object_ids)) { ?>
<tr class="<?php echo UI::flip_class(); ?>">
<td colspan="8"><span class="nodata"><?php echo T_('No video found'); ?></span></td>
<td colspan="42"><span class="nodata"><?php echo T_('No video found'); ?></span></td>
</tr>
<?php } ?>
</tbody>
@ -58,10 +73,21 @@ if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/l
<th class="cel_play"></th>
<th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th>
<th class="cel_add"></th>
<?php
if (isset($video_type)) {
require AmpConfig::get('prefix') . '/templates/show_partial_' . $video_type . 's.inc.php';
}
?>
<th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th>
<th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th>
<th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th>
<th class="cel_tags"><?php echo T_('Tags'); ?></th>
<?php if (AmpConfig::get('ratings')) { ?>
<th class="cel_rating optional"><?php echo T_('Rating'); ?></th>
<?php } ?>
<?php if (AmpConfig::get('userflags')) { ?>
<th class="cel_userflag optional"><?php echo T_('Fav.'); ?></th>
<?php } ?>
<th class="cel_action"><?php echo T_('Action'); ?></th>
</tr>
</tfoot>

3
templates/sidebar_home.inc.php
View file

@ -48,9 +48,10 @@
<?php if (AmpConfig::get('allow_video')) { ?>
<li><h4 class="header"><span class="sidebar-header-title"><?php echo T_('Browse Video'); ?></span><span class="sprite sprite-icon_all <?php echo isset($_COOKIE['sb_browse']) ? $_COOKIE['sb_browse'] : 'expanded'; ?>" id="browse" lt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<ul class="sb3" id="sb_browse_bb">
<li id="sb_browse_bb_Clip"><a href="<?php echo $web_path; ?>/browse.php?action=clip"><?php echo T_('Music Clips'); ?></a></li>
<li id="sb_browse_bb_TVShow"><a href="<?php echo $web_path; ?>/browse.php?action=tvshow"><?php echo T_('TV Shows'); ?></a></li>
<li id="sb_browse_bb_Movie"><a href="<?php echo $web_path; ?>/browse.php?action=movie"><?php echo T_('Movies'); ?></a></li>
<li id="sb_browse_bb_Video"><a href="<?php echo $web_path; ?>/browse.php?action=video"><?php echo T_('Other Videos'); ?></a></li>
<li id="sb_browse_bb_Video"><a href="<?php echo $web_path; ?>/browse.php?action=personal_video"><?php echo T_('Personal Videos'); ?></a></li>
</ul>
</li>
<?php } ?>

6
themes/classic/templates/default.css
View file

@ -646,15 +646,15 @@ td.cel_cover{padding:6px;}
/************************************************/
/* Song details */
/************************************************/
dl.song_details{font-size:0.8em;}
.song_details dt {
dl.media_details{font-size:0.8em;}
.media_details dt {
float:left;
clear:both;
width:20%;
min-width:20%; /*Ie bugfix*/
font-weight:bold;
}
.song_details dd {
.media_details dd {
float:left;
width:79%;
min-width:79%; /*Ie bugfix*/

8
themes/fresh/templates/default.css
View file

@ -991,18 +991,18 @@ span.nodata {
/***********************************************
Content (Track view)
***********************************************/
dl.song_details
dl.media_details
{
padding: 0.5em;
}
dl.song_details dd
dl.media_details dd
{
margin: 0 0 0 95px;
padding: 0 0 0.5em 0;
}
dl.song_details dt
dl.media_details dt
{
float: left;
clear: left;
@ -1012,7 +1012,7 @@ dl.song_details dt
color: #c60;
}
dl.song_details a:hover
dl.media_details a:hover
{
color: #09c;
text-decoration: underline;

6
themes/greysme/templates/default.css
View file

@ -661,15 +661,15 @@ td.cel_track {text-align:right;}
/************************************************/
/* Song details */
/************************************************/
dl.song_details{font-size:1em;}
.song_details dt {
dl.media_details{font-size:1em;}
.media_details dt {
float:left;
clear:both;
width:20%;
min-width:20%; /*Ie bugfix*/
font-weight:bold;
}
.song_details dd {
.media_details dd {
float:left;
width:79%;
min-width:79%; /*Ie bugfix*/

6
themes/penguin/templates/default.css
View file

@ -832,12 +832,12 @@ td.cel_cover {
/************************************************/
/* Song details */
/************************************************/
dl.song_details {
dl.media_details {
font-family:Verdana, Geneva, sans-serif;
font-size:10px;
width: 300px;
}
.song_details dt {
.media_details dt {
text-transform:uppercase;
float:left;
clear:both;
@ -848,7 +848,7 @@ dl.song_details {
border-right: 1px dotted #666666;
border-bottom: 1px dotted #666666;
}
.song_details dd {
.media_details dd {
float:left;
width:79%;
min-width:79%; /*Ie bugfix*/

6
themes/reborn/templates/default.css
View file

@ -1576,11 +1576,11 @@ span.fatalerror {
/***********************************************
Content (Track view)
***********************************************/
.song_details {
.media_details {
margin-top: 20px;
}
dl.song_details dt {
dl.media_details dt {
float: left;
clear: left;
width: 200px;
@ -1588,7 +1588,7 @@ dl.song_details dt {
color: #c60;
}
dl.song_details dd {
dl.media_details dd {
margin: 10px 0 10px 250px;
height: 24px;
}

41
video.php Normal file
View file

@ -0,0 +1,41 @@
<?php
/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
* Copyright 2001 - 2014 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
require_once 'lib/init.php';
UI::show_header();
switch ($_REQUEST['action']) {
case 'show_video':
default:
$type = 'Video';
if (isset($_REQUEST['type'])) {
$type = Video::validate_type($_REQUEST['type']);
}
$video = new $type($_REQUEST['video_id']);
$video->format();
require_once AmpConfig::get('prefix') . '/templates/show_video.inc.php';
break;
}
UI::show_footer();