version 1.4.3

+ Added - Bookware: A.Cloud.Guru, Technics.Publications, Stone.River.eLearning, VTC.com, OREILLY, Masterclass, Manning, PEARSON, APRESS, EC-COUNCIL, Skylines.Academy, WintellectNOW, Egghead.io, Linux.Academy, Addison.Wesley, Sitepoint.com, VueMastery, INTELLEZY, ICOLLEGE, PEACHPIT, Learnable.com, OpenClassrooms, Learnnowonline, FxpHD, RW, TVI, SCO, CG, 3DMotive, Educator, SpinAcademy, Total Training, The.Gnomon.Workshop, PrepLogic, M.O.C., Learnflash, Winstructor, Galileo, LinuxCBT, UnixCBT, La Formation - App groups: HOTiSO, EAT, BEAN, MESMERiZE, ZZGiSO, XiSO, iNDiSO, EQUiNOX, SUBSTANCE, MAGNETiC, BLZiSO, PFT - Game groups: STRANGE - Sports: MLB Championship/Division Series, MLB Wild Card, AEW Rampage (Wrestling), Saudi Pro League, ICC Cricket, BWSL, Coppa Italia, Viaplay Cup, WNBL, Suppercoppa, Arnold Clark Cup, Showtime Championship Boxing, UEFA Youth League, Biathlon, Porsche Supercup, Bellator (MMA), UFC on ABC/Fox/Fuel, SBK (Racing), KSW (MMA), Cage Warriors/Fury, PFL (MMA), Open Pool CHampionship, Mosconi Cup (Pool), World Pool Masters, Invicta FC (MMA), IMSA (Racing), Enfusion (Kickboxing), WSX (Supercross), FIM (Motocross), IIHF (Icehockey), Extreme E, Frank Warren Boxing, PDC (Darts), Joan Gamper Trophy (Football), Coupe de France, Scottish Cup, Copa del rey, SUpercopa de espanya ~ Improved - PS1 pattern - PS2 pattern - Rugby pattern - WRC Rally pattern - WWE Pattern - Indycar pattern - Music pattern
pr0pz · Jan 2, 2024 · 01cfd1b · 01cfd1b
1 parent abb1411
commit 01cfd1b
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -8,10 +8,10 @@
 
 _Like it? I'd appreciate the support :)_
 
-[![Follow on Twitter](https://img.shields.io/static/v1?label=Follow%20on&message=Twitter&color=1DA1F2&logo=twitter&logoColor=fff)](https://twitter.com/pr0pz)
-[![Watch on Twitch](https://img.shields.io/static/v1?label=Watch%20on&message=Twitch&color=bf94ff&logo=twitch&logoColor=fff)](https://www.twitch.tv/the_propz)
-[![Join on Discord](https://img.shields.io/static/v1?label=Join%20on&message=Discord&color=7289da&logo=discord&logoColor=fff)](https://discord.gg/d7GnhqqAXN)
-[![Donate on Ko-Fi](https://img.shields.io/static/v1?label=Donate%20on&message=Ko-Fi&color=ff5f5f&logo=kofi&logoColor=fff)](https://ko-fi.com/propz)
+[![Follow on Twitter](https://img.shields.io/static/v1?label=Follow%20on&message=Twitter&color=1DA1F2&logo=twitter&logoColor=fff)](https://propz.de/twitter/)
+[![Watch on Twitch](https://img.shields.io/static/v1?label=Watch%20on&message=Twitch&color=bf94ff&logo=twitch&logoColor=fff)](https://propz.de/twitch/)
+[![Join on Discord](https://img.shields.io/static/v1?label=Join%20on&message=Discord&color=7289da&logo=discord&logoColor=fff)](https://propz.de/discord/)
+[![Donate on Ko-Fi](https://img.shields.io/static/v1?label=Donate%20on&message=Ko-Fi&color=ff5f5f&logo=kofi&logoColor=fff)](https://propz.de/kofi/)
 
 ### __Description__
 

diff --git a/ReleaseParser.php b/ReleaseParser.php
@@ -9,7 +9,7 @@
  *
  * @package ReleaseParser
  * @author Wellington Estevo
- * @version 1.4.2
+ * @version 1.4.3
  */
 
 class ReleaseParser extends ReleasePatterns
@@ -778,7 +778,7 @@ private function isType( $type = '' )
 		}
 		else if ( $type === 'music' )
 		{
-			if ( \preg_match( '/^[\w()]+-[\w()]+-[\w()-]+$/i', $this->release ) )
+			if ( \preg_match( '/^[\w()]+-+[\w()]+-+[\w()-]+$/i', $this->release ) )
 				return \true;
 
 			if ( \preg_match( '/^VA-/i', $this->release ) )

diff --git a/ReleaseParserTest.php b/ReleaseParserTest.php
@@ -10,7 +10,7 @@
  * 
  * @package ReleaseParser
  * @author Wellington Estevo
- * @version 1.4.1
+ * @version 1.4.3
  */
 
 /**
@@ -558,8 +558,8 @@ function release_parser_test()
 function release_parser_test_single()
 {
 	echo \PHP_EOL . 'Starting ReleaseParser Single test ...' . \PHP_EOL . \PHP_EOL;
-	$release_name = 'El.Exorcista.1973.DC.LATiN.SPANiSH.MULTi.2160p.UHD.BluRay.x265-CEBRAY';
-	$release_section = 'DC';
+	$release_name = 'Diephuis--Mirrors_EP-(DHR19)-WEB-2023-dh';
+	$release_section = '';
 	$release = new ReleaseParser( $release_name, $release_section );
 
 	// Check if expectation matches parsed.

diff --git a/ReleasePatterns.php b/ReleasePatterns.php
@@ -6,7 +6,7 @@
  *
  * @package ReleaseParser
  * @author Wellington Estevo
- * @version 1.4.2
+ * @version 1.4.3
  */
 
 class ReleasePatterns {
@@ -34,11 +34,11 @@ class ReleasePatterns {
 	// Good for tv and audiobook rls
 	const REGEX_EPISODE = '(?:(?:s\d+[._-]?)?(?:ep?|eps[._-]?|episode[._-]?|o[av]+[._-]?|f(?:olge[._-]?)?)([\d_-]+)|(?:\d+x)(\d+))';
 	const REGEX_EPISODE_OTHER = '(?:ep?|eps[._-]?|se[._-]?|episode[._-]?|f(?:olge[._-]?)?|band[._-]?|issue[._-]?|ausgabe[._-]?|n[or]?[._-]?|(?:silber[._-])?edition[._-]?|sets?[._-]?)([\d_-]+)';
-	const REGEX_EPISODE_TV = '(?<!^)(?:(?:(?:[ST]|saison|staffel)\d+)?[._-]?(?:ep?|o[av]+[._-]?|eps[._-]?|episode[._-]?)[\d-]+|\d+x\d+|[ST]\d+)';
+	const REGEX_EPISODE_TV = '(?<!^)(?:(?:(?:[ST]|saison|staffel|temp)[._-]?\d+)?[._-]?(?:ep?|o[av]+[._-]?|eps[._-]?|episode[._-]?)[\d-]+|\d+x\d+|[ST]\d+)';
 	// For Disc numbers: Disc1 / DVD1 / CD1 / (S01)D01
 	const REGEX_DISC = '(?:s\d+[._-]?)?(?:d|di[cks][cks]|cd|dvd)[._-]?(\d+)';
 	// Season pattern matches: S01E01 / 1x01 / S01D01
-	const REGEX_SEASON = '/[._-](?:(?:[ST]|saison|staffel)[._-]?(\d+)[._-]?(?:(?:ep?|eps[._-]?|episode[._-]?|f(?:olge[._-]?)|d|di[cks][cks][._-]?|cd[._-]?|dvd[._-]?)\d+)?|(\d+)(?:x\d+))[._-]/i';
+	const REGEX_SEASON = '/[._-](?:(?:[ST]|saison|staffel|temp)[._-]?(\d+)[._-]?(?:(?:ep?|eps[._-]?|episode[._-]?|f(?:olge[._-]?)|d|di[cks][cks][._-]?|cd[._-]?|dvd[._-]?)\d+)?|(\d+)(?:x\d+))[._-]/i';
 	// Basic title pattern
 	const REGEX_TITLE = '([\w.()-]+)';
 	// Good for Ebooks
@@ -81,15 +81,15 @@ class ReleasePatterns {
 		// Anime
 		'Anime' => 'anime',
 		// Software Sections
-		'App' => [ 'app', '0day', 'pda' ],
+		'App' => [ 'app', 'apps-0day', 'pda', 'mobile' ],
 		// Bookware
 		'Bookware' => 'bookware',
 		// Ebook
 		'eBook' => 'book',
 		// Font
 		'Font' => 'font',
 		// Game/Console Sections
-		'Game' => [ 'GAME', 'D[SC]', 'G[BC]', 'NSW', 'PS', 'XBOX', 'WII' ],
+		'Game' => [ 'GAME', 'D[SC]', 'G[BC]', 'NINTENDO', 'NSW', 'PLAYSTATION', 'PS[pvx\d]', 'XBOX', 'X360', 'WII' ],
 		// Music Sections
 		'Music' => [ 'mp3', 'flac', 'music', 'ringtones' ],
 		// Music Video Sections
@@ -99,7 +99,7 @@ class ReleasePatterns {
 		// Sports
 		'Sports' => 'sport',
 		// XXX Sections
-		'XXX' => [ 'xxx', 'imgset', 'imageset' ],
+		'XXX' => [ 'xxx', 'imgset', 'imageset', 'paysite' ],
 		// Movie Sections
 		'Movie' => [ 'movie', '(?!tv).*26[45]', 'bluray', 'dvdr', 'xvid', 'divx' ],
 	];
@@ -125,7 +125,7 @@ class ReleasePatterns {
 		'CD EP' => '\d*cd.?ep',
 		'CD Single' => [ 'cds', '(?:cd[._-]?)single' ], // CD Single
 		'Comedy Central' => 'CC', // (P2P)
-		'Console Disc' => [ 'xbox.*dvd[r\d]*', 'dvd[r\d]*.*xbox', 'cd.*xbox', 'ps2.?dvd[r\d]*', 'ps3.?bd[r\d]*', '(?:blue?ray).*ps3', 'xbox360.?dvd[r\d]*', 'Wii[iu]?(.?dvd[r\d]?)' ],
+		'Console Disc' => [ 'xbox.*dvd[[:alnum:]]*', 'dvd[[:alnum:]]*.*xbox', 'cd.*xbox', 'pscd[[:alnum:]]*', 'PS2(?:.?d[vw]d[[:alnum:]]*|.?cd|.?rip)?', 'ps3.?bd[[:alnum:]]*', '(?:blue?ray).*ps3', 'xbox360.?dvd[[:alnum:]]*', 'Wii[iu]?(.?dvd[[:alnum:]]*)' ],
 		'Crave' => 'CRAV', // (P2P)
 		'Crunchyroll' => 'CR', // (P2P)
 		'DAB' => 'dab', // Digital Audio Broadcast
@@ -349,9 +349,9 @@ class ReleasePatterns {
 		'Nintendo Switch' => 'NSW',
 		'NEC PC Engine' => 'PCECD',
 		'Nokia N-Gage' => '(?:nokia[._-])?n[._-]?gage(?:[._-]qd)?',
-		'Playstation' => 'PS[X1]?',
-		'Playstation 2' => 'PS2(?:.?dvdr?|.?cd)?',
-		'Playstation 3' => 'PS3(?:.?bd)?',
+		'Playstation' => 'PS[X1]?(cd)?',
+		'Playstation 2' => '(?:jap|\d)?PS2(?:.?[ed][vw]d[[:alnum:]]*|.?cd[[:alnum:]]*|.?rip|.?hdd)?',
+		'Playstation 3' => 'PS3(?:.?bd[[:alnum:]]*)?',
 		'Playstation 4' => 'PS4',
 		'Playstation 5' => 'PS5',
 		'Playstation Portable' => 'PSP',
@@ -513,7 +513,7 @@ class ReleasePatterns {
 		'HR' => 'HRp?.(%flags%|%format%|%source%|%year%)', // High resolution
 		'HSBS' => 'HS(?:BS)?',
 		'Hybrid' => 'HYBRID',
-		'Imageset' => [ '(?:Full[._-]?)?(?:IMA?GE?|photo|picture|pic|foto).?SETS?', 'pic.?xxx' ],
+		'Imageset' => [ '(?:Full[._-]?)?(?:IMA?GG?E?|photo|picture|pic|foto).?SETS?', 'pic.?xxx' ],
 		'IMAX' => 'IMAX',
 		'Internal' => 'iNT(ERNAL)?',
 		'IVTC' => 'IVTC', // Inverce telecine
@@ -624,75 +624,108 @@ class ReleasePatterns {
 	const SPORTS = [
 		// Football
 		'a-league',			// Australia
-		'Allsvenskan\.(U\d+\.)?\d{4}',		// Swedish
+		'Allsvenskan\.(U\d+\.)?\d{4}',		// Sweden
 		'Premier.?League',	// England (also darts)
-		'La.?Liga.(santander.)?\d{2,4}',			// Spain
-		'(?:fussball.\d.|\d.)?Bundesliga\.\d{4}',// Germany
+		'La.?Liga.(santander.)?\d{2,4}',	// Spain
+		'Joan.Gamper.Trophy',				// Spain (Barcelona)
+		'Copa.del.rey',						// Spain Cup
+		'Supercopa',						// Spain
+		'(?:fussball.\d.|\d.)?Bundesliga\.\d{4}',	// Germany
 		'Fussball.Laenderspiel.\d+', // German international friendly
-		'Fussball.dfl.supercup', // German international friendly
-		'dfb.pokal.\d{4}',	// Germany Cup
+		'Fussball.dfl.supercup', 	// German international friendly
+		'dfb.pokal.\d{4}',			// Germany Cup
 		'Eredivisie',		// Netherlands
-		'Ligue.?1',			// France
+		'Ligue.?1',					// France
+		'Coupe.De.France.\d{2,4}',	// France Cup
 		'Serie.?A',			// Italy
+		'Coppa.Italia',		// Italy Cup
+		'Suppercoppa',		// Italy
 		'FA.?Cup',			// England
-		'(?:fussball.)?EPL',				// England
-		'EFL.(?:\d{1,4}|cup|championship)', // England
-		'WSL',				// England women
-		'SPFL',				// Scottish
-		'Fodbold',			// Danish
+		'(?:fussball.)?EPL',					// England
+		'EFL\d?.(?:\d{1,4}|cup|championship)',	// England
+		'B?WSL',			// England women
+		'Arnold.Clark.Cup', // England women
+		'SPFL',				// Scottland
+		'Viaplay.Cup',		// Scottland
+		'Scottish.cup',		// Scottland Cup
+		'Fodbold',			// Denmark
 		'MLS.\d{4}',		// USA
-		'NWSL.\d{4}',				// USA women
-		'CSL.\\d+',				// China
-		'fifa.(?:world.cup|women|fotbolls|futsal|wm|U\d+).\d{4}', // International
-		'(?:international.)?football.(?:australia|womens|sydney|friendly|ligue1|serie.a|uefa|conference|league)', // International
-		'(?:womens.)?UEFA.(champions|cl|cup|euro|europa|super.?cup|Bajnokok|european|pokal|futsal|el|under\d+|u\d+|womens|em|\d{4})', // European
+		'NWSL.\d{4}',		// USA women
+		'CSL.\\d+',			// China
+		'fifa.(?:world.cup|fotbolls|futsal|wm|U\d+).\d{4}', // International
+		'fifa.(?:world.cup.(?:U\d+.)?)?womens.\d{4}',		// International women
+		'(?:international.(?:friendly.)?)?football.(?:australia|womens|sydney|friendly|ligue1|serie.a|uefa|conference|league)', // International
+		'womens.international',
+		'(?:womens.)?UEFA.(champions|cl|cup|euro|europa|super.?cup|Bajnokok|european|pokal|futsal|el|under\d+|u\d+|womens|em|youth.league|\d{4})', // European
 		'UCL.\d+',			// UEFA Champions League
-		'UEL.\d{4}',		// UEFA Europa league
+		'UEL.\d{4}', 'Europa.league', // UEFA Europa league
 		'concacaf',			// North and Middle America
 		'conmebol',			// South America
 		'copa.?america',
 		'CAF.Africa.Cup.Of.Nations', // African
+		'Saudi.pro.league',
 		'afc.asian',		// Asian
-		'match.of.the.day',	// Misc football
+		'match.of.the.day', 'pre.season.friendly',	// Misc football
 		// Racing
 		'Formul[ae].?[1234E].\d{4}', 'Formel.?[1234E].\d{4}', '(?:british.)?F\d.\d{4}.Grosser',
-		'Superleague.Formula', 'Nascar.(?:cup|truck|xfinity|monster|raceday|camping|america|sprint|nextel|busch|\d{4})', 'Indycar\.(series|racing|\d{4})',
+		'Superleague.Formula', 'Nascar.(?:cup|truck|xfinity|monster|raceday|camping|america|sprint|nextel|busch|\d{4})', '(?:ntt.)?Indycar\.(series|racing|\d{4})',
 		'DTM.(\d{2,4}|spa|lauszitzring|gp\d+|\d+.lauf)', // Deutsche Tourenwagen Masters
 		'DTC.\d{4}', // Danish Touringcar Championship
-		'wrc.(?:fia|\d{4})', // Rallye
-		'Supercars.championship', 'V8.Supercars.\d{4}', 'Porsche.(Carrera|sprint)', 'Volkswagen.Racing.Cup', 'W.series.\d{4}',
+		'[ew]rc[._-](?:\d{4})', 
+		'(?:[ew]rc|rx)[._-]fia[._-](?:world|european).rally(?:cross)?.championship.\d{4}', // Rallye
+		'Supercars.championship', 'V8.Supercars.\d{4}', 'Porsche.(Carrera|sprint|supercup)', 'Volkswagen.Racing.Cup', 'W.series.\d{4}',
+		'IMSA', 'Nitro[.]RX', 'Extreme[.]e',
+		// Moto racing
 		'Moto.?(GP|\d).\d{4}',
+		'A?SBK.(?:\d{4}|world)', 	// Australian Superbike
+		'WSX', // Supercross
+		'FIM[.](?:ewc|superbike|speedway|cev|isde|motocross|world)', // International Moto events
 		// Cycling
 		'Cycling.(?:volta|giro|tour|strade|paris|criterium|liege|fleche|amstel|la.vuelta)', // International
 		'giro.d.italia', // Italy
 		'la.vuelta.(?:a.espana.)?\d{4}', // Spain
 		'tour.de.france.(?:femmes.)?\d{4}.stage.?\d+', // France
 		'UCI',	// International
 		// Rugby
-		'rugby.\d{4}',
-		'(?:Super.|international.)?rugby(.world.cup|.championship|.pacific|.aupiki|.league.(?:test.match|anzak|challenge|nsw|four|toyota|trans|state|super|womens|international|world|\d{4}))',
+		'(?:premiership.)?rugby.(?:cup.)?\d{4}',
+		'(?:Super.|six.?nations.)?rugby.(world.cup|championship|pacific|aupiki|league.(?:test.match|anzak|challenge|nsw|four|toyota|trans|state|super|womens|international|world|\d{4}))',
+		'International.rugby',
 		'IPL.\d{4}',		 // India
 		'NRL.(\d{4}|state)', // Australasian
 		// Basketball
-		'NBA.(?:\d{4}.)?(?:East|eastern|West|western|Finals|playoffs|\d{2}.\d{2})', 'WNBA.\d{4}', 'Eurocup',
+		'NBA.(?:\d{4}.)?(?:East|eastern|West|western|Finals|playoffs|\d{2}.\d{2})',
+		'WNBA.\d{4}',	// USA women
+		'Eurocup',		// Europe
+		'Euroleague',
+		'WNBL',			// Australia women
+		'Fiba',			// International
 		// Cricket
-		'T20', 'BBL.\d{4}',
+		'T20', 'BBL.\d{4}', 'ICC.Cricket',
 		// American Football
-		'NFL.(?:pre.?season|super.bowl|pro.bowl|conference|divisional|wild.card|[an]fc|football|week\d+|\d{4})',
+		'NFL',
 		// Wrestle
-		'wwe.(?:nxt|friday|this|main|monday|wrestlemania|velocity|raw|smackdown|confidential|heat)', 'aew.(?:collision|dynamite|dark)', 'New.Japan.Pro.Wrestling', 'NJPW', 'Game.changer.wrestling',
+		'wwe',
+		'aew.(?:collision|dynamite|dark|rampage)', 'New.Japan.Pro.Wrestling', 'NJPW', 'Game.changer.wrestling',
+		// Fighting
+		'(hbo.|uk.|frank.warren.)?boxing.\d{4}.\d{2}.\d{2}', 'Grand.Sumo', 'UFC.(\d+|on.(?:espn|abc|fo?x|fuel|versus)|fight.night)', 'showtime.championship.boxing', 'Bellator.(?:fighting|\d{2,4})', 'KSW[._-]\d{2,4}', 'Cage[.](?:fury|warriors)[.]\d{2,4}', 'PFL.\d{4}', 'Invicta.fc', 'Enfusion(?:[.]ece|[.]live)?[.]\d{2,4}',
 		// Icehockey
-		'NHL\.(?:\d{4}|stanley.cup|playoffs)',
+		'NHL\.(?:\d{4}|stanley.cup|playoffs|all.stars?|pre.?season|awards)',
 		'Elitserien', 	// Swedish icehockey
+		'IIHF', // International Icehoceky
 		// Baseball
-		'MLB.(?:\d{4}|spring|world.series|pre.?season|playoffs|ws|alcs)',
-		// Fighting
-		'(hbo.|uk.)?boxing.\d{4}.\d{2}.\d{2}', 'Grand.Sumo', 'UFC.(\d+|on.espn|fight.night)',
+		'MLB.(?:\d{4}|spring|(?:world|championship|division).series|pre.?season|playoffs|ws|alcs|wild.card)',
 		// Olympics
 		'(\w+.)?(?:winter|summer).(paralympics|olympics)',
 		'\w+.(paralympics|olympics)',
 		// Tennis
-		'wimbledon.(?:tennis.)?\d{4}', 'us.open.\d{4}', 'french.open(?:.tennis)?.\d{4}', 'australian.open', 'WTA.\d{4}',
+		'wimbledon.(?:tennis.)?\d{4}', 'us.open.\d{4}', '([aw]tp.|wta.)french.open(?:.tennis)?.\d{4}', 'australian.open', 'WTA.\d{4}',
+		// Pool
+		'[[:alnum:]]+.open.pool.championship.\d{4}',
+		'world.pool.masters',
+		'mosconi.cup',
+		// MISC
+		'Biathlon.(?:\d{4}|WC|VM|EM|Weltcup|world)',
+		'^pdc[.](?:.*darts|players.championship)', // Darts
 		// eSports
 		'LPL.PRO',
 		// World cup of whatever
@@ -701,15 +734,15 @@ class ReleasePatterns {
 
 	// Bookware/elearning platforms
 	const BOOKWARE = [
-		'Actualtests', 'Artstation', 'Ask.?video', 'Bassgorilla', 'Career.Academy', 'CBT.?Nuggets', 'CG.?(Circuit|workshops?|cookie)', 'Cloud.academy', 'CreativeLive', 'Digital.?tutors', 'Fravo', 'Foundation.patreon', 'Groove3', 'Gumroad', 'Infinite.?skills', 'Kelby.?Training', 'LinkedIn(?:.learning)?', 'Lynda(?:.com)?', 'MacProVideo.com', 'Mixwiththemasters', 'Mycodeteacher.com', 'ostraining', 'packt', 'Pass4sure', 'PluralSight', 'PSD.tutorials', 'Retouching.Academy', 'Skillshare', 'skillfeed', 'Skillsoft', 'Sonic.academy', 'Syngress', 'teamtreehouse', 'Testking', 'Testnow', 'Trainsignal', 'Train.?simple', 'Tutsplus', 'Video2Brain', 'Videomaker.com', 'Udemy(?:.com)?'
+		'3DMotive', 'Academy.Moz', 'A.?Cloud.?Guru', 'Actualtests', 'Addison.?Wesley', 'AppDev', 'APRESS', 'Artstation', 'Ask.?video', 'Bassgorilla', 'Career.Academy', 'CBT.?Nuggets', 'CG.?(Circuit|workshops?|cookie)?', 'Cloud.academy', 'Codeschool.com', 'CreativeLive', 'Digital.?tutors', 'EC.?COUNCIL', 'Educator', 'Egghead.?io', 'Fravo', 'Foundation.patreon', 'Fxp.?HD', 'Galileo.(press|computing|design)', 'Groove3', 'Gumroad', 'ICOLLEGE', 'INE(.com)?', 'Infinite.?skills', 'INTELLEZY', 'kelbyone', 'Kelby.?(one)?Training', 'La.?formation', 'Learnable.com', 'Learnflash(.com)?', 'Learnnowonline', 'LinkedIn(?:.learning)?', 'Linux.Academy', 'Linux.?CBT', 'Lynda(?:.com)?', 'MacProVideo.com', 'Manning', 'Masterclass', 'Mixwiththemasters', 'M.O.C', 'Mycodeteacher.com', 'Open.?Classrooms', 'OREILLY', 'ostraining', 'packt', 'Pass4sure', 'PEACHPIT', 'PEARSON(.it)?', 'PluralSight', 'Pragmatic(.?ai)?', 'PrepLogic', 'PSD.?tutorials', 'Retouching.Academy', 'RW', 'SCO', 'Sitepoint.com', 'Skillshare', 'skillfeed', 'Skillsoft', 'Skylines.?Academy', 'Sonic.academy', 'Spin.?academy', 'Stone.?River.?eLearning', 'Syngress', 'Technics.?Publications?', '(team)?treehouse', 'Testking', 'Testnow', 'The.?Gnomon.?Workshop', 'Trainsignal', 'Train.?simple', 'Total.?Training', 'Tutsplus', 'TVI', 'Video2Brain', 'Videomaker.com', 'VTC(.com)?', 'VueMastery', 'Unix.?CBT', 'Wintellect.?NOW', 'Winstructor', 'Udemy(?:.com)?'
 	];
 
 	const GROUPS_GAMES = [
-		'0x0007', '0x0815', '1C', 'ABSiSO', 'ACTiVATED', 'ADDONiA', 'ALiAS', 'ANOMALY', 'AUGETY', 'AVENGED', 'BACKLASH', 'bADkARMA', 'Bamboocha', 'BAT', 'BAZOOKA', 'BFHiSO', 'BiTE', 'BLASTCiTY', 'BReWErS', 'BREWS', 'BREWZ', 'CiFE', 'CLONECD', 'CLS', 'CODEX', 'COGENT', 'CUBiC', 'CXZiSO', 'DARKSiDERS', 'DARKZER0', 'DELiGHT', 'DEViANCE', 'DINOByTES', 'DOGE', 'DVN', 'DVNiSO', 'DYNAMIX', 'ENiGMA', 'FANiSO', 'FAS', 'FASiSO', 'FASDOX', 'FCKDRM', 'FLT', 'FLTDOX', 'GENESIS', 'gimpsRus', 'GMiSO', 'GOW', 'GREENPEACE', 'HATRED', 'HBD', 'HEiST', 'HI2U', 'HOODLUM', 'HR', 'HYBRID', 'I_KnoW', 'iMMERSiON', 'iNLAWS', 'iTWINS', 'JAGDOX', 'JAGUAR', 'LiGHTFORCE', 'LUMA', 'MONEV', 'MYSTERY', 'MYTH', 'NiiNTENDO', 'NNSSWW', 'OUTLAWS', 'PiKMiN', 'PiMoCK', 'PiZZA', 'PiZZADOX', 'PLAZA', 'POSTMORTEM', 'PRELUDE', 'PROPHET', 'PS5B', 'PUSSYCAT', 'PWZ', 'TENOKE', 'TENOKE1', 'THG', 'TiNYiSO', 'TRSi', 'TSC', 'RELOADED', 'RAZOR', 'Razor1911', 'RAZORCD', 'RazorDOX', 'ReVOLVeR', 'RiTUEL', 'RUNE', 'SCRUBS', 'SiLENTGATE', 'SiMPLEX', 'SKIDROW', 'SMACKs', 'Souldrinker', 'SPLATTER', 'SPLATTERKiNGS', 'STEAMPUNKS', 'SUXXORS', 'TDUJAM', 'TECHNiC', 'TEDOX', 'TNT', 'VACE', 'VENGEANCE', 'VENOM', 'ViTALiTY', 'VREX', 'Unleashed', 'YOUCANTNUKE', 'ZEKE'
+		'0x0007', '0x0815', '1C', 'ABSiSO', 'ACTiVATED', 'ADDONiA', 'ALiAS', 'ANOMALY', 'AUGETY', 'AVENGED', 'BACKLASH', 'bADkARMA', 'Bamboocha', 'BAT', 'BAZOOKA', 'BFHiSO', 'BiTE', 'BLASTCiTY', 'BReWErS', 'BREWS', 'BREWZ', 'CiFE', 'CLONECD', 'CLS', 'CODEX', 'COGENT', 'CUBiC', 'CXZiSO', 'DARKSiDERS', 'DARKZER0', 'DELiGHT', 'DEViANCE', 'DINOByTES', 'DOGE', 'DVN', 'DVNiSO', 'DYNAMIX', 'ENiGMA', 'FANiSO', 'FAS', 'FASiSO', 'FASDOX', 'FCKDRM', 'FLT', 'FLTDOX', 'GENESIS', 'gimpsRus', 'GMiSO', 'GOW', 'GREENPEACE', 'HATRED', 'HBD', 'HEiST', 'HI2U', 'HOODLUM', 'HR', 'HYBRID', 'I_KnoW', 'iMMERSiON', 'iNLAWS', 'iTWINS', 'JAGDOX', 'JAGUAR', 'LiGHTFORCE', 'LUMA', 'MONEV', 'MYSTERY', 'MYTH', 'NiiNTENDO', 'NNSSWW', 'OUTLAWS', 'PiKMiN', 'PiMoCK', 'PiZZA', 'PiZZADOX', 'PLAZA', 'POSTMORTEM', 'PRELUDE', 'PROPHET', 'PS5B', 'PUSSYCAT', 'PWZ', 'TENOKE', 'TENOKE1', 'THG', 'TiNYiSO', 'TRSi', 'TSC', 'RELOADED', 'RAZOR', 'Razor1911', 'RAZORCD', 'RazorDOX', 'ReVOLVeR', 'RiTUEL', 'RUNE', 'SCRUBS', 'SiLENTGATE', 'SiMPLEX', 'SKIDROW', 'SMACKs', 'Souldrinker', 'SPLATTER', 'SPLATTERKiNGS', 'STEAMPUNKS', 'STRANGE', 'SUXXORS', 'TDUJAM', 'TECHNiC', 'TEDOX', 'TNT', 'VACE', 'VENGEANCE', 'VENOM', 'ViTALiTY', 'VREX', 'Unleashed', 'YOUCANTNUKE', 'ZEKE'
 	];
 
 	const GROUPS_APPS = [
-		'ACME', 'AGAiN', 'AMPED', 'BLiZZARD', 'BRD', 'BTCR', 'BTCRiSO', 'CADZ', 'CAFE', 'CaviaR', 'CORE', 'CRD', 'CROSSFiRE', 'CYGiSO', 'DAMN', 'DARKLEASH', 'DIGERATI', 'DiSTiNCT', 'DSi', 'dT', 'DVT', 'ECLiPSE', 'ECU', 'ECZ', 'EMBRACE', 'ENFUSiA', 'EPS', 'EXPLOSiON', 'F4CG', 'FALLEN', 'FCN', 'HERiTAGE', 'iNFECTED', 'iNTENSiON', 'ISO', 'ISOBelix', 'LaTeX', 'LAXiTY', 'LND', 'LUCiD', 'Lz0', 'Lz0PDA', 'MAS', 'MASCHiNE', 'MAGNiTUDE', 'MIDNIGHT', 'MSGPDA', 'NGEN', 'NiTROUS', 'ORiON', 'PARADOX', 'PGC', 'PROPHECY', 'RENEGADE', 'rG', 'RINDVIEH', 'RiSE', 'RLTS', 'ROR', 'RORiSO', 'SCOTCH', 'SCRiPTMAFiA', 'SONiTUS', 'SoSISO', 'SSG', 'TBE', 'TE', 'TFTDOX', 'TFTISO', 'TMG', 'TNO', 'TSZ', 'TZ7iSO', 'ViRiLiTY', 'UCF', 'UnderPl', 'XFORCE', 'ZWT', 'ZWTiSO'
+		'ACME', 'AGAiN', 'AMPED', 'BEAN', 'BLiZZARD', 'BLZiSO', 'BRD', 'BTCR', 'BTCRiSO', 'CADZ', 'CAFE', 'CaviaR', 'CORE', 'CRD', 'CROSSFiRE', 'CYGiSO', 'DAMN', 'DARKLEASH', 'DIGERATI', 'DiSTiNCT', 'DSi', 'dT', 'DVT', 'DVTiSO', 'EAT', 'ECLiPSE', 'ECU', 'ECZ', 'EMBRACE', 'ENFUSiA', 'EPS', 'EQUiNOX', 'EXPANSION', 'EXPLOSiON', 'F4CG', 'FALLEN', 'FCN', 'HERiTAGE', 'HOTiSO', 'iNDiSO', 'iNFECTED', 'iNTENSiON', 'ISO', 'ISOBelix', 'iSOTOPE', 'LaTeX', 'LAXiTY', 'LND', 'LUCiD', 'Lz0', 'Lz0PDA', 'MAS', 'MASCHiNE', 'MAGNETiC', 'MAGNiTUDE', 'MESMERiZE', 'MIDNIGHT', 'MSGPDA', 'NGEN', 'NiTROUS', 'ORiON', 'PARADOX', 'PFT', 'PGC', 'PH', 'PROPHECY', 'RENEGADE', 'rG', 'RINDVIEH', 'RiSE', 'RLTS', 'ROR', 'RORiSO', 'SCOTCH', 'SCRiPTMAFiA', 'SONiTUS', 'SoSISO', 'SSG', 'SUBSTANCE', 'TBE', 'TE', 'TFTDOX', 'TFTISO', 'TMG', 'TNO', 'TSZ', 'TZ7iSO', 'ViRiLiTY', 'UCF', 'UnderPl', 'XFORCE', 'XiSO', 'ZWT', 'ZWTiSO', 'ZZGiSO'
 	];
 
 	// Put together some flag/format arrays for better type parsing.