From 183125bd3cab7be5a826092100f892dbf072e989 Mon Sep 17 00:00:00 2001
From: Omertron <Stuart.Boston@Gmail.com>
Date: Sat, 31 Mar 2012 08:39:08 +0000
Subject: [PATCH] Fixes issue 14

---
 .../themoviedb/model/TmdbConfiguration.java   | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
index e71ba8f4a..61eacf9d6 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
@@ -39,42 +39,52 @@ public class TmdbConfiguration {
     private List<String> backdropSizes;
     @JsonProperty("profile_sizes")
     private List<String> profileSizes;
+    @JsonProperty("logo_sizes")
+    private List<String> logoSizes;
 
     // <editor-fold defaultstate="collapsed" desc="Getter methods">//GEN-BEGIN:getterMethods
     public List<String> getBackdropSizes() {
         return backdropSizes;
     }
-
+    
     public String getBaseUrl() {
         return baseUrl;
     }
-
+    
     public List<String> getPosterSizes() {
         return posterSizes;
     }
-
+    
     public List<String> getProfileSizes() {
         return profileSizes;
     }
+    
+    public List<String> getLogoSizes() {
+        return logoSizes;
+    }
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="Setter methods">//GEN-BEGIN:setterMethods
     public void setBackdropSizes(List<String> backdropSizes) {
         this.backdropSizes = backdropSizes;
     }
-
+    
     public void setBaseUrl(String baseUrl) {
         this.baseUrl = baseUrl;
     }
-
+    
     public void setPosterSizes(List<String> posterSizes) {
         this.posterSizes = posterSizes;
     }
-
+    
     public void setProfileSizes(List<String> profileSizes) {
         this.profileSizes = profileSizes;
     }
-// </editor-fold>
+    
+    public void setLogoSizes(List<String> logoSizes) {
+        this.logoSizes = logoSizes;
+    }
+    // </editor-fold>
 
     /**
      * Copy the data from the passed object to this one
@@ -86,6 +96,7 @@ public class TmdbConfiguration {
         baseUrl = config.getBaseUrl();
         posterSizes = config.getPosterSizes();
         profileSizes = config.getProfileSizes();
+        logoSizes = config.getLogoSizes();
     }
 
     /**
@@ -127,6 +138,19 @@ public class TmdbConfiguration {
         return profileSizes.contains(profileSize);
     }
 
+    /**
+     * Check that the logo size is valid
+     *
+     * @param logoSize
+     * @return
+     */
+    public boolean isValidLogoSize(String logoSize) {
+        if (StringUtils.isBlank(logoSize) || logoSizes.isEmpty()) {
+            return false;
+        }
+        return logoSizes.contains(logoSize);
+    }
+
     /**
      * Check to see if the size is valid for any of the images types
      *
@@ -134,7 +158,10 @@ public class TmdbConfiguration {
      * @return
      */
     public boolean isValidSize(String sizeToCheck) {
-        return (isValidPosterSize(sizeToCheck) || isValidBackdropSize(sizeToCheck) || isValidProfileSize(sizeToCheck));
+        return (isValidPosterSize(sizeToCheck) 
+                || isValidBackdropSize(sizeToCheck) 
+                || isValidProfileSize(sizeToCheck) 
+                || isValidLogoSize(sizeToCheck));
     }
 
     /**
@@ -150,7 +177,7 @@ public class TmdbConfiguration {
         sb.append("' value: '").append(value).append("'");
         LOGGER.warn(sb.toString());
     }
-
+    
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("[ImageConfiguration=");
@@ -158,6 +185,7 @@ public class TmdbConfiguration {
         sb.append("],[posterSizes=").append(posterSizes.toString());
         sb.append("],[backdropSizes=").append(backdropSizes.toString());
         sb.append("],[profileSizes=").append(profileSizes.toString());
+        sb.append("],[logoSizes=").append(logoSizes.toString());
         sb.append(("]]"));
         return sb.toString();
     }