From dd41ff3b2f1cdc25d182a23a1174e9afa8ea4f45 Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Fri, 18 Apr 2014 07:13:12 -0700
Subject: [PATCH] Fixed 2 bugs in autoProcessMovie, one that was giving a
 keyError on '_id' and another that was preventing imdbID from being returned
 correctly.

---
 nzbtomedia/autoProcess/autoProcessMovie.py | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py
index 31a9dd39..51811d45 100644
--- a/nzbtomedia/autoProcess/autoProcessMovie.py
+++ b/nzbtomedia/autoProcess/autoProcessMovie.py
@@ -10,7 +10,10 @@ from nzbtomedia import logger
 
 class autoProcessMovie:
     def find_imdbid(self, dirName, nzbName):
+        imdbid = None
+
         nzbName = clean_nzbname(nzbName)
+
         # find imdbid in dirName
         m = re.search('(tt\d{7})', dirName)
         if m:
@@ -41,8 +44,13 @@ class autoProcessMovie:
                 return
 
             results = r.json()
-            if hasattr(results, 'imdbID'):
-                return results['imdbID']
+
+            try:
+                imdbid = results['imdbID']
+            except:pass
+
+            if imdbid:
+                return imdbid
 
     def get_releases(self, baseURL, download_id, dirName, nzbName):
         releases = {}
@@ -71,21 +79,22 @@ class autoProcessMovie:
             return
 
         results = r.json()
-
         movies = results[section]
         if not isinstance(movies, list):
             movies = [movies]
-
         for movie in movies:
-            for release in movie['releases']:
-                if download_id:
-                    try:
+            releases = movie['releases']
+            if not isinstance(releases, list):
+                releases = [releases]
+            for release in releases:
+                try:
+                    if download_id:
                         if download_id != release['download_info']['id']:
                                 continue
-                    except:continue
 
-                id = release['_id']
-                releases[id] = release
+                    id = release['_id']
+                    releases[id] = release
+                except:continue
 
         return releases