Merge branch 'refs/heads/develop'

couchpotato/core/media/movie/providers/automation/imdb.py

@@ -39,6 +39,11 @@ class IMDBBase(Automation, RSS):
         except:
             try:
                 split = splitString(html, split_on = "<div id=\"main\">")
+
+                if len(split) < 2:
+                    log.error('Failed parsing IMDB page "%s", unexpected html.', url)
+                    return []
+
                 html = BeautifulSoup(split[1])
                 for x in ['list compact', 'lister', 'list detail sub-list']:
                     html2 = html.find('div', attrs = {

couchpotato/core/notifications/core/main.py

@@ -258,14 +258,14 @@ class CoreNotifier(Notification):
 
         messages = []
 
-        # Get unread
+        # Get last message
         if init:
             db = get_db()
 
-            notifications = db.all('notification_unread', with_doc = True)
+            notifications = db.all('notification', with_doc = True)
 
             for n in notifications:
-                if n['doc'].get('time') > (time.time() - 259200):
+                if n['doc'].get('time') > (time.time() - 604800):
                     messages.append(n['doc'])
 
         return {