diff --git a/lib/DB/patches/0112~category.sql b/lib/DB/patches/0112~category.sql new file mode 100644 index 000000000..a227b0d63 --- /dev/null +++ b/lib/DB/patches/0112~category.sql @@ -0,0 +1,2 @@ +INSERT INTO category (ID, title, parentID) VALUES (6090, 'WEB-DL', 6000); +UPDATE `tmux` SET `value` = '112' WHERE `setting` = 'sqlpatch'; \ No newline at end of file diff --git a/lib/copy_this/www/lib/Categorize.php b/lib/copy_this/www/lib/Categorize.php index adc3d32cd..bc3169b8b 100644 --- a/lib/copy_this/www/lib/Categorize.php +++ b/lib/copy_this/www/lib/Categorize.php @@ -798,6 +798,7 @@ class Categorize extends Category case $this->isXxxPack(): case $this->IsXxxClipHD(): case $this->isXxxClipSD(): + case $this->catWebDL && $this->isXxxWEBDL(): case $this->isXxx264(): case $this->isXxxXvid(): case $this->isXxxImageset(): @@ -805,6 +806,7 @@ class Categorize extends Category case $this->isXxxDVD(): case $this->isXxxOther(): case $this->isXxxSD(): + return true; default: $this->tmpCat = \Category::CAT_XXX_OTHER; @@ -818,6 +820,12 @@ class Categorize extends Category $this->tmpCat = \Category::CAT_XXX_X264; return true; } + if ($this->catWebDL == false) { + if (preg_match('/web[-._ ]dl|web-?rip/i', $this->releaseName)) { + $this->tmpCat = \Category::CAT_XXX_X264; + return true; + } + } return false; } @@ -893,6 +901,7 @@ class Categorize extends Category } return false; } + public function isXxxSD() { if (preg_match('/^[\w.]+(\d{2}\.\d{2}\.\d{2})[\w.]+(MP4-\w+)/i', $this->releaseName)) { @@ -902,6 +911,15 @@ class Categorize extends Category return false; } + public function isXxxWEBDL() + { + if (preg_match('/web[-._ ]dl|web-?rip/i', $this->releaseName)) { + $this->tmpCat = \Category::CAT_XXX_WEBDL; + return true; + } + return false; + } + // Console. public function isConsole() { diff --git a/lib/copy_this/www/lib/TmuxOutput.php b/lib/copy_this/www/lib/TmuxOutput.php index 31e253284..5622a691d 100644 --- a/lib/copy_this/www/lib/TmuxOutput.php +++ b/lib/copy_this/www/lib/TmuxOutput.php @@ -117,7 +117,7 @@ class TmuxOutput extends Tmux $buffer = ''; $state = ($this->runVar['settings']['is_running'] == 1) ? 'Running' : 'Disabled'; //$version = $this->_tvers . 'r' . $this->_vers; - $tversion = '0.6r0040'; + $tversion = '0.6r0045'; $buffer .= sprintf($this->tmpMasks[2], "Monitor $state v$tversion @ $this->_tvers [" . $this->_vers ."]: ", diff --git a/lib/copy_this/www/lib/XXX.php b/lib/copy_this/www/lib/XXX.php index 7d7c32b4c..61d1132e9 100644 --- a/lib/copy_this/www/lib/XXX.php +++ b/lib/copy_this/www/lib/XXX.php @@ -557,7 +557,7 @@ class XXX FROM releases r WHERE r.nzbstatus = 1 AND r.xxxinfo_id = 0 - AND r.categoryID IN (6010, 6020, 6030, 6040, 6041, 6042, 6080) + AND r.categoryID IN (6010, 6020, 6030, 6040, 6041, 6042, 6080, 6090) LIMIT %d", $this->movieqty ) diff --git a/lib/copy_this/www/lib/category.php b/lib/copy_this/www/lib/category.php index 5ff0101af..3179dd92a 100644 --- a/lib/copy_this/www/lib/category.php +++ b/lib/copy_this/www/lib/category.php @@ -60,6 +60,7 @@ class Category const CAT_XXX_IMAGESET = 6060; const CAT_XXX_OTHER = 6070; const CAT_XXX_SD = 6080; + const CAT_XXX_WEBDL = 6090; const CAT_BOOK_MAGS = 7010; const CAT_BOOK_EBOOK = 7020; const CAT_BOOK_COMICS = 7030; diff --git a/start.php b/start.php index c472cf30f..d7463b725 100644 --- a/start.php +++ b/start.php @@ -37,7 +37,7 @@ if (count($nntpkill) === 0) { } // Check database patch version -if ($patch < 111) { +if ($patch < 112) { exit($c->error("\nYour database is not up to date. Please update.\nphp ${DIR}/tmux/lib/DB/patchDB.php\n")); }