From 6eb8cdfa306bf567497b151ebdaa98c30da61e9e Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Mon, 10 Oct 2016 04:01:13 -0500
Subject: [PATCH] Fix content pop typo
---
resources/lib/objects/common.py | 10 +++++-----
resources/lib/objects/movies.py | 2 +-
resources/lib/objects/music.py | 2 +-
resources/lib/objects/musicvideos.py | 2 +-
resources/lib/objects/tvshows.py | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/resources/lib/objects/common.py b/resources/lib/objects/common.py
index 15e39e76..1a32dc92 100644
--- a/resources/lib/objects/common.py
+++ b/resources/lib/objects/common.py
@@ -5,7 +5,6 @@
import logging
import xbmc
-import xbmcgui
import xbmcvfs
import artwork
@@ -39,7 +38,8 @@ class Items(object):
self.direct_path = settings('useDirectPaths') == "1"
self.content_msg = settings('newContent') == "true"
- def path_validation(self, path):
+ @classmethod
+ def path_validation(cls, path):
# Verify if direct path is accessible or not
if window('emby_pathverified') != "true" and not xbmcvfs.exists(path):
if dialog(type_="yesno",
@@ -51,14 +51,14 @@ class Items(object):
return True
- def content_pop(self):
+ def content_pop(self, name):
# It's possible for the time to be 0. It should be considered disabled in this case.
- if not self.pdialog and self.content_msg and self.new_time:
+ if not self.pdialog and self.content_msg and self.new_time:
dialog(type_="notification",
heading="{emby}",
message="%s %s" % (lang(33049), name),
icon="{emby}",
- time=time,
+ time=self.new_time,
sound=False)
def update_pdialog(self):
diff --git a/resources/lib/objects/movies.py b/resources/lib/objects/movies.py
index c051272b..a5a1cec3 100644
--- a/resources/lib/objects/movies.py
+++ b/resources/lib/objects/movies.py
@@ -174,7 +174,7 @@ class Movies(common.Items):
for item in super(Movies, self).added(items, total):
if self.add_update(item, view):
- self.content_pop()
+ self.content_pop(item.get('Name', "unknown"))
@catch_except()
def add_update(self, item, view=None):
diff --git a/resources/lib/objects/music.py b/resources/lib/objects/music.py
index a47467f5..bf4cd37b 100644
--- a/resources/lib/objects/music.py
+++ b/resources/lib/objects/music.py
@@ -195,7 +195,7 @@ class Music(common.Items):
self.title = "%s - %s" % (item.get('AlbumArtist', "unknown"), self.title)
if self.add_updateSong(item):
- self.content_pop()
+ self.content_pop(self.title)
@catch_except()
def add_updateArtist(self, item, artisttype="MusicArtist"):
diff --git a/resources/lib/objects/musicvideos.py b/resources/lib/objects/musicvideos.py
index 03da09b5..1e52b8f3 100644
--- a/resources/lib/objects/musicvideos.py
+++ b/resources/lib/objects/musicvideos.py
@@ -125,7 +125,7 @@ class MusicVideos(common.Items):
def added(self, items, total=None, view=None):
for item in super(MusicVideos, self).added(items, total, True):
if self.add_update(item, view):
- self.content_pop()
+ self.content_pop(item.get('Name', "unknown"))
@catch_except
def add_update(self, item, view=None):
diff --git a/resources/lib/objects/tvshows.py b/resources/lib/objects/tvshows.py
index bbf22701..fd459ca9 100644
--- a/resources/lib/objects/tvshows.py
+++ b/resources/lib/objects/tvshows.py
@@ -226,7 +226,7 @@ class TVShows(common.Items):
self.title = "%s - %s" % (item.get('SeriesName', "Unknown"), self.title)
if self.add_updateEpisode(item):
- self.content_pop()
+ self.content_pop(self.title)
@catch_except()
def add_update(self, item, view=None):