github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 05:31:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Manually merge v1.4.22 into v2

Browse source
This commit is contained in:
JonnyWong16 2017-08-19 21:11:08 -07:00
commit 581b8375b9
5 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,5 +1,11 @@
# Changelog # Changelog
## v1.4.22 (2017-08-19)
* Fix: Cleaning up of old config backups.
* Fix: Temporary fix for incorrect source media info.
## v1.4.21 (2017-07-01) ## v1.4.21 (2017-07-01)
* New: Updated donation methods. * New: Updated donation methods.

4
data/interfaces/default/js/script.js
View file

@ -263,6 +263,8 @@ function getPlatformImagePath(platformName) {
return 'images/platforms/dlna.png'; return 'images/platforms/dlna.png';
} else if (platformName.indexOf("PlexTogether") > -1) { } else if (platformName.indexOf("PlexTogether") > -1) {
return 'images/platforms/plextogether.png'; return 'images/platforms/plextogether.png';
} else if (platformName.indexOf("Linux") > -1) {
return 'images/platforms/linux.png';
} else { } else {
return 'images/platforms/default.png'; return 'images/platforms/default.png';
} }
@ -517,4 +519,4 @@ function forceMinMax(elem) {
else { else {
elem.val(val); elem.val(val);
} }
} }

14
plexpy/activity_processor.py
View file

@ -186,8 +186,14 @@ class ActivityProcessor(object):
metadata = pms_connect.get_metadata_details(rating_key=str(session['rating_key'])) metadata = pms_connect.get_metadata_details(rating_key=str(session['rating_key']))
if not metadata: if not metadata:
return False return False
else:
media_info = {}
if 'media_info' in metadata and len(metadata['media_info']) > 0:
media_info = metadata['media_info'][0]
else: else:
metadata = import_metadata metadata = import_metadata
## TODO: Fix media info from imports. Temporary media info from import session.
media_info = session
# logger.debug(u"PlexPy ActivityProcessor :: Attempting to write to session_history table...") # logger.debug(u"PlexPy ActivityProcessor :: Attempting to write to session_history table...")
query = 'INSERT INTO session_history (started, stopped, rating_key, parent_rating_key, ' \ query = 'INSERT INTO session_history (started, stopped, rating_key, parent_rating_key, ' \
@ -253,10 +259,10 @@ class ActivityProcessor(object):
'(last_insert_rowid(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)' '(last_insert_rowid(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'
args = [session['rating_key'], session['video_decision'], session['audio_decision'], args = [session['rating_key'], session['video_decision'], session['audio_decision'],
session['duration'], session['width'], session['height'], session['container'], metadata['duration'], media_info.get('width',''), media_info.get('height',''), media_info.get('container',''),
session['video_codec'], session['audio_codec'], session['bitrate'], media_info.get('video_codec',''), media_info.get('audio_codec',''), media_info.get('bitrate',''),
session['video_resolution'], session['video_framerate'], session['aspect_ratio'], media_info.get('video_resolution',''), media_info.get('video_framerate',''), media_info.get('aspect_ratio',''),
session['audio_channels'], session['transcode_protocol'], session['transcode_container'], media_info.get('audio_channels',''), session['transcode_protocol'], session['transcode_container'],
session['transcode_video_codec'], session['transcode_audio_codec'], session['transcode_video_codec'], session['transcode_audio_codec'],
session['transcode_audio_channels'], session['transcode_width'], session['transcode_height'], session['transcode_audio_channels'], session['transcode_width'], session['transcode_height'],
session['transcode_decision']] session['transcode_decision']]

3
plexpy/config.py
View file

@ -17,6 +17,7 @@ import arrow
import os import os
import re import re
import shutil import shutil
import time
from configobj import ConfigObj from configobj import ConfigObj
@ -629,7 +630,7 @@ def make_backup(cleanup=False, scheduler=False):
if cleanup: if cleanup:
now = time.time() now = time.time()
# Delete all scheduled backup files except from the last 5. # Delete all scheduled backup older than BACKUP_DAYS.
for root, dirs, files in os.walk(backup_folder): for root, dirs, files in os.walk(backup_folder):
ini_files = [os.path.join(root, f) for f in files if f.endswith('.sched.ini')] ini_files = [os.path.join(root, f) for f in files if f.endswith('.sched.ini')]
for file_ in ini_files: for file_ in ini_files:

2
plexpy/version.py
View file

@ -1,2 +1,2 @@
PLEXPY_BRANCH = "master" PLEXPY_BRANCH = "master"
PLEXPY_RELEASE_VERSION = "1.4.21" PLEXPY_RELEASE_VERSION = "1.4.22"