diff --git a/BuildData.groovy b/BuildData.groovy index f565b42f..2d6044a4 100644 --- a/BuildData.groovy +++ b/BuildData.groovy @@ -1,5 +1,41 @@ -// filebot -script BuildData.groovy -trust-script "website/data/series.list.gz" +// filebot -script BuildData.groovy -trust-script +def s_out = new File("website/data/series.list.gz") +def m_out = new File("website/data/movies.txt.gz") + +def gz(file, lines) { + file.withOutputStream{ out -> + new java.util.zip.GZIPOutputStream(out).withWriter('utf-8'){ writer -> + lines.each{ writer.append(it).append('\n') } + } + } +} + + +// ------------------------------------------------------------------------- // + + +// BUILD movies.txt.gz +def tsv = new URL("http://www.opensubtitles.org/addons/export_movie.php") +def movies = [] + +tsv.text.eachLine{ + def line = it.split(/\t/)*.replaceAll(/\s+/, ' ')*.trim() + if (line.size() == 4 && line[0] =~ /\d+/) { + movies.add([line[1].toInteger(), line[2], line[3].toInteger()]) + } +} + +movies = movies.findAll{ it[0] <= 9999999 && it[2] >= 1960 && it[1] =~ /^[A-Z0-9]/ && it[1] =~ /[\p{Alpha}]{3}/ }.sort{ it[1] } + +gz(m_out, movies.collect{ [it[0].pad(7), it[1], it[2]].join('\t') }) +println "Movie Count: " + movies.size() + + +// ------------------------------------------------------------------------- // + + +// BUILD series.list.gz def page = new URL('http://thetvdb.com/?string=&searchseriesid=&tab=listseries&function=Search') def names = page.fetch().getHtml('utf-8') @@ -11,14 +47,9 @@ def anime = net.sourceforge.filebot.WebServices.AniDB.getAnimeTitles() names += anime.findResults{ it.getPrimaryTitle() } names += anime.findResults{ it.getOfficialTitle('en') } -names = names.findAll{ it =~ /^[A-Z]/ && it =~ /[\p{Alpha}]{3}/}.findResults{ net.sourceforge.filebot.similarity.Normalization.normalizePunctuation(it) } +names = names.findAll{ it =~ /^[A-Z0-9]/ && it =~ /[\p{Alpha}]{3}/}.findResults{ net.sourceforge.filebot.similarity.Normalization.normalizePunctuation(it) } names = names*.toLowerCase().sort().unique() -args[0].withOutputStream{ out -> - new java.util.zip.GZIPOutputStream(out).withWriter('utf-8'){ writer -> - names.each{ writer.append(it).append('\n') } - } -} - +gz(s_out, names) println "Series Count: " + names.size() diff --git a/source/net/sourceforge/filebot/media/ReleaseInfo.properties b/source/net/sourceforge/filebot/media/ReleaseInfo.properties index 1aa83835..6fa1cb05 100644 --- a/source/net/sourceforge/filebot/media/ReleaseInfo.properties +++ b/source/net/sourceforge/filebot/media/ReleaseInfo.properties @@ -1,5 +1,5 @@ # source names mostly copied from [http://en.wikipedia.org/wiki/Pirated_movie_release_types] -pattern.video.source: CAMRip|CAM|TS|TELESYNC|PDVD|TS|TELESYNC|PDVD|PPV|PPVRip|Screener|SCR|SCREENER|DVDSCR|DVDSCREENER|BDSCR|R5|R5LINE|DVDRip|DVDR|TVRip|DSR|PDTV|HDTV|DVB|DVBRip|DTHRip|VODRip|VODR|BDRip|BRRip|BluRay|BDR|BR-Scr|BR-Screener|HDDVD|HDRip|WorkPrint|VHS|VCD|Telesync|TELECINE|WEB-DL|Webrip +pattern.video.source: CAMRip|CAM|PDVD|TS|TELESYNC|PDVD|PPV|PPVRip|Screener|SCR|SCREENER|DVDSCR|DVDSCREENER|BDSCR|R5|R5LINE|DVDRip|DVDR|TVRip|DSR|PDTV|HDTV|DVB|DVBRip|DTHRip|VODRip|VODR|BDRip|BRRip|BluRay|BDR|BR-Scr|BR-Screener|HDDVD|HDRip|WorkPrint|VHS|VCD|TELECINE|WEB-DL|Webrip # additional release info patterns pattern.video.format: DivX|Xvid|AVC|x264|h264|3ivx|mpeg|mpeg4|mp3|aac|ac3|2ch|6ch|WS|HR|720p|1080p|NTSC diff --git a/website/base.css b/website/base.css index 850a0ae0..1093dca1 100644 --- a/website/base.css +++ b/website/base.css @@ -2,6 +2,7 @@ body { font-family: arial, dejavu sans, freesans; font-size: 16px; background-color: #e6e6e6; + margin-top: 0; } a, acronym { @@ -32,6 +33,19 @@ hr { border-color: lightgray; } +.top { + text-align: center; + margin: 0px auto; +} + +.top small { + font-size: 11px; + line-height: 15px; + padding: 2px 5px; + background: white; + border-radius: 0 0 7px 7px; + box-shadow: 0px 2px 5px #a2a2a2; +} .navigation { font: 11px Verdana, Arial, Helvetica, sans-serif; @@ -111,7 +125,6 @@ table.reference.cli > * > * > td:first-child { background: white; background-repeat: no-repeat; border: 1px solid #a2a2a2; - margin: 20px auto; border-radius: 7px; -moz-border-radius: 7px; -webkit-border-radius: 7px; diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt index 34d6f6cf..8c8a9da8 100644 --- a/website/data/query-blacklist.txt +++ b/website/data/query-blacklist.txt @@ -9,10 +9,12 @@ ^Info ^Movie ^SAMPLE +^Season.[0-9]+ ^Tracker ^Trailer A.Release.Lounge Anime[s]? +By.Cool.Release CD[0]?[1-3] CN CVCD diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt index adb6ca77..d44cb3e2 100644 --- a/website/data/release-groups.txt +++ b/website/data/release-groups.txt @@ -306,6 +306,7 @@ TVA TX ULTiMATE UMF +UNSKiLLED USELESS UVall VanRay diff --git a/website/index.html b/website/index.html index 8bbf1d9e..08f0051e 100644 --- a/website/index.html +++ b/website/index.html @@ -48,6 +48,7 @@ +
FileBot is free software. Please help support this project.
diff --git a/website/scripts/cpmv.groovy b/website/scripts/cpmv.groovy index 765479cd..b960e724 100644 --- a/website/scripts/cpmv.groovy +++ b/website/scripts/cpmv.groovy @@ -1,4 +1,4 @@ -// filebot -script "http://filebot.sf.net/scripts/cpmv.groovy" +// filebot -script "http://filebot.sf.net/scripts/cpmv.groovy" -trust-script // copy files def temp = args*.copyTo("E:/filebot-temp")