Rename Film class into Movie class, adjust the other classes and scripts accordingly.

This commit is contained in:
DariusIII
2015-09-01 22:26:22 +02:00
parent 98e7310260
commit 2ec8b9e062
19 changed files with 32 additions and 53 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ use newznab\db\Settings;
$pdo = new Settings();
$c = new ColorCLI();
$movie = new Film(['Echo' => true, 'Settings' => $pdo]);
$movie = new Movie(['Echo' => true, 'Settings' => $pdo]);
$movies = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE tmdbid = 0 ORDER BY id ASC");
+1 -1
View File
@@ -6,7 +6,7 @@ use newznab\db\Settings;
$pdo = new Settings();
$movie = new Film(['Echo' => true, 'Settings' => $pdo]);
$movie = new Movie(['Echo' => true, 'Settings' => $pdo]);
$movies = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE cover = 0 ORDER BY year ASC, id DESC");
if ($movies instanceof \Traversable) {
+1 -1
View File
@@ -6,7 +6,7 @@ use newznab\db\Settings;
$pdo = new Settings();
$c = new ColorCLI();
$movie = new Film(['Echo' => true, 'Settings' => $pdo]);
$movie = new Movie(['Echo' => true, 'Settings' => $pdo]);
$movies = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE traktid = 0 ORDER BY id ASC");
+2 -2
View File
@@ -9,9 +9,9 @@ $movie = new Movie(true);
$db = new Settings();
$movies = $db->query("SELECT imdbID from movieinfo where cover = 0");
$movies = $db->query("SELECT imdbid from movieinfo where cover = 0");
foreach ($movies as $mov) {
$mov = $movie->updateMovieInfo($mov['imdbID']);
$mov = $movie->updateMovieInfo($mov['imdbid']);
sleep(1);
}
-21
View File
@@ -1,21 +0,0 @@
<?php
// search tmdb or web for movie from a given name
require_once dirname(__FILE__) . '/../../www/config.php';
$moviename = "Africa Screams";
$movie = new Movie();
// #1 tmdb
//
//print_r($movie->searchTmdb($moviename));
// #2 search engine (google/bing)
//$buffer = getUrl("https://www.google.com/search?source=ig&hl=en&rlz=&btnG=Google+Search&aq=f&oq=&q=".urlencode($moviename.' site:imdb.com'));
$buffer = \newznab\utility\Utility::getUrl(['url' => 'http://www.bing.com/search?&q='.urlencode($moviename.' site:imdb.com')]);
if ($buffer !== false && strlen($buffer))
{
$imdb = $movie->parseImdbFromNfo($buffer);
echo sprintf("imdbid : %s\n", $imdb);
print_r($movie->fetchImdbProperties($imdb));
}
+1 -1
View File
@@ -2,6 +2,6 @@
//run this once per day
require_once("config.php");
$m = new Film(['Echo' => true]);
$m = new Movie(['Echo' => true]);
$m->updateUpcoming();
+1 -1
View File
@@ -338,7 +338,7 @@ class Info
'PostProcess' => new PProcess(['Echo' => $this->echo, 'Nfo' => $this, 'Settings' => $this->pdo])
]
);
$movie = new Film(['Echo' => $this->echo, 'Settings' => $this->pdo]);
$movie = new Movie(['Echo' => $this->echo, 'Settings' => $this->pdo]);
$tvRage = new TvAnger(['Echo' => $this->echo, 'Settings' => $this->pdo]);
foreach ($res as $arr) {
+1 -1
View File
@@ -50,7 +50,7 @@ class MiscSorter
$this->pdo = ($pdo instanceof Settings ? $pdo : new Settings());
$this->category = new Categorize(['Settings' => $this->pdo]);
$this->movie = new Film(['Echo' => $this->echooutput, 'Settings' => $this->pdo]);
$this->movie = new Movie(['Echo' => $this->echooutput, 'Settings' => $this->pdo]);
$this->pubkey = $this->pdo->getSetting('amazonpubkey');
$this->privkey = $this->pdo->getSetting('amazonprivkey');
$this->asstag = $this->pdo->getSetting('amazonassociatetag');
@@ -5,9 +5,9 @@ use newznab\utility\Utility;
use newznab\libraries\Tmdb\TMDB;
/**
* Class Film
* Class Movie
*/
class Film
class Movie
{
const SRC_BOXOFFICE = 1;
@@ -1496,23 +1496,23 @@ class Film
switch ($operation) {
case 'boxoffice':
$data = $rt->getBoxOffice();
$update = Film::SRC_BOXOFFICE;
$update = Movie::SRC_BOXOFFICE;
break;
case 'theaters':
$data = $rt->getInTheaters();
$update = Film::SRC_INTHEATRE;
$update = Movie::SRC_INTHEATRE;
break;
case 'opening':
$data = $rt->getOpening();
$update = Film::SRC_OPENING;
$update = Movie::SRC_OPENING;
break;
case 'upcoming':
$data = $rt->getUpcoming();
$update = Film::SRC_UPCOMING;
$update = Movie::SRC_UPCOMING;
break;
case 'dvd':
$data = $rt->getDVDReleases();
$update = Film::SRC_DVD;
$update = Movie::SRC_DVD;
break;
default:
$data = false;
+1 -1
View File
@@ -190,7 +190,7 @@ class PProcess
{
$processMovies = (is_numeric($processMovies) ? $processMovies : $this->pdo->getSetting('lookupimdb'));
if ($processMovies > 0) {
(new \Film(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processMovieReleases($groupID, $guidChar, $processMovies);
(new \Movie(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processMovieReleases($groupID, $guidChar, $processMovies);
}
}
+1 -1
View File
@@ -3,7 +3,7 @@
require_once './config.php';
$page = new AdminPage();
$movie = new Film(['Settings' => $page->settings]);
$movie = new Movie(['Settings' => $page->settings]);
$id = 0;
$page->title = "Movie Add";
+1 -1
View File
@@ -3,7 +3,7 @@
require_once './config.php';
$page = new AdminPage();
$movie = new Film();
$movie = new Movie();
$id = 0;
// set the current action
+1 -1
View File
@@ -36,7 +36,7 @@ switch($action)
if ($release && $release["imdbid"] != "")
{
$movie = new Film();
$movie = new Movie();
$mov = $movie->getMovieInfo($release['imdbid']);
$page->smarty->assign('updatename', $mov["title"]);
}
+3 -3
View File
@@ -16,7 +16,7 @@ if (isset($_REQUEST['del'])) {
$cats[] = '2030';
$cats[] = '2040';
$m = new Film(['Settings' => $page->settings]);
$m = new Movie(['Settings' => $page->settings]);
$mi = $m->getMovieInfo($_REQUEST['add']);
if (!$mi) {
$m->updateMovieInfo($_REQUEST['add']);
@@ -29,7 +29,7 @@ if (isset($_REQUEST['del'])) {
}
$tmdb = new TMDB($page->settings->getSetting('tmdbkey'), $page->settings->getSetting('imdblanguage'));
$m = new Film(['Settings' => $page->settings, 'TMDb' => $tmdb]);
$m = new Movie(['Settings' => $page->settings, 'TMDb' => $tmdb]);
if (is_numeric($_REQUEST['id'])) {
$movie = $m->fetchTMDBProperties($_REQUEST['id']);
@@ -69,7 +69,7 @@ if (isset($_REQUEST['del'])) {
} else {
$ourmovieimdbs = [];
if (count($imdbids) > 0) {
$m = new Film(['Settings' => $page->settings, 'TMDb' => $tmdb]);
$m = new Movie(['Settings' => $page->settings, 'TMDb' => $tmdb]);
$allmovies = $m->getMovieInfoMultiImdb($imdbids);
foreach ($allmovies as $ourmovie) {
if ($ourmovie['relimdb'] != '') {
+1 -1
View File
@@ -72,7 +72,7 @@ if (isset($_GET["id"]))
$mov = '';
if ($data['imdbid'] != '' && $data['imdbid'] != 0000000) {
$movie = new Film(['Settings' => $page->settings]);
$movie = new Movie(['Settings' => $page->settings]);
$mov = $movie->getMovieInfo($data['imdbid']);
if ($mov && isset($mov['title'])) {
$mov['title'] = str_replace(['/', '\\'], '', $mov['title']);
+1 -1
View File
@@ -5,7 +5,7 @@ if (!$page->users->isLoggedIn()) {
}
if (isset($_GET['modal']) && isset($_GET["id"]) && ctype_digit($_GET["id"])) {
$movie = new Film(['Settings' => $page->settings]);
$movie = new Movie(['Settings' => $page->settings]);
$mov = $movie->getMovieInfo($_GET['id']);
if (!$mov) {
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
$movie = new Film(['Settings' => $page->settings]);
$movie = new Movie(['Settings' => $page->settings]);
$cat = new Category(['Settings' => $page->settings]);
if (!$page->users->isLoggedIn())
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
$movie = new Film;
$movie = new Movie;
if (!$page->users->isLoggedIn())
$page->show403();
+6 -6
View File
@@ -4,7 +4,7 @@ if (!$page->users->isLoggedIn()) {
$page->show403();
}
$m = new Film();
$m = new Movie();
if (!isset($_GET["id"])) {
$_GET["id"] = 1;
@@ -30,19 +30,19 @@ if (!$data || $data["info"] == "") {
$page->smarty->assign('data', $data->movies);
switch ($_GET["id"]) {
case Film::SRC_BOXOFFICE;
case Movie::SRC_BOXOFFICE;
$page->title = "Box Office";
break;
case Film::SRC_INTHEATRE;
case Movie::SRC_INTHEATRE;
$page->title = "In Theater";
break;
case Film::SRC_OPENING;
case Movie::SRC_OPENING;
$page->title = "Opening";
break;
case Film::SRC_UPCOMING;
case Movie::SRC_UPCOMING;
$page->title = "Upcoming";
break;
case Film::SRC_DVD;
case Movie::SRC_DVD;
$page->title = "DVD Releases";
break;
}