Merge branch 'dev' into dev-laravel-switch

This commit is contained in:
DariusIII
2017-07-01 20:46:47 +02:00
4 changed files with 23 additions and 7 deletions
+2
View File
@@ -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
+2 -2
View File
@@ -16,8 +16,8 @@
</last>
</scripts>
<sql>
<db>313</db>
<file>313</file>
<db>314</db>
<file>314</file>
</sql>
</versions>
</nntmux>
@@ -0,0 +1,13 @@
#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,
'^alt\\.binaries\\.multimedia\\.sports$',
'/^\\[?AFL.+\\" ?[ .-]?(?P<match0>.+?) ?[ .](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
);
@@ -1072,11 +1072,11 @@ id, group_regex, regex, status, description, ordinal
1071 ^alt\\.binaries\\.warez$ /.*[\\(\\[]\\d+\\/\\d+[\\)\\]][-_\\s]{0,3}("|#34;)(?P<match0>.+?)(\\.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<match0>.+?)(\\.part\\d*|\\.rar)?(\\.vol.+?"|\\.[A-Za-z0-9]{2,4}")(.+?)yEnc$/ 1 //- "JH2U0H5FIK8TO7YK3Q.part12.rar" yEnc 20
1073 ^alt\\.binaries\\.warez$ /^\\( (?P<match0>.+?) \\) - yEnc$/ 1 //( XS Video Converter Ultimate 7.7.0 Build 20121226 ) - yEnc 25
1074 ^alt\\.binaries\\.warez\\.0-day$ /^(?P<match0>[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<match0>[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<match0>.+?)(\\.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<match0>.+?)(\\.part\\d*|\\.rar)?(\\.vol.+?"|\\.[A-Za-z0-9]{2,4}")(.+?)yEnc$/ 1 //- "JH2U0H5FIK8TO7YK3Q.part12.rar" yEnc 20
1078 ^alt\\.binaries\\.warez\\.0-day$ /^\\( (?P<match0>.+?) \\) - yEnc$/ 1 //( XS Video Converter Ultimate 7.7.0 Build 20121226 ) - yEnc 25
1074 ^alt\\.binaries\\.warez(|\\.ibm-pc)\\.0-day$ /^(?P<match0>[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<match0>[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<match0>.+?)(\\.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<match0>.+?)(\\.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<match0>.+?) \\) - yEnc$/ 1 //( XS Video Converter Ultimate 7.7.0 Build 20121226 ) - yEnc 25
1079 ^alt\\.binaries\\.wii$ /^<kere\\.ws.+>(?P<match0>.+)>\\(\\d+\\/\\d+\\) ".+" yEnc$/ 1 //<kere.ws/illuminatenboard.org>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<match0>[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<match0>.+)\\.(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
@@ -1155,3 +1155,4 @@ id, group_regex, regex, status, description, ordinal
1154 ^alt\\.binaries\\.howard-stern$ /^.+? - File \\d+ of \\d+ - yEnc "(?P<match0>.+?).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<match0>.+?) \\d (?P<match1>\\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<match0>.*?)\\.\\w+"\\s+yenc$/i 1 //BDRips "Daredevil.2003.BDRip.x264-DJ.par2" yEnc 70
1157 ^alt\\.binaries\\.multimedia\\.sports$ /^\\[?AFL.+\\" ?[ .-]?(?P<match0>.+?) ?[ .](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
Can't render this file because it contains an unexpected character in line 2 and column 136.