jgaunt/pseudo-channel
1
0
Fork 0
mirror of https://github.com/FakeTV/pseudo-channel.git synced 2025-12-22 11:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolved?

Browse Source
This commit is contained in:
Justin Emter
2017-12-01 10:09:28 -08:00
parent a1c62c3e4b
commit b54ef73947
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PseudoChannel.py
View File

@@ -467,12 +467,9 @@ 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.")
@@ -481,14 +478,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: except:
print("For some reason, I've failed getting movie with xtra args.") print("For some reason, I've failed getting movie with xtra args.")
the_movie = self.db.get_random_movie() the_movie = self.db.get_random_movie()
"""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])
>>>>>>> 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(
@@ -500,10 +497,7 @@ 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: