mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for history logging.

This commit is contained in:
Louis Vézina 2019-06-16 15:24:47 -04:00
parent daa6d87e76
commit bc321392f2
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bazarr/get_subtitle.py
View File

@ -505,7 +505,7 @@ def series_download_subtitles(no):
message = result[0] message = result[0]
path = result[1] path = result[1]
forced = result[5] forced = result[5]
language_code = result[2] + ":forced" if forced else "" language_code = result[2] + ":forced" if forced else result[2]
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles(path_replace(episode[0])) store_subtitles(path_replace(episode[0]))
@ -547,7 +547,7 @@ def episode_download_subtitles(no):
message = result[0] message = result[0]
path = result[1] path = result[1]
forced = result[5] forced = result[5]
language_code = result[2] + ":forced" if forced else "" language_code = result[2] + ":forced" if forced else result[2]
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles(path_replace(episode[0])) store_subtitles(path_replace(episode[0]))
@ -636,7 +636,7 @@ def wanted_download_subtitles(path, l, count_episodes):
message = result[0] message = result[0]
path = result[1] path = result[1]
forced = result[5] forced = result[5]
language_code = result[2] + ":forced" if forced else "" language_code = result[2] + ":forced" if forced else result[2]
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles(path_replace(episode[0])) store_subtitles(path_replace(episode[0]))
@ -905,7 +905,7 @@ def upgrade_subtitles():
message = result[0] message = result[0]
path = result[1] path = result[1]
forced = result[5] forced = result[5]
language_code = result[2] + ":forced" if forced else "" language_code = result[2] + ":forced" if forced else result[2]
provider = result[3] provider = result[3]
score = result[4] score = result[4]
store_subtitles(path_replace(episode[0])) store_subtitles(path_replace(episode[0]))

4
bazarr/main.py
View File

@ -1835,7 +1835,7 @@ def get_subtitle():
message = result[0] message = result[0]
path = result[1] path = result[1]
forced = result[5] forced = result[5]
language_code = result[2] + ":forced" if forced else "" language_code = result[2] + ":forced" if forced else result[2]
provider = result[3] provider = result[3]
score = result[4] score = result[4]
history_log(1, sonarrSeriesId, sonarrEpisodeId, message, path, language_code, provider, score) history_log(1, sonarrSeriesId, sonarrEpisodeId, message, path, language_code, provider, score)
@ -1893,7 +1893,7 @@ def manual_get_subtitle():
message = result[0] message = result[0]
path = result[1] path = result[1]
forced = result[5] forced = result[5]
language_code = result[2] + ":forced" if forced else "" language_code = result[2] + ":forced" if forced else result[2]
provider = result[3] provider = result[3]
score = result[4] score = result[4]
history_log(2, sonarrSeriesId, sonarrEpisodeId, message, path, language_code, provider, score) history_log(2, sonarrSeriesId, sonarrEpisodeId, message, path, language_code, provider, score)

28
bazarr/utils.py
View File

@ -14,18 +14,14 @@ def history_log(action, sonarrSeriesId, sonarrEpisodeId, description, video_path
# Open database connection # Open database connection
db = sqlite3.connect(os.path.join(args.config_dir, 'db', 'bazarr.db'), timeout=30) db = sqlite3.connect(os.path.join(args.config_dir, 'db', 'bazarr.db'), timeout=30)
c = db.cursor() c = db.cursor()
if forced:
language = language + ":forced"
# Get Sonarr API URL from database config table
history = c.execute( history = c.execute(
'''INSERT INTO table_history(action, sonarrSeriesId, sonarrEpisodeId, timestamp, description, video_path, language, provider, score) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)''', '''INSERT INTO table_history(action, sonarrSeriesId, sonarrEpisodeId, timestamp, description, video_path, language, provider, score) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)''',
(action, sonarrSeriesId, sonarrEpisodeId, time.time(), description, video_path, language, provider, score)) (action, sonarrSeriesId, sonarrEpisodeId, time.time(), description, video_path, language, provider, score))
# Commit changes to DB # Commit changes to DB
db.commit() db.commit()
# Close database connection # Close database connection
db.close() db.close()
@ -35,38 +31,38 @@ def history_log_movie(action, radarrId, description, video_path=None, language=N
# Open database connection # Open database connection
db = sqlite3.connect(os.path.join(args.config_dir, 'db', 'bazarr.db'), timeout=30) db = sqlite3.connect(os.path.join(args.config_dir, 'db', 'bazarr.db'), timeout=30)
c = db.cursor() c = db.cursor()
if forced: if forced:
language = language + ":forced" language = language + ":forced"
history = c.execute( history = c.execute(
'''INSERT INTO table_history_movie(action, radarrId, timestamp, description, video_path, language, provider, score) VALUES (?, ?, ?, ?, ?, ?, ?, ?)''', '''INSERT INTO table_history_movie(action, radarrId, timestamp, description, video_path, language, provider, score) VALUES (?, ?, ?, ?, ?, ?, ?, ?)''',
(action, radarrId, time.time(), description, video_path, language, provider, score)) (action, radarrId, time.time(), description, video_path, language, provider, score))
# Commit changes to DB # Commit changes to DB
db.commit() db.commit()
# Close database connection # Close database connection
db.close() db.close()
def get_binary(name): def get_binary(name):
binaries_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'bin')) binaries_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'bin'))
exe = None exe = None
installed_exe = which(name) installed_exe = which(name)
if installed_exe and os.path.isfile(installed_exe): if installed_exe and os.path.isfile(installed_exe):
return installed_exe return installed_exe
else: else:
if platform.system() == "Windows": # Windows if platform.system() == "Windows": # Windows
exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "i386", name, "%s.exe" % name)) exe = os.path.abspath(os.path.join(binaries_dir, "Windows", "i386", name, "%s.exe" % name))
elif platform.system() == "Darwin": # MacOSX elif platform.system() == "Darwin": # MacOSX
exe = os.path.abspath(os.path.join(binaries_dir, "MacOSX", "i386", name, name)) exe = os.path.abspath(os.path.join(binaries_dir, "MacOSX", "i386", name, name))
elif platform.system() == "Linux": # Linux elif platform.system() == "Linux": # Linux
exe = os.path.abspath(os.path.join(binaries_dir, "Linux", platform.machine(), name, name)) exe = os.path.abspath(os.path.join(binaries_dir, "Linux", platform.machine(), name, name))
if exe and os.path.isfile(exe): if exe and os.path.isfile(exe):
return exe return exe