Index: allocine.pl
===================================================================
--- allocine.pl	(revision 19320)
+++ allocine.pl	(working copy)
@@ -38,6 +38,7 @@
    print "       -v, --version                    display version\n";
    print "       -i, --info                       display info\n";
    print "       -o, --originaltitle              concatenate title and original title\n";
+   print "       --uk                             Get from screenruch.co.uk\n";
    print "       -c, --casting                    with -D option, grap the complete actor list (much slower)\n";
    print "\n";
    print "       -M <query>,   --movie query>     get movie list\n";
@@ -82,36 +83,75 @@
 # get Movie Data 
 sub getMovieData {
    my ($movieid)=@_; # grab movieid parameter
+   
+   my $website = "www.allocine.fr";
+   
+   my $originalTitleStart = "<h4>Titre original : <i>";
+   my $originalTitleEnd   = "</i></h4></div>";
+   
+   my $productionYearStart = "<h4>Année de production : ";
+   my $productionYearEnd   = "</h4>";
+   
+   my $directorStart = "<h4>Réalisé par ";
+   my $directorEnd   = "</h4>";
+   
+   my $pressReviewStart = "Presse</a></h5>";
+   my $pressReviewEnd   = " border";
+
+   my $userReviewStart = "Spectateurs</a></h5>";
+   my $userReviewEnd   = " border";
+   
+   my $runtimeStart = "Durée : ";
+   my $runtimeEnd   = ".&nbsp;</h4>";
+   
+   my $genresStart = "<h4>Genre : ";
+   my $genresEnd   = "</h4>";
+   
+   my $countriesStart = "<h4>Film ";
+   my $countriesEnd   = ".&nbsp;</h4>";
+   
+   my $castStart = "<h4>Avec ";
+   my $castEnd   = " &nbsp;&nbsp;<img src";
+   
+   if (defined $opt_uk) 
+   { 
+      $website = "www.screenrush.co.uk";
+      $originalTitleStart = "<h4>Original title : <i>";
+      $productionYearStart = "<h4>Production year: ";
+      $directorStart = "<h4>Directed by ";
+      $pressReviewStart = "Press&nbsp;reviews</a></h5>";
+      $userReviewStart = "user reviews</a></h5>";
+      $runtimeStart = "Running time: ";
+      $genresStart = "<h4>Genre: ";
+      $countriesStart = "<h4>Nationality: ";
+      $castStart = "<h4>Cast ";
+   }
+
    if (defined $opt_d) { printf("# looking for movie id: '%s'\n", $movieid);}
 
    # get the search results  page
-   my $request = "http://www.allocine.fr/film/fichefilm_gen_cfilm=" . $movieid . ".html";
+   my $request = "http://" . $website . "/film/fichefilm_gen_cfilm=" . $movieid . ".html";
    if (defined $opt_d) { printf("# request: '%s'\n", $request); }
    my ($rc, $response) = myth_url_get($request);
 
    # parse title and year
    my $title = parseBetween($response, "<title>", "</title>");
-   my $original_title = parseBetween($response, "<h4>Titre original : <i>","</i></h4></div>");
+   my $original_title = parseBetween($response, $originalTitleStart,$originalTitleEnd);
    $original_title = removeTag($original_title);
    if (defined $opt_originaltitle){
       if ($original_title  ne  ""){
         $title = $title . " (" . $original_title . ")";
       }
    }
-   
-   #print "titre = $title\n";
    $title = removeTag($title);
-   my $year = parseBetween($response,"<h4>Année de production : ","</h4>");
 
+   # parse year
+   my $year = parseBetween($response,$productionYearStart,$productionYearEnd);
+
    # parse director 
-   my $director = parseBetween($response,"<h4>Réalisé par ","</h4>");
+   my $director = parseBetween($response,$directorStart,$directorEnd);
    $director = removeTag($director);
 
-   # parse writer 
-   # (Note: this takes the 'first' writer, may want to include others)
-   my $writer = parseBetween($response, ">Writing credits</b>", "</table>");
-   $writer = parseBetween($writer, "/\">", "</");
-
    # parse plot
    my $plot = parseBetween($response,"<td valign=\"top\" style=\"padding:10 0 0 0\"><div align=\"justify\"><h4>","</h4></div></td>");
    $plot =~ s/\n//g;
@@ -119,16 +159,19 @@
   
    # parse user rating
    my $userrating;
-   my $rating = parseBetween($response,"Presse</a> <img ", " border=\"0\" /></h4></td>");
    my $nbvote = 0;
    my $sommevote = 0;
-   $rating = parseBetween($rating,"etoile_",".gif");
+
+   my $rating = parseBetween($response,$pressReviewStart, $pressReviewEnd);
+   $rating = parseBetween($rating,"etoile_","\"");
+
    if (!($rating eq "")){
-	    $sommevote += $rating - 1;
-	    $nbvote ++;
+      $sommevote += $rating;
+      $nbvote ++;
    }
-   $rating = parseBetween($response,"Spectateurs</a> <img ", " border=\"0\" /></h4></td>");
-   $rating = parseBetween($rating,"etoile_",".gif");
+
+   $rating = parseBetween($response,$userReviewStart, $userReviewEnd);
+   $rating = parseBetween($rating,"etoile_","\"");
    if (!($rating eq "")){
 	$sommevote += $rating - 1;
 	$nbvote ++;
@@ -139,18 +182,13 @@
 	
 
    # parse rating
-   my $movierating = parseBetween($response,"Interdit aux moins de ","ans");
-   if (!($movierating eq ""))
-   	{ $movierating = "Interdit aux moins de " . $movierating . "ans";}
-   else
-   	{
-    		$movierating = parseBetween($response,"Visible ","enfants");
-   		if (!($movierating eq "")){ $movierating = "Visible par des enfants";};
-   	}
-   
+   my $movierating;
+   $movierating = parseBetween($response,"</h4></div><div style=\"padding: 2 0 2 0;\"><h4 style=\"color: #D20000;\">",
+   "</h4>");
+   $movierating =  removeTag($movierating );   
 
    # parse movie length
-   my $runtime = parseBetween($response,"Durée : ",".&nbsp;</h4>");
+   my $runtime = parseBetween($response,$runtimeStart,$runtimeEnd);
    my $heure;
    my $minutes;
    ($heure,$minutes)=($runtime=~/[^\d]*(\d+)[^\d]*(\d*)/);
@@ -166,7 +204,7 @@
 
    # parse cast 
 
-   my $cast = parseBetween($response, "<h4>Avec ","</h4>");
+   my $cast = parseBetween($response, $castStart,$castEnd);
    $cast = removeTag($cast);
    if (defined $opt_casting){
       my ($rc, $responsecasting) = myth_url_get("http://www.allocine.fr/film/casting_gen_cfilm=" . $movieid . ".html");
@@ -187,11 +225,11 @@
    
 
    #genres
-   my $genres = parseBetween($response,"<h4>Genre : ","</h4>");
+   my $genres = parseBetween($response,$genresStart,$genresEnd);
    $genres = removeTag($genres);
    
    #countries
-   my $countries = parseBetween($response,"<h4>Film ",".&nbsp;</h4>");
+   my $countries = parseBetween($response,$countriesStart,$countriesEnd);
    $countries = removeTag($countries);
 
    # output fields (these field names must match what MythVideo is looking for)
@@ -205,7 +243,6 @@
    print "UserRating:$userrating\n";
    print "MovieRating:$movierating\n";
    print "Runtime:$runtime\n";
-   print "Writers: $writer\n";
    print "Cast: $cast\n";
    print "Genres:$genres\n";
    print "Countries:$countries\n";
@@ -214,11 +251,18 @@
 # dump Movie Poster
 sub getMoviePoster {
    my ($movieid)=@_; # grab movieid parameter
+   
+   my $website = "www.allocine.fr";
+   if (defined $opt_uk) 
+   { 
+      $website = "www.screenrush.co.uk";
+   }
+
    if (defined $opt_d) { printf("# looking for movie id: '%s'\n", $movieid);}
 
    # get the search results  page
    
-   my $request = "http://www.allocine.fr/film/galerie_gen_cfilm=" . $movieid . ".html";
+   my $request = "http://".$website."/film/galerie_gen_cfilm=" . $movieid . ".html";
    if (defined $opt_d) { printf("# request: '%s'\n", $request); }
    my ($rc, $response) = myth_url_get($request);
    my $page=parseBetween($response,"&page=",".html\" class=\"link1\"><span class=\"text2\">>>");
@@ -237,7 +281,7 @@
 	$request = substr($request, 0, index($request, '.'));
   
         if (!($request eq "")) {
-	     $request = "http://www.allocine.fr/film/galerie_gen_cfilm=" . $movieid . "&page=" . $request . ".html";
+	     $request = "http://".$website."/film/galerie_gen_cfilm=" . $movieid . "&page=" . $request . ".html";
 	     ($rc, $response) = myth_url_get($request);
         
              $uri = parseBetween($response,"<table style=\"padding:0 0 0 0\" border=\"0\" >","Ko\" />");
@@ -271,7 +315,7 @@
    #
    if ($uri eq "")
    {
-	$request = "http://www.allocine.fr/film/fichefilm_gen_cfilm=" . $movieid .".html";
+	$request = "http://".$website."/film/fichefilm_gen_cfilm=" . $movieid .".html";
 	($rc, $response) = myth_url_get($request);
 	$response = parseBetween($response, "sousnav_separe_droite2.gif","sortie");
 	$uri = parseBetween($response, "<img src=\"","\"");
@@ -282,7 +326,7 @@
         #
         if ($uri =~ /AffichetteAllocine/)
 	{
-		$request = "http://www.allocine.fr/film/fichefilm_gen_cfilm=" . $movieid .".html";
+		$request = "http://".$website."/film/fichefilm_gen_cfilm=" . $movieid .".html";
 		($rc, $response) = myth_url_get($request);
 		$response = parseBetween($response, "Disponible en","Zone");
 		$uri = parseBetween($response, "<img src=\"","\"");
@@ -307,12 +351,19 @@
    if (defined $opt_d) { 
       printf("# query: '%s', options: '%s'\n", $query, $options);
    }
+   
+   my $website = "www.allocine.fr";
+   if (defined $opt_uk) 
+   { 
+      $website = "www.screenrush.co.uk";
+   }
+
    my $count = 0;
    my $typerecherche = 3;
   
    while (($typerecherche <=5) && ($count ==0)){
 	   # get the search results  page
-	   my $request = "http://www.allocine.fr/recherche/?rub=1&motcle=$query";
+	   my $request = "http://".$website."/recherche/?rub=1&motcle=$query";
 	   if (defined $opt_d) { printf("# request: '%s'\n", $request); }
 	   my ($rc, $response) = myth_url_get($request);
 
@@ -377,6 +428,7 @@
                 "version" => \$opt_v,
                 "info" => \$opt_i,
                 "originaltitle" => \$opt_originaltitle,
+                "uk" => \$opt_uk,
                 "casting" => \$opt_casting,
                 "Data" => \$opt_D,
                 "Movie" => \$opt_M,