Various regex and categorization fixes.

lib/copy_this/www/lib/Categorize.php

@@ -178,7 +178,13 @@ class Categorize extends Category
 					}
 					$this->tmpCat = \Category::CAT_MISC_OTHER;
 					break;
-				case $this->categorizeForeign && preg_match('/alt\.binaries\.(dvdnordic\.org|nordic\.(dvdr?|xvid))|dk\.(binaer|binaries)\.film(\.divx)?/', $group):
+				case preg_match('/alt\.binaries\.(dvdnordic\.org|nordic\.(dvdr?|xvid))|dk\.(binaer|binaries)\.film(\.divx)?/', $group):
+					if ($this->categorizeForeign && $this->isMovieForeign()) {
+						break;
+					}
+					if ($this->isMovie()) {
+						break;
+					}
 					$this->tmpCat = \Category::CAT_MOVIE_FOREIGN;
 					break;
 				case $group === 'alt.binaries.documentaries':

lib/copy_this/www/lib/CollectionsCleaning.php

@@ -216,6 +216,8 @@ class CollectionsCleaning
 				return $this->pictures_erotica_anime();
 			case 'alt.binaries.ps3':
 				return $this->ps3();
+			case 'alt.binaries.pwp':
+				return $this->pwp();
 			case 'alt.binaries.series.tv.french':
 				return $this->series_tv_french();
 			case 'alt.binaries.sony.psp':
@@ -2509,6 +2511,20 @@ class CollectionsCleaning
 		return $this->generic();
 	}
 
+	// a.b.pwp
+	protected function pwp()
+	{
+		//(620/899) -  "Giggi_9M05YD32TO4.part147.rar" - 252,53 GB - yEnc
+		if (preg_match('/^\(\d+\/(\d+\)[-_ ]{0,4}"Giggi.+)[A-Z]\d' . $this->e2, $this->subject, $match)) {
+			return $match[1];
+		}
+		//(300/454) "James_Bond_You_Only_Live_Twice_bd25.part300.rar" - 22,22 GB - yEnc
+		if (preg_match('/^\(\d+\/(\d+\)[-_ ]{0,4}".+?)' . $this->e2, $this->subject, $match)) {
+			return $match[1];
+		}
+		return $this->generic();
+	}
+
 	// a.b.series.tv.french
 	protected function series_tv_french()
 	{

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.6r0025';
+		$tversion = '0.6r0030';
 
 		$buffer .= sprintf($this->tmpMasks[2],
 					"Monitor $state v$tversion @ $this->_tvers [" . $this->_vers ."]: ",