From 45273610dbdad4f495715afca9aee3bc7a21802f Mon Sep 17 00:00:00 2001 From: Amir Zarrinkafsh Date: Sat, 1 Jul 2017 17:31:13 +1000 Subject: [PATCH 1/3] Added AFL regex for a.b.multimedia.sports --- .../db/patches/mysql/+1~release_naming_regexes.sql | 10 ++++++++++ resources/db/schema/data/10-release_naming_regexes.tsv | 1 + 2 files changed, 11 insertions(+) create mode 100644 resources/db/patches/mysql/+1~release_naming_regexes.sql diff --git a/resources/db/patches/mysql/+1~release_naming_regexes.sql b/resources/db/patches/mysql/+1~release_naming_regexes.sql new file mode 100644 index 000000000..0fccb5f59 --- /dev/null +++ b/resources/db/patches/mysql/+1~release_naming_regexes.sql @@ -0,0 +1,10 @@ +#Add updated regex +INSERT INTO release_naming_regexes (id, group_regex, regex, status, description, ordinal) +VALUES ( + 1157, + '^alt\\.binaries\\.multimedia\\.sports$', + '/^\\[?AFL.+\\" ?[ .-]?(?P.+?) ?[ .](7z|avi|md5|mkv|mp4|nfo|nzb|par|rar|sfv|vol)t?\\d?+.+yEnc$/', + 1, + '//[AFL 2017 Round 8 NMFC vs SYD 720p] - "AFL 2017 Round 8 NMFC vs SYD 720p par2" yEnc or AFL.2017.Round.8.ADEL.vs.MELB.480p] - "AFL.2017.Round.8.ADEL.vs.MELB.480p.sfv" yEnc', + 1 +); \ No newline at end of file diff --git a/resources/db/schema/data/10-release_naming_regexes.tsv b/resources/db/schema/data/10-release_naming_regexes.tsv index 840d166b3..fb600b0c6 100755 --- a/resources/db/schema/data/10-release_naming_regexes.tsv +++ b/resources/db/schema/data/10-release_naming_regexes.tsv @@ -1155,3 +1155,4 @@ id, group_regex, regex, status, description, ordinal 1154 ^alt\\.binaries\\.howard-stern$ /^.+? - File \\d+ of \\d+ - yEnc "(?P.+?).mp3" \\d+ bytes$/ 1 Howard Stern 11.04.2015 CF 32K 57.7MB + WUS - File 1 of 1 - yEnc "Howard Stern 11.04.15 (Alanis Morissette Visits).mp3" 60596352 bytes 10 1155 ^alt\\.binaries\\.howard-stern$ /^(?P.+?) \\d (?P\\d+kbps) - \\[\\d+\\/\\d+\\] - ".+?Part_\\d+\\.(mp3|nzb).*?" yEnc$/ 1 Howard Stern Show Oct 19 2015 Mon Hour 6 96kbps - [1/1] - "Stern-2015_10_19-96k-Part_06.mp3" yEnc 15 1156 ^alt\\.binaries\\.movies$ /^.*?"(?P.*?)\\.\\w+"\\s+yenc$/i 1 //BDRips "Daredevil.2003.BDRip.x264-DJ.par2" yEnc 70 +1157 ^alt\\.binaries\\.multimedia\\.sports$ /^\\[?AFL.+\\" ?[ .-]?(?P.+?) ?[ .](7z|avi|md5|mkv|mp4|nfo|nzb|par|rar|sfv|vol)t?\\d?+.+yEnc$/ 1 //[AFL 2017 Round 8 NMFC vs SYD 720p] - "AFL 2017 Round 8 NMFC vs SYD 720p par2" yEnc or AFL.2017.Round.8.ADEL.vs.MELB.480p] - "AFL.2017.Round.8.ADEL.vs.MELB.480p.sfv" yEnc 5 From c63780099eb2b804dadd66c58c19d1a2bd294508 Mon Sep 17 00:00:00 2001 From: Amir Zarrinkafsh Date: Sun, 2 Jul 2017 00:22:09 +1000 Subject: [PATCH 2/3] Updated regexes 1074-1078 to include a.b.warez.ibm-pc.0-day --- .../db/patches/mysql/+1~release_naming_regexes.sql | 5 ++++- resources/db/schema/data/10-release_naming_regexes.tsv | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/db/patches/mysql/+1~release_naming_regexes.sql b/resources/db/patches/mysql/+1~release_naming_regexes.sql index 0fccb5f59..8082c9021 100644 --- a/resources/db/patches/mysql/+1~release_naming_regexes.sql +++ b/resources/db/patches/mysql/+1~release_naming_regexes.sql @@ -1,4 +1,7 @@ -#Add updated regex +#Update old regexes +UPDATE release_naming_regexes SET group_regex = '^alt\\.binaries\\.warez(|\\.ibm-pc)\\.0-day$' WHERE id IN (1074, 1075, 1076, 1077, 1078); + +#Add new regexes INSERT INTO release_naming_regexes (id, group_regex, regex, status, description, ordinal) VALUES ( 1157, diff --git a/resources/db/schema/data/10-release_naming_regexes.tsv b/resources/db/schema/data/10-release_naming_regexes.tsv index fb600b0c6..d8b3ea8e0 100755 --- a/resources/db/schema/data/10-release_naming_regexes.tsv +++ b/resources/db/schema/data/10-release_naming_regexes.tsv @@ -1072,11 +1072,11 @@ id, group_regex, regex, status, description, ordinal 1071 ^alt\\.binaries\\.warez$ /.*[\\(\\[]\\d+\\/\\d+[\\)\\]][-_\\s]{0,3}("|#34;)(?P.+?)(\\.part\\d*|\\.rar)?(\\.vol.+?"|\\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/ 1 //-Panzer.Command.Kharkov-SKIDROW - [1/7] - "-Panzer.Command.Kharkov-SKIDROW.rar" yEnc ::: //-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS - [1/7] - #34;-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS.rar#34; yEnc 15 1072 ^alt\\.binaries\\.warez$ /.*"(?P.+?)(\\.part\\d*|\\.rar)?(\\.vol.+?"|\\.[A-Za-z0-9]{2,4}")(.+?)yEnc$/ 1 //- "JH2U0H5FIK8TO7YK3Q.part12.rar" yEnc 20 1073 ^alt\\.binaries\\.warez$ /^\\( (?P.+?) \\) - yEnc$/ 1 //( XS Video Converter Ultimate 7.7.0 Build 20121226 ) - yEnc 25 -1074 ^alt\\.binaries\\.warez\\.0-day$ /^(?P[a-zA-Z].+) - \\[\\d+\\/\\d+\\] - ".+?" yEnc$/ 1 //BabysitterMovies.13.03.11.Babysitter.Jocelyn.Pink.XXX.HR.WMV-VSEX - [7/7] - "BabysitterMovies.13.03.11.Babysitter.Jocelyn.Pink.XXX.HR.WMV-VSEX.rar.vol15+5.par2" yEnc 5 -1075 ^alt\\.binaries\\.warez\\.0-day$ /^(?P[a-z].+) - \\[\\d+\\/\\d+\\][ _-]{0,3}("|#34;).+("|#34;) yEnc$/i 1 //ATKExotics.13.01.06.Janea.Toys.XXX.1080p.x264-SEXORS - [1/7] - #34;ATKExotics.13.01.06.Janea.Toys.XXX.1080p.x264-SEXORS.rar#34; yEnc 10 -1076 ^alt\\.binaries\\.warez\\.0-day$ /.*[\\(\\[]\\d+\\/\\d+[\\)\\]][-_\\s]{0,3}("|#34;)(?P.+?)(\\.part\\d*|\\.rar)?(\\.vol.+?"|\\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/ 1 //-Panzer.Command.Kharkov-SKIDROW - [1/7] - "-Panzer.Command.Kharkov-SKIDROW.rar" yEnc ::: //-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS - [1/7] - #34;-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS.rar#34; yEnc 15 -1077 ^alt\\.binaries\\.warez\\.0-day$ /.*"(?P.+?)(\\.part\\d*|\\.rar)?(\\.vol.+?"|\\.[A-Za-z0-9]{2,4}")(.+?)yEnc$/ 1 //- "JH2U0H5FIK8TO7YK3Q.part12.rar" yEnc 20 -1078 ^alt\\.binaries\\.warez\\.0-day$ /^\\( (?P.+?) \\) - yEnc$/ 1 //( XS Video Converter Ultimate 7.7.0 Build 20121226 ) - yEnc 25 +1074 ^alt\\.binaries\\.warez(|\\.ibm-pc)\\.0-day$ /^(?P[a-zA-Z].+) - \\[\\d+\\/\\d+\\] - ".+?" yEnc$/ 1 //BabysitterMovies.13.03.11.Babysitter.Jocelyn.Pink.XXX.HR.WMV-VSEX - [7/7] - "BabysitterMovies.13.03.11.Babysitter.Jocelyn.Pink.XXX.HR.WMV-VSEX.rar.vol15+5.par2" yEnc 5 +1075 ^alt\\.binaries\\.warez(|\\.ibm-pc)\\.0-day$ /^(?P[a-z].+) - \\[\\d+\\/\\d+\\][ _-]{0,3}("|#34;).+("|#34;) yEnc$/i 1 //ATKExotics.13.01.06.Janea.Toys.XXX.1080p.x264-SEXORS - [1/7] - #34;ATKExotics.13.01.06.Janea.Toys.XXX.1080p.x264-SEXORS.rar#34; yEnc 10 +1076 ^alt\\.binaries\\.warez(|\\.ibm-pc)\\.0-day$ /.*[\\(\\[]\\d+\\/\\d+[\\)\\]][-_\\s]{0,3}("|#34;)(?P.+?)(\\.part\\d*|\\.rar)?(\\.vol.+?"|\\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/ 1 //-Panzer.Command.Kharkov-SKIDROW - [1/7] - "-Panzer.Command.Kharkov-SKIDROW.rar" yEnc ::: //-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS - [1/7] - #34;-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS.rar#34; yEnc 15 +1077 ^alt\\.binaries\\.warez(|\\.ibm-pc)\\.0-day$ /.*"(?P.+?)(\\.part\\d*|\\.rar)?(\\.vol.+?"|\\.[A-Za-z0-9]{2,4}")(.+?)yEnc$/ 1 //- "JH2U0H5FIK8TO7YK3Q.part12.rar" yEnc 20 +1078 ^alt\\.binaries\\.warez(|\\.ibm-pc)\\.0-day$ /^\\( (?P.+?) \\) - yEnc$/ 1 //( XS Video Converter Ultimate 7.7.0 Build 20121226 ) - yEnc 25 1079 ^alt\\.binaries\\.wii$ /^(?P.+)>\\(\\d+\\/\\d+\\) ".+" yEnc$/ 1 //Guitar.Hero.5-Vampire.Weekend.The.Kids.Dont.Stand.a.Chance.PAL.DLC.Wii-OneUp>(01/13) "1u-gh5-the-kids-dont-stand-a-chance-pal.nfo" yEnc 5 1080 ^alt\\.binaries\\.wii$ /^\\((?P[a-zA-Z].+)\\) \\[\\d+\\/\\d+\\] - ".+".+yEnc$/ 1 //(Alice_In_Wonderland_PAL_Wii-BAHAMUT) [000/101] - "b-alicew.nzb" (1/4yEnc 10 1081 ^alt\\.binaries\\.wii$ /^\\(\\d+\\/\\d+\\) "(?P.+)\\.(rar|par2|avi|URL|jpg)".+yEnc$/ 1 //(13/24) "amateur.-.Deutsches.Girl.-.Erster.User.Anal.Fick.rar" - 2,40 GB -md-hobbys.com yEnc 15 From 5bcc761a537edb28926a6dd7ba67a6fe24a81554 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sat, 1 Jul 2017 20:45:42 +0200 Subject: [PATCH 3/3] Merge PR #152 by Nightah - Release Naming Regexes --- Changelog | 2 ++ build/nntmux.xml | 4 ++-- ...ase_naming_regexes.sql => 0314~release_naming_regexes.sql} | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename resources/db/patches/mysql/{+1~release_naming_regexes.sql => 0314~release_naming_regexes.sql} (100%) diff --git a/Changelog b/Changelog index e0468c46e..4c6d2de9c 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2017-07-01 DariusIII + * Mrg: Merge PR #152 by Nightah - Release Naming Regexes 2017-06-28 DariusIII * Mrg: Merge PR #151 by Nightah - Fix safe_backfill 2017-06-27 DariusIII diff --git a/build/nntmux.xml b/build/nntmux.xml index bfc96be63..03106a396 100755 --- a/build/nntmux.xml +++ b/build/nntmux.xml @@ -16,8 +16,8 @@ - 313 - 313 + 314 + 314 diff --git a/resources/db/patches/mysql/+1~release_naming_regexes.sql b/resources/db/patches/mysql/0314~release_naming_regexes.sql similarity index 100% rename from resources/db/patches/mysql/+1~release_naming_regexes.sql rename to resources/db/patches/mysql/0314~release_naming_regexes.sql