* update data files and enable "Movie 43" sample data

This commit is contained in:
Reinhard Pointner 2013-09-10 10:12:55 +00:00
parent bf0b2d1555
commit 4799476150
3 changed files with 7 additions and 6 deletions

View File

@ -60,14 +60,13 @@ new File('omdb.txt').eachLine('Windows-1252'){
if (line.length > 11 && line[0] ==~ /\d+/) { if (line.length > 11 && line[0] ==~ /\d+/) {
def imdbid = line[1].substring(2).toInteger() def imdbid = line[1].substring(2).toInteger()
def name = line[2] def name = line[2].replaceAll(/\s+/, ' ').trim()
def year = line[3].toInteger() def year = line[3].toInteger()
def runtime = line[5] def runtime = line[5]
def rating = tryQuietly{ line[11].toFloat() } ?: 0 def rating = tryQuietly{ line[11].toFloat() } ?: 0
def votes = tryQuietly{ line[12].replaceAll(/\D/, '').toInteger() } ?: 0 def votes = tryQuietly{ line[12].replaceAll(/\D/, '').toInteger() } ?: 0
if ((year >= 1970 && (runtime =~ /h/ || votes >= 200) && rating >= 1 && votes >= 50) || (votes >= 2000)) { if ((year >= 1970 && (runtime =~ /h/ || votes >= 200) && rating >= 1 && votes >= 50) || (year >= 1950 && votes >= 5000)) {
line = line*.replaceAll(/\s+/, ' ')*.trim()
omdb << [imdbid, name, year] omdb << [imdbid, name, year]
} }
} }
@ -77,7 +76,7 @@ omdb = omdb.findAll{ it[0] <= 9999999 && it[1] =~ /^[A-Z0-9]/ && it[1] =~ /[\p{A
// save movie data // save movie data
def movies = omdb.findAll{ it.size() >= 3 && !it[1].startsWith('"') } def movies = omdb.findAll{ it.size() >= 3 && !it[1].startsWith('"') }
def movieSorter = new TreeMap(String.CASE_INSENSITIVE_ORDER) def movieSorter = new TreeMap(String.CASE_INSENSITIVE_ORDER)
movies.each{ movieSorter.put([it[1], it[2], it[0]].join('\t'), it) } movies.each{ movieSorter.put([it[1], it[2], it[0]].join('\t'), [it[0], it[2], it[1]]) } // ORDER => ID, YEAR, NAME
movies = movieSorter.values().collect{ it.join('\t') } movies = movieSorter.values().collect{ it.join('\t') }
pack(movies_out, movies) pack(movies_out, movies)

View File

@ -38,7 +38,6 @@
^extract$ ^extract$
^extracted$ ^extracted$
^Family$ ^Family$
^Film$
^Film[s]? ^Film[s]?
^Filme$ ^Filme$
^Finished ^Finished
@ -57,7 +56,7 @@
^MD0_DATA$ ^MD0_DATA$
^media$ ^media$
^mnt$ ^mnt$
^movie[s]? ^Movie[s]?$
^new$ ^new$
^other$ ^other$
^Part$ ^Part$

View File

@ -309,6 +309,7 @@ BiFOS
BIGTOPS BIGTOPS
Billman424 Billman424
BiQ BiQ
BiRDHOUSE
BiTo BiTo
BKF BKF
BKT BKT
@ -843,6 +844,7 @@ furzi
Fussoir Fussoir
FXG FXG
FxM FxM
FyHD
FZERO FZERO
G.AX G.AX
g0tm1Lk g0tm1Lk
@ -1265,6 +1267,7 @@ LoLi
Loli-pop Subs Loli-pop Subs
LoneWolf LoneWolf
LOST LOST
LOUNGE
lOVE lOVE
LP LP
LPD LPD