Compare commits

...

5 Commits

Author SHA1 Message Date
JonnyWong16
ec685407bb v1.4.22 2017-08-19 20:50:28 -07:00
JonnyWong16
be9a1dcf06 Temporary fix for incorrect source media info 2017-08-19 20:48:01 -07:00
JonnyWong16
1f7e8b4d9a Fix removing old config backups 2017-08-19 20:29:49 -07:00
JonnyWong16
b3da08ce74 Merge pull request #1084 from mttlmy/dev
Added platform 'Linux' to link to image linux.png
2017-08-07 16:32:12 -07:00
mttlmy
50753db4ff Added platform 'Linux' to link to image linux.png 2017-08-07 19:27:46 -04:00
6 changed files with 20 additions and 8 deletions

View File

@@ -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.

View File

@@ -258,6 +258,8 @@ function getPlatformImagePath(platformName) {
return 'images/platforms/pmp.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';
}
@@ -467,4 +469,4 @@ function humanFileSize(bytes, si) {
++u;
} while (Math.abs(bytes) >= thresh && u < units.length - 1);
return bytes.toFixed(1) + '&nbsp;' + units[u];
}
}

View File

@@ -220,7 +220,7 @@ class ActivityProcessor(object):
if not is_import:
logger.debug(u"PlexPy ActivityProcessor :: Fetching metadata for item ratingKey %s" % session['rating_key'])
pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_metadata_details(rating_key=str(session['rating_key']))
result = pms_connect.get_metadata_details(rating_key=str(session['rating_key']), get_media_info=True)
if result and result['metadata']:
metadata = result['metadata']
else:
@@ -293,10 +293,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'], metadata['width'], metadata['height'], metadata['container'],
metadata['video_codec'], metadata['audio_codec'], metadata['bitrate'],
metadata['video_resolution'], metadata['video_framerate'], metadata['aspect_ratio'],
metadata['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']]

View File

@@ -17,6 +17,7 @@ import arrow
import os
import re
import shutil
import time
from configobj import ConfigObj
@@ -610,7 +611,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:

View File

@@ -881,6 +881,9 @@ class PmsConnect(object):
'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'),
'audio_codec': helpers.get_xml_attr(media, 'audioCodec'),
'audio_channels': helpers.get_xml_attr(media, 'audioChannels'),
'aspect_ratio': helpers.get_xml_attr(media, 'aspectRatio'),
'width': helpers.get_xml_attr(media, 'width'),
'height': helpers.get_xml_attr(media, 'height'),
'file': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'file'),
'file_size': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'size'),
}

View File

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