From dc42d931aa45f37849cab82e516564d9bb7623db Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Sun, 19 Jan 2014 18:48:12 +0100
Subject: [PATCH] add movie tagline and plot
---
api.php | 57 +++++++++++++++++++++++------------------------
css/mediarack.css | 10 +++++++++
js/mediarack.js | 12 ++++++++--
3 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/api.php b/api.php
index c52bbe8..7a95633 100644
--- a/api.php
+++ b/api.php
@@ -1,8 +1,6 @@
<?php
include_once 'config.php';
-/*** TV SHOWS ***/
-
if ($_GET['get'] == 'shows' && $_GET['limit'] && isset($_GET['offset'])) {
$sbdb = new PDO('sqlite:'.$sbPath.'/sickbeard.db');
@@ -29,6 +27,34 @@ if ($_GET['get'] == 'shows' && $_GET['limit'] && isset($_GET['offset'])) {
}
+if ($_GET['get'] == 'movies' && $_GET['limit'] && isset($_GET['offset'])) {
+
+ $cpdb = new PDO('sqlite:'.$cpPath.'/couchpotato.db');
+ $cpdb->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+ $movies = $cpdb->query("SELECT l.identifier AS imdb, lt.title, l.year, l.tagline, l.plot, s.label AS status FROM library AS l
+ JOIN librarytitle AS lt ON l.id=lt.libraries_id
+ JOIN movie AS m on l.id=m.library_id
+ JOIN status AS s ON m.status_id=s.id
+ WHERE m.status_id = 3 AND `default` = 1
+ ORDER BY title ASC LIMIT ".$_GET['limit']." OFFSET ".$_GET['offset'].";");
+ $output = array();
+ foreach ($movies as $movie) {
+ array_push($output, array(
+ "imdb" => $movie['imdb'],
+ "title" => $movie['title'],
+ "year" => $movie['year'],
+ "tagline" => $movie['tagline'],
+ "plot" => $movie['plot'],
+ "status" => $movie['status']
+ ));
+ }
+ echo json_encode($output);
+ die;
+
+}
+
+
if ($_GET['get'] == 'poster' && (!empty($_GET['show']) || !empty($_GET['movie']))) {
if($_GET['show'] && $_GET['season'])
@@ -166,33 +192,6 @@ if ($_GET['get'] == 'latest' && $_GET['type'] == 'shows') {
}
-/*** MOVIES ***/
-
-if ($_GET['get'] == 'movies' && $_GET['limit'] && isset($_GET['offset'])) {
-
- $cpdb = new PDO('sqlite:'.$cpPath.'/couchpotato.db');
- $cpdb->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
- $movies = $cpdb->query("SELECT l.identifier AS imdb, lt.title, l.year, s.label AS status FROM library AS l
- JOIN librarytitle AS lt ON l.id=lt.libraries_id
- JOIN movie AS m on l.id=m.library_id
- JOIN status AS s ON m.status_id=s.id
- WHERE m.status_id = 3 AND `default` = 1
- ORDER BY title ASC LIMIT ".$_GET['limit']." OFFSET ".$_GET['offset'].";");
- $output = array();
- foreach ($movies as $movie) {
- array_push($output, array(
- "imdb" => $movie['imdb'],
- "title" => $movie['title'],
- "year" => $movie['year'],
- "status" => $movie['status']
- ));
- }
- echo json_encode($output);
- die;
-
-}
-
function cleanName($show) {
return preg_replace("/[^a-zA-Z0-9]/", "_", $show);
}
diff --git a/css/mediarack.css b/css/mediarack.css
index 2cf41ff..897971d 100644
--- a/css/mediarack.css
+++ b/css/mediarack.css
@@ -24,6 +24,8 @@ body {
display: block;
margin-left: auto;
margin-right: auto;
+ min-height: 50px;
+ height: 50px;
}
#shows .thumbnail {
@@ -53,6 +55,14 @@ div.panel-body {
background-size: 100% auto;
}
+div.moviePlot {
+ padding: 0;
+}
+
+div.moviePlot div.panel-heading{
+ font-weight: bold;
+}
+
div#shows, div#movies {
display: none;
}
diff --git a/js/mediarack.js b/js/mediarack.js
index 3582f92..9cb1a75 100644
--- a/js/mediarack.js
+++ b/js/mediarack.js
@@ -195,13 +195,21 @@ 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" style="min-height: 50px; height: 50px;" alt="'+movie.title+'" data-original="api.php?get=logo&movie='+escape(movie.title+' ('+movie.year+')')+'" 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="api.php?get=logo&movie='+escape(movie.title+' ('+movie.year+')')+'" src="" /></h2></div>');
var divMovieBody = $('<div class="panel-body lazy" data-original="api.php?get=fanart&movie='+escape(movie.title+' ('+movie.year+')')+'"></div>');
- var divMovieFooter =$('<div class="panel-footer">IMDB Rating: </div>');
var divMoviePoster = $('<div class="col-md-2 text-center"><a href="#" class="thumbnail"><img id="poster_'+movie.imdb+'" class="moviePoster lazy" data-original="api.php?get=poster&movie='+escape(movie.title+' ('+movie.year+')')+'" src="img/no_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">IMDB Rating: </div>');
divMovieContainer.append(divMovieHeader);
divMovieContainer.append(divMovieBody);
divMovieBody.append(divMoviePoster);
+ divMoviePlot.fadeTo(0, 0.3);
+ divMovieContainer.hover(function() {
+ divMoviePlot.fadeTo(300, 1);
+ }, function() {
+ divMoviePlot.fadeTo(300, 0.3);
+ });
+ divMovieBody.append(divMoviePlot);
divMovieContainer.append(divMovieFooter);
$("#movies div.panel-body.lazy").lazyload({
//event: "scrollstop",
--
GitLab