mirror of
https://github.com/FakeTV/pseudo-channel.git
synced 2025-12-20 10:13:39 +00:00
merged
This commit is contained in:
@@ -440,8 +440,6 @@ class PseudoChannel():
|
|||||||
if section.title.lower() in [x.lower() for x in user_lib_name]:
|
if section.title.lower() in [x.lower() for x in user_lib_name]:
|
||||||
if correct_lib_name == "Movies":
|
if correct_lib_name == "Movies":
|
||||||
|
|
||||||
pass
|
|
||||||
|
|
||||||
print "entry[13]", entry[13]
|
print "entry[13]", entry[13]
|
||||||
movies = self.PLEX.library.section(section.title)
|
movies = self.PLEX.library.section(section.title)
|
||||||
|
|
||||||
@@ -469,9 +467,12 @@ class PseudoChannel():
|
|||||||
|
|
||||||
the_movie = self.db.get_movie(random.choice(movies_list).title)
|
the_movie = self.db.get_movie(random.choice(movies_list).title)
|
||||||
|
|
||||||
|
the_movie = self.db.get_movie(random.choice(movies_list).title)
|
||||||
|
|
||||||
"""Updating movies table in the db with lastPlayedDate entry"""
|
"""Updating movies table in the db with lastPlayedDate entry"""
|
||||||
self.db.update_movies_table_with_last_played_date(the_movie[3])
|
self.db.update_movies_table_with_last_played_date(the_movie[3])
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
else:
|
else:
|
||||||
|
|
||||||
print("For some reason, I've failed getting movie with xtra args.")
|
print("For some reason, I've failed getting movie with xtra args.")
|
||||||
@@ -480,6 +481,14 @@ class PseudoChannel():
|
|||||||
# Updating movies table in the db with lastPlayedDate entry
|
# Updating movies table in the db with lastPlayedDate entry
|
||||||
self.db.update_movies_table_with_last_played_date(the_movie[3])
|
self.db.update_movies_table_with_last_played_date(the_movie[3])
|
||||||
|
|
||||||
|
=======
|
||||||
|
except:
|
||||||
|
print("For some reason, I've failed getting movie with xtra args.")
|
||||||
|
the_movie = self.db.get_random_movie()
|
||||||
|
|
||||||
|
"""Updating movies table in the db with lastPlayedDate entry"""
|
||||||
|
self.db.update_movies_table_with_last_played_date(the_movie[3])
|
||||||
|
>>>>>>> develop
|
||||||
else:
|
else:
|
||||||
|
|
||||||
"""the_movie = self.db.get_movie(self.movieMagic.get_random_movie(
|
"""the_movie = self.db.get_movie(self.movieMagic.get_random_movie(
|
||||||
@@ -491,6 +500,10 @@ class PseudoChannel():
|
|||||||
|
|
||||||
"""Updating movies table in the db with lastPlayedDate entry"""
|
"""Updating movies table in the db with lastPlayedDate entry"""
|
||||||
self.db.update_movies_table_with_last_played_date(the_movie[3])
|
self.db.update_movies_table_with_last_played_date(the_movie[3])
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> develop
|
||||||
else:
|
else:
|
||||||
the_movie = self.db.get_movie(entry[3])
|
the_movie = self.db.get_movie(entry[3])
|
||||||
if the_movie != None:
|
if the_movie != None:
|
||||||
|
|||||||
Reference in New Issue
Block a user