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

Some minor styling changes.

Browse source 
Add album_name as parameter for notifications.
This commit is contained in:
Tim 2015-07-29 01:06:21 +02:00
parent 5f203bb837
commit d750c5f610
4 changed files with 143 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

36
data/interfaces/default/plexwatch_import.html
View file

@ -3,25 +3,23 @@
<h3>Import PlexWatch Database</h3> <h3>Import PlexWatch Database</h3>
</div> </div>
<div class="modal-body" id="modal-text"> <div class="modal-body" id="modal-text">
<div class="card-back"> <div class="form-group">
<div class="form-group"> <label for="db_location">Database Location</label>
<label for="db_location">Database Location</label> <input type="text" class="input-xlarge" id="db_location" name="db_location" value="" required>
<input type="text" id="db_location" name="db_location" value="" size="30" required> <p class="help-block">Enter the path and file name for the PlexWatch database you wish to import.</p>
<p class="help-block">Enter the path and file name for the PlexWatch database you wish to import.</p> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="table_name">Table Name</label>
<label for="table_name">Table Name</label> <select id="table_name" name="table_name">
<select id="table_name" name="table_name"> <option value="processed">processed</option>
<option value="processed">processed</option> <option value="processed">grouped</option>
<option value="processed">grouped</option> </select>
</select> <p class="help-block">The table name from which you wish to import. Only import one of these, importing both will result in duplicated data.</p>
<p class="help-block">The table name from which you wish to import. Only import one of these, importing both will result in duplicated data.</p> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="import_ignore_interval">Ignore Interval</label>
<label for="import_ignore_interval">Ignore Interval</label> <input type="text" class="input-mini" id="import_ignore_interval" name="import_ignore_interval" value="120" required>
<input type="text" id="import_ignore_interval" name="import_ignore_interval" value="120" size="30" required> <p class="help-block">Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.</p>
<p class="help-block">Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.</p>
</div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

248
data/interfaces/default/settings.html
View file

@ -407,117 +407,115 @@
<h3 id="myModalLabel">Date &amp; Time Format Options</h3> <h3 id="myModalLabel">Date &amp; Time Format Options</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="card-back"> <table>
<table> <tbody>
<tbody> <tr>
<tr> <td align="center" colspan="3"><h5>Day</h5></td>
<td colspan="3"><h5>Day</h5></td> </tr>
</tr> <tr>
<tr> <td width="100"><strong>DD</strong></td>
<td align="center"><strong>DD</strong></td> <td width="300">Numeric, with leading zeros</td>
<td width="300">Numeric, with leading zeros</td> <td>01 to 31</td>
<td>01 to 31</td> </tr>
</tr> <tr>
<tr> <td><strong>D</strong></td>
<td align="center"><strong>D</strong></td> <td>Numeric, without leading zeros</td>
<td>Numeric, without leading zeros</td> <td>1 to 31</td>
<td>1 to 31</td> </tr>
</tr> <tr>
<tr> <td><strong>Do</strong></td>
<td align="center"><strong>Do</strong></td> <td>The English suffix for the day of the month</td>
<td>The English suffix for the day of the month</td> <td>st, nd or th in the 1st, 2nd or 15th.</td>
<td>st, nd or th in the 1st, 2nd or 15th.</td> </tr>
</tr>
<tr> <tr>
<td colspan="3"><h5>Month</h5></td> <td align="center" colspan="3"><h5>Month</h5></td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>MM</strong></td> <td><strong>MM</strong></td>
<td>Numeric, with leading zeros</td> <td>Numeric, with leading zeros</td>
<td>01 to 31</td> <td>01 to 31</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>M</strong></td> <td><strong>M</strong></td>
<td>Numeric, without leading zeros</td> <td>Numeric, without leading zeros</td>
<td>1 to 31</td> <td>1 to 31</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>MMMM</strong></td> <td><strong>MMMM</strong></td>
<td>Textual full</td> <td>Textual full</td>
<td>January to December</td> <td>January to December</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>MMM</strong></td> <td><strong>MMM</strong></td>
<td>Textual three letters</td> <td>Textual three letters</td>
<td>Jan to Dec</td> <td>Jan to Dec</td>
</tr> </tr>
<tr> <tr>
<td colspan="3"><h5>Year</h5></td> <td align="center" colspan="3"><h5>Year</h5></td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>YYYY</strong></td> <td><strong>YYYY</strong></td>
<td>Numeric, 4 digits</td> <td>Numeric, 4 digits</td>
<td>Eg., 1999, 2003</td> <td>Eg., 1999, 2003</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>YY</strong></td> <td><strong>YY</strong></td>
<td>Numeric, 2 digits</td> <td>Numeric, 2 digits</td>
<td>Eg., 99, 03</td> <td>Eg., 99, 03</td>
</tr> </tr>
<tr> <tr>
<td colspan="3"><h5>Time</h5></td> <td align="center" colspan="3"><h5>Time</h5></td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>a</strong></td> <td><strong>a</strong></td>
<td width="300">am/pm Lowercase</td> <td width="300">am/pm Lowercase</td>
<td>am, pm</td> <td>am, pm</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>A</strong></td> <td><strong>A</strong></td>
<td>AM/PM Uppercase</td> <td>AM/PM Uppercase</td>
<td>AM, PM</td> <td>AM, PM</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>h</strong></td> <td><strong>h</strong></td>
<td>Hour, 12-hour, without leading zeros</td> <td>Hour, 12-hour, without leading zeros</td>
<td>1-12</td> <td>1-12</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>hh</strong></td> <td><strong>hh</strong></td>
<td>Hour, 12-hour, with leading zeros</td> <td>Hour, 12-hour, with leading zeros</td>
<td>01-12</td> <td>01-12</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>H</strong></td> <td><strong>H</strong></td>
<td>Hour, 24-hour, without leading zeros</td> <td>Hour, 24-hour, without leading zeros</td>
<td>0-23</td> <td>0-23</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>HH</strong></td> <td><strong>HH</strong></td>
<td>Hour, 24-hour, with leading zeros</td> <td>Hour, 24-hour, with leading zeros</td>
<td>00-23</td> <td>00-23</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>mm</strong></td> <td><strong>mm</strong></td>
<td>Minutes, with leading zeros</td> <td>Minutes, with leading zeros</td>
<td>00-59</td> <td>00-59</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>ss</strong></td> <td><strong>ss</strong></td>
<td>Seconds, with leading zeros</td> <td>Seconds, with leading zeros</td>
<td>00-59</td> <td>00-59</td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong>zz</strong></td> <td><strong>zz</strong></td>
<td>Timezone abbreviation</td> <td>Timezone abbreviation</td>
<td>Eg., EST, MDT ...</td> <td>Eg., EST, MDT ...</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
<div class="modal-footer"></div> <div class="modal-footer"></div>
</div> </div>
@ -530,22 +528,20 @@
</div> </div>
<div class="modal-body" id="modal-text"> <div class="modal-body" id="modal-text">
<div> <div>
<div class="card-back"> <span>
<span> This will attempt to fetch your token for you. This will not work on Internet Explorer 9 or lower.
This will attempt to fetch your token for you. This will not work on Internet Explorer 9 or lower. PlexPy does not store your username and password.
PlexPy does not store your username and password. </span>
</span> <br/><br/>
<br/><br/> <div class="form-group">
<div class="form-group"> <label for="pms_username">PMS Username</label>
<label for="pms_username">PMS Username</label> <input type="text" id="pms_username" name="pms_username" size="30">
<input type="text" id="pms_username" name="pms_username" size="30"> <p class="help-block">Username for Plex.tv authentication.</p>
<p class="help-block">Username for Plex.tv authentication.</p> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="pms_password">PMS Password</label>
<label for="pms_password">PMS Password</label> <input type="password" id="pms_password" name="pms_password" size="30">
<input type="password" id="pms_password" name="pms_password" size="30"> <p class="help-block">Password for Plex.tv authentication.</p>
<p class="help-block">Password for Plex.tv authentication.</p>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -604,6 +600,10 @@
<td width="150"><strong>{episode_name}</strong></td> <td width="150"><strong>{episode_name}</strong></td>
<td>The title of the episode being played back.</td> <td>The title of the episode being played back.</td>
</tr> </tr>
<tr>
<td width="150"><strong>{album_name}</strong></td>
<td>The title of the album being played back if item is track.</td>
</tr>
<tr> <tr>
<td width="150"><strong>{transcode_decision}</strong></td> <td width="150"><strong>{transcode_decision}</strong></td>
<td>The transcode decisions for the media item.</td> <td>The transcode decisions for the media item.</td>

2
plexpy/config.py
View file

@ -27,11 +27,9 @@ _CONFIG_DEFINITIONS = {
'PMS_IS_REMOTE': (int, 'PMS', 0), 'PMS_IS_REMOTE': (int, 'PMS', 0),
'PMS_LOGS_FOLDER': (str, 'PMS', ''), 'PMS_LOGS_FOLDER': (str, 'PMS', ''),
'PMS_PORT': (int, 'PMS', 32400), 'PMS_PORT': (int, 'PMS', 32400),
'PMS_PASSWORD': (str, 'PMS', ''),
'PMS_TOKEN': (str, 'PMS', ''), 'PMS_TOKEN': (str, 'PMS', ''),
'PMS_SSL': (int, 'General', 0), 'PMS_SSL': (int, 'General', 0),
'PMS_URL': (str, 'PMS', ''), 'PMS_URL': (str, 'PMS', ''),
'PMS_USERNAME': (str, 'PMS', ''),
'PMS_USE_BIF': (int, 'PMS', 0), 'PMS_USE_BIF': (int, 'PMS', 0),
'PMS_UUID': (str, 'PMS', ''), 'PMS_UUID': (str, 'PMS', ''),
'TIME_FORMAT': (str, 'General', 'HH:mm'), 'TIME_FORMAT': (str, 'General', 'HH:mm'),

3
plexpy/notification_handler.py
View file

@ -210,7 +210,7 @@ def build_notify_text(session, state):
on_watched_body = strip_tag(re.sub('<tv>[^>]+.</tv>|<movie>[^>]+.</movie>', '', on_watched_body = strip_tag(re.sub('<tv>[^>]+.</tv>|<movie>[^>]+.</movie>', '',
plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT)) plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT))
else: else:
on_start_subject = plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT on_start_subject = plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT
on_start_body = plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT on_start_body = plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT
on_stop_subject = plexpy.CONFIG.NOTIFY_ON_STOP_SUBJECT_TEXT on_stop_subject = plexpy.CONFIG.NOTIFY_ON_STOP_SUBJECT_TEXT
on_stop_body = plexpy.CONFIG.NOTIFY_ON_STOP_BODY_TEXT on_stop_body = plexpy.CONFIG.NOTIFY_ON_STOP_BODY_TEXT
@ -261,6 +261,7 @@ def build_notify_text(session, state):
'summary': item_metadata['summary'], 'summary': item_metadata['summary'],
'season_num': item_metadata['parent_index'], 'season_num': item_metadata['parent_index'],
'episode_num': item_metadata['index'], 'episode_num': item_metadata['index'],
'album_name': item_metadata['parent_title'],
'rating': item_metadata['rating'], 'rating': item_metadata['rating'],
'duration': duration, 'duration': duration,
'progress': view_offset, 'progress': view_offset,