Changeset 843

Timestamp:

07/09/07 04:01:29 (6 years ago)

Author:

paul

Message:

imdb_augment_data: keep order of directors, cast and writers

Files:

• postprocessors/imdb_augment_data (modified) (8 diffs)
• status (modified) (1 diff)

postprocessors/imdb_augment_data

@@ -27 +27 @@
 
 my $progname = "imdb_augment_data";
-my $version = "0.23";
+my $version = "0.24";
 
 use XMLTV;
@@ -521 +521 @@
         $tp = HTML::TokeParser->new(\$html_data);
         while (my $tag = $tp->get_tag('h5')) {
-                last if ($tp->get_text =~ /^directed/i);
+                last if ($tp->get_text =~ /^(directed|director)/i);
         }
         while (my $tag = $tp->get_tag) {
                 my $text = $tp->get_text();
-                last if (($text =~ /writing/i) || ($tag->[0] =~ /\/td/i));
+                last if (($text =~ /^(writing|writer)/i) || ($tag->[0] =~ /\/td/i));
                 if ($tag->[0] eq 'a') {
                         my $id = $tag->[1]{href};
                         next if ($id !~ /^\/name\/nm/);
-                        $data_cache->{movie_lookup}->{$movie_url}->{directors}->{$text} = $id;
+                        push(@{$data_cache->{movie_lookup}->{$movie_url}->{directors}}, [$text, $id]);
                         Shepherd::Common::log(" - parsed director ".$text." (".$id.")") if ($opt->{debug});
                 }
@@ -539 +539 @@
         $tp = HTML::TokeParser->new(\$html_data);
         while (my $tag = $tp->get_tag('h5')) {
-                last if ($tp->get_text =~ /^writing/i);
+                last if ($tp->get_text =~ /^(writing|writer)/i);
         }
         while (my $tag = $tp->get_tag) {
                 my $text = $tp->get_text();
                 last if ($tag->[0] =~ /div/i);
-                if (($tag->[0] eq 'a') && ($text !~ /more/i)) {
+                if (($tag->[0] eq 'a') && ($text !~ /\bmore\b/i)) {
                         my $id = $tag->[1]{href};
                         next if ($id !~ /^\/name\/nm/);
-                        $data_cache->{movie_lookup}->{$movie_url}->{writers}->{$text} = $id;
+                        push(@{$data_cache->{movie_lookup}->{$movie_url}->{writers}}, [$text, $id]);
                         Shepherd::Common::log(" - parsed writer ".$text." (".$id.")") if ($opt->{debug});
                 }
@@ -571 +571 @@
 
                                 if ((defined $person) && (defined $role)) {
-                                        $data_cache->{movie_lookup}->{$movie_url}->{cast}->{$person} = $role;
+                                        push(@{$data_cache->{movie_lookup}->{$movie_url}->{cast}}, [$person, $role]);
                                         Shepherd::Common::log(" - parsed cast (".$role.") ".$person) if ($opt->{debug});
                                 }
@@ -879 +879 @@
                 }
 
-                $num = 0;
                 if (defined $imdb->{cast}) {
-                        foreach my $c (sort keys %{($imdb->{cast})}) {
-                                $imdb_desc .= sprintf "%s%s%s",
-                                  ($num > 0 ? ", " : "\n Cast: "), 
-                                  $c, 
-                                  ($imdb->{cast}->{$c} ? " as $imdb->{cast}->{$c}" : "");
-                                $num++;
+                        $num = 0;
+                        if (ref($imdb->{cast}) eq "ARRAY") {
+                                foreach my $c (@{$imdb->{cast}}) {
+                                        $imdb_desc .= sprintf "%s%s%s",
+                                        ($num > 0 ? ", " : "\n Cast: "),
+                                        @$c[0],
+                                        (@$c[1] ? " as @$c[1]" : "");
+                                        $num++;
+                                }
+                        } else { # HASH
+                                foreach my $c (sort keys %{($imdb->{cast})}) {
+                                        $imdb_desc .= sprintf "%s%s%s",
+                                        ($num > 0 ? ", " : "\n Cast: "),
+                                        $c,
+                                        ($imdb->{cast}->{$c} ? " as $imdb->{cast}->{$c}" : "");
+                                        $num++;
+                                }
                         }
                 }
 
                 $imdb_desc .= sprintf "\n Directors: %s",
-                  join(", ",keys %{($imdb->{directors})})
+                  join(", ", ref($imdb->{directors}) eq "ARRAY" ?
+                  map(@$_[0], @{$imdb->{directors}}) : sort keys %{$imdb->{directors}})
                   if ($imdb->{directors});
                 $imdb_desc .= sprintf "\n Writers: %s",
-                  join(", ",keys %{($imdb->{writers})})
+                  join(", ", ref($imdb->{writers}) eq "ARRAY" ?
+                  map(@$_[0], @{$imdb->{writers}}) : sort keys %{$imdb->{writers}})
                   if ($imdb->{writers});
 
@@ -994 +1006 @@
 
         if (defined $imdb->{cast}) {
-                foreach my $cast (sort keys %{($imdb->{cast})}) {
+                foreach my $cast (ref($imdb->{cast}) eq "ARRAY" ?
+                                map(@$_[0], @{$imdb->{cast}}) : sort keys %{$imdb->{cast}}) {
                         my $found_cast = 0;
                         if ((defined $prog->{credits}) && (defined $prog->{credits}->{actor})) {
@@ -1006 +1019 @@
 
         if (defined $imdb->{writers}) {
-                foreach my $cast (keys %{($imdb->{writers})}) {
+                foreach my $cast (ref($imdb->{writers}) eq "ARRAY" ?
+                                map(@$_[0], @{$imdb->{writers}}) : sort keys %{$imdb->{writers}}) {
                         my $found_cast = 0;
                         if ((defined $prog->{credits}) && (defined $prog->{credits}->{writer})) {
@@ -1018 +1032 @@
 
         if (defined $imdb->{directors}) {
-                foreach my $cast (keys %{($imdb->{directors})}) {
+                foreach my $cast (ref($imdb->{directors}) eq "ARRAY" ?
+                                map(@$_[0], @{$imdb->{directors}}) : sort keys %{$imdb->{directors}}) {
                         my $found_cast = 0;
                         if ((defined $prog->{credits}) && (defined $prog->{credits}->{director})) {

status

@@ -15 +15 @@
 grabber         ten_website         1.01
 reconciler      reconciler_mk2      0.32
-postprocessor   imdb_augment_data   0.23
+postprocessor   imdb_augment_data   0.24
 postprocessor   tvdb_augment_data   0.06
 postprocessor   flag_aus_hdtv       0.18