From 7c6238d749fe281873551e5fb2bc197c497d7a6c Mon Sep 17 00:00:00 2001
From: Omertron <Stuart.Boston@Gmail.com>
Date: Sat, 4 Feb 2012 11:54:43 +0000
Subject: [PATCH] Fix issue with movieCompare

---
 .../moviejukebox/themoviedb/TheMovieDb.java   | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
index d82f955b1..5e5e64e1d 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
@@ -80,6 +80,7 @@ public class TheMovieDb {
 
     /**
      * Get the API key that is to be used
+     *
      * @return
      */
     public String getApiKey() {
@@ -466,6 +467,7 @@ public class TheMovieDb {
 
     /**
      * This method is used to retrieve the newest movie that was added to TMDb.
+     *
      * @return
      */
     public MovieDb getLatestMovie() {
@@ -491,30 +493,29 @@ public class TheMovieDb {
             return false;
         }
 
-        if (StringUtils.isNotBlank(year)) {
-            if (StringUtils.isNotBlank(moviedb.getReleaseDate())) {
-                // Compare with year
-                String movieYear = moviedb.getReleaseDate().substring(0, 4);
-                if (movieYear.equals(year)) {
-                    if (moviedb.getOriginalTitle().equalsIgnoreCase(title)) {
-                        return true;
-                    }
-
-                    if (moviedb.getTitle().equalsIgnoreCase(title)) {
-                        return true;
-                    }
+        if (StringUtils.isNotBlank(year) && !year.equalsIgnoreCase("UNKNOWN") && StringUtils.isNotBlank(moviedb.getReleaseDate())) {
+            // Compare with year
+            String movieYear = moviedb.getReleaseDate().substring(0, 4);
+            if (movieYear.equals(year)) {
+                if (moviedb.getOriginalTitle().equalsIgnoreCase(title)) {
+                    return true;
                 }
-            }
-        } else {
-            // Compare without year
-            if (moviedb.getOriginalTitle().equalsIgnoreCase(title)) {
-                return true;
-            }
 
-            if (moviedb.getTitle().equalsIgnoreCase(title)) {
-                return true;
+                if (moviedb.getTitle().equalsIgnoreCase(title)) {
+                    return true;
+                }
             }
         }
+
+        // Compare without year
+        if (moviedb.getOriginalTitle().equalsIgnoreCase(title)) {
+            return true;
+        }
+
+        if (moviedb.getTitle().equalsIgnoreCase(title)) {
+            return true;
+        }
+
         return false;
     }
 }