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

Merge branch 'dev'

Browse source
This commit is contained in:
Jonathan Wong 2015-12-06 11:41:08 -08:00
commit fc0be6bce2
6 changed files with 21 additions and 15 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.2.12 (2015-12-06)
* Fix match newlines between tags in notification text.
* Fix current activity not showing on PMS 0.9.12.
## v1.2.12 (2015-12-06) ## v1.2.12 (2015-12-06)
* Fix for "too many open files" error. * Fix for "too many open files" error.

8
data/interfaces/default/notification_config.html
View file

@ -25,7 +25,7 @@ from plexpy import helpers
% endif % endif
</div> </div>
</div> </div>
<p class="help-block">${item['description']}</p> <p class="help-block">${item['description'] | n}</p>
</div> </div>
% elif item['input_type'] == 'button': % elif item['input_type'] == 'button':
<div class="form-group"> <div class="form-group">
@ -34,14 +34,14 @@ from plexpy import helpers
<input type="${item['input_type']}" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}"> <input type="${item['input_type']}" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}">
</div> </div>
</div> </div>
<p class="help-block">${item['description']}</p> <p class="help-block">${item['description'] | n}</p>
</div> </div>
% elif item['input_type'] == 'checkbox': % elif item['input_type'] == 'checkbox':
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" ${helpers.checked(item['value'])}> ${item['label']} <input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" ${helpers.checked(item['value'])}> ${item['label']}
</label> </label>
<p class="help-block">${item['description']}</p> <p class="help-block">${item['description'] | n}</p>
<input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}"> <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
</div> </div>
% elif item['input_type'] == 'select': % elif item['input_type'] == 'select':
@ -60,7 +60,7 @@ from plexpy import helpers
</select> </select>
</div> </div>
</div> </div>
<p class="help-block">${item['description']}</p> <p class="help-block">${item['description'] | n}</p>
</div> </div>
% endif % endif
% endfor % endfor

2
plexpy/datafactory.py
View file

@ -1046,6 +1046,6 @@ class DataFactory(object):
ip_address = 'N/A' ip_address = 'N/A'
for item in result: for item in result:
ip_address = item[0] ip_address = item['ip_address']
return ip_address return ip_address

6
plexpy/notification_handler.py
View file

@ -315,13 +315,13 @@ def build_notify_text(session=None, timeline=None, state=None):
# Check for exclusion tags # Check for exclusion tags
if metadata['media_type'] == 'movie': if metadata['media_type'] == 'movie':
# Regex pattern to remove the text in the tags we don't want # Regex pattern to remove the text in the tags we don't want
pattern = re.compile('<tv>[^>]+.</tv>|<music>[^>]+.</music>', re.IGNORECASE|re.DOTALL) pattern = re.compile('\n*<tv>[^>]+.</tv>\n*|\n*<music>[^>]+.</music>\n*', re.IGNORECASE|re.DOTALL)
elif metadata['media_type'] == 'show' or metadata['media_type'] == 'episode': elif metadata['media_type'] == 'show' or metadata['media_type'] == 'episode':
# Regex pattern to remove the text in the tags we don't want # Regex pattern to remove the text in the tags we don't want
pattern = re.compile('<movie>[^>]+.</movie>|<music>[^>]+.</music>', re.IGNORECASE|re.DOTALL) pattern = re.compile('\n*<movie>[^>]+.</movie>\n*|\n*?<music>[^>]+.</music>\n*', re.IGNORECASE|re.DOTALL)
elif metadata['media_type'] == 'artist' or metadata['media_type'] == 'track': elif metadata['media_type'] == 'artist' or metadata['media_type'] == 'track':
# Regex pattern to remove the text in the tags we don't want # Regex pattern to remove the text in the tags we don't want
pattern = re.compile('<tv>[^>]+.</tv>|<movie>[^>]+.</movie>', re.IGNORECASE|re.DOTALL) pattern = re.compile('\n*<tv>[^>]+.</tv>\n*|\n*<movie>[^>]+.</movie>\n*', re.IGNORECASE|re.DOTALL)
else: else:
pattern = None pattern = None

12
plexpy/plextv.py
View file

@ -342,13 +342,13 @@ class PlexTV(object):
rating_key = clean_uri.rpartition('%2F')[-1] rating_key = clean_uri.rpartition('%2F')[-1]
sync_details = {"device_name": device_name, sync_details = {"device_name": helpers.sanitize(device_name),
"platform": device_platform, "platform": helpers.sanitize(device_platform),
"username": device_username, "username": helpers.sanitize(device_username),
"friendly_name": device_friendly_name, "friendly_name": helpers.sanitize(device_friendly_name),
"user_id": device_user_id, "user_id": device_user_id,
"root_title": sync_root_title, "root_title": helpers.sanitize(sync_root_title),
"title": sync_title, "title": helpers.sanitize(sync_title),
"metadata_type": sync_metadata_type, "metadata_type": sync_metadata_type,
"content_type": sync_content_type, "content_type": sync_content_type,
"rating_key": rating_key, "rating_key": rating_key,

2
plexpy/version.py
View file

@ -1,2 +1,2 @@
PLEXPY_VERSION = "master" PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.2.12" PLEXPY_RELEASE_VERSION = "1.2.13"