diff --git a/.gitignore b/.gitignore
index 64c48e5136c01e5d365741b280d591049e18d004..b93773376963d4cba3b3071a6f457471e6ffcabd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
/config.php
-/logo/*.png
-/fanart/*.jpg
-/poster/*.jpg
/cache/*.json
+/logo/show/*.png
+/logo/movie/*.png
+/fanart/show/*.jpg
+/fanart/movie/*.jpg
+/poster/show/*.jpg
+/poster/movie/*.jpg
diff --git a/api.php b/api.php
index 887a71dd71f16719e70b9b6514783ab42826a597..e5e7c90962c098786f7c69d713ab1e15d28b97ca 100644
--- a/api.php
+++ b/api.php
@@ -44,7 +44,7 @@ if ($_GET['get'] == 'movies' && $_GET['limit'] && isset($_GET['offset'])) {
"plot" => $movie['info']['plot'],
"rating" => $movie['info']['rating']['imdb'][0].' ('.$movie['info']['rating']['imdb'][1].')',
"status" => $movie['status'],
- "folder" => current(explode('/', current(str_replace($moviesPath.'/', '', $movie['releases'][0]['files']['movie']))))
+ "folder" => current(explode('/', current(str_replace($moviesPath.'/', '', $movie['releases'][release_with_file($movie['releases'])]['files']['movie']))))
));
}
echo json_encode($output);
@@ -84,7 +84,7 @@ if ($_GET['get'] == 'poster' && (!empty($_GET['show']) || !empty($_GET['movie'])
$img->readImage($source);
$img->thumbnailImage(0, 220);
$img->setImageCompression(Imagick::COMPRESSION_JPEG);
- $img->setImageCompressionQuality(80);
+ $img->setImageCompressionQuality(70);
$img->writeImage($poster);
}elseif($_GET['season'] != '') {
header("HTTP/1.0 404 Not Found");
@@ -130,7 +130,7 @@ if ($_GET['get'] == 'fanart' && (!empty($_GET['show']) || !empty($_GET['movie'])
$overlay->setImageOpacity(0.80);
$img->compositeImage($overlay, imagick::COMPOSITE_OVER, 0, 0);
$img->setImageCompression(Imagick::COMPRESSION_JPEG);
- $img->setImageCompressionQuality(75);
+ $img->setImageCompressionQuality(50);
$img->writeImage($fanart);
}else{
//$fanart = 'img/no_fanart.jpg';
@@ -153,7 +153,7 @@ if ($_GET['get'] == 'logo' && (!empty($_GET['show']) || !empty($_GET['movie'])))
$type = 'movie';
}
- $logo = get_absolute_path('logo/'.cleanName($_GET[$type]).'.png');
+ $logo = get_absolute_path('logo/'.$type.'/'.cleanName($_GET[$type]).'.png');
if(!file_exists($logo)) {
@@ -281,4 +281,13 @@ function queryCP($cmd, $params = '') {
}
-?>
\ No newline at end of file
+function release_with_file($releases) {
+ foreach($releases as $release => $value) {
+ if($releases[$release]['status'] == 'done' && count($releases[$release]['files']['movie']) > 0) {
+ return $release;
+ }
+ }
+ return false;
+}
+
+?>
diff --git a/js/mediarack.js b/js/mediarack.js
index ca754ca0faf3bd457db41e3c2bb2ed6a238157aa..d8fd94b239f7c29de6f3631e3723946b46ac25e8 100644
--- a/js/mediarack.js
+++ b/js/mediarack.js
@@ -121,14 +121,19 @@ function getShows() {
var i = 0;
$.each(data, function (key, show) {
var divShowContainer = $('<div class="show panel panel-default" data-showid="'+show.id+'" id="show_'+show.id+'"></div>');
- var divShowHeader = $('<div class="showName panel-heading"><h2 class="panel-title text-center"><img class="showLogo lazy" style="min-height: 50px; height: 50px;" alt="'+show.name+'" data-original="'+cdn('show/'+escape(show.folder)+'/logo.png')+'" src="" /></h2></div>');
+ var divShowHeader = $('<div class="showName panel-heading"><h2 class="panel-title text-center"><img class="showLogo lazy" style="min-height: 50px; height: 50px;" alt="'+show.name+'" data-original="'+cdn('show/'+escape(show.folder)+'/logo.png')+'" /></h2></div>');
var divShowBody = $('<div class="panel-body lazy" data-original="'+cdn('show/'+escape(show.folder)+'/fanart.jpg')+'"></div>');
divShowBody.css('background-image', 'url('+cdn('img/no_fanart.jpg'));
var divShowFooter =$('<div class="panel-footer">Seasons: , Episodes: </div>');
- var divShowPoster = $('<div class="col-md-2 text-center"><a href="#" class="thumbnail"><img id="poster_'+show.id+'" class="showPoster lazy" data-original="'+cdn('show/'+escape(show.folder)+'/poster.jpg')+'" src="'+cdn('img/no_poster.jpg')+'" /></a></div>');
+ var divShowPoster = $('<div class="col-md-2 text-center"><a href="#" class="thumbnail"><img id="poster_'+show.id+'" class="showPoster lazy" data-original="'+cdn('show/'+escape(show.folder)+'/poster.jpg')+'" /></a></div>');
var ulSeasons = $('<ul class="seasons col-md-10 list-group"></ul>');
$.each(show.seasons, function(key, season) {
- var liSeason = $('<li class="season list-group-item" data-season="'+season.season+'"><strong>Season '+season.season+'</strong><span class="badge">'+season.count+'</span></li>');
+ if (season.season == '0') {
+ var seasonTitle = 'Specials';
+ }else{
+ var seasonTitle = 'Season '+season.season;
+ }
+ var liSeason = $('<li class="season list-group-item" data-season="'+season.season+'"><strong>'+seasonTitle+'</strong><span class="badge">'+season.count+'</span></li>');
liSeason.bind('click', function() {
getEpisodes($(this).parent().parent().parent().data('showid'), $(this).data('season'));
});
@@ -154,17 +159,17 @@ function getShows() {
$("#shows div.panel-body.lazy").lazyload({
//event: "scrollstop",
effect: "fadeIn",
- threshold: 100
+ //threshold: 100
});
$("#shows img.showPoster.lazy").lazyload({
//event: "scrollstop",
effect: "fadeIn",
- threshold: 100
+ //threshold: 100
});
$("#shows img.showLogo.lazy").lazyload({
//event: "scrollstop",
effect: "fadeIn",
- threshold: 100
+ //threshold: 100
});
divShows.append(divShowContainer);
if(i < 5) {
@@ -239,10 +244,10 @@ function getMovies() {
var i = 0;
$.each(data, function (key, movie) {
var divMovieContainer = $('<div class="movie panel panel-default" data-imdb="'+movie.imdb+'" id="movie_'+movie.imdb+'"></div>');
- var divMovieHeader = $('<div class="movieName panel-heading"><h2 class="panel-title text-center"><img class="movieLogo lazy" alt="'+movie.title+'" data-original="'+cdn('movie/'+escape(movie.folder)+'/logo.png')+'" src="" /></h2></div>');
+ var divMovieHeader = $('<div class="movieName panel-heading"><h2 class="panel-title text-center"><img class="movieLogo lazy" alt="'+movie.title+'" data-original="'+cdn('movie/'+escape(movie.folder)+'/logo.png')+'" /></h2></div>');
var divMovieBody = $('<div class="panel-body lazy" data-original="'+cdn('movie/'+escape(movie.folder)+'/fanart.jpg')+'"></div>');
divMovieBody.css('background-image', 'url('+cdn('img/no_fanart.jpg'));
- var divMoviePoster = $('<div class="col-md-2 text-center"><a href="#" class="thumbnail"><img id="poster_'+movie.imdb+'" class="moviePoster lazy" data-original="'+cdn('movie/'+escape(movie.folder)+'/poster.jpg')+'" src="'+cdn('img/no_poster.jpg')+'" /></a></div>');
+ var divMoviePoster = $('<div class="col-md-2 text-center"><a href="#" class="thumbnail"><img id="poster_'+movie.imdb+'" class="moviePoster lazy" data-original="'+cdn('movie/'+escape(movie.folder)+'/poster.jpg')+'" /></a></div>');
var divMoviePlot = $('<div class="moviePlot col-md-10 panel panel-default"><div class="panel-heading">'+movie.tagline+'</div><div class="panel-body">'+movie.plot+'</div></div>');
var divMovieFooter =$('<div class="panel-footer text-right">IMDB Rating: '+movie.rating+'</div>');
divMovieContainer.append(divMovieHeader);
@@ -259,17 +264,17 @@ function getMovies() {
$("#movies div.panel-body.lazy").lazyload({
//event: "scrollstop",
effect: "fadeIn",
- threshold: 100
+ //threshold: 100
});
$("#movies img.moviePoster.lazy").lazyload({
//event: "scrollstop",
effect: "fadeIn",
- threshold: 100
+ //threshold: 100
});
$("#movies img.movieLogo.lazy").lazyload({
//event: "scrollstop",
effect: "fadeIn",
- threshold: 100
+ //threshold: 100
});
divMovies.append(divMovieContainer);
if(i < 5) {