From cbba2fbffae76d979a5f2a06df5fe2193138e4e4 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 19 Jul 2016 22:59:38 +0200 Subject: [PATCH] Move UHD releases checks before HD ondes --- Changelog | 1 + build/nntmux.xml | 2 +- nntmux/Categorize.php | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Changelog b/Changelog index 688de77b6..29ffe79f5 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2016-07-19 DariusIII + * Chg: Move UHD releases checks before HD ondes * Chg: Add UHD subcategories to Movies, TV and XXX categories * Chg: Add categorization by poster to Categorize.php (used in XXX SD clips for now) * Fix: Add lithium libraries bootstrap for Admin pages diff --git a/build/nntmux.xml b/build/nntmux.xml index 16a6cd2a8..66cea5f43 100755 --- a/build/nntmux.xml +++ b/build/nntmux.xml @@ -2,7 +2,7 @@ - v0.4.2 + 0.0.0 9 diff --git a/nntmux/Categorize.php b/nntmux/Categorize.php index 574430a06..8ac319d74 100644 --- a/nntmux/Categorize.php +++ b/nntmux/Categorize.php @@ -160,9 +160,9 @@ class Categorize extends Category break; case $group === 'alt.binaries.british.drama': switch (true) { + case $this->isUHDTV(): case $this->isHDTV(): case $this->isSDTV(): - case $this->isUHDTV(): case $this->isPC(): break; default: @@ -183,9 +183,9 @@ class Categorize extends Category break; case $group === 'alt.binaries.b4e': switch (true) { + case $this->isUHDTV(): case $this->isHDTV(): case $this->isSDTV(): - case $this->isUHDTV(): case $this->isPC(): case $this->isMovie(): case $this->isXxx(): @@ -420,10 +420,10 @@ class Categorize extends Category break; case $this->isMovieSD(): // Need to check this BEFORE the HD check break; - case $this->isMovieHD(): // Check the movie isn't an HD release before blindly assigning SD - break; case $this->isMovieUHD(): // Check the movie isn't an UHD release before blindly assigning SD break; + case $this->isMovieHD(): // Check the movie isn't an HD release before blindly assigning SD + break; default: $this->tmpCat = Category::MOVIE_SD; break; @@ -723,8 +723,8 @@ class Categorize extends Category case $this->isMovieSD(): case $this->isMovie3D(): case $this->isMovieBluRay(): - case $this->isMovieHD(): case $this->isMovieUHD(): + case $this->isMovieHD(): case $this->isMovieOther(): return true; default: @@ -915,8 +915,8 @@ class Categorize extends Category case $this->isXxxPack(): case $this->isXxxClipSD(): case $this->isXxxSD(): - case $this->isXxxClipHD(): case $this->isXxxUHD(): + case $this->isXxxClipHD(): case $this->catWebDL && $this->isXxxWEBDL(): case $this->isXxx264(): case $this->isXxxXvid():