Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.2.6 (2015-11-27)
+
+* Fixes for IP logging in PMS < 0.9.14.x.
+* Fix issue in plexWatch importer when trying to import item with no ratingKey.
+
+
 ## v1.2.5 (2015-11-25)
 
 * Add video_decision and audio_decision to notification options

plexpy/helpers.py

@@ -92,13 +92,15 @@ def latinToAscii(unicrap):
     }
 
     r = ''
-    for i in unicrap:
+    if unicrap:
-        if ord(i) in xlate:
+        for i in unicrap:
-            r += xlate[ord(i)]
+            if ord(i) in xlate:
-        elif ord(i) >= 0x80:
+                r += xlate[ord(i)]
-            pass
+            elif ord(i) >= 0x80:
-        else:
+                pass
-            r += str(i)
+            else:
+                r += str(i)
+
     return r
 
 

plexpy/plexwatch_import.py

@@ -292,10 +292,15 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval
 
         # If we get back None from our xml extractor skip over the record and log error.
         if not extracted_xml:
-            logger.error(u"PlexPy Importer :: Skipping line with ratingKey %s due to malformed xml."
+            logger.error(u"PlexPy Importer :: Skipping record with ratingKey %s due to malformed xml."
                          % str(row['rating_key']))
             continue
 
+        # Skip line if we don't have a ratingKey to work with
+        if not row['rating_key']:
+            logger.error(u"PlexPy Importer :: Skipping record due to null ratingRey.")
+            continue
+
         # If the user_id no longer exists in the friends list, pull it from the xml.
         if user_data.get_user_id(user=row['user']):
             user_id = user_data.get_user_id(user=row['user'])

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.2.5"
+PLEXPY_RELEASE_VERSION = "1.2.6"