diff --git a/CHANGELOG.md b/CHANGELOG.md index baffea0b..fd6c3d83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 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) * New: Updated donation methods. diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index 1983546c..0b9890a9 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -263,6 +263,8 @@ function getPlatformImagePath(platformName) { return 'images/platforms/dlna.png'; } else if (platformName.indexOf("PlexTogether") > -1) { return 'images/platforms/plextogether.png'; + } else if (platformName.indexOf("Linux") > -1) { + return 'images/platforms/linux.png'; } else { return 'images/platforms/default.png'; } @@ -517,4 +519,4 @@ function forceMinMax(elem) { else { elem.val(val); } -} \ No newline at end of file +} diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index 3822e83b..a7482c81 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -186,8 +186,14 @@ class ActivityProcessor(object): metadata = pms_connect.get_metadata_details(rating_key=str(session['rating_key'])) if not metadata: return False + else: + media_info = {} + if 'media_info' in metadata and len(metadata['media_info']) > 0: + media_info = metadata['media_info'][0] else: 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...") query = 'INSERT INTO session_history (started, stopped, rating_key, parent_rating_key, ' \ @@ -253,10 +259,10 @@ class ActivityProcessor(object): '(last_insert_rowid(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)' args = [session['rating_key'], session['video_decision'], session['audio_decision'], - session['duration'], session['width'], session['height'], session['container'], - session['video_codec'], session['audio_codec'], session['bitrate'], - session['video_resolution'], session['video_framerate'], session['aspect_ratio'], - session['audio_channels'], session['transcode_protocol'], session['transcode_container'], + metadata['duration'], media_info.get('width',''), media_info.get('height',''), media_info.get('container',''), + media_info.get('video_codec',''), media_info.get('audio_codec',''), media_info.get('bitrate',''), + media_info.get('video_resolution',''), media_info.get('video_framerate',''), media_info.get('aspect_ratio',''), + media_info.get('audio_channels',''), session['transcode_protocol'], session['transcode_container'], session['transcode_video_codec'], session['transcode_audio_codec'], session['transcode_audio_channels'], session['transcode_width'], session['transcode_height'], session['transcode_decision']] diff --git a/plexpy/config.py b/plexpy/config.py index f16c55ca..b6f7cc4d 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -17,6 +17,7 @@ import arrow import os import re import shutil +import time from configobj import ConfigObj @@ -629,7 +630,7 @@ def make_backup(cleanup=False, scheduler=False): if cleanup: 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): ini_files = [os.path.join(root, f) for f in files if f.endswith('.sched.ini')] for file_ in ini_files: diff --git a/plexpy/version.py b/plexpy/version.py index 0bf75532..c06a6b34 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_BRANCH = "master" -PLEXPY_RELEASE_VERSION = "1.4.21" +PLEXPY_RELEASE_VERSION = "1.4.22"