diff --git a/CHANGELOG.md b/CHANGELOG.md index d98aa431..fe72b72d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,41 @@ # Changelog +## v1.3.0 (2016-01-23) + +* Add: Brand new Libraries section. +* Add: Lots of new library statistics. +* Add: Media info table for libraries. +* Add: Web app for Android and iOS. (Thanks @zobe123) +* Add: Slack notification agent. (Thanks @richipargo) +* Add: Facebook notification agent. +* Add: Custom script notification agent. (Thanks @Hellowlol) +* Add: Custom "From Name" to email notification agent. +* Add: Ability to test notifications / send custom one-off notifications. +* Add: 'datestamp' and 'timestamp' notification options. +* Add: More concurrent stream statistics. +* Add: Media info flags on the info pages. +* Add: Ability to fix broken metadata if the item has been moved in Plex. +* Add: Ability to rearrange the homepage statistics cards. +* Add: CentOS startup script (Thanks @PHoSawyer) +* Fix: Server name blank after first run wizard. +* Fix: Incorrect duration for grouped home stats. +* Fix: Allow SSL when verifying server in settings. +* Fix: Metadata for grouped recently added notifications. +* Fix: Unable to access settings with missing changelog file. +* Fix: Month name localization on play totals graphs. +* Fix: Get new PMS identifier when changing servers. +* Fix: Websocket log spam when there is no active session. +* Fix: Logs and cache folder not created in the data directory. +* Fix: Title links on sync table. +* Fix: Other various minor bugs and graphical glitches. +* Change: Prettier thumbnail popovers on tables. +* Change: Star ratings to use css/font-awesome. +* Change: More detailed logging info to warnings and errors. +* Change: Better PlexPy process restart handling (Thanks @jackwilsdon) +* Change: Massive behind the scenes code cleanup. +* Remove: Built in Pushover API token (User's own API token is now required). + + ## v1.2.16 (2015-12-22) * Fix Most Concurrent stream stat for emtpy databases diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 129bea69..0d52c444 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -18,12 +18,117 @@ from plexpy import version ${next.headIncludes()} - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -69,37 +174,42 @@ from plexpy import version - % if title=="Home": + % if title == "Home":
    • % else:
    • % endif - % if title=="Users" or title=="User": + % if title == "Libraries" or title == "Library" or title == "Info": +
  • Libraries
    • + % else: +
  • Libraries
    • + % endif + % if title == "Users" or title == "User":
  • Users
    • % else:
  • Users
    • % endif - % if title=="History": + % if title == "History":
  • History
    • % else:
  • History
    • % endif - % if title=="Graphs": + % if title == "Graphs":
  • Graphs
    • % else:
  • Graphs
    • % endif - % if title=="Synced Items": + % if title == "Synced Items":
  • Synced Items
    • % else:
  • Synced Items
    • % endif - % if title=="Log": + % if title == "Log":
  • Logs
    • % else:
  • Logs
    • % endif - % if title=="Settings": + % if title == "Settings":
  • Settings
    • % else:
  • Settings
    • @@ -135,7 +245,7 @@ ${next.headerIncludes()} $.ajax({ type: 'post', url: 'search', - data: { 'query': $('#query').val() } + data: { query: $('#query').val() } }) } else { e.preventDefault(); @@ -151,6 +261,21 @@ ${next.headerIncludes()} } }); + ${next.javascriptIncludes()} diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 5ae38fe4..d06e8f7e 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -235,8 +235,8 @@ fieldset[disabled] .btn-bright:active, .btn-bright.disabled.active, .btn-bright[disabled].active, fieldset[disabled] .btn-bright.active { - background-color: #5cb85c; - border-color: #4cae4c; + background-color: #c9302c; + border-color: #ac2925; } .btn-bright .badge { color: #fff; @@ -498,6 +498,16 @@ textarea.form-control:focus { -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); } +.libraries-poster-face { + overflow: hidden; + float: left; + background-size: contain; + height: 40px; + width: 40px; + /*-webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);*/ +} a .poster-face:hover, a .cover-face:hover, a .users-poster-face:hover { @@ -1195,6 +1205,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span { width: 250px; height: 1px; margin: 0 40px 20px 25px; + position: relative; } .summary-content { position: relative; @@ -1218,6 +1229,20 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span { margin-left: 2px; margin-right: 10px; } +.summary-content-media-info-wrapper { + width: 100%; + position: absolute; + bottom: 0; + left: 0; + text-align: center; +} +.summary-content-media-flag { + width: auto; + height: auto; + max-width: 75pt; + max-height: 15px; + margin: 0 5px; +} .summary-content-summary { overflow: hidden; color: #fff; @@ -1294,31 +1319,25 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span { line-height: 18px; color: #fff; } -.rateit { - display: -moz-inline-box; +.star-rating { display: inline-block; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -o-user-select: none; - -ms-user-select: none; - user-select: none; - -webkit-touch-callout: none; + font-size: 15px; overflow: hidden; white-space: nowrap; - float: right; margin-top: 3px; height: 21px; + position: absolute; + right: 0; } -.rateit .rateit-range { - background: url(../images/star-gray-32.png); - background-size: contain; - height: 16px; +.star-rating .star-icon { + width: auto; + margin-left: 2px; + color: #F9AA03; } -.rateit .rateit-selected { - background: url(../images/star-32.png); - background-size: contain; - height: 16px; +.star-rating .star-icon-o { + width: auto; + margin-left: 2px; + color: #999; } #children-list, #search-results-list { position: relative; @@ -1654,7 +1673,6 @@ a:hover .item-children-poster { } .user-player-instance-box { float: left; - width: 75px; border-radius: 3px; -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); @@ -1676,6 +1694,7 @@ a:hover .item-children-poster { font-weight: normal; width: 140px; margin-left: 10px; + margin-bottom: 10px; } .user-player-instance-playcount h3 { font-size: 30px; @@ -1695,6 +1714,35 @@ a:hover .item-children-poster { top: 15px; left: 0px; } +.library-info-poster-face { + float: left; + margin-top: 15px; + margin-right: 15px; + background-size: contain; + height: 80px; + width: 80px; + /*-webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);*/ +} +.library-user-instance-box { + float: left; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + border-radius: 50%; + -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + background-size: contain; + position: relative; + height: 80px; + width: 80px; +} +.library-user-instance-box:hover { + -webkit-box-shadow: inset 0 0 0 2px #e9a049; + -moz-box-shadow: inset 0 0 0 2px #e9a049; + box-shadow: inset 0 0 0 2px #e9a049; +} .home-platforms { } .home-platforms ul { @@ -1725,6 +1773,7 @@ a:hover .item-children-poster { padding-left: 80px; width: 100%; height: 120px; + overflow: hidden; } .home-platforms-instance-name { color: #fff; @@ -2126,7 +2175,8 @@ a .home-platforms-instance-list-oval:hover, float: right; } .colvis-button-bar, -.refresh-users-button { +.refresh-users-button, +.refresh-libraries-button { float: right; } .nav-settings, @@ -2325,6 +2375,9 @@ a .home-platforms-instance-list-oval:hover, width: 250px; z-index: 9999; } +.dataTables_paginate li { + margin: 0; +} .tooltip.top .tooltip-arrow { border-top-color: #fff; } @@ -2342,42 +2395,52 @@ a .home-platforms-instance-list-oval:hover, background: #fff; border: 0; font-weight: bold; + border-radius: 2px; } -.history-title .popover.right { - margin-left: 12px; - z-index: 5; +.history-thumbnail-popover { + z-index: 2; + padding: 0; + border: 0; } -.history-title .popover.right .popover-content { - padding: 5px 8px; +.history-thumbnail-popover.popover.right { + margin-left: 15px; +} +.history-thumbnail-popover .popover-content { + color: #000; + padding: 0; } .history-thumbnail { background-position: center; background-size: cover; width: 80px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); } -.edit-user-toggles { +.edit-user-toggles, +.edit-library-toggles { padding-right: 10px; } -.edit-user-toggles > input[type='checkbox'] { +.edit-user-toggles > input[type='checkbox'], +.edit-library-toggles > input[type='checkbox'] { display: none; } -.edit-user-toggles > input[type='checkbox'] + label { +.edit-user-toggles > input[type='checkbox'] + label, +.edit-library-toggles > input[type='checkbox'] + label { color: #444; cursor: pointer; } -.edit-user-toggles > input[type='checkbox']:checked + label { +.edit-user-toggles > input[type='checkbox']:checked + label, +.edit-library-toggles > input[type='checkbox']:checked + label { color: #fff; cursor: pointer; } .edit-user-name > input[type='text'] { margin: 0; } -.popover { - z-index: 2; -} -.popover .popover-content { - color: #000; -} .noTransition { -moz-transition: none !important; @@ -2414,7 +2477,9 @@ a .home-platforms-instance-list-oval:hover, left: 12px; } #users-to-delete > li, -#users-to-purge > li { +#users-to-purge > li, +#libraries-to-delete > li, +#libraries-to-purge > li { color: #e9a049; } #updatebar { @@ -2464,9 +2529,8 @@ a .home-platforms-instance-list-oval:hover, right: 0; bottom: 0; left: 0; - overflow-x: hidden; - overflow-y: auto; - + overflow: auto; + -webkit-overflow-scrolling: touch; } ::-webkit-scrollbar { width: 15px; @@ -2492,12 +2556,19 @@ a .home-platforms-instance-list-oval:hover, width: 100%; } } +table.display, +table.display tr.shown + tr table[id^='history_child'], +table.display tr.shown + tr table[id^='media_info_child'], +table.display tr.shown + tr table[id^='media_info_child'] tr.shown + tr table[id^='media_info_child'] { + table-layout: auto; +} table.display tr.shown + tr div.slider { display: none; } table.display tr.shown + tr > td { padding-top: 0; padding-bottom: 0; + padding-left: 0; } table.display tr.shown + tr:hover { background-color: rgba(255,255,255,0); @@ -2508,7 +2579,9 @@ table.display tr.shown + tr .pagination > .active > a, table.display tr.shown + tr .pagination > .active > a:hover { color: #fff; } -table.display tr.shown + tr table[id^='history_child'] td:hover a { +table.display tr.shown + tr table[id^='history_child'] td:hover a, +table.display tr.shown + tr table[id^='media_info_child'] > tr > td:hover a, +table.display tr.shown + tr table[id^='media_info_child'] tr.shown + tr table[id^='media_info_child'] td:hover a { color: #F9AA03; } table.display tr.shown + tr .pagination > .disabled > a { @@ -2519,14 +2592,22 @@ table.display tr.shown + tr .pagination > li > a:hover { } table[id^='history_child'] { margin-top: 0; - margin-left: -4px; opacity: .6; } -table[id^='history_child'] thead th { +table[id^='media_info_child'] { + margin-top: 0; +} +table[id^='history_child'] thead th, +table[id^='media_info_child'] thead th { line-height: 0; height: 0 !important; overflow: hidden; } +table[id^='media_info_child'] table[id^='media_info_child'] thead th { + line-height: 25px; + height: 35px !important; + overflow: hidden; +} #search_form { width: 300px; padding: 8px 15px; @@ -2560,7 +2641,14 @@ table[id^='history_child'] thead th { -o-transition: background 0.3s; transition: background 0.3s; } - +#update_search_form div.input-group { + display: inline-table; + vertical-align: middle; + max-width: 250px; +} +#update_search_form #update_query { + margin: 5px 0 0 0.5em; +} .notification-params { margin-top: 10px; background-color: #282828; @@ -2585,7 +2673,6 @@ table[id^='history_child'] thead th { .notification-params tr:nth-child(even) td { background-color: rgba(255,255,255,0.010); } - #days-selection label { margin-bottom: 0; } @@ -2594,3 +2681,36 @@ table[id^='history_child'] thead th { width: 75px; height: 34px; } +.card-sortable { + height: 36px; + padding: 0 20px 0 0; + line-height: 34px; + cursor: move; + cursor: -webkit-grab; + cursor: grab; + border-bottom: 1px solid #232323; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; +} +.card { + position: relative; + background-color: #282828; + border-top: 1px solid #2d2d2d; +} +.card label { + font-weight: normal; +} +.card-handle { + display: inline-block; + width: 30px; + margin-right: 10px; + color: #444; + text-align: center; + background-color: #2f2f2f; +} +.selectize-input input[type='text'] { + height: 20px; +} \ No newline at end of file diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index 54d612fd..5b4ab21e 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -69,12 +69,12 @@ DOCUMENTATION :: END % for a in data['sessions']:
    % if a['media_type'] == 'movie' or a['media_type'] == 'episode' or a['media_type'] == 'track': - + % endif
    - % if a['media_type'] == 'movie' and not a['indexes']: + % if (a['media_type'] == 'movie' and not a['indexes']) or (a['indexes'] and not a['view_offset']):
    - % elif a['media_type'] == 'episode' and not a['indexes']: + % elif (a['media_type'] == 'episode' and not a['indexes']) or (a['indexes'] and not a['view_offset']):
    % elif a['indexes']: @@ -227,13 +227,13 @@ DOCUMENTATION :: END   % endif % if a['media_type'] == 'episode': -     ${a['grandparent_title']} - ${a['title']} + ${a['grandparent_title']} - ${a['title']} % elif a['media_type'] == 'movie': - ${a['title']} + ${a['title']} % elif a['media_type'] == 'clip': ${a['title']} % elif a['media_type'] == 'track': - ${a['grandparent_title']} - ${a['title']} + ${a['grandparent_title']} - ${a['title']} % elif a['media_type'] == 'photo': ${a['parent_title']} % else: @@ -246,7 +246,7 @@ DOCUMENTATION :: END % elif a['media_type'] == 'movie': ${a['year']} % elif a['media_type'] == 'track': - ${a['parent_title']} + ${a['parent_title']} % elif a['media_type'] == 'photo': ${a['title']} % else: diff --git a/data/interfaces/default/edit_library.html b/data/interfaces/default/edit_library.html new file mode 100644 index 00000000..c8548fb7 --- /dev/null +++ b/data/interfaces/default/edit_library.html @@ -0,0 +1,179 @@ +<%doc> +USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE + +For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/ + +Filename: edit_library.html +Version: 0.1 +Variable names: data [list] + +data :: Usable parameters + +== Global keys == +section_id Returns the library id of the library. +section_name Returns the name of the library. +section_type Returns the type of the library. +library_thumb Returns the thumbnail for the library. +custom_thumb Returns the custom thumbnail for the library. +library_art Returns the artwork for the library. +count Returns the item count for the library. +parent_count Returns the parent item count for the library. +child_count Returns the child item count for the library. +do_notify Returns bool value for whether to send notifications for the library. +keep_history Returns bool value for whether to keep history for the library. + +DOCUMENTATION :: END + + +<%! + from plexpy import helpers +%> + +% if data != None: +
    +
    +
    + +

    Edit library ${data['section_name']}

    +
    +
    +
    +
    + +
    +
    + +
    +
    +

    Change the library's picture in PlexPy. To reset to default, leave this field empty and save.

    +
    +
    + +

    Uncheck this if you do not want to receive notifications for this library's activity.

    +
    +
    + +

    Uncheck this if you do not want to keep any history on this library's activity.

    +
    +
    + +

    Uncheck this if you do not want to receive recently added notifications for this library.

    +
    + % if data['section_id']: +
    + +

    DANGER ZONE! Click the purge button to remove all history logged for this library. This is permanent!

    +
    + % endif +
    +
    +
    +
    + + +
    +
    +
    +
    + + +% endif \ No newline at end of file diff --git a/data/interfaces/default/edit_user.html b/data/interfaces/default/edit_user.html index 502ab11a..8d5626ca 100644 --- a/data/interfaces/default/edit_user.html +++ b/data/interfaces/default/edit_user.html @@ -10,21 +10,30 @@ Variable names: data [list] data :: Usable parameters == Global keys == -user Return the real Plex username -user_id Return the Plex user_id -friendly_name Returns the friendly edited Plex username -do_notify Returns bool value for whether the user should trigger notifications -keep_history Returns bool value for whether the user's activity should be logged +user_id Returns the user id of the user. +username Returns the user's username. +friendly_name Returns the friendly name of the user. +email Returns the user's email address. +user_thumb Returns the thumbnail for the user. +is_home_user Returns bool value for whether the user is part of a Plex Home. +is_allow_sync Returns bool value for whether the user has sync rights. +is_restricted Returns bool value for whether the user account is restricted. +do_notify Returns bool value for whether to send notifications for the user. +keep_history Returns bool value for whether to keep history for the user. DOCUMENTATION :: END -% if data is not None: +<%! + from plexpy import helpers +%> + +% if data != None:
    -

    Edit user ${data['user']}

    +

    Edit user ${data['username']}

    @@ -41,22 +50,22 @@ DOCUMENTATION :: END
    - +
    -

    Change the users profile picture in PlexPy. To reset to default, leave this field empty and save then perform a user refresh.

    +

    Change the users profile picture in PlexPy. To reset to default, leave this field empty and save.

    Uncheck this if you do not want to receive notifications for this user's activity.

    -

    Uncheck this if you do not want this keep any history on this user's activity.

    +

    Uncheck this if you do not want to keep any history on this user's activity.

    % if data['user_id']:
    @@ -69,7 +78,7 @@ DOCUMENTATION :: END
    - +
    @@ -93,10 +102,10 @@ DOCUMENTATION :: END
    - % endif \ No newline at end of file diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index 59cb8aa0..992f2df6 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -25,18 +25,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -83,8 +83,8 @@ type: 'post', data: function (d) { return { - 'json_data': JSON.stringify(d), - 'media_type': media_type + json_data: JSON.stringify(d), + media_type: media_type }; } } diff --git a/data/interfaces/default/history_table_modal.html b/data/interfaces/default/history_table_modal.html index 19de1faf..a6d6804d 100644 --- a/data/interfaces/default/history_table_modal.html +++ b/data/interfaces/default/history_table_modal.html @@ -13,11 +13,11 @@
    DeleteTimeUserIP AddressPlatformPlayerTitleStartedPausedStoppedDurationDeleteTimeUserIP AddressPlatformPlayerTitleStartedPausedStoppedDuration
    - - - - - + + + + + @@ -34,13 +34,14 @@ $(document).ready(function() { $('#date-header').html(moment('${data}','YYYY-MM-DD').format('ddd MMM Do YYYY')); history_table_modal_options.ajax = { - "url": "get_history", - type: "post", + url: 'get_history', + type: 'post', data: function ( d ) { - return { 'json_data': JSON.stringify( d ), - 'grouping': false, - 'start_date': '${data}' - }; + return { + json_data: JSON.stringify(d), + grouping: false, + start_date: '${data}' + }; } } diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index e6efb512..de0995ea 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -70,8 +70,8 @@ DOCUMENTATION :: END %> % if data: -% if data[0]['stat_id']:
    StartedStoppedUserPlayerTitleStartedStoppedUserPlayerTitle
    ' + + '
    ' + '' + '' + '' + diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js index 1080bdc3..30cd1db7 100644 --- a/data/interfaces/default/js/tables/history_table_modal.js +++ b/data/interfaces/default/js/tables/history_table_modal.js @@ -25,6 +25,7 @@ history_table_modal_options = { "serverSide": true, "pageLength": 10, "lengthChange": false, + "autoWidth": false, "order": [ 0, 'desc'], "columnDefs": [ { @@ -37,9 +38,9 @@ history_table_modal_options = { $(td).html(moment(cellData,"X").format(time_format)); } }, - "searchable": false, + "width": "10%", "className": "no-wrap", - "width": "5%" + "searchable": false }, { "targets": [1], @@ -51,9 +52,9 @@ history_table_modal_options = { $(td).html(moment(cellData,"X").format(time_format)); } }, - "searchable": false, + "width": "10%", "className": "no-wrap", - "width": "5%" + "searchable": false }, { "targets": [2], @@ -69,6 +70,7 @@ history_table_modal_options = { $(td).html(cellData); } }, + "width": "15%", "className": "no-wrap hidden-xs" }, { @@ -87,6 +89,7 @@ history_table_modal_options = { $(td).html('
    ' + transcode_dec + ' ' + cellData + '
    '); } }, + "width": "25%", "className": "no-wrap hidden-sm hidden-xs modal-control" }, { @@ -98,22 +101,23 @@ history_table_modal_options = { var thumb_popover = ''; if (rowData['media_type'] === 'movie') { media_type = ''; - thumb_popover = '' + cellData + ' (' + rowData['year'] + ')' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + thumb_popover = '' + cellData + ' (' + rowData['year'] + ')' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else if (rowData['media_type'] === 'episode') { media_type = ''; - thumb_popover = '' + cellData + ' \ + thumb_popover = '' + cellData + ' \ (S' + rowData['parent_media_index'] + '· E' + rowData['media_index'] + ')' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else if (rowData['media_type'] === 'track') { media_type = ''; - thumb_popover = '' + cellData + ' (' + rowData['parent_title'] + ')' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + thumb_popover = '' + cellData + ' (' + rowData['parent_title'] + ')' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else { - $(td).html('' + cellData + ''); + $(td).html('' + cellData + ''); } } - } + }, + "width": "40%" } ], "drawCallback": function (settings) { @@ -129,8 +133,9 @@ history_table_modal_options = { container: '#history-modal', trigger: 'hover', placement: 'right', + template: '', content: function () { - return '
    '; + return '
    '; } }); }, diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js new file mode 100644 index 00000000..c49ef8ee --- /dev/null +++ b/data/interfaces/default/js/tables/libraries.js @@ -0,0 +1,293 @@ +var libraries_to_delete = []; +var libraries_to_purge = []; + +libraries_list_table_options = { + "language": { + "search": "Search: ", + "lengthMenu":"Show _MENU_ entries per page", + "info":"Showing _START_ to _END_ of _TOTAL_ active libraries", + "infoEmpty":"Showing 0 to 0 of 0 entries", + "infoFiltered":"", + "emptyTable": "No data in table", + }, + "destroy": true, + "processing": false, + "serverSide": true, + "pageLength": 10, + "order": [ 2, 'asc'], + "autoWidth": true, + "stateSave": true, + "pagingType": "bootstrap", + "columnDefs": [ + { + "targets": [0], + "data": null, + "createdCell": function (td, cellData, rowData, row, col) { + $(td).html('
    ' + + ' ' + + '   ' + + ' ' + + ' ' + + ' ' + + '
    '); + }, + "width": "7%", + "className": "edit-control no-wrap hidden", + "searchable": false, + "orderable": false + }, + { + "targets": [1], + "data": "library_thumb", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + if (rowData['library_thumb'].substring(0, 4) == "http") { + $(td).html('
    '); + } else { + $(td).html('
    '); + } + } else { + $(td).html('
    '); + } + }, + "orderable": false, + "searchable": false, + "width": "5%", + "className": "libraries-thumbs" + }, + { + "targets": [2], + "data": "section_name", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html('
    ' + + '' + cellData + '' + + '
    '); + } else { + $(td).html('n/a'); + } + }, + "width": "10%", + "className": "no-wrap" + }, + { + "targets": [3], + "data": "section_type", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "width": "10%", + "className": "no-wrap hidden-xs" + }, + { + "targets": [4], + "data": "count", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + + }, + "width": "10%", + "className": "no-wrap hidden-xs" + }, + { + "targets": [5], + "data": "parent_count", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + + }, + "width": "10%", + "className": "no-wrap hidden-xs" + }, + { + "targets": [6], + "data": "child_count", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + + }, + "width": "10%", + "className": "no-wrap hidden-xs" + }, + { + "targets": [7], + "data": "last_accessed", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(moment(cellData, "X").fromNow()); + } else { + $(td).html("never"); + } + }, + "searchable": false, + "width": "10%", + "className": "no-wrap hidden-xs" + }, + { + "targets": [8], + "data":"last_watched", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + var media_type = ''; + var thumb_popover = '' + if (rowData['media_type'] === 'movie') { + media_type = ''; + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type'] === 'episode') { + media_type = ''; + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type'] === 'track') { + media_type = ''; + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type']) { + $(td).html('' + cellData + ''); + } + } else { + $(td).html('n/a'); + } + }, + "width": "25%", + "className": "hidden-sm hidden-xs" + }, + { + "targets": [9], + "data": "plays", + "searchable": false, + "width": "10%" + } + + ], + "drawCallback": function (settings) { + // Jump to top of page + //$('html,body').scrollTop(0); + $('#ajaxMsg').fadeOut(); + + // Create the tooltips. + $('.purge-tooltip').tooltip(); + $('.edit-tooltip').tooltip(); + $('.transcode-tooltip').tooltip(); + $('.media-type-tooltip').tooltip(); + $('.thumb-tooltip').popover({ + html: true, + container: 'body', + trigger: 'hover', + placement: 'right', + template: '', + content: function () { + return '
    '; + } + }); + + if ($('#row-edit-mode').hasClass('active')) { + $('.edit-control').each(function () { + $(this).removeClass('hidden'); + }); + } + }, + "preDrawCallback": function(settings) { + var msg = " Fetching rows..."; + showMsg(msg, false, false, 0) + }, + "rowCallback": function (row, rowData) { + if ($.inArray(rowData['section_id'], libraries_to_delete) !== -1) { + $(row).find('button.delete-library[data-id="' + rowData['section_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger'); + } + if ($.inArray(rowData['section_id'], libraries_to_purge) !== -1) { + $(row).find('button.purge-library[data-id="' + rowData['section_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger'); + } + } +} + +$('#libraries_list_table').on('change', 'td.edit-control > .edit-library-toggles > input', function () { + var tr = $(this).parents('tr'); + var row = libraries_list_table.row(tr); + var rowData = row.data(); + + var do_notify = 0; + var do_notify_created = 0; + var keep_history = 0; + if ($('#do_notify-' + rowData['section_id']).is(':checked')) { + do_notify = 1; + } + if ($('#do_notify_created-' + rowData['section_id']).is(':checked')) { + do_notify_created = 1; + } + if ($('#keep_history-' + rowData['section_id']).is(':checked')) { + keep_history = 1; + } + if (rowData['custom_thumb']) { + custom_thumb = rowData['custom_thumb'] + } else { + custom_thumb = rowData['library_thumb'] + } + + $.ajax({ + url: 'edit_library', + data: { + section_id: rowData['section_id'], + do_notify: do_notify, + do_notify_created: do_notify_created, + keep_history: keep_history, + custom_thumb: custom_thumb + }, + cache: false, + async: true, + success: function (data) { + var msg = "Library updated"; + showMsg(msg, false, true, 2000); + } + }); +}); + +$('#libraries_list_table').on('click', 'td.edit-control > .edit-library-toggles > button.delete-library', function () { + var tr = $(this).parents('tr'); + var row = libraries_list_table.row(tr); + var rowData = row.data(); + + var index_delete = $.inArray(rowData['section_id'], libraries_to_delete); + var index_purge = $.inArray(rowData['section_id'], libraries_to_purge); + + if (index_delete === -1) { + libraries_to_delete.push(rowData['section_id']); + if (index_purge === -1) { + tr.find('button.purge-library').click(); + } + } else { + libraries_to_delete.splice(index_delete, 1); + if (index_purge != -1) { + tr.find('button.purge-library').click(); + } + } + $(this).toggleClass('btn-warning').toggleClass('btn-danger'); + +}); + +$('#libraries_list_table').on('click', 'td.edit-control > .edit-library-toggles > button.purge-library', function () { + var tr = $(this).parents('tr'); + var row = libraries_list_table.row(tr); + var rowData = row.data(); + + var index_delete = $.inArray(rowData['section_id'], libraries_to_delete); + var index_purge = $.inArray(rowData['section_id'], libraries_to_purge); + + if (index_purge === -1) { + libraries_to_purge.push(rowData['section_id']); + } else { + libraries_to_purge.splice(index_purge, 1); + if (index_delete != -1) { + tr.find('button.delete-library').click(); + } + } + $(this).toggleClass('btn-warning').toggleClass('btn-danger'); +}); \ No newline at end of file diff --git a/data/interfaces/default/js/tables/media_info_table.js b/data/interfaces/default/js/tables/media_info_table.js new file mode 100644 index 00000000..860f06ab --- /dev/null +++ b/data/interfaces/default/js/tables/media_info_table.js @@ -0,0 +1,479 @@ +var date_format = 'YYYY-MM-DD'; +var time_format = 'hh:mm a'; + +$.ajax({ + url: 'get_date_formats', + type: 'GET', + success: function(data) { + date_format = data.date_format; + time_format = data.time_format; + } +}); + +var refresh_child_tables = false; + +media_info_table_options = { + "destroy": true, + "language": { + "search": "Search: ", + "lengthMenu":"Show _MENU_ entries per page", + "info":"Showing _START_ to _END_ of _TOTAL_ library items", + "infoEmpty":"Showing 0 to 0 of 0 entries", + "infoFiltered":"", + "emptyTable": "No data in table" + }, + "pagingType": "bootstrap", + "stateSave": false, + "processing": false, + "serverSide": true, + "pageLength": 25, + "order": [ 1, 'asc'], + "autoWidth": false, + "columnDefs": [ + { + "targets": [0], + "data": "added_at", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + var expand_details = ''; + var date = moment(cellData, "X").format(date_format); + if (rowData['media_type'] === 'show') { + expand_details = ''; + $(td).html(''); + } else if (rowData['media_type'] === 'season') { + expand_details = ''; + $(td).html(''); + } else if (rowData['media_type'] === 'artist') { + expand_details = ''; + $(td).html(''); + } else if (rowData['media_type'] === 'album') { + expand_details = ''; + $(td).html(''); + } else if (rowData['media_type'] === 'photo' && rowData['parent_rating_key'] == '') { + expand_details = ''; + $(td).html(''); + } else { + $(td).html('
     ' + date + '
    '); + } + } + }, + "width": "7%", + "className": "no-wrap expand-media-info", + "searchable": false + }, + { + "targets": [1], + "data": "title", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + var media_type = ''; + var thumb_popover = ''; + if (rowData['media_type'] === 'movie') { + media_type = ''; + thumb_popover = '' + cellData + ' (' + rowData['year'] + ')' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type'] === 'show') { + media_type = ''; + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type'] === 'season') { + media_type = ''; + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type'] === 'episode') { + media_type = ''; + thumb_popover = 'E' + rowData['media_index'] + ' - ' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type'] === 'artist') { + media_type = ''; + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type'] === 'album') { + media_type = ''; + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else if (rowData['media_type'] === 'track') { + media_type = ''; + thumb_popover = 'T' + rowData['media_index'] + ' - ' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + } else { + $(td).html(cellData); + } + } + }, + "width": "20%" + }, + { + "targets": [2], + "data": "container", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "width": "6%", + "className": "no-wrap hidden-sm hidden-xs" + }, + { + "targets": [3], + "data": "bitrate", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData + ' kbps'); + } + }, + "width": "6%", + "className": "no-wrap hidden-md hidden-sm hidden-xs", + "searchable": false + }, + { + "targets": [4], + "data": "video_codec", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "width": "8%", + "className": "no-wrap hidden-sm hidden-xs" + }, + { + "targets": [5], + "data": "video_resolution", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "width": "8%", + "className": "no-wrap hidden-md hidden-sm hidden-xs" + }, + { + "targets": [6], + "data": "video_framerate", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "width": "8%", + "className": "no-wrap hidden-md hidden-sm hidden-xs" + }, + { + "targets": [7], + "data": "audio_codec", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "width": "8%", + "className": "no-wrap hidden-sm hidden-xs" + }, + { + "targets": [8], + "data": "audio_channels", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData + ' ch'); + } + }, + "width": "8%", + "className": "no-wrap hidden-md hidden-sm hidden-xs" + }, + { + "targets": [9], + "data": "file_size", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(Math.round(cellData / Math.pow(1024, 2)).toString() + ' MiB'); + } else { + if (rowData['section_type'] != 'photo' && get_file_sizes != null) { + get_file_sizes = true; + } + } + }, + "width": "7%", + "className": "no-wrap hidden-md hidden-sm hidden-xs", + "searchable": false + }, + { + "targets": [10], + "data": "last_watched", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + date = moment(cellData, "X").format(date_format); + $(td).html(date); + } + }, + "width": "7%", + "className": "no-wrap hidden-xs", + "searchable": false + }, + { + "targets": [11], + "data": "play_count", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "width": "5%", + "className": "no-wrap hidden-xs", + "searchable": false + } + ], + "drawCallback": function (settings) { + // Jump to top of page + // $('html,body').scrollTop(0); + $('#ajaxMsg').fadeOut(); + + // Create the tooltips. + $('.expand-media-info-tooltip').tooltip({ container: 'body' }); + $('.media-type-tooltip').tooltip({ container: 'body' }); + $('.thumb-tooltip').popover({ + html: true, + container: 'body', + trigger: 'hover', + placement: 'right', + template: '', + content: function () { + return '
    '; + } + }); + + media_info_table.rows().every(function () { + var rowData = this.data(); + if (rowData['rating_key'] in media_info_child_table) { + // if a child table was already created + $(this.node()).find('i.fa.fa-plus-circle').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle'); + this.child(childTableFormatMedia(rowData)).show(); + createChildTableMedia(this, rowData) + } + }); + + if (get_file_sizes) { + $('#get_file_sizes_message').show(); + $('#refresh-media-info-table').prop('disabled', true); + $.ajax({ + url: 'get_media_info_file_sizes', + async: true, + data: { section_id: section_id }, + complete: function (xhr, status) { + response = JSON.parse(xhr.responseText) + if (response.success == true) { + $('#get_file_sizes_message').hide(); + $('#refresh-media-info-table').prop('disabled', false); + media_info_table.draw(); + } + } + }); + get_file_sizes = false; + } + + $("#media_info_table_info").append(''); + }, + "preDrawCallback": function(settings) { + var msg = " Fetching rows..."; + showMsg(msg, false, false, 0) + }, + "rowCallback": function (row, rowData, rowIndex) { + if (rowData['rating_key'] in media_info_child_table) { + // if a child table was already created + $(row).addClass('shown') + media_info_table.row(row).child(childTableFormatMedia(rowData)).show(); + } + } +} + +// Parent table expand detailed media info +$('#media_info_table').on('click', '> tbody > tr > td.expand-media-info a', function () { + var tr = $(this).closest('tr'); + var row = media_info_table.row(tr); + var rowData = row.data(); + + $(this).find('i.fa').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle'); + + if (row.child.isShown()) { + $('div.slider', row.child()).slideUp(function () { + row.child.hide(); + tr.removeClass('shown'); + delete media_info_child_table[rowData['rating_key']]; + }); + } else { + tr.addClass('shown'); + row.child(childTableFormatMedia(rowData)).show(); + createChildTableMedia(row, rowData); + } +}); + +// Initialize the detailed media info child table options using the parent table options +function childTableOptionsMedia(rowData) { + switch (rowData['media_type']) { + case 'show': + section_type = 'season'; + break; + case 'season': + section_type = 'episode'; + break; + case 'artist': + section_type = 'album'; + break; + case 'album': + section_type = 'track'; + break; + case 'photo': + section_type = 'picture'; + break; + } + + media_info_table_options = media_info_table_options; + // Remove settings that are not necessary + media_info_table_options.searching = false; + media_info_table_options.lengthChange = false; + media_info_table_options.info = false; + media_info_table_options.pageLength = 10; + media_info_table_options.bStateSave = false; + media_info_table_options.ajax = { + url: 'get_library_media_info', + type: 'post', + data: function (d) { + return { + json_data: JSON.stringify(d), + section_id: rowData['section_id'], + section_type: section_type, + rating_key: rowData['rating_key'], + refresh: refresh_child_tables + }; + } + } + media_info_table_options.fnDrawCallback = function (settings) { + $('#ajaxMsg').fadeOut(); + + // Create the tooltips. + $('.expand-media-info-tooltip').tooltip({ container: 'body' }); + $('.media-type-tooltip').tooltip(); + $('.thumb-tooltip').popover({ + html: true, + container: 'body', + trigger: 'hover', + placement: 'right', + template: '', + content: function () { + return '
    '; + } + }); + + if (rowData['rating_key'] in media_info_child_table) { + media_info_child_table[rowData['rating_key']].rows().every(function () { + var childrowData = this.data(); + if (childrowData['rating_key'] in media_info_child_table) { + // if a child table was already created + $(this.node()).find('i.fa.fa-plus-circle').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle'); + this.child(childTableFormatMedia(childrowData)).show(); + createChildTableMedia(this, childrowData) + } + }); + } + + if (get_file_sizes) { + $('#refresh-media-info-table').prop('disabled', true); + $.ajax({ + url: 'get_media_info_file_sizes', + async: true, + data: { + section_id: section_id, + rating_key: rowData['rating_key'] + }, + complete: function (xhr, status) { + response = JSON.parse(xhr.responseText) + if (response.success == true) { + $('#refresh-media-info-table').prop('disabled', false); + media_info_child_table[rowData['rating_key']].draw(); + } + } + }); + get_file_sizes = false; + } + + $(this).closest('div.slider').slideDown(); + } + media_info_table_options.fnRowCallback = function (row, rowData, rowIndex) { + if (rowData['rating_key'] in media_info_child_table) { + // if a child table was already created + $(row).addClass('shown') + media_info_table.row(row).child(childTableFormatMedia(rowData)).show(); + } + } + + return media_info_table_options; +} + +// Format the detailed media info child table +function childTableFormatMedia(rowData) { + return '
    ' + + '
    Delete
    ' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
    Added AtTitleContainerBitrateVideo CodecVideo ResolutionVideo FramerateAudio CodecAudio ChannelsFile SizeLast WatchedTotal Plays
    ' + + '
    '; +} + +// Create the detailed media info child table +media_info_child_table = {}; +function createChildTableMedia(row, rowData) { + media_info_table_options = childTableOptionsMedia(rowData); + // initialize the child table + media_info_child_table[rowData['rating_key']] = $('#media_info_child-' + rowData['rating_key']).DataTable(media_info_table_options); + + // Set child table column visibility to match parent table + var visibility = media_info_table.columns().visible(); + for (var i = 0; i < visibility.length; i++) { + if (!(visibility[i])) { media_info_child_table[rowData['rating_key']].column(i).visible(visibility[i]); } + } + media_info_table.on('column-visibility', function (e, settings, colIdx, visibility) { + if (row.child.isShown()) { + media_info_child_table[rowData['rating_key']].column(colIdx).visible(visibility); + } + }); + + // Child table expand detailed media info + $('table[id^=media_info_child-' + rowData['rating_key'] + ']').on('click', '> tbody > tr > td.expand-media-info a', function () { + var table_id = $(this).closest('table').data('id'); + var tr = $(this).closest('tr'); + var row = media_info_child_table[table_id].row(tr); + var rowData = row.data(); + + $(this).find('i.fa').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle'); + + if (row.child.isShown()) { + $('div.slider', row.child()).slideUp(function () { + row.child.hide(); + tr.removeClass('shown'); + delete media_info_child_table[rowData['rating_key']]; + }); + } else { + tr.addClass('shown'); + row.child(childTableFormatMedia(rowData)).show(); + createChildTableMedia(row, rowData); + } + }); +} \ No newline at end of file diff --git a/data/interfaces/default/js/tables/plex_logs.js b/data/interfaces/default/js/tables/plex_logs.js index 50b76199..8a1109ba 100644 --- a/data/interfaces/default/js/tables/plex_logs.js +++ b/data/interfaces/default/js/tables/plex_logs.js @@ -4,7 +4,7 @@ var plex_log_table_options = { "serverSide": false, "pagingType": "bootstrap", "order": [ 0, 'desc'], - "pageLength": 10, + "pageLength": 50, "stateSave": true, "language": { "search":"Search: ", diff --git a/data/interfaces/default/js/tables/sync_table.js b/data/interfaces/default/js/tables/sync_table.js index f4b85407..94f4e289 100644 --- a/data/interfaces/default/js/tables/sync_table.js +++ b/data/interfaces/default/js/tables/sync_table.js @@ -50,7 +50,7 @@ sync_table_options = { "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { if (rowData['metadata_type'] !== '') { - $(td).html('' + cellData + ''); + $(td).html('' + cellData + ''); } else { $(td).html(cellData); } diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js index 506fe43a..46cbee3a 100644 --- a/data/interfaces/default/js/tables/user_ips.js +++ b/data/interfaces/default/js/tables/user_ips.js @@ -88,18 +88,18 @@ user_ip_table_options = { var thumb_popover = '' if (rowData['media_type'] === 'movie') { media_type = ''; - thumb_popover = '' + cellData + '' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else if (rowData['media_type'] === 'episode') { media_type = ''; - thumb_popover = '' + cellData + '' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else if (rowData['media_type'] === 'track') { media_type = ''; - thumb_popover = '' + cellData + '' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else if (rowData['media_type']) { - $(td).html('' + cellData + ''); + $(td).html('' + cellData + ''); } else { $(td).html('n/a'); } @@ -126,10 +126,12 @@ user_ip_table_options = { $('.watched-tooltip').tooltip(); $('.thumb-tooltip').popover({ html: true, + container: 'body', trigger: 'hover', placement: 'right', + template: '', content: function () { - return '
    '; + return '
    '; } }); diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js index ab03435e..80292ec0 100644 --- a/data/interfaces/default/js/tables/users.js +++ b/data/interfaces/default/js/tables/users.js @@ -23,12 +23,12 @@ users_list_table_options = { "targets": [0], "data": null, "createdCell": function (td, cellData, rowData, row, col) { - $(td).html('
     ' + + $(td).html('
    ' + + ' ' + '   ' + ' ' + - ' '); - // Show/hide user currently doesn't work - //''); + ' ' + + '
    '); }, "width": "7%", "className": "edit-control no-wrap hidden", @@ -42,7 +42,7 @@ users_list_table_options = { if (cellData === '') { $(td).html('
    '); } else { - $(td).html('
    '); + $(td).html('
    '); } }, "orderable": false, @@ -54,16 +54,13 @@ users_list_table_options = { "targets": [2], "data": "friendly_name", "createdCell": function (td, cellData, rowData, row, col) { - if (cellData !== '') { - if (rowData['user_id'] > 0) { - $(td).html('
    ' + cellData + '' + - '
    '); - } else { - $(td).html('
    ' + cellData + '' + - '
    '); - } + if (cellData !== null && cellData !== '') { + $(td).html('
    ' + + '' + cellData + '' + + '' + + '
    '); } else { - $(td).html(cellData); + $(td).html('n/a'); } }, "width": "10%", @@ -72,11 +69,11 @@ users_list_table_options = { { "targets": [3], "data": "last_seen", - "render": function ( data, type, full ) { - if (data) { - return moment(data, "X").fromNow(); + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(moment(cellData, "X").fromNow()); } else { - return "never"; + $(td).html("never"); } }, "searchable": false, @@ -108,7 +105,7 @@ users_list_table_options = { "targets": [5], "data": "platform", "createdCell": function (td, cellData, rowData, row, col) { - if (cellData !== '') { + if (cellData !== null && cellData !== '') { $(td).html(cellData); } else { $(td).html('n/a'); @@ -121,16 +118,16 @@ users_list_table_options = { "targets": [6], "data":"player", "createdCell": function (td, cellData, rowData, row, col) { - if (cellData) { + if (cellData !== null && cellData !== '') { var transcode_dec = ''; - if (rowData['video_decision'] === 'transcode') { + if (rowData['video_decision'] === 'transcode' || rowData['audio_decision'] === 'transcode') { transcode_dec = ''; - } else if (rowData['video_decision'] === 'copy') { + } else if (rowData['video_decision'] === 'copy' || rowData['audio_decision'] === 'copy') { transcode_dec = ''; - } else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') { + } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') { transcode_dec = ''; } - $(td).html('
    ' + transcode_dec + ' ' + cellData + '
    '); + $(td).html('
    ' + transcode_dec + ' ' + cellData + '
    '); } else { $(td).html('n/a'); } @@ -142,26 +139,26 @@ users_list_table_options = { "targets": [7], "data":"last_watched", "createdCell": function (td, cellData, rowData, row, col) { - if (cellData !== '') { + if (cellData !== null && cellData !== '') { var media_type = ''; var thumb_popover = '' if (rowData['media_type'] === 'movie') { media_type = ''; - thumb_popover = '' + cellData + '' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else if (rowData['media_type'] === 'episode') { media_type = ''; - thumb_popover = '' + cellData + '' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else if (rowData['media_type'] === 'track') { media_type = ''; - thumb_popover = '' + cellData + '' - $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); + thumb_popover = '' + cellData + '' + $(td).html('
    ' + media_type + ' ' + thumb_popover + '
    '); } else if (rowData['media_type']) { - $(td).html('' + cellData + ''); - } else { - $(td).html('n/a'); + $(td).html('' + cellData + ''); } + } else { + $(td).html('n/a'); } }, "width": "30%", @@ -190,8 +187,9 @@ users_list_table_options = { html: true, trigger: 'hover', placement: 'right', + template: '', content: function () { - return '
    '; + return '
    '; } }); @@ -206,8 +204,11 @@ users_list_table_options = { showMsg(msg, false, false, 0) }, "rowCallback": function (row, rowData) { + if ($.inArray(rowData['user_id'], users_to_delete) !== -1) { + $(row).find('button.delete-user[data-id="' + rowData['user_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger'); + } if ($.inArray(rowData['user_id'], users_to_purge) !== -1) { - $(row).find('button[data-id="' + rowData['user_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger'); + $(row).find('button.purge-user[data-id="' + rowData['user_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger'); } } } diff --git a/data/interfaces/default/json/Android-manifest.json b/data/interfaces/default/json/Android-manifest.json new file mode 100644 index 00000000..6c5f25e8 --- /dev/null +++ b/data/interfaces/default/json/Android-manifest.json @@ -0,0 +1,28 @@ +{ + "name": "PlexPy", + "display": "standalone", + "icons": [ + { + "src": "../images/res/android/icon-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "../images/res/android/icon-256x256.png", + "sizes": "256x256", + "type": "image/png" + }, + { + "src": "../images/res/android/icon-384x384.png", + "sizes": "384x384", + "type": "image/png" + }, + { + "src": "../images/res/android/icon-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "background_color": "#1F1F1F", + "theme_color": "#000000" +} \ No newline at end of file diff --git a/data/interfaces/default/libraries.html b/data/interfaces/default/libraries.html new file mode 100644 index 00000000..78697293 --- /dev/null +++ b/data/interfaces/default/libraries.html @@ -0,0 +1,202 @@ +<%inherit file="base.html"/> + +<%def name="headIncludes()"> + + + + +<%def name="body()"> +
    + % if config['update_section_ids'] == 1: +
    + PlexPy needs to update the Library IDs in your databse. Click the "Refresh libraries" button below to begin the update. +
    + % elif config['update_section_ids'] == -1: +
    + PlexPy is updating library IDs in the database. This could take a few minutes depending on the size of your database. +
    + You may leave this page and come back later. +
    + % endif +
    +
    + All Libraries +
    +
    + % if config['update_section_ids'] == -1: + + % else: + + % endif +   + +
    +
    +
    + + + + + + + + + + + + + + + + + +
    EditLibrary NameLibrary TypeTotal Movies / TV Shows / ArtistsTotal Seasons / AlbumsTotal Episodes / TracksLast AccessedLast WatchedTotal Plays
    + +
    +
    + + + +<%def name="javascriptIncludes()"> + + + + + + + \ No newline at end of file diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html new file mode 100644 index 00000000..4f75e7fd --- /dev/null +++ b/data/interfaces/default/library.html @@ -0,0 +1,519 @@ +<%doc> +USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE + +For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/ + +Filename: library.html +Version: 0.1 +Variable names: data [list] + +data :: Usable parameters + +section_id Returns the library id of the library. +section_name Returns the name of the library. +section_type Returns the type of the library. +library_thumb Returns the thumbnail for the library. +custom_thumb Returns the custom thumbnail for the library. +library_art Returns the artwork for the library. +count Returns the item count for the library. +parent_count Returns the parent item count for the library. +child_count Returns the child item count for the library. +do_notify Returns bool value for whether to send notifications for the library. +keep_history Returns bool value for whether to keep history for the library. + +DOCUMENTATION :: END + + + +<%inherit file="base.html"/> + +<%def name="headIncludes()"> + + + + + +<%def name="body()"> +% if data: +
    +
    +
    +
    +
    +
    +
    +
      +
    • ${data['section_name']}
      • +
    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    + Global Stats +
    +
    +
    +
    +
    Loading data...
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + User Stats +
    +
    +
    +
    +
    Loading data...
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + Recently Watched +
    +
    +
    +
    +
    Loading data...
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + Recently Added +
    +
    +
    +
    +
    Loading data...
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + Watch History for + ${data['section_name']} + + +
    +
    + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + +
    DeleteTimeUserIP AddressPlatformPlayerTitleStartedPausedStoppedDuration
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + % if config['get_file_sizes'] and data['section_id'] in config['get_file_sizes_hold']['section_ids']: +
    + % else: + +
    +
    + + All Media Info for + ${data['section_name']} + + +
    +
    + % if config['get_file_sizes'] and data['section_id'] in config['get_file_sizes_hold']['section_ids']: + + % else: + + % endif + +
    +
    +
    + + + + + + + + + + + + + + + + + + +
    Added AtTitleContainerBitrateVideo CodecVideo ResolutionVideo FramerateAudio CodecAudio ChannelsFile SizeLast WatchedTotal Plays
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    +% else: +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + Error retrieving library information. Please see the logs for more details. +
    +
    +
    +
    +
    +
    +% endif + + +<%def name="javascriptIncludes()"> + + + + +% if data: + + + + + +% endif + \ No newline at end of file diff --git a/data/interfaces/default/library_recently_added.html b/data/interfaces/default/library_recently_added.html new file mode 100644 index 00000000..264bce2b --- /dev/null +++ b/data/interfaces/default/library_recently_added.html @@ -0,0 +1,96 @@ +<%doc> +USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE + +For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/ + +Filename: library_recently_added.html +Version: 0.1 +Variable names: data [array] + +data[array_index] :: Usable parameters + +== Global keys == +media_type Returns the type of media. Either 'movie' or 'episode' or 'album'. +rating_key Returns the unique identifier for the media item. +parent_rating_key Returns the unique identifier for the season or artist. +grandparent_rating_key Returns the unique identifier for the show. +title Returns the name of the movie, episode, album. +parent_title Returns the name of the artist. +grandparent_title Returns the name of the show. +media_index Returns the index number of the episode. +parent_media_index Returns the index number of the season. +section_id Returns the library section number of the media item. +library_name Returns the library section name of the media item. +year Returns the release year of the movie, episode, or album. +thumb Returns the location of the item's thumbnail. Use with pms_image_proxy. +parent_thumb Returns the location of the artist's thumbnail. Use with pms_image_proxy. +grandparent_thumb Returns the location of the show's thumbnail. Use with pms_image_proxy. +added_at Returns the time when the media was added to the library. + +DOCUMENTATION :: END + + +% if data: +
    + +
    +% else: +
    Unable to retrieve data from database. +

    +% endif \ No newline at end of file diff --git a/data/interfaces/default/library_stats.html b/data/interfaces/default/library_stats.html index f310ab5c..048d5e6f 100644 --- a/data/interfaces/default/library_stats.html +++ b/data/interfaces/default/library_stats.html @@ -9,23 +9,16 @@ Variable names: data [array] data[array_index] :: Usable parameters -data['type'] Returns the type of the library. Either 'movie', 'show', 'photo', or 'artist'. -data['rows'] Returns an array containing stat data +data Returns an array containing stat data -data[array_index]['rows'] :: Usable parameters +data[array_index] :: Usable parameters -title Returns the title of the library. +section_name Returns the title of the library. +section_type Returns the type of the library. thumb Returns the thumb of the library. -count Returns the number of items in the library. -count_type Returns the sorting type for the library - -== Only if 'type' is 'show' -episode_count Return the number of episodes in the library. -episode_count_type Return the sorting type for the episodes. - -== Only if 'type' is 'artist' -album_count Return the number of episodes in the library. -album_count_type Return the sorting type for the episodes. +count Returns the number of top level items in the library. +parent_count Returns the number of parent items in the library. +child_count Returns the number of child items in the library. DOCUMENTATION :: END @@ -37,37 +30,54 @@ DOCUMENTATION :: END
  • - % if library['type'] != 'photo':

    - ${library['rows']['title']} + ${library['section_name']}

    - % else: -

    ${library['rows']['title']}

    - % endif
    + % if library['section_type'] == 'movie':
    -
    ${library['rows']['count_type']}
    -

    ${library['rows']['count']}

    +
    All Movies
    +

    ${library['count']}

    items

    - % if library['type'] == 'show': -
    -
    ${library['rows']['episode_count_type']}
    -

    ${library['rows']['episode_count']}

    + % elif library['section_type'] == 'show': +
    +
    All Shows
    +

    ${library['count']}

    items

    - % endif - % if library['type'] == 'artist':
    -
    ${library['rows']['album_count_type']}
    -

    ${library['rows']['album_count']}

    +
    All Episodes
    +

    ${library['child_count']}

    +

    items

    +
    + % elif library['section_type'] == 'artist': +
    +
    All Artists
    +

    ${library['count']}

    +

    items

    +
    +
    +
    All Albums
    +

    ${library['parent_count']}

    +

    items

    +
    + % elif library['section_type'] == 'photo': +
    +
    All Albums
    +

    ${library['count']}

    +

    items

    +
    +
    +
    All Photos
    +

    ${library['child_count']}

    items

    % endif
    - % if library['rows']['thumb']: + % if library['thumb']:
    -
    +
    % else:
    @@ -79,6 +89,5 @@ DOCUMENTATION :: END % endfor % else: -
    Unable to retrieve data from server. Please check your settings. -

    +
    No stats to show.

    % endif \ No newline at end of file diff --git a/data/interfaces/default/library_user_stats.html b/data/interfaces/default/library_user_stats.html new file mode 100644 index 00000000..c8bf832a --- /dev/null +++ b/data/interfaces/default/library_user_stats.html @@ -0,0 +1,42 @@ +<%doc> +USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE + +For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/ + +Filename: library_user_stats.html +Version: 0.1 +Variable names: data [array] + +data[array_index] :: Usable parameters + +== Global keys == +user Returns the name of the user. +user_id Returns the user id of the user. +thumb Returns the avatar of the user. +total_plays Returns the play count for the user. + +DOCUMENTATION :: END + + +% if data: +% for a in data: + +% endfor +% else: +
    No stats to show.

    +% endif \ No newline at end of file diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html index bb992c17..ecb1d17f 100644 --- a/data/interfaces/default/logs.html +++ b/data/interfaces/default/logs.html @@ -18,7 +18,7 @@ from plexpy import helpers
    - Logs + Logs
    diff --git a/data/interfaces/default/notification_config.html b/data/interfaces/default/notification_config.html index b9859ae1..d362ef70 100644 --- a/data/interfaces/default/notification_config.html +++ b/data/interfaces/default/notification_config.html @@ -14,7 +14,12 @@ from plexpy import helpers
    % for item in data: - % if item['input_type'] == 'text' or item['input_type'] == 'number' or item['input_type'] == 'password': + % if item['input_type'] == 'help': +
    + +

    ${item['description'] | n}

    +
    + % elif item['input_type'] == 'text' or item['input_type'] == 'number' or item['input_type'] == 'password':
    @@ -29,6 +34,7 @@ from plexpy import helpers
    % elif item['input_type'] == 'button':
    +
    @@ -48,7 +54,7 @@ from plexpy import helpers
    -
    +
    + % for key, value in sorted(data[2]['select_options'].iteritems()): + + % endfor + +

    Choose the script to test.

    +
    +
    + + +

    Set custom arguments passed to the script.

    +
    + % else: +
    + + +

    Set a custom subject line.

    +
    +
    + + +

    Set a custom body.

    +
    + % endif +
    +
    +
    + +
    +
    +
    +
    @@ -92,15 +136,14 @@ from plexpy import helpers cache: false, async: true, complete: function (xhr, status) { - $("#notification-config-modal").html(xhr.responseText); + $('#notification-config-modal').html(xhr.responseText); } }); } $('#osxnotifyregister').click(function () { - var osx_notify_app = $("#osx_notify_app").val(); - $.get("/osxnotifyregister", { 'app': osx_notify_app }, function (data) { $('#ajaxMsg').html(" " + data); }); - $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); + var osx_notify_app = $('#osx_notify_app').val(); + $.get('/osxnotifyregister', { 'app': osx_notify_app }, function (data) { showMsg(' ' + data, false, true, 3000); }); }) $('#save-notification-item').click(function () { @@ -110,41 +153,72 @@ from plexpy import helpers return false; }); + function disableTwitterVerify() { + if ($('#twitter_key').val() != '') { $('#twitterStep2').prop('disabled', false); } + else { $('#twitterStep2').prop('disabled', true); } + } + disableTwitterVerify(); + $('#twitter_key').on('change', function () { + disableTwitterVerify() + }); + $('#twitterStep1').click(function () { - $.get("/twitterStep1", function (data) {window.open(data); }) - .done(function () { $('#ajaxMsg').html(" Confirm Authorization. Check pop-up blocker if no response."); }); - $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); + $.get('/twitterStep1', function (data) {window.open(data); }) + .done(function () { showMsg(' Confirm Authorization. Check pop-up blocker if no response.', false, true, 3000); }); }); $('#twitterStep2').click(function () { - var twitter_key = $("#twitter_key").val(); - $.get("/twitterStep2", { 'key': twitter_key }, function (data) { $('#ajaxMsg').html(" " + data); }); - $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); - }); - $('#testTwitter').click(function () { - $.get("/testTwitter", - function (data) { $('#ajaxMsg').html(" " + data); }); - $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); + var twitter_key = $('#twitter_key').val(); + $.get('/twitterStep2', { 'key': twitter_key }, function (data) { showMsg(' ' + data, false, true, 3000); }); }); - $('#testIFTTT').click(function () { - $.get("/test_ifttt", - function (data) { $('#ajaxMsg').html(" " + data); }); - $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut(); + function disableFacebookRequest() { + if ($('#facebook_app_id').val() != '' && $('#facebook_app_secret').val() != '') { $('#facebookStep1').prop('disabled', false); } + else { $('#facebookStep1').prop('disabled', true); } + } + disableFacebookRequest(); + $('#facebook_app_id, #facebook_app_secret').on('change', function () { + disableFacebookRequest() + }); + + $('#facebookStep1').click(function () { + doAjaxCall('set_notification_config', $(this), 'tabs', true); + $.get('/facebookStep1', function (data) { window.open(data); }) + .done(function () { showMsg(' Confirm Authorization. Check pop-up blocker if no response.', false, true, 3000); }); }); - $('#pushbullet_apikey').on('change', function () { + $('#test_notifier').click(function () { + doAjaxCall('set_notification_config', $(this), 'tabs', true); + $.ajax({ + url: 'test_notifier', + data: { + config_id: '${agent["id"]}', + subject: $('#test_subject').val(), + body: $('#test_body').val(), + script: $('#test_script').val(), + script_args: $('#test_script_args').val() + }, + cache: false, + async: true, + complete: function (xhr, status) { + msg = '  ' + xhr.responseText; + showMsg(msg, false, true, 2000); + } + }); + }); + + $('#pushbullet_apikey, #pushover_apitoken, #scripts_folder').on('change', function () { doAjaxCall('set_notification_config', $(this), 'tabs', true); reloadModal(); return false; }); - + // Never send checkbox values directly, always substitute value in hidden input. $('.checkboxes').click(function () { var configToggle = $(this).data('id'); - if ($(this).is(":checked")) { - $("#"+configToggle).val(1); + if ($(this).is(':checked')) { + $('#'+configToggle).val(1); } else { - $("#"+configToggle).val(0); + $('#'+configToggle).val(0); } }); diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html index f961801a..bba1601b 100644 --- a/data/interfaces/default/recently_added.html +++ b/data/interfaces/default/recently_added.html @@ -10,15 +10,22 @@ Variable names: data [array] data[array_index] :: Usable parameters == Global keys == +media_type Returns the type of media. Either 'movie' or 'episode' or 'album'. rating_key Returns the unique identifier for the media item. -media_type Returns the media type of media. Either 'movie' or 'season' or 'album'. +parent_rating_key Returns the unique identifier for the season or artist. +grandparent_rating_key Returns the unique identifier for the show. +title Returns the name of the movie, episode, album. +parent_title Returns the name of the artist. +grandparent_title Returns the name of the show. +media_index Returns the index number of the episode. +parent_media_index Returns the index number of the season. +section_id Returns the library section number of the media item. +library_name Returns the library section name of the media item. +year Returns the release year of the movie, episode, or album. thumb Returns the location of the item's thumbnail. Use with pms_image_proxy. +parent_thumb Returns the location of the artist's thumbnail. Use with pms_image_proxy. +grandparent_thumb Returns the location of the show's thumbnail. Use with pms_image_proxy. added_at Returns the time when the media was added to the library. -title Returns the name of the movie or season. -parent_title Returns the name of the TV Show a season belongs too. - -== Only if 'media_type' is 'movie' == -year Returns the movie release year. DOCUMENTATION :: END @@ -30,7 +37,7 @@ DOCUMENTATION :: END
  • % if item['media_type'] == 'season' or item['media_type'] == 'movie': - +
    @@ -53,7 +60,7 @@ DOCUMENTATION :: END
    % elif item['media_type'] == 'album': - +
    diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 2683860b..15d7e2bb 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -98,25 +98,78 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    - + +

    + Select the cards to show in the watch statistics on the home page. Select none to disable.
    + Drag the items below to reorder your homepage content. +

    - +
      +
    • +
      + +
      • +
    • +
      + +
      • +
    • +
      + +
      • +
    • +
      + +
      • +
    • +
      + +
      • +
    • +
      + +
      • +
    • +
      + +
      • +
    • +
      + +
      • +
    • +
      + +
      • +
    • +
      + +
      • +
    +
    -

    Select the cards to show in the watch statistics on the home page. Select none to disable.

    @@ -151,14 +204,17 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    +

    + Select the cards to show in the library statistics on the home page. Select none to disable.
    + Drag the items below to reorder your homepage content. +

    - +
      +
    +
    -

    Select the cards to show in the library statistics on the home page. Select none to disable.

    @@ -348,7 +404,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

    Friends List

    - +
    @@ -359,9 +415,29 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    -

    Refresh the user list when PlexPy starts.

    +

    Refresh the users list when PlexPy starts.

    +
    + +
    +

    Libraries List

    +
    +
    + +
    +
    + +
    + +
    +

    The interval (in hours) PlexPy will request an updated libraries list from your Plex Media Server. 1 minimum, 24 maximum.

    +
    +
    + +

    Refresh the libraries list when PlexPy starts.

    @@ -377,6 +453,13 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

    If you have media indexing enabled on your server, use these on the activity pane.

    +
    + +

    Enable if you want PlexPy to calculate the total file size for TV Shows/Seasons and Artists/Albums on the media info tables.
    + This is currently experimental.

    +

    PlexWatch Import Tool

    @@ -402,9 +485,10 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
    -

    Instead of polling the server at regular intervals let the server tell us when something happens. This is currently experimental. Encrypted websocket is not currently supported.

    +

    Instead of polling the server at regular intervals let the server tell us when something happens.
    + This is currently experimental. Encrypted websocket is not currently supported.

    • - +
      +
    • +
       Script
      +
        +
      • +
        + + +

        Set custom arguments passed to the scripts.

        +
        +
        • +
      +
      • +

    @@ -767,7 +864,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents() % for agent in available_notification_agents:
  • - % if agent['on_play'] or agent['on_stop'] or agent['on_pause'] or agent['on_resume'] or agent['on_buffer'] or agent['on_watched'] or agent['on_created'] or agent['on_extdown'] or agent['on_intdown']: + % if any(k[:2] == 'on' and v == 1 for k, v in agent.iteritems()): % else: @@ -999,6 +1096,22 @@ available_notification_agents = sorted(notifiers.available_notification_agents() + + {streams} + The number of concurrent streams. + + + {action} + The action that triggered the notification. + + + {datestamp} + The date the notification was triggered. + + + {timestamp} + The time the notification was triggered. + {user} The username of the person streaming. @@ -1126,6 +1239,10 @@ available_notification_agents = sorted(notifiers.available_notification_agents() {title} The full title of the item being played. + + {library_name} + The library title of the item being played. + {show_name} The title of the TV series being played. @@ -1290,6 +1407,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents() <%def name="javascriptIncludes()"> + +% endif + \ No newline at end of file diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html index 8c84a3b6..f5183b95 100644 --- a/data/interfaces/default/user.html +++ b/data/interfaces/default/user.html @@ -13,10 +13,12 @@ user_id Returns the user id of the user. username Returns the user's username. friendly_name Returns the friendly name of the user. email Returns the user's email address. -thumb Returns the thumbnail for the user. +user_thumb Returns the thumbnail for the user. is_home_user Returns bool value for whether the user is part of a Plex Home. is_allow_sync Returns bool value for whether the user has sync rights. is_restricted Returns bool value for whether the user account is restricted. +do_notify Returns bool value for whether to send notifications for the user. +keep_history Returns bool value for whether to keep history for the user. DOCUMENTATION :: END @@ -33,223 +35,261 @@ from plexpy import helpers -% if user != None: <%def name="body()"> +% if data:
    -
    -
    - -
    -
    -
    -
    +
    -
    -
    - Global Stats -
    -
    -
    -
    Loading data...
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - Player Stats -
    -
    -
    -
    -
    Loading data...
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - Recently Watched -
    -
    -
    -
    -
    Loading data...
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - IP Addresses for +
    -
    - - - - - - - - - - - -
    Last SeenIP AddressLast PlatformLast PlayerLast WatchedPlay Count
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - Watch History for - ${data['friendly_name']} - + +
    +
    +
    +
    +
    +
    +
    + Global Stats +
    +
    +
    +
    +
    Loading data...
    +
    +
    +
    +
    +
    -
    - - - +
    +
    +
    +
    +
    + Player Stats +
    +
    +
    +
    +
    Loading data...
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + Recently Watched +
    +
    +
    +
    +
    Loading data...
    +
    +
    +
    +
    +
    -
    - - - - - - - - - - - - - - - - - - - -
    DeleteTimeUserIP AddressPlatformPlayerTitleStartedPausedStoppedDuration
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - Synced Items for - ${data['friendly_name']} - -
    - -
    -
    - - -
    +% else: +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + Error retrieving user information. Please see the logs for more details. +
    +
    +
    +
    +
    +
    +% endif <%def name="javascriptIncludes()"> @@ -257,6 +297,7 @@ from plexpy import helpers +% if data: @@ -264,10 +305,10 @@ from plexpy import helpers - -% else: -
    -
    -
    -
    -

    Error retrieving user information. Please see the logs for more details.

    -
    -
    -
    -% endif \ No newline at end of file +% endif + \ No newline at end of file diff --git a/data/interfaces/default/user_player_stats.html b/data/interfaces/default/user_player_stats.html index 7aab53b6..6520cfec 100644 --- a/data/interfaces/default/user_player_stats.html +++ b/data/interfaces/default/user_player_stats.html @@ -18,7 +18,7 @@ total_plays Returns the play count for the player. DOCUMENTATION :: END -% if data != None: +% if data: % for a in data:
      @@ -39,6 +39,5 @@ DOCUMENTATION :: END % endfor % else: -
      Unable to retrieve data from database. Please check your settings. -

      +
      No stats to show.

      % endif \ No newline at end of file diff --git a/data/interfaces/default/user_recently_watched.html b/data/interfaces/default/user_recently_watched.html index 2e432203..d13652b9 100644 --- a/data/interfaces/default/user_recently_watched.html +++ b/data/interfaces/default/user_recently_watched.html @@ -12,29 +12,27 @@ data[array_index] :: Usable parameters == Global keys == rating_key Returns the unique identifier for the media item. row_id Returns the unique row id for the media item in the database. -type Returns the type of media. Either 'movie' or 'episode'. +media_type Returns the type of media. Either 'movie' or 'episode' or 'album'. thumb Returns the location of the item's thumbnail. Use with pms_image_proxy. time Returns the last watched time of the media. -title Returns the name of the movie or episode. - -== Only if 'type' is 'episode == -parent_title Returns the name of the TV Show a season belongs too. -parent_index Returns the season number. -index Returns the episode number. - -== Only if 'type' is 'movie' == -year Returns the movie release year. +user Returns the name of the user that watched the item. +title Returns the name of the movie, episode, album. +parent_title Returns the name of the artist. +grandparent_title Returns the name of the show. +media_index Returns the index number of the episode. +parent_media_index Returns the index number of the season. +year Returns the release year of the movie, episode, or album. DOCUMENTATION :: END -% if data != None: +% if data:
      % else: -
      Unable to retrieve data from database. Please check your settings. -

      +
      No stats to show.

      % endif \ No newline at end of file diff --git a/data/interfaces/default/user_watch_time_stats.html b/data/interfaces/default/user_watch_time_stats.html index fdaba5f6..ba2c86ec 100644 --- a/data/interfaces/default/user_watch_time_stats.html +++ b/data/interfaces/default/user_watch_time_stats.html @@ -16,7 +16,7 @@ total_plays Returns the play count for the watch stat period.. DOCUMENTATION :: END -% if data != None: +% if data:
        % for a in data:
        @@ -43,6 +43,6 @@ DOCUMENTATION :: END % endfor
      % else: -
      Unable to retrieve data from database. Please check your settings. +
      Unable to retrieve data from database.

      % endif \ No newline at end of file diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html index c97c46e8..fb2600f3 100644 --- a/data/interfaces/default/users.html +++ b/data/interfaces/default/users.html @@ -77,7 +77,9 @@ url: 'get_user_list', type: 'POST', data: function ( d ) { - return { 'json_data': JSON.stringify( d ) }; + return { + json_data: JSON.stringify(d) + }; } } @@ -177,10 +179,13 @@ cache: false, async: true, success: function(data) { - showMsg(' User list refresh started...',false,true,2000,false) + showMsg(' Users list refresh started...', false, true, 2000, false); }, - error: function(jqXHR, textStatus, errorThrown) { - showMsg(' Unable to refresh user list.',false,true,2000,true) + complete: function (data) { + showMsg(' Users list refreshed.', false, true, 2000, false); + }, + error: function (jqXHR, textStatus, errorThrown) { + showMsg(' Unable to refresh users list.', false, true, 2000, true); } }); }); diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html index 93a5b518..0b19eca1 100644 --- a/data/interfaces/default/welcome.html +++ b/data/interfaces/default/welcome.html @@ -168,8 +168,11 @@ from plexpy import common
      + + +
      @@ -369,38 +372,43 @@ from plexpy import common var pms_verified = false; var authenticated = false; - $("#verify-plex-server").click(function() { - var pms_ip = $("#pms_ip").val() - var pms_port = $("#pms_port").val() - if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) { - $("#pms-verify-status").html(' Validating server...'); - $('#pms-verify-status').fadeIn('fast'); - $.ajax({ - url: 'get_server_id', - data : { hostname: pms_ip, port: pms_port }, - cache: true, - async: true, - timeout: 5000, - error: function(jqXHR, textStatus, errorThrown) { - $("#pms-verify-status").html(' This is not a Plex Server!'); - $('#pms-verify-status').fadeIn('fast'); - }, - success: function (xml) { - if ( $(xml).find('MediaContainer').attr('machineIdentifier') ) { - $("#pms_identifier").val($(xml).find('MediaContainer').attr('machineIdentifier')); - $("#pms-verify-status").html(' Server found!'); - $('#pms-verify-status').fadeIn('fast'); - pms_verified = true; - $("#pms_valid").val("valid"); - } else { + $("#verify-plex-server").click(function () { + if (!(pms_verified)) { + var pms_ip = $("#pms_ip").val().trim(); + var pms_port = $("#pms_port").val().trim(); + var pms_identifier = $("#pms_identifier").val(); + var pms_ssl = $("#pms_ssl").val(); + var pms_is_remote = $("#pms_is_remote").val(); + if ((pms_ip !== '') || (pms_port !== '')) { + $("#pms-verify-status").html(' Validating server...'); + $('#pms-verify-status').fadeIn('fast'); + $.ajax({ + url: 'get_server_id', + data: { hostname: pms_ip, port: pms_port, identifier: pms_identifier, ssl: pms_ssl, remote: pms_is_remote }, + cache: true, + async: true, + timeout: 5000, + error: function (jqXHR, textStatus, errorThrown) { $("#pms-verify-status").html(' This is not a Plex Server!'); $('#pms-verify-status').fadeIn('fast'); + }, + success: function (xml) { + if ($(xml).find('MediaContainer').attr('machineIdentifier')) { + $("#pms_identifier").val($(xml).find('MediaContainer').attr('machineIdentifier')); + $("#pms-verify-status").html(' Server found!'); + $('#pms-verify-status').fadeIn('fast'); + pms_verified = true; + $("#pms_valid").val("valid"); + } else { + $("#pms-verify-status").html(' This is not a Plex Server!'); + $('#pms-verify-status').fadeIn('fast'); + } } - } - }); - } else { - $("#pms-verify-status").html(' Please enter both fields.'); - $('#pms-verify-status').fadeIn('fast'); + }); + } else { + $("#pms-verify-status").html(' Please enter both fields.'); + $('#pms-verify-status').fadeIn('fast'); + } } }); @@ -420,20 +428,23 @@ from plexpy import common $("#pms-authenticate").click(function() { $("#pms-token-status").html(' Fetching token...'); $('#pms-token-status').fadeIn('fast'); - if (($("#pms_username").val() !== '') || ($("#pms_password").val() !== '')) { + var pms_username = $("#pms_username").val().trim(); + var pms_password = $("#pms_password").val().trim(); + if ((pms_username !== '') || (pms_password !== '')) { $.ajax({ type: "post", url: "https://plex.tv/users/sign_in.xml", dataType: 'xml', async: true, - headers: {'Content-Type': 'application/xml; charset=utf-8', - 'X-Plex-Device-Name': 'PlexPy', - 'X-Plex-Product': 'PlexPy', - 'X-Plex-Version': '${common.VERSION_NUMBER}', - 'X-Plex-Platform': '${common.PLATFORM}', - 'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}', - 'X-Plex-Client-Identifier': '${config['pms_uuid']}', - 'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val()) + headers: { + 'Content-Type': 'application/xml; charset=utf-8', + 'X-Plex-Device-Name': 'PlexPy', + 'X-Plex-Product': 'PlexPy', + 'X-Plex-Version': '${common.VERSION_NUMBER}', + 'X-Plex-Platform': '${common.PLATFORM}', + 'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}', + 'X-Plex-Client-Identifier': '${config["pms_uuid"]}', + 'Authorization': 'Basic ' + btoa(pms_username + ':' + pms_password) }, error: function(jqXHR, textStatus, errorThrown) { $("#pms-token-status").html(' Authentation failed!'); diff --git a/data/interfaces/default/xml/IEconfig.xml b/data/interfaces/default/xml/IEconfig.xml new file mode 100644 index 00000000..a37cd592 --- /dev/null +++ b/data/interfaces/default/xml/IEconfig.xml @@ -0,0 +1,12 @@ + + + + + + + + + #1F1F1F + + + \ No newline at end of file diff --git a/init-scripts/init.fedora.centos.service b/init-scripts/init.fedora.centos.service new file mode 100644 index 00000000..83a6d2ad --- /dev/null +++ b/init-scripts/init.fedora.centos.service @@ -0,0 +1,76 @@ +#!/bin/sh +# +### BEGIN INIT INFO +# Provides: PlexPy +# Required-Start: $all +# Required-Stop: $all +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: starts PlexPy +# Description: starts PlexPy +### END INIT INFO + +# Source function library. +. /etc/init.d/functions + +## Variables +prog=plexpy +lockfile=/var/lock/subsys/$prog +homedir=/opt/plexpy +datadir=/opt/plexpy +configfile=/opt/plexpy/config.ini +pidfile=/var/run/plexpy.pid +nice= +# The following line must point to your Python 2.7 install +python27=/usr/src/Python-2.7.11/python +## + +options=" --daemon --config $configfile --pidfile $pidfile --datadir $datadir --nolaunch --quiet" + +start() { + # Start daemon. + echo -n $"Starting $prog: " + daemon --pidfile=$pidfile $nice $python27 $homedir/PlexPy.py $options + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch $lockfile + return $RETVAL +} + +stop() { + echo -n $"Shutting down $prog: " + killproc -p $pidfile $python27 + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile + return $RETVAL +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $prog + ;; + restart|force-reload) + stop + start + ;; + try-restart|condrestart) + if status $prog > /dev/null; then + stop + start + fi + ;; + reload) + exit 3 + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}" + exit 2 +esac diff --git a/lib/pythonfacebook/__init__.py b/lib/pythonfacebook/__init__.py new file mode 100644 index 00000000..cfadcbbb --- /dev/null +++ b/lib/pythonfacebook/__init__.py @@ -0,0 +1,457 @@ +#!/usr/bin/env python +# +# Copyright 2010 Facebook +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +"""Python client library for the Facebook Platform. + +This client library is designed to support the Graph API and the +official Facebook JavaScript SDK, which is the canonical way to +implement Facebook authentication. Read more about the Graph API at +http://developers.facebook.com/docs/api. You can download the Facebook +JavaScript SDK at http://github.com/facebook/connect-js/. + +""" + +import hashlib +import hmac +import binascii +import base64 +import requests +import json +import re + +try: + from urllib.parse import parse_qs, urlencode +except ImportError: + from urlparse import parse_qs + from urllib import urlencode + +from . import version + + +__version__ = version.__version__ + + +VALID_API_VERSIONS = ["2.0", "2.1", "2.2", "2.3", "2.4", "2.5"] + + +class GraphAPI(object): + """A client for the Facebook Graph API. + + See http://developers.facebook.com/docs/api for complete + documentation for the API. + + The Graph API is made up of the objects in Facebook (e.g., people, + pages, events, photos) and the connections between them (e.g., + friends, photo tags, and event RSVPs). This client provides access + to those primitive types in a generic way. For example, given an + OAuth access token, this will fetch the profile of the active user + and the list of the user's friends: + + graph = facebook.GraphAPI(access_token) + user = graph.get_object("me") + friends = graph.get_connections(user["id"], "friends") + + You can see a list of all of the objects and connections supported + by the API at http://developers.facebook.com/docs/reference/api/. + + You can obtain an access token via OAuth or by using the Facebook + JavaScript SDK. See + http://developers.facebook.com/docs/authentication/ for details. + + If you are using the JavaScript SDK, you can use the + get_user_from_cookie() method below to get the OAuth access token + for the active user from the cookie saved by the SDK. + + """ + + def __init__(self, access_token=None, timeout=None, version=None, + proxies=None): + # The default version is only used if the version kwarg does not exist. + default_version = "2.0" + + self.access_token = access_token + self.timeout = timeout + self.proxies = proxies + + if version: + version_regex = re.compile("^\d\.\d$") + match = version_regex.search(str(version)) + if match is not None: + if str(version) not in VALID_API_VERSIONS: + raise GraphAPIError("Valid API versions are " + + str(VALID_API_VERSIONS).strip('[]')) + else: + self.version = "v" + str(version) + else: + raise GraphAPIError("Version number should be in the" + " following format: #.# (e.g. 2.0).") + else: + self.version = "v" + default_version + + def get_object(self, id, **args): + """Fetches the given object from the graph.""" + return self.request(self.version + "/" + id, args) + + def get_objects(self, ids, **args): + """Fetches all of the given object from the graph. + + We return a map from ID to object. If any of the IDs are + invalid, we raise an exception. + """ + args["ids"] = ",".join(ids) + return self.request(self.version + "/", args) + + def get_connections(self, id, connection_name, **args): + """Fetches the connections for given object.""" + return self.request( + "%s/%s/%s" % (self.version, id, connection_name), args) + + def put_object(self, parent_object, connection_name, **data): + """Writes the given object to the graph, connected to the given parent. + + For example, + + graph.put_object("me", "feed", message="Hello, world") + + writes "Hello, world" to the active user's wall. Likewise, this + will comment on the first post of the active user's feed: + + feed = graph.get_connections("me", "feed") + post = feed["data"][0] + graph.put_object(post["id"], "comments", message="First!") + + See http://developers.facebook.com/docs/api#publishing for all + of the supported writeable objects. + + Certain write operations require extended permissions. For + example, publishing to a user's feed requires the + "publish_actions" permission. See + http://developers.facebook.com/docs/publishing/ for details + about publishing permissions. + + """ + assert self.access_token, "Write operations require an access token" + return self.request( + self.version + "/" + parent_object + "/" + connection_name, + post_args=data, + method="POST") + + def put_wall_post(self, message, attachment={}, profile_id="me"): + """Writes a wall post to the given profile's wall. + + We default to writing to the authenticated user's wall if no + profile_id is specified. + + attachment adds a structured attachment to the status message + being posted to the Wall. It should be a dictionary of the form: + + {"name": "Link name" + "link": "http://www.example.com/", + "caption": "{*actor*} posted a new review", + "description": "This is a longer description of the attachment", + "picture": "http://www.example.com/thumbnail.jpg"} + + """ + return self.put_object(profile_id, "feed", message=message, + **attachment) + + def put_comment(self, object_id, message): + """Writes the given comment on the given post.""" + return self.put_object(object_id, "comments", message=message) + + def put_like(self, object_id): + """Likes the given post.""" + return self.put_object(object_id, "likes") + + def delete_object(self, id): + """Deletes the object with the given ID from the graph.""" + self.request(self.version + "/" + id, method="DELETE") + + def delete_request(self, user_id, request_id): + """Deletes the Request with the given ID for the given user.""" + self.request("%s_%s" % (request_id, user_id), method="DELETE") + + def put_photo(self, image, album_path="me/photos", **kwargs): + """ + Upload an image using multipart/form-data. + + image - A file object representing the image to be uploaded. + album_path - A path representing where the image should be uploaded. + + """ + return self.request( + self.version + "/" + album_path, + post_args=kwargs, + files={"source": image}, + method="POST") + + def get_version(self): + """Fetches the current version number of the Graph API being used.""" + args = {"access_token": self.access_token} + try: + response = requests.request("GET", + "https://graph.facebook.com/" + + self.version + "/me", + params=args, + timeout=self.timeout, + proxies=self.proxies) + except requests.HTTPError as e: + response = json.loads(e.read()) + raise GraphAPIError(response) + + try: + headers = response.headers + version = headers["facebook-api-version"].replace("v", "") + return float(version) + except Exception: + raise GraphAPIError("API version number not available") + + def request( + self, path, args=None, post_args=None, files=None, method=None): + """Fetches the given path in the Graph API. + + We translate args to a valid query string. If post_args is + given, we send a POST request to the given path with the given + arguments. + + """ + args = args or {} + + if post_args is not None: + method = "POST" + + if self.access_token: + if post_args is not None: + post_args["access_token"] = self.access_token + else: + args["access_token"] = self.access_token + + try: + response = requests.request(method or "GET", + "https://graph.facebook.com/" + + path, + timeout=self.timeout, + params=args, + data=post_args, + proxies=self.proxies, + files=files) + except requests.HTTPError as e: + response = json.loads(e.read()) + raise GraphAPIError(response) + + headers = response.headers + if 'json' in headers['content-type']: + result = response.json() + elif 'image/' in headers['content-type']: + mimetype = headers['content-type'] + result = {"data": response.content, + "mime-type": mimetype, + "url": response.url} + elif "access_token" in parse_qs(response.text): + query_str = parse_qs(response.text) + if "access_token" in query_str: + result = {"access_token": query_str["access_token"][0]} + if "expires" in query_str: + result["expires"] = query_str["expires"][0] + else: + raise GraphAPIError(response.json()) + else: + raise GraphAPIError('Maintype was not text, image, or querystring') + + if result and isinstance(result, dict) and result.get("error"): + raise GraphAPIError(result) + return result + + def fql(self, query): + """FQL query. + + Example query: "SELECT affiliations FROM user WHERE uid = me()" + + """ + return self.request(self.version + "/" + "fql", {"q": query}) + + def get_app_access_token(self, app_id, app_secret): + """Get the application's access token as a string.""" + args = {'grant_type': 'client_credentials', + 'client_id': app_id, + 'client_secret': app_secret} + + return self.request("oauth/access_token", args=args)["access_token"] + + def get_access_token_from_code( + self, code, redirect_uri, app_id, app_secret): + """Get an access token from the "code" returned from an OAuth dialog. + + Returns a dict containing the user-specific access token and its + expiration date (if applicable). + + """ + args = { + "code": code, + "redirect_uri": redirect_uri, + "client_id": app_id, + "client_secret": app_secret} + + return self.request("oauth/access_token", args) + + def extend_access_token(self, app_id, app_secret): + """ + Extends the expiration time of a valid OAuth access token. See + + + """ + args = { + "client_id": app_id, + "client_secret": app_secret, + "grant_type": "fb_exchange_token", + "fb_exchange_token": self.access_token, + } + + return self.request("oauth/access_token", args=args) + + def debug_access_token(self, token, app_id, app_secret): + """ + Gets information about a user access token issued by an app. See + + + We can generate the app access token by concatenating the app + id and secret: + + """ + args = { + "input_token": token, + "access_token": "%s|%s" % (app_id, app_secret) + } + return self.request("/debug_token", args=args) + + +class GraphAPIError(Exception): + def __init__(self, result): + self.result = result + self.code = None + try: + self.type = result["error_code"] + except: + self.type = "" + + # OAuth 2.0 Draft 10 + try: + self.message = result["error_description"] + except: + # OAuth 2.0 Draft 00 + try: + self.message = result["error"]["message"] + self.code = result["error"].get("code") + if not self.type: + self.type = result["error"].get("type", "") + except: + # REST server style + try: + self.message = result["error_msg"] + except: + self.message = result + + Exception.__init__(self, self.message) + + +def get_user_from_cookie(cookies, app_id, app_secret): + """Parses the cookie set by the official Facebook JavaScript SDK. + + cookies should be a dictionary-like object mapping cookie names to + cookie values. + + If the user is logged in via Facebook, we return a dictionary with + the keys "uid" and "access_token". The former is the user's + Facebook ID, and the latter can be used to make authenticated + requests to the Graph API. If the user is not logged in, we + return None. + + Download the official Facebook JavaScript SDK at + http://github.com/facebook/connect-js/. Read more about Facebook + authentication at + http://developers.facebook.com/docs/authentication/. + + """ + cookie = cookies.get("fbsr_" + app_id, "") + if not cookie: + return None + parsed_request = parse_signed_request(cookie, app_secret) + if not parsed_request: + return None + try: + result = GraphAPI().get_access_token_from_code( + parsed_request["code"], "", app_id, app_secret) + except GraphAPIError: + return None + result["uid"] = parsed_request["user_id"] + return result + + +def parse_signed_request(signed_request, app_secret): + """ Return dictionary with signed request data. + + We return a dictionary containing the information in the + signed_request. This includes a user_id if the user has authorised + your application, as well as any information requested. + + If the signed_request is malformed or corrupted, False is returned. + + """ + try: + encoded_sig, payload = map(str, signed_request.split('.', 1)) + + sig = base64.urlsafe_b64decode(encoded_sig + "=" * + ((4 - len(encoded_sig) % 4) % 4)) + data = base64.urlsafe_b64decode(payload + "=" * + ((4 - len(payload) % 4) % 4)) + except IndexError: + # Signed request was malformed. + return False + except TypeError: + # Signed request had a corrupted payload. + return False + except binascii.Error: + # Signed request had a corrupted payload. + return False + + data = json.loads(data.decode('ascii')) + if data.get('algorithm', '').upper() != 'HMAC-SHA256': + return False + + # HMAC can only handle ascii (byte) strings + # http://bugs.python.org/issue5285 + app_secret = app_secret.encode('ascii') + payload = payload.encode('ascii') + + expected_sig = hmac.new(app_secret, + msg=payload, + digestmod=hashlib.sha256).digest() + if sig != expected_sig: + return False + + return data + + +def auth_url(app_id, canvas_url, perms=None, **kwargs): + url = "https://www.facebook.com/dialog/oauth?" + kvps = {'client_id': app_id, 'redirect_uri': canvas_url} + if perms: + kvps['scope'] = ",".join(perms) + kvps.update(kwargs) + return url + urlencode(kvps) diff --git a/lib/pythonfacebook/version.py b/lib/pythonfacebook/version.py new file mode 100644 index 00000000..1ff2e07a --- /dev/null +++ b/lib/pythonfacebook/version.py @@ -0,0 +1,17 @@ +#!/usr/bin/env python +# +# Copyright 2014 Martey Dodoo +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +__version__ = "1.0.0-alpha" diff --git a/plexpy/__init__.py b/plexpy/__init__.py index bbd234da..03b393f1 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -95,12 +95,12 @@ def initialize(config_file): 'HTTP_PORT out of bounds: 21 < %s < 65535', CONFIG.HTTP_PORT) CONFIG.HTTP_PORT = 8181 - if CONFIG.HTTPS_CERT == '': + if not CONFIG.HTTPS_CERT: CONFIG.HTTPS_CERT = os.path.join(DATA_DIR, 'server.crt') - if CONFIG.HTTPS_KEY == '': + if not CONFIG.HTTPS_KEY: CONFIG.HTTPS_KEY = os.path.join(DATA_DIR, 'server.key') - if not CONFIG.LOG_DIR: + if not CONFIG.LOG_DIR.startswith(os.path.abspath(DATA_DIR)): CONFIG.LOG_DIR = os.path.join(DATA_DIR, 'logs') if not os.path.exists(CONFIG.LOG_DIR): @@ -117,7 +117,7 @@ def initialize(config_file): logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR, verbose=VERBOSE) - if not CONFIG.CACHE_DIR: + if not CONFIG.CACHE_DIR.startswith(os.path.abspath(DATA_DIR)): # Put the cache dir in the data dir for now CONFIG.CACHE_DIR = os.path.join(DATA_DIR, 'cache') if not os.path.exists(CONFIG.CACHE_DIR): @@ -175,6 +175,10 @@ def initialize(config_file): if CONFIG.PMS_TOKEN and CONFIG.REFRESH_USERS_ON_STARTUP: plextv.refresh_users() + # Refresh the libraries list on startup + if CONFIG.PMS_TOKEN and CONFIG.REFRESH_LIBRARIES_ON_STARTUP: + pmsconnect.refresh_libraries() + # Store the original umask UMASK = os.umask(0) os.umask(UMASK) @@ -256,8 +260,6 @@ def initialize_scheduler(): Start the scheduled background tasks. Re-schedule if interval settings changed. """ - - with SCHED_LOCK: # Check if scheduler should be started @@ -280,7 +282,7 @@ def initialize_scheduler(): else: seconds = 0 - if CONFIG.PMS_IP and CONFIG.PMS_TOKEN: + if CONFIG.PMS_IP and CONFIG.PMS_TOKEN and CONFIG.UPDATE_SECTION_IDS != -1: schedule_job(plextv.get_real_pms_url, 'Refresh Plex Server URLs', hours=12, minutes=0, seconds=0) schedule_job(pmsconnect.get_server_friendly_name, 'Refresh Plex Server Name', @@ -311,8 +313,14 @@ def initialize_scheduler(): else: hours = 0 + if CONFIG.PMS_TOKEN: - schedule_job(plextv.refresh_users, 'Refresh users list', hours=hours, minutes=0, seconds=0) + schedule_job(plextv.refresh_users, 'Refresh users list', + hours=hours, minutes=0, seconds=0) + + if CONFIG.PMS_IP and CONFIG.PMS_TOKEN: + schedule_job(pmsconnect.refresh_libraries, 'Refresh libraries list', + hours=hours, minutes=0, seconds=0) # Start scheduler if start_jobs and len(SCHED.get_jobs()): @@ -369,7 +377,7 @@ def dbcheck(): # sessions table :: This is a temp table that logs currently active sessions c_db.execute( 'CREATE TABLE IF NOT EXISTS sessions (id INTEGER PRIMARY KEY AUTOINCREMENT, ' - 'session_key INTEGER, rating_key INTEGER, media_type TEXT, started INTEGER, ' + 'session_key INTEGER, rating_key INTEGER, section_id INTEGER, media_type TEXT, started INTEGER, ' 'paused_counter INTEGER DEFAULT 0, state TEXT, user_id INTEGER, user TEXT, friendly_name TEXT, ' 'ip_address TEXT, machine_id TEXT, player TEXT, platform TEXT, title TEXT, parent_title TEXT, ' 'grandparent_title TEXT, parent_rating_key INTEGER, grandparent_rating_key INTEGER, ' @@ -405,25 +413,41 @@ def dbcheck(): 'CREATE TABLE IF NOT EXISTS session_history_metadata (id INTEGER PRIMARY KEY, ' 'rating_key INTEGER, parent_rating_key INTEGER, grandparent_rating_key INTEGER, ' 'title TEXT, parent_title TEXT, grandparent_title TEXT, full_title TEXT, media_index INTEGER, ' - 'parent_media_index INTEGER, thumb TEXT, parent_thumb TEXT, grandparent_thumb TEXT, art TEXT, media_type TEXT, ' - 'year INTEGER, originally_available_at TEXT, added_at INTEGER, updated_at INTEGER, last_viewed_at INTEGER, ' - 'content_rating TEXT, summary TEXT, tagline TEXT, rating TEXT, duration INTEGER DEFAULT 0, guid TEXT, ' - 'directors TEXT, writers TEXT, actors TEXT, genres TEXT, studio TEXT)' - '' + 'parent_media_index INTEGER, section_id INTEGER, thumb TEXT, parent_thumb TEXT, grandparent_thumb TEXT, ' + 'art TEXT, media_type TEXT, year INTEGER, originally_available_at TEXT, added_at INTEGER, updated_at INTEGER, ' + 'last_viewed_at INTEGER, content_rating TEXT, summary TEXT, tagline TEXT, rating TEXT, ' + 'duration INTEGER DEFAULT 0, guid TEXT, directors TEXT, writers TEXT, actors TEXT, genres TEXT, studio TEXT)' ) # users table :: This table keeps record of the friends list c_db.execute( 'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTOINCREMENT, ' - 'user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL UNIQUE, ' - 'friendly_name TEXT, thumb TEXT, email TEXT, custom_avatar_url TEXT, is_home_user INTEGER DEFAULT NULL, ' + 'user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL, friendly_name TEXT, ' + 'thumb TEXT, custom_avatar_url TEXT, email TEXT, is_home_user INTEGER DEFAULT NULL, ' 'is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, do_notify INTEGER DEFAULT 1, ' 'keep_history INTEGER DEFAULT 1, deleted_user INTEGER DEFAULT 0)' ) + # notify_log table :: This is a table which logs notifications sent + c_db.execute( + 'CREATE TABLE IF NOT EXISTS notify_log (id INTEGER PRIMARY KEY AUTOINCREMENT, ' + 'session_key INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, ' + 'agent_id INTEGER, agent_name TEXT, on_play INTEGER, on_stop INTEGER, on_watched INTEGER, ' + 'on_pause INTEGER, on_resume INTEGER, on_buffer INTEGER, on_created INTEGER)' + ) + + # library_sections table :: This table keeps record of the servers library sections + c_db.execute( + 'CREATE TABLE IF NOT EXISTS library_sections (id INTEGER PRIMARY KEY AUTOINCREMENT, ' + 'server_id TEXT, section_id INTEGER, section_name TEXT, section_type TEXT, ' + 'thumb TEXT, custom_thumb_url TEXT, art TEXT, count INTEGER, parent_count INTEGER, child_count INTEGER, ' + 'do_notify INTEGER DEFAULT 1, do_notify_created INTEGER DEFAULT 1, keep_history INTEGER DEFAULT 1, ' + 'deleted_section INTEGER DEFAULT 0, UNIQUE(server_id, section_id))' + ) + # Upgrade sessions table from earlier versions try: - c_db.execute('SELECT started from sessions') + c_db.execute('SELECT started FROM sessions') except sqlite3.OperationalError: logger.debug(u"Altering database. Updating database table sessions.") c_db.execute( @@ -444,7 +468,7 @@ def dbcheck(): # Upgrade sessions table from earlier versions try: - c_db.execute('SELECT title from sessions') + c_db.execute('SELECT title FROM sessions') except sqlite3.OperationalError: logger.debug(u"Altering database. Updating database table sessions.") c_db.execute( @@ -468,7 +492,7 @@ def dbcheck(): # Upgrade sessions table from earlier versions try: - c_db.execute('SELECT ip_address from sessions') + c_db.execute('SELECT ip_address FROM sessions') except sqlite3.OperationalError: logger.debug(u"Altering database. Updating database table sessions.") c_db.execute( @@ -547,77 +571,9 @@ def dbcheck(): 'ALTER TABLE sessions ADD COLUMN transcode_height INTEGER' ) - # Upgrade session_history_metadata table from earlier versions - try: - c_db.execute('SELECT full_title from session_history_metadata') - except sqlite3.OperationalError: - logger.debug(u"Altering database. Updating database table session_history_metadata.") - c_db.execute( - 'ALTER TABLE session_history_metadata ADD COLUMN full_title TEXT' - ) - - # Upgrade session_history_metadata table from earlier versions - try: - c_db.execute('SELECT tagline from session_history_metadata') - except sqlite3.OperationalError: - logger.debug(u"Altering database. Updating database table session_history_metadata.") - c_db.execute( - 'ALTER TABLE session_history_metadata ADD COLUMN tagline TEXT' - ) - - # notify_log table :: This is a table which logs notifications sent - c_db.execute( - 'CREATE TABLE IF NOT EXISTS notify_log (id INTEGER PRIMARY KEY AUTOINCREMENT, ' - 'session_key INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, ' - 'agent_id INTEGER, agent_name TEXT, on_play INTEGER, on_stop INTEGER, on_watched INTEGER, ' - 'on_pause INTEGER, on_resume INTEGER, on_buffer INTEGER, on_created INTEGER)' - ) - - # Upgrade users table from earlier versions - try: - c_db.execute('SELECT do_notify from users') - except sqlite3.OperationalError: - logger.debug(u"Altering database. Updating database table users.") - c_db.execute( - 'ALTER TABLE users ADD COLUMN do_notify INTEGER DEFAULT 1' - ) - - # Upgrade users table from earlier versions - try: - c_db.execute('SELECT keep_history from users') - except sqlite3.OperationalError: - logger.debug(u"Altering database. Updating database table users.") - c_db.execute( - 'ALTER TABLE users ADD COLUMN keep_history INTEGER DEFAULT 1' - ) - - # Upgrade notify_log table from earlier versions - try: - c_db.execute('SELECT on_pause from notify_log') - except sqlite3.OperationalError: - logger.debug(u"Altering database. Updating database table notify_log.") - c_db.execute( - 'ALTER TABLE notify_log ADD COLUMN on_pause INTEGER' - ) - c_db.execute( - 'ALTER TABLE notify_log ADD COLUMN on_resume INTEGER' - ) - c_db.execute( - 'ALTER TABLE notify_log ADD COLUMN on_buffer INTEGER' - ) - - # Upgrade notify_log table from earlier versions - try: - c_db.execute('SELECT on_created from notify_log') - except sqlite3.OperationalError: - logger.debug(u"Altering database. Updating database table notify_log.") - c_db.execute( - 'ALTER TABLE notify_log ADD COLUMN on_created INTEGER' - ) - # Upgrade sessions table from earlier versions try: - c_db.execute('SELECT buffer_count from sessions') + c_db.execute('SELECT buffer_count FROM sessions') except sqlite3.OperationalError: logger.debug(u"Altering database. Updating database table sessions.") c_db.execute( @@ -627,33 +583,27 @@ def dbcheck(): 'ALTER TABLE sessions ADD COLUMN buffer_last_triggered INTEGER' ) - # Upgrade users table from earlier versions - try: - c_db.execute('SELECT custom_avatar_url from users') - except sqlite3.OperationalError: - logger.debug(u"Altering database. Updating database table users.") - c_db.execute( - 'ALTER TABLE users ADD COLUMN custom_avatar_url TEXT' - ) - # Upgrade sessions table from earlier versions try: - c_db.execute('SELECT last_paused from sessions') + c_db.execute('SELECT last_paused FROM sessions') except sqlite3.OperationalError: logger.debug(u"Altering database. Updating database table sessions.") c_db.execute( 'ALTER TABLE sessions ADD COLUMN last_paused INTEGER' ) - # Add "Local" user to database as default unauthenticated user. - result = c_db.execute('SELECT id FROM users WHERE username = "Local"') - if not result.fetchone(): - logger.debug(u'User "Local" does not exist. Adding user.') - c_db.execute('INSERT INTO users (user_id, username) VALUES (0, "Local")') + # Upgrade sessions table from earlier versions + try: + c_db.execute('SELECT section_id FROM sessions') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table sessions.") + c_db.execute( + 'ALTER TABLE sessions ADD COLUMN section_id INTEGER' + ) # Upgrade session_history table from earlier versions try: - c_db.execute('SELECT reference_id from session_history') + c_db.execute('SELECT reference_id FROM session_history') except sqlite3.OperationalError: logger.debug(u"Altering database. Updating database table session_history.") c_db.execute( @@ -674,15 +624,169 @@ def dbcheck(): 'WHERE t1.id = session_history.id) ' ) + # Upgrade session_history_metadata table from earlier versions + try: + c_db.execute('SELECT full_title FROM session_history_metadata') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table session_history_metadata.") + c_db.execute( + 'ALTER TABLE session_history_metadata ADD COLUMN full_title TEXT' + ) + + # Upgrade session_history_metadata table from earlier versions + try: + c_db.execute('SELECT tagline FROM session_history_metadata') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table session_history_metadata.") + c_db.execute( + 'ALTER TABLE session_history_metadata ADD COLUMN tagline TEXT' + ) + + # Upgrade session_history_metadata table from earlier versions + try: + c_db.execute('SELECT section_id FROM session_history_metadata') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table session_history_metadata.") + c_db.execute( + 'ALTER TABLE session_history_metadata ADD COLUMN section_id INTEGER' + ) + # Upgrade users table from earlier versions try: - c_db.execute('SELECT deleted_user from users') + c_db.execute('SELECT do_notify FROM users') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table users.") + c_db.execute( + 'ALTER TABLE users ADD COLUMN do_notify INTEGER DEFAULT 1' + ) + + # Upgrade users table from earlier versions + try: + c_db.execute('SELECT keep_history FROM users') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table users.") + c_db.execute( + 'ALTER TABLE users ADD COLUMN keep_history INTEGER DEFAULT 1' + ) + + # Upgrade users table from earlier versions + try: + c_db.execute('SELECT custom_avatar_url FROM users') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table users.") + c_db.execute( + 'ALTER TABLE users ADD COLUMN custom_avatar_url TEXT' + ) + + # Upgrade users table from earlier versions + try: + c_db.execute('SELECT deleted_user FROM users') except sqlite3.OperationalError: logger.debug(u"Altering database. Updating database table users.") c_db.execute( 'ALTER TABLE users ADD COLUMN deleted_user INTEGER DEFAULT 0' ) + # Upgrade notify_log table from earlier versions + try: + c_db.execute('SELECT on_pause FROM notify_log') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table notify_log.") + c_db.execute( + 'ALTER TABLE notify_log ADD COLUMN on_pause INTEGER' + ) + c_db.execute( + 'ALTER TABLE notify_log ADD COLUMN on_resume INTEGER' + ) + c_db.execute( + 'ALTER TABLE notify_log ADD COLUMN on_buffer INTEGER' + ) + + # Upgrade notify_log table from earlier versions + try: + c_db.execute('SELECT on_created FROM notify_log') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table notify_log.") + c_db.execute( + 'ALTER TABLE notify_log ADD COLUMN on_created INTEGER' + ) + + # Upgrade library_sections table from earlier versions (remove UNIQUE constraint on section_id) + try: + result = c_db.execute('PRAGMA index_xinfo("sqlite_autoindex_library_sections_1")') + if result and 'server_id' not in [row[2] for row in result]: + logger.debug(u"Altering database. Removing unique constraint on section_id from library_sections table.") + c_db.execute( + 'CREATE TABLE library_sections_temp (id INTEGER PRIMARY KEY AUTOINCREMENT, ' + 'server_id TEXT, section_id INTEGER, section_name TEXT, section_type TEXT, ' + 'thumb TEXT, custom_thumb_url TEXT, art TEXT, count INTEGER, parent_count INTEGER, child_count INTEGER, ' + 'do_notify INTEGER DEFAULT 1, do_notify_created INTEGER DEFAULT 1, keep_history INTEGER DEFAULT 1, ' + 'deleted_section INTEGER DEFAULT 0, UNIQUE(server_id, section_id))' + ) + c_db.execute( + 'INSERT INTO library_sections_temp (id, server_id, section_id, section_name, section_type, ' + 'thumb, custom_thumb_url, art, count, parent_count, child_count, do_notify, do_notify_created, ' + 'keep_history, deleted_section) ' + 'SELECT id, server_id, section_id, section_name, section_type, ' + 'thumb, custom_thumb_url, art, count, parent_count, child_count, do_notify, do_notify_created, ' + 'keep_history, deleted_section ' + 'FROM library_sections' + ) + c_db.execute( + 'DROP TABLE library_sections' + ) + c_db.execute( + 'ALTER TABLE library_sections_temp RENAME TO library_sections' + ) + except sqlite3.OperationalError: + logger.debug(u"Unable to remove section_id unique constraint from library_sections.") + try: + c_db.execute( + 'DROP TABLE library_sections_temp' + ) + except: + pass + + # Upgrade users table from earlier versions (remove UNIQUE constraint on username) + try: + result = c_db.execute('PRAGMA index_xinfo("sqlite_autoindex_users_2")') + if result and 'username' in [row[2] for row in result]: + logger.debug(u"Altering database. Removing unique constraint on username from users table.") + c_db.execute( + 'CREATE TABLE users_temp (id INTEGER PRIMARY KEY AUTOINCREMENT, ' + 'user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL, friendly_name TEXT, ' + 'thumb TEXT, custom_avatar_url TEXT, email TEXT, is_home_user INTEGER DEFAULT NULL, ' + 'is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, do_notify INTEGER DEFAULT 1, ' + 'keep_history INTEGER DEFAULT 1, deleted_user INTEGER DEFAULT 0)' + ) + c_db.execute( + 'INSERT INTO users_temp (id, user_id, username, friendly_name, thumb, custom_avatar_url, ' + 'email, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history, deleted_user) ' + 'SELECT id, user_id, username, friendly_name, thumb, custom_avatar_url, ' + 'email, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history, deleted_user ' + 'FROM users' + ) + c_db.execute( + 'DROP TABLE users' + ) + c_db.execute( + 'ALTER TABLE users_temp RENAME TO users' + ) + except sqlite3.OperationalError: + logger.debug(u"Unable to remove username unique constraint from users.") + try: + c_db.execute( + 'DROP TABLE users_temp' + ) + except: + pass + + # Add "Local" user to database as default unauthenticated user. + result = c_db.execute('SELECT id FROM users WHERE username = "Local"') + if not result.fetchone(): + logger.debug(u'User "Local" does not exist. Adding user.') + c_db.execute('INSERT INTO users (user_id, username) VALUES (0, "Local")') + conn_db.commit() c_db.close() @@ -708,15 +812,16 @@ def shutdown(restart=False, update=False): if restart: logger.info('PlexPy is restarting...') - popen_list = [sys.executable, FULL_PATH] - popen_list += ARGS - if '--nolaunch' not in popen_list: - popen_list += ['--nolaunch'] - logger.info('Restarting PlexPy with %s', popen_list) - subprocess.Popen(popen_list, cwd=os.getcwd()) + exe = sys.executable + args = [exe, FULL_PATH] + args += ARGS + if '--nolaunch' not in args: + args += ['--nolaunch'] + logger.info('Restarting PlexPy with %s', args) + os.execv(exe, args) os._exit(0) def generate_uuid(): logger.debug(u"Generating UUID...") - return uuid.uuid4().hex \ No newline at end of file + return uuid.uuid4().hex diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py index 967a2e21..956cee73 100644 --- a/plexpy/activity_handler.py +++ b/plexpy/activity_handler.py @@ -16,7 +16,7 @@ import time import plexpy -from plexpy import logger, pmsconnect, activity_processor, threading, notification_handler +from plexpy import logger, pmsconnect, activity_processor, threading, notification_handler, helpers class ActivityHandler(object): @@ -54,7 +54,7 @@ class ActivityHandler(object): monitor_proc.write_session(session=self.get_live_session(), notify=False) def on_start(self): - if self.is_valid_session(): + if self.is_valid_session() and self.get_live_session(): logger.debug(u"PlexPy ActivityHandler :: Session %s has started." % str(self.get_session_key())) # Fire off notifications @@ -165,8 +165,6 @@ class ActivityHandler(object): # This function receives events from our websocket connection def process(self): if self.is_valid_session(): - from plexpy import helpers - ap = activity_processor.ActivityProcessor() db_session = ap.get_session_by_key(session_key=self.get_session_key()) diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index ee0479d3..84474577 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, pmsconnect, plextv, notification_handler, database, helpers, activity_processor +from plexpy import logger, pmsconnect, plextv, notification_handler, database, helpers, activity_processor, libraries import threading import plexpy @@ -46,16 +46,7 @@ def check_active_sessions(ws_request=False): media_container = session_list['sessions'] # Check our temp table for what we must do with the new streams - db_streams = monitor_db.select('SELECT started, session_key, rating_key, media_type, title, parent_title, ' - 'grandparent_title, user_id, user, friendly_name, ip_address, player, ' - 'platform, machine_id, parent_rating_key, grandparent_rating_key, state, ' - 'view_offset, duration, video_decision, audio_decision, width, height, ' - 'container, video_codec, audio_codec, bitrate, video_resolution, ' - 'video_framerate, aspect_ratio, audio_channels, transcode_protocol, ' - 'transcode_container, transcode_video_codec, transcode_audio_codec, ' - 'transcode_audio_channels, transcode_width, transcode_height, ' - 'paused_counter, last_paused ' - 'FROM sessions') + db_streams = monitor_db.select('SELECT * FROM sessions') for stream in db_streams: if any(d['session_key'] == str(stream['session_key']) and d['rating_key'] == str(stream['rating_key']) for d in media_container): @@ -182,7 +173,7 @@ def check_active_sessions(ws_request=False): if int_ping_count == 3: # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, - kwargs=dict(notify_action='intdown')).start() + kwargs=dict(notify_action='intdown')).start() def check_recently_added(): @@ -196,10 +187,16 @@ def check_recently_added(): pms_connect = pmsconnect.PmsConnect() recently_added_list = pms_connect.get_recently_added_details(count='10') + library_data = libraries.Libraries() if recently_added_list: recently_added = recently_added_list['recently_added'] for item in recently_added: + library_details = library_data.get_details(section_id=item['section_id']) + + if not library_details['do_notify_created']: + continue + metadata = [] if 0 < time_threshold - int(item['added_at']) <= time_interval: @@ -220,8 +217,12 @@ def check_recently_added(): % str(item['rating_key'])) if metadata: + if not plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: for item in metadata: + + library_details = library_data.get_details(section_id=item['section_id']) + if 0 < time_threshold - int(item['added_at']) <= time_interval: logger.debug(u"PlexPy Monitor :: Library item %s has been added to Plex." % str(item['rating_key'])) # Fire off notifications diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index 0a68f4d0..fff24627 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -29,6 +29,7 @@ class ActivityProcessor(object): def write_session(self, session=None, notify=True): if session: values = {'session_key': session['session_key'], + 'section_id': session['section_id'], 'rating_key': session['rating_key'], 'media_type': session['media_type'], 'state': session['state'], @@ -97,10 +98,15 @@ class ActivityProcessor(object): self.db.upsert('sessions', ip_address, keys) def write_session_history(self, session=None, import_metadata=None, is_import=False, import_ignore_interval=0): - from plexpy import users + from plexpy import users, libraries user_data = users.Users() - user_details = user_data.get_user_friendly_name(user=session['user']) + user_details = user_data.get_details(user_id=session['user_id']) + + section_id = session['section_id'] if not is_import else import_metadata['section_id'] + + library_data = libraries.Libraries() + library_details = library_data.get_details(section_id=section_id) if session: logging_enabled = False @@ -155,7 +161,10 @@ class ActivityProcessor(object): if not user_details['keep_history'] and not is_import: logging_enabled = False - logger.debug(u"PlexPy ActivityProcessor :: History logging for user '%s' is disabled." % session['user']) + logger.debug(u"PlexPy ActivityProcessor :: History logging for user '%s' is disabled." % user_details['username']) + elif not library_details['keep_history'] and not is_import: + logging_enabled = False + logger.debug(u"PlexPy ActivityProcessor :: History logging for library '%s' is disabled." % library_details['section_name']) if logging_enabled: # logger.debug(u"PlexPy ActivityProcessor :: Attempting to write to session_history table...") @@ -250,19 +259,20 @@ class ActivityProcessor(object): # logger.debug(u"PlexPy ActivityProcessor :: Attempting to write to session_history_metadata table...") query = 'INSERT INTO session_history_metadata (id, rating_key, parent_rating_key, ' \ 'grandparent_rating_key, title, parent_title, grandparent_title, full_title, media_index, ' \ - 'parent_media_index, thumb, parent_thumb, grandparent_thumb, art, media_type, year, ' \ - 'originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, ' \ - 'tagline, rating, duration, guid, directors, writers, actors, genres, studio) VALUES ' \ + 'parent_media_index, section_id, thumb, parent_thumb, grandparent_thumb, art, media_type, ' \ + 'year, originally_available_at, added_at, updated_at, last_viewed_at, content_rating, ' \ + 'summary, tagline, rating, duration, guid, directors, writers, actors, genres, studio) VALUES ' \ '(last_insert_rowid(), ' \ - '?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)' + '?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)' args = [session['rating_key'], session['parent_rating_key'], session['grandparent_rating_key'], session['title'], session['parent_title'], session['grandparent_title'], full_title, - metadata['index'], metadata['parent_index'], metadata['thumb'], metadata['parent_thumb'], - metadata['grandparent_thumb'], metadata['art'], session['media_type'], metadata['year'], - metadata['originally_available_at'], metadata['added_at'], metadata['updated_at'], + metadata['media_index'], metadata['parent_media_index'], metadata['section_id'], metadata['thumb'], + metadata['parent_thumb'], metadata['grandparent_thumb'], metadata['art'], session['media_type'], + metadata['year'], metadata['originally_available_at'], metadata['added_at'], metadata['updated_at'], metadata['last_viewed_at'], metadata['content_rating'], metadata['summary'], metadata['tagline'], - metadata['rating'], metadata['duration'], metadata['guid'], directors, writers, actors, genres, metadata['studio']] + metadata['rating'], metadata['duration'], metadata['guid'], directors, writers, actors, genres, + metadata['studio']] # logger.debug(u"PlexPy ActivityProcessor :: Writing session_history_metadata transaction...") self.db.action(query=query, args=args) @@ -330,15 +340,7 @@ class ActivityProcessor(object): def get_session_by_key(self, session_key=None): if str(session_key).isdigit(): - result = self.db.select('SELECT started, session_key, rating_key, media_type, title, parent_title, ' - 'grandparent_title, user_id, user, friendly_name, ip_address, player, ' - 'platform, machine_id, parent_rating_key, grandparent_rating_key, state, ' - 'view_offset, duration, video_decision, audio_decision, width, height, ' - 'container, video_codec, audio_codec, bitrate, video_resolution, ' - 'video_framerate, aspect_ratio, audio_channels, transcode_protocol, ' - 'transcode_container, transcode_video_codec, transcode_audio_codec, ' - 'transcode_audio_channels, transcode_width, transcode_height, ' - 'paused_counter, last_paused ' + result = self.db.select('SELECT * ' 'FROM sessions WHERE session_key = ? LIMIT 1', args=[session_key]) for session in result: if session: @@ -419,4 +421,4 @@ class ActivityProcessor(object): if last_time: return last_time['buffer_last_triggered'] - return None \ No newline at end of file + return None diff --git a/plexpy/api.py b/plexpy/api.py index d2d0d432..6f5c2882 100644 --- a/plexpy/api.py +++ b/plexpy/api.py @@ -323,7 +323,7 @@ class Api(object): custom_where = [['strftime("%Y-%m-%d", datetime(date, "unixepoch", "localtime"))', start_date]] data_factory = datafactory.DataFactory() - history = data_factory.get_history(kwargs=kwargs, custom_where=custom_where) + history = data_factory.get_datatables_history(kwargs=kwargs, custom_where=custom_where) self.data = history return self.data diff --git a/plexpy/common.py b/plexpy/common.py index 8853cbde..3e17d2d4 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -47,3 +47,14 @@ PLATFORM_NAME_OVERRIDES = {'Konvergo': 'Plex Media Player', 'Mystery 3': 'Playstation 3', 'Mystery 4': 'Playstation 4', 'Mystery 5': 'Xbox 360'} + +MEDIA_FLAGS_AUDIO = {'ac.?3': 'dolby_digital', + 'truehd': 'dolby_truehd', + '(dca|dta)': 'dts', + 'dts(hd_|-hd|-)?ma': 'dca-ma', + 'vorbis': 'ogg' + } +MEDIA_FLAGS_VIDEO = {'avc1': 'h264', + 'wmv(1|2)': 'wmv', + 'wmv3': 'wmvhd' + } \ No newline at end of file diff --git a/plexpy/config.py b/plexpy/config.py index 22219786..afe81bf8 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -1,6 +1,4 @@ import plexpy.logger -import itertools -import os import re from configobj import ConfigObj @@ -14,8 +12,6 @@ def bool_int(value): value = 0 return int(bool(value)) - - _CONFIG_DEFINITIONS = { 'DATE_FORMAT': (str, 'General', 'YYYY-MM-DD'), 'GROUPING_GLOBAL_HISTORY': (int, 'PlexWatch', 0), @@ -61,6 +57,7 @@ _CONFIG_DEFINITIONS = { 'CONFIG_VERSION': (str, 'General', '0'), 'DO_NOT_OVERRIDE_GIT_BRANCH': (int, 'General', 0), 'EMAIL_ENABLED': (int, 'Email', 0), + 'EMAIL_FROM_NAME': (str, 'Email', 'PlexPy'), 'EMAIL_FROM': (str, 'Email', ''), 'EMAIL_TO': (str, 'Email', ''), 'EMAIL_CC': (str, 'Email', ''), @@ -82,8 +79,27 @@ _CONFIG_DEFINITIONS = { 'EMAIL_ON_EXTUP': (int, 'Email', 0), 'EMAIL_ON_INTUP': (int, 'Email', 0), 'ENABLE_HTTPS': (int, 'General', 0), + 'FACEBOOK_ENABLED': (int, 'Facebook', 0), + 'FACEBOOK_REDIRECT_URI': (str, 'Facebook', ''), + 'FACEBOOK_APP_ID': (str, 'Facebook', ''), + 'FACEBOOK_APP_SECRET': (str, 'Facebook', ''), + 'FACEBOOK_TOKEN': (str, 'Facebook', ''), + 'FACEBOOK_GROUP': (str, 'Facebook', ''), + 'FACEBOOK_ON_PLAY': (int, 'Facebook', 0), + 'FACEBOOK_ON_STOP': (int, 'Facebook', 0), + 'FACEBOOK_ON_PAUSE': (int, 'Facebook', 0), + 'FACEBOOK_ON_RESUME': (int, 'Facebook', 0), + 'FACEBOOK_ON_BUFFER': (int, 'Facebook', 0), + 'FACEBOOK_ON_WATCHED': (int, 'Facebook', 0), + 'FACEBOOK_ON_CREATED': (int, 'Facebook', 0), + 'FACEBOOK_ON_EXTDOWN': (int, 'Facebook', 0), + 'FACEBOOK_ON_INTDOWN': (int, 'Facebook', 0), + 'FACEBOOK_ON_EXTUP': (int, 'Facebook', 0), + 'FACEBOOK_ON_INTUP': (int, 'Facebook', 0), 'FIRST_RUN_COMPLETE': (int, 'General', 0), 'FREEZE_DB': (int, 'General', 0), + 'GET_FILE_SIZES': (int, 'General', 0), + 'GET_FILE_SIZES_HOLD': (dict, 'General', {'section_ids': [], 'rating_keys': []}), 'GIT_BRANCH': (str, 'General', 'master'), 'GIT_PATH': (str, 'General', ''), 'GIT_USER': (str, 'General', 'drzoidberg33'), @@ -105,12 +121,12 @@ _CONFIG_DEFINITIONS = { 'GROWL_ON_INTDOWN': (int, 'Growl', 0), 'GROWL_ON_EXTUP': (int, 'Growl', 0), 'GROWL_ON_INTUP': (int, 'Growl', 0), - 'HOME_LIBRARY_CARDS': (str, 'General', 'library_statistics_first'), + 'HOME_LIBRARY_CARDS': (list, 'General', ['first_run']), 'HOME_STATS_LENGTH': (int, 'General', 30), 'HOME_STATS_TYPE': (int, 'General', 0), 'HOME_STATS_COUNT': (int, 'General', 5), - 'HOME_STATS_CARDS': (str, 'General', 'watch_statistics, top_tv, popular_tv, top_movies, popular_movies, ' \ - 'top_music, popular_music, last_watched, top_users, top_platforms, most_concurrent'), + 'HOME_STATS_CARDS': (list, 'General', ['top_tv', 'popular_tv', 'top_movies', 'popular_movies', 'top_music', \ + 'popular_music', 'last_watched', 'top_users', 'top_platforms', 'most_concurrent']), 'HTTPS_CERT': (str, 'General', ''), 'HTTPS_KEY': (str, 'General', ''), 'HTTP_HOST': (str, 'General', '0.0.0.0'), @@ -193,6 +209,7 @@ _CONFIG_DEFINITIONS = { 'NOTIFY_ON_EXTUP_BODY_TEXT': (unicode, 'Monitoring', 'The Plex Media Server remote access is back up.'), 'NOTIFY_ON_INTUP_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), 'NOTIFY_ON_INTUP_BODY_TEXT': (unicode, 'Monitoring', 'The Plex Media Server is back up.'), + 'NOTIFY_SCRIPTS_ARGS_TEXT': (unicode, 'Monitoring', ''), 'OSX_NOTIFY_APP': (str, 'OSX_Notify', '/Applications/PlexPy'), 'OSX_NOTIFY_ENABLED': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_PLAY': (int, 'OSX_Notify', 0), @@ -279,8 +296,50 @@ _CONFIG_DEFINITIONS = { 'PUSHOVER_ON_INTDOWN': (int, 'Pushover', 0), 'PUSHOVER_ON_EXTUP': (int, 'Pushover', 0), 'PUSHOVER_ON_INTUP': (int, 'Pushover', 0), + 'REFRESH_LIBRARIES_INTERVAL': (int, 'Monitoring', 12), + 'REFRESH_LIBRARIES_ON_STARTUP': (int, 'Monitoring', 1), 'REFRESH_USERS_INTERVAL': (int, 'Monitoring', 12), 'REFRESH_USERS_ON_STARTUP': (int, 'Monitoring', 1), + 'SLACK_ENABLED': (int, 'Slack', 0), + 'SLACK_HOOK': (str, 'Slack', ''), + 'SLACK_CHANNEL': (str, 'Slack', ''), + 'SLACK_ICON_EMOJI': (str, 'Slack', ''), + 'SLACK_USERNAME': (str, 'Slack', ''), + 'SLACK_ON_PLAY': (int, 'Slack', 0), + 'SLACK_ON_STOP': (int, 'Slack', 0), + 'SLACK_ON_PAUSE': (int, 'Slack', 0), + 'SLACK_ON_RESUME': (int, 'Slack', 0), + 'SLACK_ON_BUFFER': (int, 'Slack', 0), + 'SLACK_ON_WATCHED': (int, 'Slack', 0), + 'SLACK_ON_CREATED': (int, 'Slack', 0), + 'SLACK_ON_EXTDOWN': (int, 'Slack', 0), + 'SLACK_ON_INTDOWN': (int, 'Slack', 0), + 'SLACK_ON_EXTUP': (int, 'Slack', 0), + 'SLACK_ON_INTUP': (int, 'Slack', 0), + 'SCRIPTS_ENABLED': (int, 'Scripts', 0), + 'SCRIPTS_FOLDER': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_PLAY': (int, 'Scripts', 0), + 'SCRIPTS_ON_STOP': (int, 'Scripts', 0), + 'SCRIPTS_ON_PAUSE': (int, 'Scripts', 0), + 'SCRIPTS_ON_RESUME': (int, 'Scripts', 0), + 'SCRIPTS_ON_BUFFER': (int, 'Scripts', 0), + 'SCRIPTS_ON_WATCHED': (int, 'Scripts', 0), + 'SCRIPTS_ON_CREATED': (int, 'Scripts', 0), + 'SCRIPTS_ON_EXTDOWN': (int, 'Scripts', 0), + 'SCRIPTS_ON_EXTUP': (int, 'Scripts', 0), + 'SCRIPTS_ON_INTDOWN': (int, 'Scripts', 0), + 'SCRIPTS_ON_INTUP': (int, 'Scripts', 0), + 'SCRIPTS_ON_PLAY_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_STOP_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_PAUSE_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_RESUME_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_BUFFER_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_WATCHED_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_CREATED_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_EXTDOWN_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_EXTUP_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_INTDOWN_SCRIPT': (unicode, 'Scripts', ''), + 'SCRIPTS_ON_INTUP_SCRIPT': (unicode, 'Scripts', ''), 'TELEGRAM_BOT_TOKEN': (str, 'Telegram', ''), 'TELEGRAM_ENABLED': (int, 'Telegram', 0), 'TELEGRAM_CHAT_ID': (str, 'Telegram', ''), @@ -316,6 +375,7 @@ _CONFIG_DEFINITIONS = { 'TWITTER_ON_EXTUP': (int, 'Twitter', 0), 'TWITTER_ON_INTUP': (int, 'Twitter', 0), 'UPDATE_DB_INTERVAL': (int, 'General', 24), + 'UPDATE_SECTION_IDS': (int, 'General', 1), 'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1), 'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1), 'XBMC_ENABLED': (int, 'XBMC', 0), @@ -334,6 +394,8 @@ _CONFIG_DEFINITIONS = { 'XBMC_ON_EXTUP': (int, 'XBMC', 0), 'XBMC_ON_INTUP': (int, 'XBMC', 0) } + + # pylint:disable=R0902 # it might be nice to refactor for fewer instance variables class Config(object): @@ -448,4 +510,18 @@ class Config(object): if self.VIDEO_LOGGING_ENABLE == 0: self.MOVIE_LOGGING_ENABLE = 0 self.TV_LOGGING_ENABLE = 0 - self.CONFIG_VERSION = '1' \ No newline at end of file + self.CONFIG_VERSION = '1' + if self.CONFIG_VERSION == '1': + # Change home_stats_cards to list + if self.HOME_STATS_CARDS: + home_stats_cards = ''.join(self.HOME_STATS_CARDS).split(', ') + if 'watch_statistics' in home_stats_cards: + home_stats_cards.remove('watch_statistics') + self.HOME_STATS_CARDS = home_stats_cards + # Change home_library_cards to list + if self.HOME_LIBRARY_CARDS: + home_library_cards = ''.join(self.HOME_LIBRARY_CARDS).split(', ') + if 'library_statistics' in home_library_cards: + home_library_cards.remove('library_statistics') + self.HOME_LIBRARY_CARDS = home_library_cards + self.CONFIG_VERSION = '2' \ No newline at end of file diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 4f1afefd..3be50b84 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -26,7 +26,7 @@ class DataFactory(object): def __init__(self): pass - def get_history(self, kwargs=None, custom_where=None, grouping=0, watched_percent=85): + def get_datatables_history(self, kwargs=None, custom_where=None, grouping=0, watched_percent=85): data_tables = datatables.DataTables() group_by = ['session_history.reference_id'] if grouping else ['session_history.id'] @@ -81,8 +81,8 @@ class DataFactory(object): ['session_history.id', 'session_history_metadata.id'], ['session_history.id', 'session_history_media_info.id']], kwargs=kwargs) - except: - logger.warn("Unable to execute database query for get_history.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_history: %s." % e) return {'recordsFiltered': 0, 'recordsTotal': 0, 'draw': 0, @@ -98,12 +98,12 @@ class DataFactory(object): for item in history: filter_duration += int(item['duration']) - if item["media_type"] == 'episode' and item["parent_thumb"]: - thumb = item["parent_thumb"] - elif item["media_type"] == 'episode': - thumb = item["grandparent_thumb"] + if item['media_type'] == 'episode' and item['parent_thumb']: + thumb = item['parent_thumb'] + elif item['media_type'] == 'episode': + thumb = item['grandparent_thumb'] else: - thumb = item["thumb"] + thumb = item['thumb'] if item['percent_complete'] >= watched_percent: watched_status = 1 @@ -113,37 +113,37 @@ class DataFactory(object): watched_status = 0 # Rename Mystery platform names - platform = common.PLATFORM_NAME_OVERRIDES.get(item["platform"], item["platform"]) + platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']) - row = {"reference_id": item["reference_id"], - "id": item["id"], - "date": item["date"], - "started": item["started"], - "stopped": item["stopped"], - "duration": item["duration"], - "paused_counter": item["paused_counter"], - "user_id": item["user_id"], - "user": item["user"], - "friendly_name": item["friendly_name"], - "platform": platform, - "player": item['player'], - "ip_address": item["ip_address"], - "media_type": item["media_type"], - "rating_key": item["rating_key"], - "parent_rating_key": item["parent_rating_key"], - "grandparent_rating_key": item["grandparent_rating_key"], - "full_title": item["full_title"], - "parent_title": item["parent_title"], - "year": item["year"], - "media_index": item["media_index"], - "parent_media_index": item["parent_media_index"], - "thumb": thumb, - "video_decision": item["video_decision"], - "audio_decision": item["audio_decision"], - "percent_complete": int(round(item['percent_complete'])), - "watched_status": watched_status, - "group_count": item["group_count"], - "group_ids": item["group_ids"] + row = {'reference_id': item['reference_id'], + 'id': item['id'], + 'date': item['date'], + 'started': item['started'], + 'stopped': item['stopped'], + 'duration': item['duration'], + 'paused_counter': item['paused_counter'], + 'user_id': item['user_id'], + 'user': item['user'], + 'friendly_name': item['friendly_name'], + 'platform': platform, + 'player': item['player'], + 'ip_address': item['ip_address'], + 'media_type': item['media_type'], + 'rating_key': item['rating_key'], + 'parent_rating_key': item['parent_rating_key'], + 'grandparent_rating_key': item['grandparent_rating_key'], + 'full_title': item['full_title'], + 'parent_title': item['parent_title'], + 'year': item['year'], + 'media_index': item['media_index'], + 'parent_media_index': item['parent_media_index'], + 'thumb': thumb, + 'video_decision': item['video_decision'], + 'audio_decision': item['audio_decision'], + 'percent_complete': int(round(item['percent_complete'])), + 'watched_status': watched_status, + 'group_count': item['group_count'], + 'group_ids': item['group_ids'] } rows.append(row) @@ -154,11 +154,11 @@ class DataFactory(object): 'draw': query['draw'], 'filter_duration': helpers.human_duration(filter_duration, sig='dhm'), 'total_duration': helpers.human_duration(total_duration, sig='dhm') - } + } return dict - def get_home_stats(self, grouping=0, time_range='30', stats_type=0, stats_count='5', stats_cards='', notify_watched_percent='85'): + def get_home_stats(self, grouping=0, time_range='30', stats_type=0, stats_count='5', stats_cards=[], notify_watched_percent='85'): monitor_db = database.MonitorDatabase() group_by = 'session_history.reference_id' if grouping else 'session_history.id' @@ -171,11 +171,11 @@ class DataFactory(object): top_tv = [] try: query = 'SELECT t.id, t.grandparent_title, t.grandparent_rating_key, t.grandparent_thumb, ' \ - 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, ' \ - 'SUM(CASE WHEN t.stopped > 0 THEN (t.stopped - t.started) ' \ - ' - (CASE WHEN t.paused_counter IS NULL THEN 0 ELSE t.paused_counter END) ELSE 0 END) ' \ - ' AS total_duration ' \ - 'FROM (SELECT * FROM session_history ' \ + 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, SUM(t.d) AS total_duration ' \ + 'FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - ' \ + ' (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) ' \ + ' AS d ' \ + ' FROM session_history ' \ ' JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ ' WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \ ' >= datetime("now", "-%s days", "localtime") ' \ @@ -185,8 +185,8 @@ class DataFactory(object): 'ORDER BY %s DESC ' \ 'LIMIT %s ' % (time_range, group_by, sort_type, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: top_tv.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: top_tv: %s." % e) return None for item in result: @@ -215,11 +215,11 @@ class DataFactory(object): try: query = 'SELECT t.id, t.grandparent_title, t.grandparent_rating_key, t.grandparent_thumb, ' \ 'COUNT(DISTINCT t.user_id) AS users_watched, ' \ - 'MAX(t.started) AS last_watch, COUNT(t.id) as total_plays, ' \ - 'SUM(CASE WHEN t.stopped > 0 THEN (t.stopped - t.started) ' \ - ' - (CASE WHEN t.paused_counter IS NULL THEN 0 ELSE t.paused_counter END) ELSE 0 END) ' \ - ' AS total_duration ' \ - 'FROM (SELECT * FROM session_history ' \ + 'MAX(t.started) AS last_watch, COUNT(t.id) as total_plays, SUM(t.d) AS total_duration ' \ + 'FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - ' \ + ' (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) ' \ + ' AS d ' \ + ' FROM session_history ' \ ' JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ ' WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \ ' >= datetime("now", "-%s days", "localtime") ' \ @@ -229,8 +229,8 @@ class DataFactory(object): 'ORDER BY users_watched DESC, %s DESC ' \ 'LIMIT %s ' % (time_range, group_by, sort_type, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: popular_tv.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: popular_tv: %s." % e) return None for item in result: @@ -256,11 +256,11 @@ class DataFactory(object): top_movies = [] try: query = 'SELECT t.id, t.full_title, t.rating_key, t.thumb, ' \ - 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, ' \ - 'SUM(CASE WHEN t.stopped > 0 THEN (t.stopped - t.started) ' \ - ' - (CASE WHEN t.paused_counter IS NULL THEN 0 ELSE t.paused_counter END) ELSE 0 END) ' \ - ' AS total_duration ' \ - 'FROM (SELECT * FROM session_history ' \ + 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, SUM(t.d) AS total_duration ' \ + 'FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - ' \ + ' (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) ' \ + ' AS d ' \ + ' FROM session_history ' \ ' JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ ' WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \ ' >= datetime("now", "-%s days", "localtime") ' \ @@ -270,8 +270,8 @@ class DataFactory(object): 'ORDER BY %s DESC ' \ 'LIMIT %s ' % (time_range, group_by, sort_type, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: top_movies.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: top_movies: %s." % e) return None for item in result: @@ -299,11 +299,11 @@ class DataFactory(object): try: query = 'SELECT t.id, t.full_title, t.rating_key, t.thumb, ' \ 'COUNT(DISTINCT t.user_id) AS users_watched, ' \ - 'MAX(t.started) AS last_watch, COUNT(t.id) as total_plays, ' \ - 'SUM(CASE WHEN t.stopped > 0 THEN (t.stopped - t.started) ' \ - ' - (CASE WHEN t.paused_counter IS NULL THEN 0 ELSE t.paused_counter END) ELSE 0 END) ' \ - ' AS total_duration ' \ - 'FROM (SELECT * FROM session_history ' \ + 'MAX(t.started) AS last_watch, COUNT(t.id) as total_plays, SUM(t.d) AS total_duration ' \ + 'FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - ' \ + ' (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) ' \ + ' AS d ' \ + ' FROM session_history ' \ ' JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ ' WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \ ' >= datetime("now", "-%s days", "localtime") ' \ @@ -313,8 +313,8 @@ class DataFactory(object): 'ORDER BY users_watched DESC, %s DESC ' \ 'LIMIT %s ' % (time_range, group_by, sort_type, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: popular_movies.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: popular_movies: %s." % e) return None for item in result: @@ -340,11 +340,11 @@ class DataFactory(object): top_music = [] try: query = 'SELECT t.id, t.grandparent_title, t.grandparent_rating_key, t.grandparent_thumb, ' \ - 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, ' \ - 'SUM(CASE WHEN t.stopped > 0 THEN (t.stopped - t.started) ' \ - ' - (CASE WHEN t.paused_counter IS NULL THEN 0 ELSE t.paused_counter END) ELSE 0 END) ' \ - ' AS total_duration ' \ - 'FROM (SELECT * FROM session_history ' \ + 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, SUM(t.d) AS total_duration ' \ + 'FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - ' \ + ' (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) ' \ + ' AS d ' \ + ' FROM session_history ' \ ' JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ ' WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \ ' >= datetime("now", "-%s days", "localtime") ' \ @@ -354,8 +354,8 @@ class DataFactory(object): 'ORDER BY %s DESC ' \ 'LIMIT %s ' % (time_range, group_by, sort_type, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: top_music.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: top_music: %s." % e) return None for item in result: @@ -384,11 +384,11 @@ class DataFactory(object): try: query = 'SELECT t.id, t.grandparent_title, t.grandparent_rating_key, t.grandparent_thumb, ' \ 'COUNT(DISTINCT t.user_id) AS users_watched, ' \ - 'MAX(t.started) AS last_watch, COUNT(t.id) as total_plays, ' \ - 'SUM(CASE WHEN t.stopped > 0 THEN (t.stopped - t.started) ' \ - ' - (CASE WHEN t.paused_counter IS NULL THEN 0 ELSE t.paused_counter END) ELSE 0 END) ' \ - ' AS total_duration ' \ - 'FROM (SELECT * FROM session_history ' \ + 'MAX(t.started) AS last_watch, COUNT(t.id) as total_plays, SUM(t.d) AS total_duration ' \ + 'FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - ' \ + ' (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) ' \ + ' AS d ' \ + ' FROM session_history ' \ ' JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ ' WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \ ' >= datetime("now", "-%s days", "localtime") ' \ @@ -398,8 +398,8 @@ class DataFactory(object): 'ORDER BY users_watched DESC, %s DESC ' \ 'LIMIT %s ' % (time_range, group_by, sort_type, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: popular_music.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: popular_music: %s." % e) return None for item in result: @@ -424,14 +424,14 @@ class DataFactory(object): elif stat == 'top_users': top_users = [] try: - query = 'SELECT t.user, t.user_id, t.custom_avatar_url as thumb, ' \ + query = 'SELECT t.user, t.user_id, t.user_thumb, t.custom_thumb, ' \ '(CASE WHEN t.friendly_name IS NULL THEN t.username ELSE t.friendly_name END) ' \ ' AS friendly_name, ' \ - 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, ' \ - 'SUM(CASE WHEN t.stopped > 0 THEN (t.stopped - t.started) ' \ - ' - (CASE WHEN t.paused_counter IS NULL THEN 0 ELSE t.paused_counter END) ELSE 0 END) ' \ - ' AS total_duration ' \ - 'FROM (SELECT * FROM session_history ' \ + 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, SUM(t.d) AS total_duration ' \ + 'FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - ' \ + ' (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) ' \ + ' AS d, users.thumb AS user_thumb, users.custom_avatar_url AS custom_thumb ' \ + ' FROM session_history ' \ ' JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ ' LEFT OUTER JOIN users ON session_history.user_id = users.user_id ' \ ' WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \ @@ -441,15 +441,17 @@ class DataFactory(object): 'ORDER BY %s DESC ' \ 'LIMIT %s ' % (time_range, group_by, sort_type, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: top_users.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: top_users: %s." % e) return None for item in result: - if not item['thumb'] or item['thumb'] == '': - user_thumb = common.DEFAULT_USER_THUMB + if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']: + user_thumb = item['custom_thumb'] + elif item['user_thumb']: + user_thumb = item['user_thumb'] else: - user_thumb = item['thumb'] + user_thumb = common.DEFAULT_USER_THUMB row = {'user': item['user'], 'user_id': item['user_id'], @@ -477,11 +479,11 @@ class DataFactory(object): try: query = 'SELECT t.platform, ' \ - 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, ' \ - 'SUM(CASE WHEN t.stopped > 0 THEN (t.stopped - t.started) ' \ - ' - (CASE WHEN t.paused_counter IS NULL THEN 0 ELSE t.paused_counter END) ELSE 0 END) ' \ - ' AS total_duration ' \ - 'FROM (SELECT * FROM session_history ' \ + 'MAX(t.started) AS last_watch, COUNT(t.id) AS total_plays, SUM(t.d) AS total_duration ' \ + 'FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - ' \ + ' (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) ' \ + ' AS d ' \ + ' FROM session_history ' \ ' JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ ' WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \ ' >= datetime("now", "-%s days", "localtime") ' \ @@ -490,8 +492,8 @@ class DataFactory(object): 'ORDER BY %s DESC ' \ 'LIMIT %s ' % (time_range, group_by, sort_type, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: top_platforms.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: top_platforms: %s." % e) return None for item in result: @@ -542,8 +544,8 @@ class DataFactory(object): 'ORDER BY last_watch DESC ' \ 'LIMIT %s' % (time_range, group_by, notify_watched_percent, stats_count) result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: last_watched.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: last_watched: %s." % e) return None for item in result: @@ -570,45 +572,119 @@ class DataFactory(object): 'rows': last_watched}) elif stat == 'most_concurrent': - try: - query = 'SELECT started, stopped ' \ - 'FROM session_history ' \ - 'WHERE datetime(stopped, "unixepoch", "localtime") ' \ - '>= datetime("now", "-%s days", "localtime") ' % time_range - result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_home_stats: most_concurrent.") - return None - times = [] - for item in result: - times.append({'time': str(item['started']) + 'B', 'count': 1}) - times.append({'time': str(item['stopped']) + 'A', 'count': -1}) - times = sorted(times, key=lambda k: k['time']) + def calc_most_concurrent(title, result): + ''' + Function to calculate most concurrent streams + Input: Stat title, SQLite query result + Output: Dict {title, count, started, stopped} + ''' + times = [] + for item in result: + times.append({'time': str(item['started']) + 'B', 'count': 1}) + times.append({'time': str(item['stopped']) + 'A', 'count': -1}) + times = sorted(times, key=lambda k: k['time']) + + count = 0 + last_count = 0 + last_start = 0 + concurrent = {'title': title, + 'count': 0, + 'started': None, + 'stopped': None + } + + for d in times: + if d['count'] == 1: + count += d['count'] + if count >= last_count: + last_start = d['time'] + else: + if count >= last_count: + last_count = count + concurrent['count'] = count + concurrent['started'] = last_start[:-1] + concurrent['stopped'] = d['time'][:-1] + count += d['count'] + + return concurrent - count = 0 - last_count = 0 - last_start = 0 most_concurrent = [] - for d in times: - if d['count'] == 1: - count += d['count'] - if count >= last_count: - last_start = d['time'] - else: - if count >= last_count: - last_count = count - most_concurrent = [{'count': count, - 'started': last_start[:-1], - 'stopped': d['time'][:-1]}] - count += d['count'] + try: + base_query = 'SELECT session_history.started, session_history.stopped ' \ + 'FROM session_history ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE datetime(stopped, "unixepoch", "localtime") ' \ + '>= datetime("now", "-%s days", "localtime") ' % time_range + + title = 'Concurrent Streams' + query = base_query + result = monitor_db.select(query) + if result: + most_concurrent.append(calc_most_concurrent(title, result)) + + title = 'Concurrent Transcodes' + query = base_query \ + + 'AND (session_history_media_info.video_decision = "transcode" ' \ + 'OR session_history_media_info.audio_decision = "transcode") ' + result = monitor_db.select(query) + if result: + most_concurrent.append(calc_most_concurrent(title, result)) + + title = 'Concurrent Direct Streams' + query = base_query \ + + 'AND (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") ' + result = monitor_db.select(query) + if result: + most_concurrent.append(calc_most_concurrent(title, result)) + + title = 'Concurrent Direct Plays' + query = base_query \ + + 'AND (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") ' + result = monitor_db.select(query) + if result: + most_concurrent.append(calc_most_concurrent(title, result)) + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_home_stats: most_concurrent: %s." % e) + return None home_stats.append({'stat_id': stat, 'rows': most_concurrent}) return home_stats + def get_library_stats(self, library_cards=[]): + monitor_db = database.MonitorDatabase() + + library_stats = [] + + for id in library_cards: + if id.isdigit(): + try: + query = 'SELECT section_id, section_name, section_type, thumb, count, parent_count, child_count ' \ + 'FROM library_sections ' \ + 'WHERE section_id = %s ' % id + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_library_stats: %s." % e) + return None + + for item in result: + library = {'section_id': item['section_id'], + 'section_name': item['section_name'], + 'section_type': item['section_type'], + 'thumb': item['thumb'], + 'count': item['count'], + 'parent_count': item['parent_count'], + 'child_count': item['child_count'] + } + library_stats.append(library) + + return library_stats + def get_stream_details(self, row_id=None): monitor_db = database.MonitorDatabase() @@ -651,86 +727,33 @@ class DataFactory(object): return stream_output - def get_recently_watched(self, user=None, user_id=None, limit='10'): - monitor_db = database.MonitorDatabase() - recently_watched = [] - - if not limit.isdigit(): - limit = '10' - - try: - if user_id: - query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \ - 'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \ - 'year, started, user ' \ - 'FROM session_history_metadata ' \ - 'JOIN session_history ON session_history_metadata.id = session_history.id ' \ - 'WHERE user_id = ? ' \ - 'GROUP BY (CASE WHEN session_history.media_type = "track" THEN session_history.parent_rating_key ' \ - ' ELSE session_history.rating_key END) ' \ - 'ORDER BY started DESC LIMIT ?' - result = monitor_db.select(query, args=[user_id, limit]) - elif user: - query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \ - 'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \ - 'year, started, user ' \ - 'FROM session_history_metadata ' \ - 'JOIN session_history ON session_history_metadata.id = session_history.id ' \ - 'WHERE user = ? ' \ - 'GROUP BY (CASE WHEN session_history.media_type = "track" THEN session_history.parent_rating_key ' \ - ' ELSE session_history.rating_key END) ' \ - 'ORDER BY started DESC LIMIT ?' - result = monitor_db.select(query, args=[user, limit]) - else: - query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \ - 'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \ - 'year, started, user ' \ - 'FROM session_history_metadata ' \ - 'JOIN session_history ON session_history_metadata.id = session_history.id ' \ - 'GROUP BY (CASE WHEN session_history.media_type = "track" THEN session_history.parent_rating_key ' \ - ' ELSE session_history.rating_key END) ' \ - 'ORDER BY started DESC LIMIT ?' - result = monitor_db.select(query, args=[limit]) - except: - logger.warn("Unable to execute database query for get_recently_watched.") - return None - - for row in result: - if row['media_type'] == 'episode' and row['parent_thumb']: - thumb = row['parent_thumb'] - elif row['media_type'] == 'episode': - thumb = row['grandparent_thumb'] - else: - thumb = row['thumb'] - - recent_output = {'row_id': row['id'], - 'type': row['media_type'], - 'rating_key': row['rating_key'], - 'title': row['title'], - 'parent_title': row['parent_title'], - 'grandparent_title': row['grandparent_title'], - 'thumb': thumb, - 'index': row['media_index'], - 'parent_index': row['parent_media_index'], - 'year': row['year'], - 'time': row['started'], - 'user': row['user'] - } - recently_watched.append(recent_output) - - return recently_watched - - def get_metadata_details(self, row_id): + def get_metadata_details(self, rating_key): monitor_db = database.MonitorDatabase() - if row_id: - query = 'SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, ' \ - 'full_title, media_index, parent_media_index, thumb, parent_thumb, grandparent_thumb, art, media_type, ' \ - 'year, originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, tagline, ' \ - 'rating, duration, guid, directors, writers, actors, genres, studio ' \ + if rating_key: + query = 'SELECT session_history_metadata.rating_key, session_history_metadata.parent_rating_key, ' \ + 'session_history_metadata.grandparent_rating_key, session_history_metadata.title, ' \ + 'session_history_metadata.parent_title, session_history_metadata.grandparent_title, ' \ + 'session_history_metadata.full_title, library_sections.section_name, ' \ + 'session_history_metadata.media_index, session_history_metadata.parent_media_index, ' \ + 'session_history_metadata.section_id, session_history_metadata.thumb, ' \ + 'session_history_metadata.parent_thumb, session_history_metadata.grandparent_thumb, ' \ + 'session_history_metadata.art, session_history_metadata.media_type, session_history_metadata.year, ' \ + 'session_history_metadata.originally_available_at, session_history_metadata.added_at, ' \ + 'session_history_metadata.updated_at, session_history_metadata.last_viewed_at, ' \ + 'session_history_metadata.content_rating, session_history_metadata.summary, ' \ + 'session_history_metadata.tagline, session_history_metadata.rating, session_history_metadata.duration, ' \ + 'session_history_metadata.guid, session_history_metadata.directors, session_history_metadata.writers, ' \ + 'session_history_metadata.actors, session_history_metadata.genres, session_history_metadata.studio, ' \ + 'session_history_media_info.container, session_history_media_info.bitrate, ' \ + 'session_history_media_info.video_codec, session_history_media_info.video_resolution, ' \ + 'session_history_media_info.video_framerate, session_history_media_info.audio_codec, ' \ + 'session_history_media_info.audio_channels ' \ 'FROM session_history_metadata ' \ - 'WHERE id = ?' - result = monitor_db.select(query=query, args=[row_id]) + 'JOIN library_sections ON session_history_metadata.section_id = library_sections.section_id ' \ + 'JOIN session_history_media_info ON session_history_metadata.id = session_history_media_info.id ' \ + 'WHERE session_history_metadata.rating_key = ?' + result = monitor_db.select(query=query, args=[rating_key]) else: result = [] @@ -746,9 +769,9 @@ class DataFactory(object): 'parent_rating_key': item['parent_rating_key'], 'grandparent_rating_key': item['grandparent_rating_key'], 'grandparent_title': item['grandparent_title'], - 'parent_index': item['parent_media_index'], + 'parent_media_index': item['parent_media_index'], 'parent_title': item['parent_title'], - 'index': item['media_index'], + 'media_index': item['media_index'], 'studio': item['studio'], 'title': item['title'], 'content_rating': item['content_rating'], @@ -769,88 +792,61 @@ class DataFactory(object): 'writers': writers, 'directors': directors, 'genres': genres, - 'actors': actors + 'actors': actors, + 'library_name': item['section_name'], + 'section_id': item['section_id'], + 'container': item['container'], + 'bitrate': item['bitrate'], + 'video_codec': item['video_codec'], + 'video_resolution': item['video_resolution'], + 'video_framerate': item['video_framerate'], + 'audio_codec': item['audio_codec'], + 'audio_channels': item['audio_channels'] } return metadata - def delete_session_history_rows(self, row_id=None): + def get_total_duration(self, custom_where=None): monitor_db = database.MonitorDatabase() - if row_id.isdigit(): - logger.info(u"PlexPy DataFactory :: Deleting row id %s from the session history database." % row_id) - session_history_del = \ - monitor_db.action('DELETE FROM session_history WHERE id = ?', [row_id]) - session_history_media_info_del = \ - monitor_db.action('DELETE FROM session_history_media_info WHERE id = ?', [row_id]) - session_history_metadata_del = \ - monitor_db.action('DELETE FROM session_history_metadata WHERE id = ?', [row_id]) - - return 'Deleted rows %s.' % row_id + # Split up custom wheres + if custom_where: + where = 'WHERE ' + ' AND '.join([w[0] + ' = "' + w[1] + '"' for w in custom_where]) else: - return 'Unable to delete rows. Input row not valid.' + where = '' + + try: + query = 'SELECT SUM(CASE WHEN stopped > 0 THEN (stopped - started) ELSE 0 END) - ' \ + 'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS total_duration ' \ + 'FROM session_history ' \ + 'JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ + '%s ' % where + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_total_duration: %s." % e) + return None - def delete_all_user_history(self, user_id=None): + total_duration = 0 + for item in result: + total_duration = item['total_duration'] + + return total_duration + + def get_session_ip(self, session_key=''): monitor_db = database.MonitorDatabase() - if user_id.isdigit(): - logger.info(u"PlexPy DataFactory :: Deleting all history for user id %s from database." % user_id) - session_history_media_info_del = \ - monitor_db.action('DELETE FROM ' - 'session_history_media_info ' - 'WHERE session_history_media_info.id IN (SELECT session_history_media_info.id ' - 'FROM session_history_media_info ' - 'JOIN session_history ON session_history_media_info.id = session_history.id ' - 'WHERE session_history.user_id = ?)', [user_id]) - session_history_metadata_del = \ - monitor_db.action('DELETE FROM ' - 'session_history_metadata ' - 'WHERE session_history_metadata.id IN (SELECT session_history_metadata.id ' - 'FROM session_history_metadata ' - 'JOIN session_history ON session_history_metadata.id = session_history.id ' - 'WHERE session_history.user_id = ?)', [user_id]) - session_history_del = \ - monitor_db.action('DELETE FROM ' - 'session_history ' - 'WHERE session_history.user_id = ?', [user_id]) - - return 'Deleted all items for user_id %s.' % user_id + if session_key: + query = 'SELECT ip_address FROM sessions WHERE session_key = %d' % int(session_key) + result = monitor_db.select(query) else: - return 'Unable to delete items. Input user_id not valid.' + return None - def delete_user(self, user_id=None): - monitor_db = database.MonitorDatabase() + ip_address = 'N/A' - if user_id.isdigit(): - self.delete_all_user_history(user_id) - logger.info(u"PlexPy DataFactory :: Deleting user with id %s from database." % user_id) - monitor_db.action('UPDATE users SET deleted_user = 1 WHERE user_id = ?', [user_id]) - monitor_db.action('UPDATE users SET keep_history = 0 WHERE user_id = ?', [user_id]) - monitor_db.action('UPDATE users SET do_notify = 0 WHERE user_id = ?', [user_id]) + for item in result: + ip_address = item['ip_address'] - return 'Deleted user with id %s.' % user_id - else: - return 'Unable to delete user. Input user_id not valid.' - - def undelete_user(self, user_id=None, username=None): - monitor_db = database.MonitorDatabase() - - if user_id and user_id.isdigit(): - logger.info(u"PlexPy DataFactory :: Re-adding user with id %s to database." % user_id) - monitor_db.action('UPDATE users SET deleted_user = 0 WHERE user_id = ?', [user_id]) - monitor_db.action('UPDATE users SET keep_history = 1 WHERE user_id = ?', [user_id]) - monitor_db.action('UPDATE users SET do_notify = 1 WHERE user_id = ?', [user_id]) - - return 'Re-added user with id %s.' % user_id - elif username: - logger.info(u"PlexPy DataFactory :: Re-adding user with username %s to database." % username) - monitor_db.action('UPDATE users SET deleted_user = 0 WHERE username = ?', [username]) - monitor_db.action('UPDATE users SET keep_history = 1 WHERE username = ?', [username]) - monitor_db.action('UPDATE users SET do_notify = 1 WHERE username = ?', [username]) - - return 'Re-added user with username %s.' % username - else: - return 'Unable to re-add user. Input user_id or username not valid.' + return ip_address def get_search_query(self, rating_key=''): monitor_db = database.MonitorDatabase() @@ -939,8 +935,8 @@ class DataFactory(object): grandparent_rating_key = result[0]['grandparent_rating_key'] - except: - logger.warn("Unable to execute database query for get_rating_keys_list.") + except Exception as e: + logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_rating_keys_list: %s." % e) return {} query = 'SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, ' \ @@ -983,7 +979,25 @@ class DataFactory(object): return key_list - def update_rating_key(self, old_key_list='', new_key_list='', media_type=''): + def delete_session_history_rows(self, row_id=None): + monitor_db = database.MonitorDatabase() + + if row_id.isdigit(): + logger.info(u"PlexPy DataFactory :: Deleting row id %s from the session history database." % row_id) + session_history_del = \ + monitor_db.action('DELETE FROM session_history WHERE id = ?', [row_id]) + session_history_media_info_del = \ + monitor_db.action('DELETE FROM session_history_media_info WHERE id = ?', [row_id]) + session_history_metadata_del = \ + monitor_db.action('DELETE FROM session_history_metadata WHERE id = ?', [row_id]) + + return 'Deleted rows %s.' % row_id + else: + return 'Unable to delete rows. Input row not valid.' + + def update_metadata(self, old_key_list='', new_key_list='', media_type=''): + from plexpy import pmsconnect + pms_connect = pmsconnect.PmsConnect() monitor_db = database.MonitorDatabase() # function to map rating keys pairs @@ -991,8 +1005,7 @@ class DataFactory(object): pairs = {} for k, v in old.iteritems(): if k in new: - if v['rating_key'] != new[k]['rating_key']: - pairs.update({v['rating_key']: new[k]['rating_key']}) + pairs.update({v['rating_key']: new[k]['rating_key']}) if 'children' in old[k]: pairs.update(get_pairs(old[k]['children'], new[k]['children'])) @@ -1004,89 +1017,73 @@ class DataFactory(object): mapping = get_pairs(old_key_list, new_key_list) if mapping: - logger.info(u"PlexPy DataFactory :: Updating rating keys in the database.") + logger.info(u"PlexPy DataFactory :: Updating metadata in the database.") for old_key, new_key in mapping.iteritems(): - # check rating_key (3 tables) - monitor_db.action('UPDATE session_history SET rating_key = ? WHERE rating_key = ?', - [new_key, old_key]) - monitor_db.action('UPDATE session_history_media_info SET rating_key = ? WHERE rating_key = ?', - [new_key, old_key]) - monitor_db.action('UPDATE session_history_metadata SET rating_key = ? WHERE rating_key = ?', - [new_key, old_key]) + result = pms_connect.get_metadata_details(new_key) - # check parent_rating_key (2 tables) - monitor_db.action('UPDATE session_history SET parent_rating_key = ? WHERE parent_rating_key = ?', - [new_key, old_key]) - monitor_db.action('UPDATE session_history_metadata SET parent_rating_key = ? WHERE parent_rating_key = ?', - [new_key, old_key]) + if result: + metadata = result['metadata'] + if metadata['media_type'] == 'show' or metadata['media_type'] == 'artist': + # check grandparent_rating_key (2 tables) + monitor_db.action('UPDATE session_history SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?', + [new_key, old_key]) + monitor_db.action('UPDATE session_history_metadata SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?', + [new_key, old_key]) + elif metadata['media_type'] == 'season' or metadata['media_type'] == 'album': + # check parent_rating_key (2 tables) + monitor_db.action('UPDATE session_history SET parent_rating_key = ? WHERE parent_rating_key = ?', + [new_key, old_key]) + monitor_db.action('UPDATE session_history_metadata SET parent_rating_key = ? WHERE parent_rating_key = ?', + [new_key, old_key]) + else: + # check rating_key (2 tables) + monitor_db.action('UPDATE session_history SET rating_key = ? WHERE rating_key = ?', + [new_key, old_key]) + monitor_db.action('UPDATE session_history_media_info SET rating_key = ? WHERE rating_key = ?', + [new_key, old_key]) - # check grandparent_rating_key (2 tables) - monitor_db.action('UPDATE session_history SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?', - [new_key, old_key]) - monitor_db.action('UPDATE session_history_metadata SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?', - [new_key, old_key]) + # update session_history_metadata table + self.update_metadata_details(old_key, new_key, metadata) - # check thumb (1 table) - monitor_db.action('UPDATE session_history_metadata SET thumb = replace(thumb, ?, ?) \ - WHERE thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key, - [old_key, new_key]) - - # check parent_thumb (1 table) - monitor_db.action('UPDATE session_history_metadata SET parent_thumb = replace(parent_thumb, ?, ?) \ - WHERE parent_thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key, - [old_key, new_key]) - - # check grandparent_thumb (1 table) - monitor_db.action('UPDATE session_history_metadata SET grandparent_thumb = replace(grandparent_thumb, ?, ?) \ - WHERE grandparent_thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key, - [old_key, new_key]) - - # check art (1 table) - monitor_db.action('UPDATE session_history_metadata SET art = replace(art, ?, ?) \ - WHERE art LIKE "/library/metadata/%s/art/%%"' % old_key, - [old_key, new_key]) - - return 'Updated rating key in database.' + return 'Updated metadata in database.' else: - return 'No updated rating key needed in database. No changes were made.' - # for debugging - #return mapping + return 'Unable to update metadata in database. No changes were made.' - def get_session_ip(self, session_key=''): - monitor_db = database.MonitorDatabase() + def update_metadata_details(self, old_rating_key='', new_rating_key='', metadata=None): - if session_key: - query = 'SELECT ip_address FROM sessions WHERE session_key = %d' % int(session_key) - result = monitor_db.select(query) - else: - return None + if metadata: + # Create full_title + if metadata['media_type'] == 'episode' or metadata['media_type'] == 'track': + full_title = '%s - %s' % (metadata['grandparent_title'], metadata['title']) + else: + full_title = metadata['title'] - ip_address = 'N/A' + directors = ";".join(metadata['directors']) + writers = ";".join(metadata['writers']) + actors = ";".join(metadata['actors']) + genres = ";".join(metadata['genres']) - for item in result: - ip_address = item['ip_address'] + #logger.info(u"PlexPy DataFactory :: Updating metadata in the database for rating key: %s." % new_rating_key) + monitor_db = database.MonitorDatabase() - return ip_address + # Update the session_history_metadata table + query = 'UPDATE session_history_metadata SET rating_key = ?, parent_rating_key = ?, ' \ + 'grandparent_rating_key = ?, title = ?, parent_title = ?, grandparent_title = ?, full_title = ?, ' \ + 'media_index = ?, parent_media_index = ?, section_id = ?, thumb = ?, parent_thumb = ?, ' \ + 'grandparent_thumb = ?, art = ?, media_type = ?, year = ?, originally_available_at = ?, ' \ + 'added_at = ?, updated_at = ?, last_viewed_at = ?, content_rating = ?, summary = ?, ' \ + 'tagline = ?, rating = ?, duration = ?, guid = ?, directors = ?, writers = ?, actors = ?, ' \ + 'genres = ?, studio = ? ' \ + 'WHERE rating_key = ?' - def get_total_duration(self, custom_where=None): - monitor_db = database.MonitorDatabase() + args = [metadata['rating_key'], metadata['parent_rating_key'], metadata['grandparent_rating_key'], + metadata['title'], metadata['parent_title'], metadata['grandparent_title'], full_title, + metadata['media_index'], metadata['parent_media_index'], metadata['section_id'], metadata['thumb'], + metadata['parent_thumb'], metadata['grandparent_thumb'], metadata['art'], metadata['media_type'], + metadata['year'], metadata['originally_available_at'], metadata['added_at'], metadata['updated_at'], + metadata['last_viewed_at'], metadata['content_rating'], metadata['summary'], metadata['tagline'], + metadata['rating'], metadata['duration'], metadata['guid'], directors, writers, actors, genres, + metadata['studio'], + old_rating_key] - # Split up custom wheres - if custom_where: - where = 'WHERE ' + ' AND '.join([w[0] + ' = "' + w[1] + '"' for w in custom_where]) - else: - where = '' - - try: - query = 'SELECT SUM(CASE WHEN stopped > 0 THEN (stopped - started) ELSE 0 END) - ' \ - 'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS total_duration ' \ - 'FROM session_history %s ' % where - result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query for get_total_duration.") - return None - - for item in result: - total_duration = item['total_duration'] - - return total_duration + monitor_db.action(query=query, args=args) \ No newline at end of file diff --git a/plexpy/datatables.py b/plexpy/datatables.py index 3cf8f0ca..6c0a9b98 100644 --- a/plexpy/datatables.py +++ b/plexpy/datatables.py @@ -124,8 +124,9 @@ class DataTables(object): order += ', ' + order = order.rstrip(', ') if order: - order = 'ORDER BY ' + order.rstrip(', ') + order = 'ORDER BY ' + order # Build where parameters if parameters['search']['value']: diff --git a/plexpy/graphs.py b/plexpy/graphs.py index ae6aa65a..bcede4d5 100644 --- a/plexpy/graphs.py +++ b/plexpy/graphs.py @@ -16,6 +16,7 @@ from plexpy import logger, database, helpers, common import datetime +import locale class Graphs(object): @@ -31,10 +32,10 @@ class Graphs(object): try: if y_axis == 'plays': - query = 'SELECT date(started, "unixepoch", "localtime") as date_played, ' \ - 'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" then 1 else 0 end) as music_count ' \ + query = 'SELECT date(started, "unixepoch", "localtime") AS date_played, ' \ + 'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \ 'FROM session_history ' \ 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ 'GROUP BY date_played ' \ @@ -42,21 +43,21 @@ class Graphs(object): result = monitor_db.select(query) else: - query = 'SELECT date(started, "unixepoch", "localtime") as date_played, ' \ - 'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count ' \ + query = 'SELECT date(started, "unixepoch", "localtime") AS date_played, ' \ + 'SUM(CASE WHEN media_type = "episode" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count ' \ 'FROM session_history ' \ 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ 'GROUP BY date_played ' \ 'ORDER BY started ASC' % time_range result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query.") + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_day: %s." % e) return None # create our date range as some days may not have any data @@ -107,49 +108,51 @@ class Graphs(object): if not time_range.isdigit(): time_range = '30' - if y_axis == 'plays': - query = 'SELECT strftime("%w", datetime(started, "unixepoch", "localtime")) as daynumber, ' \ - 'case cast (strftime("%w", datetime(started, "unixepoch", "localtime")) as integer) ' \ - 'when 0 then "Sunday" ' \ - 'when 1 then "Monday" ' \ - 'when 2 then "Tuesday" ' \ - 'when 3 then "Wednesday" ' \ - 'when 4 then "Thursday" ' \ - 'when 5 then "Friday" ' \ - 'else "Saturday" end as dayofweek, ' \ - 'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" then 1 else 0 end) as music_count ' \ - 'FROM session_history ' \ - 'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime") ' \ - 'GROUP BY dayofweek ' \ - 'ORDER BY daynumber' + try: + if y_axis == 'plays': + query = 'SELECT strftime("%%w", datetime(started, "unixepoch", "localtime")) AS daynumber, ' \ + '(CASE CAST(strftime("%%w", datetime(started, "unixepoch", "localtime")) AS INTEGER) ' \ + 'WHEN 0 THEN "Sunday" ' \ + 'WHEN 1 THEN "Monday" ' \ + 'WHEN 2 THEN "Tuesday" ' \ + 'WHEN 3 THEN "Wednesday" ' \ + 'WHEN 4 THEN "Thursday" ' \ + 'WHEN 5 THEN "Friday" ' \ + 'ELSE "Saturday" END) AS dayofweek, ' \ + 'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \ + 'FROM session_history ' \ + 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ + 'GROUP BY dayofweek ' \ + 'ORDER BY daynumber' % time_range - result = monitor_db.select(query) - else: - query = 'SELECT strftime("%w", datetime(started, "unixepoch", "localtime")) as daynumber, ' \ - 'case cast (strftime("%w", datetime(started, "unixepoch", "localtime")) as integer) ' \ - 'when 0 then "Sunday" ' \ - 'when 1 then "Monday" ' \ - 'when 2 then "Tuesday" ' \ - 'when 3 then "Wednesday" ' \ - 'when 4 then "Thursday" ' \ - 'when 5 then "Friday" ' \ - 'else "Saturday" end as dayofweek, ' \ - 'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count ' \ - 'FROM session_history ' \ - 'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime") ' \ - 'GROUP BY dayofweek ' \ - 'ORDER BY daynumber' + result = monitor_db.select(query) + else: + query = 'SELECT strftime("%%w", datetime(started, "unixepoch", "localtime")) AS daynumber, ' \ + '(CASE CAST(strftime("%%w", datetime(started, "unixepoch", "localtime")) AS INTEGER) ' \ + 'WHEN 0 THEN "Sunday" ' \ + 'WHEN 1 THEN "Monday" ' \ + 'WHEN 2 THEN "Tuesday" ' \ + 'WHEN 3 THEN "Wednesday" ' \ + 'WHEN 4 THEN "Thursday" ' \ + 'WHEN 5 THEN "Friday" ' \ + 'ELSE "Saturday" END) AS dayofweek, ' \ + 'SUM(CASE WHEN media_type = "episode" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count ' \ + 'FROM session_history ' \ + 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ + 'GROUP BY dayofweek ' \ + 'ORDER BY daynumber' % time_range - result = monitor_db.select(query) + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_dayofweek: %s." % e) + return None days_list = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] @@ -196,33 +199,35 @@ class Graphs(object): if not time_range.isdigit(): time_range = '30' - if y_axis == 'plays': - query = 'select strftime("%H", datetime(started, "unixepoch", "localtime")) as hourofday, ' \ - 'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" then 1 else 0 end) as music_count ' \ - 'FROM session_history ' \ - 'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime") ' \ - 'GROUP BY hourofday ' \ - 'ORDER BY hourofday' + try: + if y_axis == 'plays': + query = 'SELECT strftime("%%H", datetime(started, "unixepoch", "localtime")) AS hourofday, ' \ + 'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \ + 'FROM session_history ' \ + 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ + 'GROUP BY hourofday ' \ + 'ORDER BY hourofday' % time_range - result = monitor_db.select(query) - else: - query = 'select strftime("%H", datetime(started, "unixepoch", "localtime")) as hourofday, ' \ - 'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count ' \ - 'FROM session_history ' \ - 'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime") ' \ - 'GROUP BY hourofday ' \ - 'ORDER BY hourofday' + result = monitor_db.select(query) + else: + query = 'SELECT strftime("%%H", datetime(started, "unixepoch", "localtime")) AS hourofday, ' \ + 'SUM(CASE WHEN media_type = "episode" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count ' \ + 'FROM session_history ' \ + 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ + 'GROUP BY hourofday ' \ + 'ORDER BY hourofday' % time_range - result = monitor_db.select(query) + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_hourofday: %s." % e) + return None hours_list = ['00','01','02','03','04','05', '06','07','08','09','10','11', @@ -269,31 +274,36 @@ class Graphs(object): import time as time monitor_db = database.MonitorDatabase() - if y_axis == 'plays': - query = 'SELECT strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) as datestring, ' \ - 'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" then 1 else 0 end) as music_count ' \ - 'FROM session_history ' \ - 'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-12 months", "localtime") ' \ - 'GROUP BY strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) ' \ - 'ORDER BY datestring DESC LIMIT 12' - result = monitor_db.select(query) - else: - query = 'SELECT strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) as datestring, ' \ - 'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count ' \ - 'FROM session_history ' \ - 'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-12 months", "localtime") ' \ - 'GROUP BY strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) ' \ - 'ORDER BY datestring DESC LIMIT 12' + try: + if y_axis == 'plays': + query = 'SELECT strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) AS datestring, ' \ + 'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \ + 'FROM session_history ' \ + 'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-12 months", "localtime") ' \ + 'GROUP BY strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) ' \ + 'ORDER BY datestring DESC LIMIT 12' - result = monitor_db.select(query) + result = monitor_db.select(query) + else: + query = 'SELECT strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) AS datestring, ' \ + 'SUM(CASE WHEN media_type = "episode" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count ' \ + 'FROM session_history ' \ + 'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-12 months", "localtime") ' \ + 'GROUP BY strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) ' \ + 'ORDER BY datestring DESC LIMIT 12' + + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_month: %s." % e) + return None # create our date range as some months may not have any data # but we still want to display them @@ -311,7 +321,7 @@ class Graphs(object): dt = datetime.datetime(*month_item[:6]) date_string = dt.strftime('%Y-%m') - categories.append(dt.strftime('%b %Y')) + categories.append(dt.strftime('%b %Y').decode(locale.getlocale()[1])) series_1_value = 0 series_2_value = 0 series_3_value = 0 @@ -347,38 +357,40 @@ class Graphs(object): if not time_range.isdigit(): time_range = '30' - if y_axis == 'plays': - query = 'SELECT platform, ' \ - 'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" then 1 else 0 end) as music_count, ' \ - 'COUNT(id) as total_count ' \ - 'FROM session_history ' \ - 'WHERE (datetime(stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime")) ' \ - 'GROUP BY platform ' \ - 'ORDER BY total_count DESC ' \ - 'LIMIT 10' + try: + if y_axis == 'plays': + query = 'SELECT platform, ' \ + 'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count, ' \ + 'COUNT(id) AS total_count ' \ + 'FROM session_history ' \ + 'WHERE (datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) ' \ + 'GROUP BY platform ' \ + 'ORDER BY total_count DESC ' \ + 'LIMIT 10' % time_range - result = monitor_db.select(query) - else: - query = 'SELECT platform, ' \ - 'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count, ' \ - 'SUM(case when stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \ - 'FROM session_history ' \ - 'WHERE (datetime(stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime")) ' \ - 'GROUP BY platform ' \ - 'ORDER BY total_duration DESC ' \ - 'LIMIT 10' + result = monitor_db.select(query) + else: + query = 'SELECT platform, ' \ + 'SUM(CASE WHEN media_type = "episode" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count, ' \ + 'SUM(CASE WHEN stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \ + 'FROM session_history ' \ + 'WHERE (datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) ' \ + 'GROUP BY platform ' \ + 'ORDER BY total_duration DESC ' \ + 'LIMIT 10' % time_range - result = monitor_db.select(query) + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_by_top_10_platforms: %s." % e) + return None categories = [] series_1 = [] @@ -408,44 +420,44 @@ class Graphs(object): if not time_range.isdigit(): time_range = '30' - if y_axis == 'plays': - query = 'SELECT ' \ - '(case when users.friendly_name is null then users.username else ' \ - 'users.friendly_name end) as friendly_name,' \ - 'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" then 1 else 0 end) as music_count, ' \ - 'COUNT(session_history.id) as total_count ' \ - 'FROM session_history ' \ - 'JOIN users on session_history.user_id = users.user_id ' \ - 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime")) ' \ - 'GROUP BY session_history.user_id ' \ - 'ORDER BY total_count DESC ' \ - 'LIMIT 10' + try: + if y_axis == 'plays': + query = 'SELECT ' \ + '(CASE WHEN users.friendly_name IS NULL THEN users.username ELSE users.friendly_name END) AS friendly_name,' \ + 'SUM(CASE WHEN media_type = "episode" THEN 1 ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" THEN 1 ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count, ' \ + 'COUNT(session_history.id) AS total_count ' \ + 'FROM session_history ' \ + 'JOIN users ON session_history.user_id = users.user_id ' \ + 'WHERE (datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) ' \ + 'GROUP BY session_history.user_id ' \ + 'ORDER BY total_count DESC ' \ + 'LIMIT 10' % time_range - result = monitor_db.select(query) - else: - query = 'SELECT ' \ - '(case when users.friendly_name is null then users.username else ' \ - 'users.friendly_name end) as friendly_name,' \ - 'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \ - 'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \ - 'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count, ' \ - 'SUM(case when stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \ - 'FROM session_history ' \ - 'JOIN users on session_history.user_id = users.user_id ' \ - 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime")) ' \ - 'GROUP BY session_history.user_id ' \ - 'ORDER BY total_duration DESC ' \ - 'LIMIT 10' + result = monitor_db.select(query) + else: + query = 'SELECT ' \ + '(CASE WHEN users.friendly_name IS NULL THEN users.username ELSE users.friendly_name END) AS friendly_name,' \ + 'SUM(CASE WHEN media_type = "episode" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tv_count, ' \ + 'SUM(CASE WHEN media_type = "movie" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS movie_count, ' \ + 'SUM(CASE WHEN media_type = "track" AND stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS music_count, ' \ + 'SUM(CASE WHEN stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \ + 'FROM session_history ' \ + 'JOIN users ON session_history.user_id = users.user_id ' \ + 'WHERE (datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) ' \ + 'GROUP BY session_history.user_id ' \ + 'ORDER BY total_duration DESC ' \ + 'LIMIT 10' % time_range - result = monitor_db.select(query) + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_by_top_10_users: %s." % e) + return None categories = [] series_1 = [] @@ -477,16 +489,13 @@ class Graphs(object): try: if y_axis == 'plays': - query = 'SELECT date(session_history.started, "unixepoch", "localtime") as date_played, ' \ - 'SUM(case when session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \ - 'then 1 else 0 end) as dp_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \ - 'then 1 else 0 end) as ds_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \ - 'then 1 else 0 end) as tc_count ' \ + query = 'SELECT date(session_history.started, "unixepoch", "localtime") AS date_played, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") THEN 1 ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") THEN 1 ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'OR session_history_media_info.audio_decision = "transcode") THEN 1 ELSE 0 END) AS tc_count ' \ 'FROM session_history ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ @@ -497,19 +506,19 @@ class Graphs(object): result = monitor_db.select(query) else: - query = 'SELECT date(session_history.started, "unixepoch", "localtime") as date_played, ' \ - 'SUM(case when (session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count ' \ + query = 'SELECT date(session_history.started, "unixepoch", "localtime") AS date_played, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'OR session_history_media_info.audio_decision = "transcode") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tc_count ' \ 'FROM session_history ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ 'WHERE datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ @@ -519,8 +528,8 @@ class Graphs(object): 'ORDER BY started ASC' % time_range result = monitor_db.select(query) - except: - logger.warn("Unable to execute database query.") + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_stream_type: %s." % e) return None # create our date range as some days may not have any data @@ -571,54 +580,55 @@ class Graphs(object): if not time_range.isdigit(): time_range = '30' - if y_axis == 'plays': - query = 'SELECT session_history_media_info.video_resolution AS resolution, ' \ - 'SUM(case when session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \ - 'then 1 else 0 end) as dp_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \ - 'then 1 else 0 end) as ds_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \ - 'then 1 else 0 end) as tc_count, ' \ - 'COUNT(session_history.id) as total_count ' \ - 'FROM session_history ' \ - 'JOIN session_history_media_info on session_history.id = session_history_media_info.id ' \ - 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime")) AND ' \ - '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \ - 'GROUP BY resolution ' \ - 'ORDER BY total_count DESC ' \ - 'LIMIT 10' + try: + if y_axis == 'plays': + query = 'SELECT session_history_media_info.video_resolution AS resolution, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") THEN 1 ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") THEN 1 ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'OR session_history_media_info.audio_decision = "transcode") THEN 1 ELSE 0 END) AS tc_count, ' \ + 'COUNT(session_history.id) AS total_count ' \ + 'FROM session_history ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ + 'datetime("now", "-%s days", "localtime")) AND ' \ + '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \ + 'GROUP BY resolution ' \ + 'ORDER BY total_count DESC ' \ + 'LIMIT 10' % time_range - result = monitor_db.select(query) - else: - query = 'SELECT session_history_media_info.video_resolution AS resolution,' \ - 'SUM(case when (session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count, ' \ - 'SUM(case when stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \ - 'FROM session_history ' \ - 'JOIN session_history_media_info on session_history.id = session_history_media_info.id ' \ - 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime")) AND ' \ - '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \ - 'GROUP BY resolution ' \ - 'ORDER BY total_duration DESC ' \ - 'LIMIT 10' + result = monitor_db.select(query) + else: + query = 'SELECT session_history_media_info.video_resolution AS resolution,' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'OR session_history_media_info.audio_decision = "transcode") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tc_count, ' \ + 'SUM(CASE WHEN stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \ + 'FROM session_history ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ + 'datetime("now", "-%s days", "localtime")) AND ' \ + '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \ + 'GROUP BY resolution ' \ + 'ORDER BY total_duration DESC ' \ + 'LIMIT 10' % time_range - result = monitor_db.select(query) + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_by_source_resolution: %s." % e) + return None categories = [] series_1 = [] @@ -648,74 +658,75 @@ class Graphs(object): if not time_range.isdigit(): time_range = '30' - if y_axis == 'plays': - query = 'SELECT ' \ - '(case when session_history_media_info.video_decision = "transcode" then ' \ - '(case ' \ - 'when session_history_media_info.transcode_height <= 360 then "sd" ' \ - 'when session_history_media_info.transcode_height <= 480 then "480" ' \ - 'when session_history_media_info.transcode_height <= 576 then "576" ' \ - 'when session_history_media_info.transcode_height <= 720 then "720" ' \ - 'when session_history_media_info.transcode_height <= 1080 then "1080" ' \ - 'when session_history_media_info.transcode_height <= 1440 then "QHD" ' \ - 'when session_history_media_info.transcode_height <= 2160 then "4K" ' \ - 'else "unknown" end) else session_history_media_info.video_resolution end) as resolution, ' \ - 'SUM(case when session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \ - 'then 1 else 0 end) as dp_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \ - 'then 1 else 0 end) as ds_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \ - 'then 1 else 0 end) as tc_count, ' \ - 'COUNT(session_history.id) as total_count ' \ - 'FROM session_history ' \ - 'JOIN session_history_media_info on session_history.id = session_history_media_info.id ' \ - 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime")) AND ' \ - '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \ - 'GROUP BY resolution ' \ - 'ORDER BY total_count DESC ' \ - 'LIMIT 10' + try: + if y_axis == 'plays': + query = 'SELECT ' \ + '(CASE WHEN session_history_media_info.video_decision = "transcode" THEN ' \ + '(CASE ' \ + 'WHEN session_history_media_info.transcode_height <= 360 THEN "sd" ' \ + 'WHEN session_history_media_info.transcode_height <= 480 THEN "480" ' \ + 'WHEN session_history_media_info.transcode_height <= 576 THEN "576" ' \ + 'WHEN session_history_media_info.transcode_height <= 720 THEN "720" ' \ + 'WHEN session_history_media_info.transcode_height <= 1080 THEN "1080" ' \ + 'WHEN session_history_media_info.transcode_height <= 1440 THEN "QHD" ' \ + 'WHEN session_history_media_info.transcode_height <= 2160 THEN "4K" ' \ + 'ELSE "unknown" END) ELSE session_history_media_info.video_resolution END) AS resolution, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") THEN 1 ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") THEN 1 ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" '\ + 'OR session_history_media_info.audio_decision = "transcode") THEN 1 ELSE 0 END) AS tc_count, ' \ + 'COUNT(session_history.id) AS total_count ' \ + 'FROM session_history ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ + 'datetime("now", "-%s days", "localtime")) AND ' \ + '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \ + 'GROUP BY resolution ' \ + 'ORDER BY total_count DESC ' \ + 'LIMIT 10' % time_range - result = monitor_db.select(query) - else: - query = 'SELECT ' \ - '(case when session_history_media_info.video_decision = "transcode" then ' \ - '(case ' \ - 'when session_history_media_info.transcode_height <= 360 then "sd" ' \ - 'when session_history_media_info.transcode_height <= 480 then "480" ' \ - 'when session_history_media_info.transcode_height <= 576 then "576" ' \ - 'when session_history_media_info.transcode_height <= 720 then "720" ' \ - 'when session_history_media_info.transcode_height <= 1080 then "1080" ' \ - 'when session_history_media_info.transcode_height <= 1440 then "QHD" ' \ - 'when session_history_media_info.transcode_height <= 2160 then "4K" ' \ - 'else "unknown" end) else session_history_media_info.video_resolution end) as resolution, ' \ - 'SUM(case when (session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count, ' \ - 'SUM(case when stopped > 0 then (stopped - started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \ - 'FROM session_history ' \ - 'JOIN session_history_media_info on session_history.id = session_history_media_info.id ' \ - 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime")) AND ' \ - '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \ - 'GROUP BY resolution ' \ - 'ORDER BY total_duration DESC ' \ - 'LIMIT 10' + result = monitor_db.select(query) + else: + query = 'SELECT ' \ + '(CASE WHEN session_history_media_info.video_decision = "transcode" THEN ' \ + '(CASE ' \ + 'WHEN session_history_media_info.transcode_height <= 360 THEN "sd" ' \ + 'WHEN session_history_media_info.transcode_height <= 480 THEN "480" ' \ + 'WHEN session_history_media_info.transcode_height <= 576 THEN "576" ' \ + 'WHEN session_history_media_info.transcode_height <= 720 THEN "720" ' \ + 'WHEN session_history_media_info.transcode_height <= 1080 THEN "1080" ' \ + 'WHEN session_history_media_info.transcode_height <= 1440 THEN "QHD" ' \ + 'WHEN session_history_media_info.transcode_height <= 2160 THEN "4K" ' \ + 'ELSE "unknown" END) ELSE session_history_media_info.video_resolution END) AS resolution, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'OR session_history_media_info.audio_decision = "transcode") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tc_count, ' \ + 'SUM(CASE WHEN stopped > 0 THEN (stopped - started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \ + 'FROM session_history ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \ + 'datetime("now", "-%s days", "localtime")) AND ' \ + '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \ + 'GROUP BY resolution ' \ + 'ORDER BY total_duration DESC ' \ + 'LIMIT 10' % time_range - result = monitor_db.select(query) + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_by_stream_resolution: %s." % e) + return None categories = [] series_1 = [] @@ -745,55 +756,54 @@ class Graphs(object): if not time_range.isdigit(): time_range = '30' - if y_axis == 'plays': - query = 'SELECT ' \ - 'session_history.platform as platform, ' \ - 'SUM(case when session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \ - 'then 1 else 0 end) as dp_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \ - 'then 1 else 0 end) as ds_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \ - 'then 1 else 0 end) as tc_count, ' \ - 'COUNT(session_history.id) as total_count ' \ - 'FROM session_history ' \ - 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ - 'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime") AND ' \ - '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \ - 'GROUP BY platform ' \ - 'ORDER BY total_count DESC LIMIT 10' + try: + if y_axis == 'plays': + query = 'SELECT session_history.platform AS platform, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") THEN 1 ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") THEN 1 ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'OR session_history_media_info.audio_decision = "transcode") THEN 1 ELSE 0 END) AS tc_count, ' \ + 'COUNT(session_history.id) AS total_count ' \ + 'FROM session_history ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \ + 'datetime("now", "-%s days", "localtime") AND ' \ + '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \ + 'GROUP BY platform ' \ + 'ORDER BY total_count DESC LIMIT 10' % time_range - result = monitor_db.select(query) - else: - query = 'SELECT ' \ - 'session_history.platform as platform, ' \ - 'SUM(case when (session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count, ' \ - 'SUM(case when session_history.stopped > 0 ' \ - 'then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \ - 'FROM session_history ' \ - 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ - 'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime") AND ' \ - '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \ - 'GROUP BY platform ' \ - 'ORDER BY total_duration DESC LIMIT 10' + result = monitor_db.select(query) + else: + query = 'SELECT session_history.platform AS platform, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'AND session_history_media_info.audio_decision = "transcode") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tc_count, ' \ + 'SUM(CASE WHEN session_history.stopped > 0 ' \ + 'THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \ + 'FROM session_history ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \ + 'datetime("now", "-%s days", "localtime") AND ' \ + '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \ + 'GROUP BY platform ' \ + 'ORDER BY total_duration DESC LIMIT 10' % time_range - result = monitor_db.select(query) + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_stream_type_by_top_10_platforms: %s." % e) + return None categories = [] series_1 = [] @@ -824,57 +834,58 @@ class Graphs(object): if not time_range.isdigit(): time_range = '30' - if y_axis == 'plays': - query = 'SELECT ' \ - 'CASE WHEN users.friendly_name is null then users.username else users.friendly_name end as username, ' \ - 'SUM(case when session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \ - 'then 1 else 0 end) as dp_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \ - 'then 1 else 0 end) as ds_count, ' \ - 'SUM(case when session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \ - 'then 1 else 0 end) as tc_count, ' \ - 'COUNT(session_history.id) as total_count ' \ - 'FROM session_history ' \ - 'JOIN users ON session_history.user_id = users.user_id ' \ - 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ - 'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime") AND ' \ - '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \ - 'GROUP BY username ' \ - 'ORDER BY total_count DESC LIMIT 10' + try: + if y_axis == 'plays': + query = 'SELECT ' \ + '(CASE WHEN users.friendly_name IS NULL THEN users.username ELSE users.friendly_name END) AS username, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") THEN 1 ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") THEN 1 ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'OR session_history_media_info.audio_decision = "transcode") THEN 1 ELSE 0 END) AS tc_count, ' \ + 'COUNT(session_history.id) AS total_count ' \ + 'FROM session_history ' \ + 'JOIN users ON session_history.user_id = users.user_id ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \ + 'datetime("now", "-%s days", "localtime") AND ' \ + '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \ + 'GROUP BY username ' \ + 'ORDER BY total_count DESC LIMIT 10' % time_range - result = monitor_db.select(query) - else: - query = 'SELECT ' \ - 'CASE WHEN users.friendly_name is null then users.username else users.friendly_name end as username, ' \ - 'SUM(case when (session_history_media_info.video_decision = "direct play" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "copy" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \ - 'SUM(case when (session_history_media_info.video_decision = "transcode" ' \ - 'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \ - 'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count, ' \ - 'SUM(case when session_history.stopped > 0 ' \ - 'then (session_history.stopped - session_history.started) ' \ - ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \ - 'FROM session_history ' \ - 'JOIN users ON session_history.user_id = users.user_id ' \ - 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ - 'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \ - 'datetime("now", "-' + time_range + ' days", "localtime") AND ' \ - '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \ - 'GROUP BY username ' \ - 'ORDER BY total_duration DESC LIMIT 10' + result = monitor_db.select(query) + else: + query = 'SELECT ' \ + '(CASE WHEN users.friendly_name IS NULL THEN users.username ELSE users.friendly_name END) AS username, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "direct play" ' \ + 'OR session_history_media_info.audio_decision = "direct play") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS dp_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision != "transcode" ' \ + 'AND session_history_media_info.audio_decision = "copy") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS ds_count, ' \ + 'SUM(CASE WHEN (session_history_media_info.video_decision = "transcode" ' \ + 'AND session_history_media_info.audio_decision = "transcode") ' \ + 'AND session_history.stopped > 0 THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS tc_count, ' \ + 'SUM(CASE WHEN session_history.stopped > 0 ' \ + 'THEN (session_history.stopped - session_history.started) ' \ + ' - (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) AS total_duration ' \ + 'FROM session_history ' \ + 'JOIN users ON session_history.user_id = users.user_id ' \ + 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ + 'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \ + 'datetime("now", "-%s days", "localtime") AND ' \ + '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \ + 'GROUP BY username ' \ + 'ORDER BY total_duration DESC LIMIT 10' % time_range - result = monitor_db.select(query) + result = monitor_db.select(query) + except Exception as e: + logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_stream_type_by_top_10_users: %s." % e) + return None categories = [] series_1 = [] diff --git a/plexpy/helpers.py b/plexpy/helpers.py index 6319f423..c0c24b47 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -150,7 +150,7 @@ def human_duration(s, sig='dhms'): hd = '' - if str(s).isdigit(): + if str(s).isdigit() and s > 0: d = int(s / 84600) h = int((s % 84600) / 3600) m = int(((s % 84600) % 3600) / 60) @@ -173,6 +173,8 @@ def human_duration(s, sig='dhms'): hd_list.append(str(s) + ' secs') hd = ' '.join(hd_list) + else: + hd = '0' return hd @@ -364,13 +366,18 @@ def create_https_certificates(ssl_cert, ssl_key): return True +def cast_to_int(s): + try: + return int(s) + except ValueError: + return -1 + def cast_to_float(s): try: return float(s) except ValueError: return -1 - def convert_xml_to_json(xml): o = xmltodict.parse(xml) return json.dumps(o) @@ -440,3 +447,84 @@ def sanitize(string): return unicode(string).replace('<','<').replace('>','>') else: return '' + +def parse_js_date(date): + """ + Taken from moment library. + + Translate the easy-to-use JavaScript format strings to Python's cumbersome + strftime format. Also, this is some ugly code -- and it's completely + order-dependent. + """ + # AM/PM + if 'A' in date: + date = date.replace('A', '%p') + elif 'a' in date: + date = date.replace('a', '%P') + # 24 hours + if 'HH' in date: + date = date.replace('HH', '%H') + elif 'H' in date: + date = date.replace('H', '%k') + # 12 hours + elif 'hh' in date: + date = date.replace('hh', '%I') + elif 'h' in date: + date = date.replace('h', '%l') + # Minutes + if 'mm' in date: + date = date.replace('mm', '%min') + elif 'm' in date: + date = date.replace('m', '%min') + # Seconds + if 'ss' in date: + date = date.replace('ss', '%S') + elif 's' in date: + date = date.replace('s', '%S') + # Milliseconds + if 'SSS' in date: + date = date.replace('SSS', '%3') + # Years + if 'YYYY' in date: + date = date.replace('YYYY', '%Y') + elif 'YY' in date: + date = date.replace('YY', '%y') + # Months + if 'MMMM' in date: + date = date.replace('MMMM', '%B') + elif 'MMM' in date: + date = date.replace('MMM', '%b') + elif 'MM' in date: + date = date.replace('MM', '%m') + elif 'M' in date: + date = date.replace('M', '%m') + # Days of the week + if 'dddd' in date: + date = date.replace('dddd', '%A') + elif 'ddd' in date: + date = date.replace('ddd', '%a') + elif 'dd' in date: + date = date.replace('dd', '%w') + elif 'd' in date: + date = date.replace('d', '%u') + # Days of the year + if 'DDDD' in date: + date = date.replace('DDDD', '%j') + elif 'DDD' in date: + date = date.replace('DDD', '%j') + # Days of the month + elif 'DD' in date: + date = date.replace('DD', '%d') + # 'Do' not valid python time format + elif 'Do' in date: + date = date.replace('Do', '') + elif 'D' in date: + date = date.replace('D', '%d') + # Timezone + if 'zz' in date: + date = date.replace('zz', '%Z') + # A necessary evil right now... + if '%min' in date: + date = date.replace('%min', '%M') + + return date \ No newline at end of file diff --git a/plexpy/http_handler.py b/plexpy/http_handler.py index abcf7ec7..c85d2958 100644 --- a/plexpy/http_handler.py +++ b/plexpy/http_handler.py @@ -56,12 +56,12 @@ class HTTPHandler(object): if proto.upper() == 'HTTPS': if not self.ssl_verify and hasattr(ssl, '_create_unverified_context'): context = ssl._create_unverified_context() - handler = HTTPSConnection(host=self.host, port=self.port, timeout=10, context=context) + handler = HTTPSConnection(host=self.host, port=self.port, timeout=20, context=context) logger.warn(u"PlexPy HTTP Handler :: Unverified HTTPS request made. This connection is not secure.") else: - handler = HTTPSConnection(host=self.host, port=self.port, timeout=10) + handler = HTTPSConnection(host=self.host, port=self.port, timeout=20) else: - handler = HTTPConnection(host=self.host, port=self.port, timeout=10) + handler = HTTPConnection(host=self.host, port=self.port, timeout=20) token_string = '' if not no_token: diff --git a/plexpy/libraries.py b/plexpy/libraries.py new file mode 100644 index 00000000..4a6ba97b --- /dev/null +++ b/plexpy/libraries.py @@ -0,0 +1,851 @@ +# This file is part of PlexPy. +# +# PlexPy is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# PlexPy is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with PlexPy. If not, see . + +from plexpy import logger, datatables, common, database, helpers +import plexpy + +def update_section_ids(): + from plexpy import pmsconnect, activity_pinger + import threading + + plexpy.CONFIG.UPDATE_SECTION_IDS = -1 + + logger.info(u"PlexPy Libraries :: Updating section_id's in database.") + + logger.debug(u"PlexPy Libraries :: Disabling monitoring while update in progress.") + plexpy.schedule_job(activity_pinger.check_active_sessions, 'Check for active sessions', + hours=0, minutes=0, seconds=0) + plexpy.schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', + hours=0, minutes=0, seconds=0) + plexpy.schedule_job(activity_pinger.check_server_response, 'Check for server response', + hours=0, minutes=0, seconds=0) + + monitor_db = database.MonitorDatabase() + + try: + query = 'SELECT id, rating_key FROM session_history_metadata WHERE section_id IS NULL' + result = monitor_db.select(query=query) + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for update_section_ids: %s." % e) + + logger.warn(u"PlexPy Libraries :: Unable to update section_id's in database.") + plexpy.CONFIG.__setattr__('UPDATE_SECTION_IDS', 1) + plexpy.CONFIG.write() + + logger.debug(u"PlexPy Libraries :: Re-enabling monitoring.") + plexpy.initialize_scheduler() + return None + + # Add thread filter to the logger + logger.debug(u"PlexPy Libraries :: Disabling logging in the current thread while update in progress.") + thread_filter = logger.NoThreadFilter(threading.current_thread().name) + for handler in logger.logger.handlers: + handler.addFilter(thread_filter) + + pms_connect = pmsconnect.PmsConnect() + + error_keys = set() + for item in result: + id = item['id'] + rating_key = item['rating_key'] + metadata = pms_connect.get_metadata_details(rating_key=rating_key) + + if metadata: + metadata = metadata['metadata'] + section_keys = {'id': id} + section_values = {'section_id': metadata['section_id']} + monitor_db.upsert('session_history_metadata', key_dict=section_keys, value_dict=section_values) + else: + error_keys.add(rating_key) + + # Remove thread filter from the logger + for handler in logger.logger.handlers: + handler.removeFilter(thread_filter) + logger.debug(u"PlexPy Libraries :: Re-enabling logging in the current thread.") + + if error_keys: + logger.info(u"PlexPy Libraries :: Updated all section_id's in database except for rating_keys: %s." % + ', '.join(str(key) for key in error_keys)) + else: + logger.info(u"PlexPy Libraries :: Updated all section_id's in database.") + + plexpy.CONFIG.__setattr__('UPDATE_SECTION_IDS', 0) + plexpy.CONFIG.write() + + logger.debug(u"PlexPy Libraries :: Re-enabling monitoring.") + plexpy.initialize_scheduler() + + return True + +class Libraries(object): + + def __init__(self): + pass + + def get_datatables_list(self, kwargs=None): + data_tables = datatables.DataTables() + + custom_where = ['library_sections.deleted_section', 0] + + columns = ['library_sections.section_id', + 'library_sections.section_name', + 'library_sections.section_type', + 'library_sections.count', + 'library_sections.parent_count', + 'library_sections.child_count', + 'library_sections.thumb AS library_thumb', + 'library_sections.custom_thumb_url AS custom_thumb', + 'library_sections.art', + 'COUNT(session_history.id) AS plays', + 'MAX(session_history.started) AS last_accessed', + 'MAX(session_history.id) AS id', + 'session_history_metadata.full_title AS last_watched', + 'session_history_metadata.thumb', + 'session_history_metadata.parent_thumb', + 'session_history_metadata.grandparent_thumb', + 'session_history_metadata.media_type', + 'session_history.rating_key', + 'session_history_media_info.video_decision', + 'library_sections.do_notify', + 'library_sections.do_notify_created', + 'library_sections.keep_history' + ] + try: + query = data_tables.ssp_query(table_name='library_sections', + columns=columns, + custom_where=[custom_where], + group_by=['library_sections.server_id', 'library_sections.section_id'], + join_types=['LEFT OUTER JOIN', + 'LEFT OUTER JOIN', + 'LEFT OUTER JOIN'], + join_tables=['session_history_metadata', + 'session_history', + 'session_history_media_info'], + join_evals=[['session_history_metadata.section_id', 'library_sections.section_id'], + ['session_history_metadata.id', 'session_history.id'], + ['session_history_metadata.id', 'session_history_media_info.id']], + kwargs=kwargs) + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for get_list: %s." % e) + return {'recordsFiltered': 0, + 'recordsTotal': 0, + 'draw': 0, + 'data': 'null', + 'error': 'Unable to execute database query.'} + + result = query['result'] + + rows = [] + for item in result: + if item['media_type'] == 'episode' and item['parent_thumb']: + thumb = item['parent_thumb'] + elif item['media_type'] == 'episode': + thumb = item['grandparent_thumb'] + else: + thumb = item['thumb'] + + if item['custom_thumb'] and item['custom_thumb'] != item['library_thumb']: + library_thumb = item['custom_thumb'] + elif item['library_thumb']: + library_thumb = item['library_thumb'] + else: + library_thumb = common.DEFAULT_COVER_THUMB + + row = {'section_id': item['section_id'], + 'section_name': item['section_name'], + 'section_type': item['section_type'].capitalize(), + 'count': item['count'], + 'parent_count': item['parent_count'], + 'child_count': item['child_count'], + 'library_thumb': library_thumb, + 'library_art': item['art'], + 'plays': item['plays'], + 'last_accessed': item['last_accessed'], + 'id': item['id'], + 'last_watched': item['last_watched'], + 'thumb': thumb, + 'media_type': item['media_type'], + 'rating_key': item['rating_key'], + 'video_decision': item['video_decision'], + 'do_notify': helpers.checked(item['do_notify']), + 'do_notify_created': helpers.checked(item['do_notify_created']), + 'keep_history': helpers.checked(item['keep_history']) + } + + rows.append(row) + + dict = {'recordsFiltered': query['filteredCount'], + 'recordsTotal': query['totalCount'], + 'data': rows, + 'draw': query['draw'] + } + + return dict + + def get_datatables_media_info(self, section_id=None, section_type=None, rating_key=None, refresh=False, kwargs=None): + from plexpy import pmsconnect + import json, os + + default_return = {'recordsFiltered': 0, + 'recordsTotal': 0, + 'draw': 0, + 'data': None, + 'error': 'Unable to execute database query.'} + + if section_id and not str(section_id).isdigit(): + logger.warn(u"PlexPy Libraries :: Datatable media info called by invalid section_id provided.") + return default_return + elif rating_key and not str(rating_key).isdigit(): + logger.warn(u"PlexPy Libraries :: Datatable media info called by invalid rating_key provided.") + return default_return + + # Get the library details + library_details = self.get_details(section_id=section_id) + if library_details['section_id'] == None: + logger.debug(u"PlexPy Libraries :: Library section_id %s not found." % section_id) + return default_return + + if not section_type: + section_type = library_details['section_type'] + + # Get play counts from the database + monitor_db = database.MonitorDatabase() + + if plexpy.CONFIG.GROUP_HISTORY_TABLES: + count_by = 'reference_id' + else: + count_by = 'id' + + if section_type == 'show' or section_type == 'artist': + group_by = 'grandparent_rating_key' + elif section_type == 'season' or section_type == 'album': + group_by = 'parent_rating_key' + else: + group_by = 'rating_key' + + try: + query = 'SELECT MAX(session_history.started) AS last_watched, COUNT(DISTINCT session_history.%s) AS play_count, ' \ + 'session_history.rating_key, session_history.parent_rating_key, session_history.grandparent_rating_key ' \ + 'FROM session_history ' \ + 'JOIN session_history_metadata ON session_history.id = session_history_metadata.id ' \ + 'WHERE session_history_metadata.section_id = ? ' \ + 'GROUP BY session_history.%s ' % (count_by, group_by) + result = monitor_db.select(query, args=[section_id]) + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for get_datatables_media_info2: %s." % e) + return default_return + + watched_list = {} + for item in result: + watched_list[str(item[group_by])] = {'last_watched': item['last_watched'], + 'play_count': item['play_count']} + + rows = [] + # Import media info cache from json file + if rating_key: + try: + inFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s-%s.json' % (section_id, rating_key)) + with open(inFilePath, 'r') as inFile: + rows = json.load(inFile) + library_count = len(rows) + except IOError as e: + #logger.debug(u"PlexPy Libraries :: No JSON file for rating_key %s." % rating_key) + #logger.debug(u"PlexPy Libraries :: Refreshing data and creating new JSON file for rating_key %s." % rating_key) + pass + elif section_id: + try: + inFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s.json' % section_id) + with open(inFilePath, 'r') as inFile: + rows = json.load(inFile) + library_count = len(rows) + except IOError as e: + #logger.debug(u"PlexPy Libraries :: No JSON file for library section_id %s." % section_id) + #logger.debug(u"PlexPy Libraries :: Refreshing data and creating new JSON file for section_id %s." % section_id) + pass + + # If no cache was imported, get all library children items + cached_items = {d['rating_key']: d['file_size'] for d in rows} + + if refresh or not rows: + pms_connect = pmsconnect.PmsConnect() + + if rating_key: + library_children = pms_connect.get_library_children_details(rating_key=rating_key, + get_media_info=True) + elif section_id: + library_children = pms_connect.get_library_children_details(section_id=section_id, + section_type=section_type, + get_media_info=True) + + if library_children: + library_count = library_children['library_count'] + children_list = library_children['childern_list'] + else: + logger.warn(u"PlexPy Libraries :: Unable to get a list of library items.") + return default_return + + new_rows = [] + for item in children_list: + cached_file_size = cached_items.get(item['rating_key'], None) + file_size = cached_file_size if cached_file_size else item.get('file_size', '') + + row = {'section_id': library_details['section_id'], + 'section_type': library_details['section_type'], + 'added_at': item['added_at'], + 'media_type': item['media_type'], + 'rating_key': item['rating_key'], + 'parent_rating_key': item['parent_rating_key'], + 'grandparent_rating_key': item['grandparent_rating_key'], + 'title': item['title'], + 'year': item['year'], + 'media_index': item['media_index'], + 'parent_media_index': item['parent_media_index'], + 'thumb': item['thumb'], + 'container': item.get('container', ''), + 'bitrate': item.get('bitrate', ''), + 'video_codec': item.get('video_codec', ''), + 'video_resolution': item.get('video_resolution', ''), + 'video_framerate': item.get('video_framerate', ''), + 'audio_codec': item.get('audio_codec', ''), + 'audio_channels': item.get('audio_channels', ''), + 'file_size': file_size + } + new_rows.append(row) + + rows = new_rows + if not rows: + return default_return + + # Cache the media info to a json file + if rating_key: + try: + outFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s-%s.json' % (section_id, rating_key)) + with open(outFilePath, 'w') as outFile: + json.dump(rows, outFile) + except IOError as e: + logger.debug(u"PlexPy Libraries :: Unable to create cache file for rating_key %s." % rating_key) + elif section_id: + try: + outFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s.json' % section_id) + with open(outFilePath, 'w') as outFile: + json.dump(rows, outFile) + except IOError as e: + logger.debug(u"PlexPy Libraries :: Unable to create cache file for section_id %s." % section_id) + + # Update the last_watched and play_count + for item in rows: + watched_item = watched_list.get(item['rating_key'], None) + if watched_item: + item['last_watched'] = watched_item['last_watched'] + item['play_count'] = watched_item['play_count'] + else: + item['last_watched'] = None + item['play_count'] = None + + results = [] + + # Get datatables JSON data + if kwargs.get('json_data'): + json_data = helpers.process_json_kwargs(json_kwargs=kwargs.get('json_data')) + #print json_data + + # Search results + search_value = json_data['search']['value'].lower() + if search_value: + searchable_columns = [d['data'] for d in json_data['columns'] if d['searchable']] + for row in rows: + for k,v in row.iteritems(): + if k in searchable_columns and search_value in v.lower(): + results.append(row) + break + else: + results = rows + + filtered_count = len(results) + + # Sort results + results = sorted(results, key=lambda k: k['title']) + sort_order = json_data['order'] + for order in reversed(sort_order): + sort_key = json_data['columns'][int(order['column'])]['data'] + reverse = True if order['dir'] == 'desc' else False + if rating_key and sort_key == 'title': + results = sorted(results, key=lambda k: helpers.cast_to_int(k['media_index']), reverse=reverse) + elif sort_key == 'file_size' or sort_key == 'bitrate': + results = sorted(results, key=lambda k: helpers.cast_to_int(k[sort_key]), reverse=reverse) + else: + results = sorted(results, key=lambda k: k[sort_key], reverse=reverse) + + total_file_size = sum([helpers.cast_to_int(d['file_size']) for d in results]) + + # Paginate results + results = results[json_data['start']:(json_data['start'] + json_data['length'])] + + filtered_file_size = sum([helpers.cast_to_int(d['file_size']) for d in results]) + + dict = {'recordsFiltered': filtered_count, + 'recordsTotal': library_count, + 'data': results, + 'draw': int(json_data['draw']), + 'filtered_file_size': filtered_file_size, + 'total_file_size': total_file_size + } + + return dict + + def get_media_info_file_sizes(self, section_id=None, rating_key=None): + from plexpy import pmsconnect + import json, os + + if section_id and not str(section_id).isdigit(): + logger.warn(u"PlexPy Libraries :: Datatable media info file size called by invalid section_id provided.") + return False + elif rating_key and not str(rating_key).isdigit(): + logger.warn(u"PlexPy Libraries :: Datatable media info file size called by invalid rating_key provided.") + return False + + # Get the library details + library_details = self.get_details(section_id=section_id) + if library_details['section_id'] == None: + logger.debug(u"PlexPy Libraries :: Library section_id %s not found." % section_id) + return False + if library_details['section_type'] == 'photo': + return False + + rows = [] + # Import media info cache from json file + if rating_key: + #logger.debug(u"PlexPy Libraries :: Getting file sizes for rating_key %s." % rating_key) + try: + inFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s-%s.json' % (section_id, rating_key)) + with open(inFilePath, 'r') as inFile: + rows = json.load(inFile) + except IOError as e: + #logger.debug(u"PlexPy Libraries :: No JSON file for rating_key %s." % rating_key) + #logger.debug(u"PlexPy Libraries :: Refreshing data and creating new JSON file for rating_key %s." % rating_key) + pass + elif section_id: + logger.debug(u"PlexPy Libraries :: Getting file sizes for section_id %s." % section_id) + try: + inFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s.json' % section_id) + with open(inFilePath, 'r') as inFile: + rows = json.load(inFile) + except IOError as e: + #logger.debug(u"PlexPy Libraries :: No JSON file for library section_id %s." % section_id) + #logger.debug(u"PlexPy Libraries :: Refreshing data and creating new JSON file for section_id %s." % section_id) + pass + + # Get the total file size for each item + pms_connect = pmsconnect.PmsConnect() + + for item in rows: + if item['rating_key'] and not item['file_size']: + file_size = 0 + + child_metadata = pms_connect.get_metadata_children_details(rating_key=item['rating_key'], + get_children=True, + get_media_info=True) + metadata_list = child_metadata['metadata'] + + for child_metadata in metadata_list: + file_size += helpers.cast_to_int(child_metadata.get('file_size', 0)) + + item['file_size'] = file_size + + # Cache the media info to a json file + if rating_key: + try: + outFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s-%s.json' % (section_id, rating_key)) + with open(outFilePath, 'w') as outFile: + json.dump(rows, outFile) + except IOError as e: + logger.debug(u"PlexPy Libraries :: Unable to create cache file with file sizes for rating_key %s." % rating_key) + elif section_id: + try: + outFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s.json' % section_id) + with open(outFilePath, 'w') as outFile: + json.dump(rows, outFile) + except IOError as e: + logger.debug(u"PlexPy Libraries :: Unable to create cache file with file sizes for section_id %s." % section_id) + + if rating_key: + #logger.debug(u"PlexPy Libraries :: File sizes updated for rating_key %s." % rating_key) + pass + elif section_id: + logger.debug(u"PlexPy Libraries :: File sizes updated for section_id %s." % section_id) + + return True + + def set_config(self, section_id=None, custom_thumb='', do_notify=1, keep_history=1, do_notify_created=1): + if section_id: + monitor_db = database.MonitorDatabase() + + key_dict = {'section_id': section_id} + value_dict = {'custom_thumb_url': custom_thumb, + 'do_notify': do_notify, + 'do_notify_created': do_notify_created, + 'keep_history': keep_history} + try: + monitor_db.upsert('library_sections', value_dict, key_dict) + except: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for set_config: %s." % e) + + def get_details(self, section_id=None): + from plexpy import pmsconnect + + monitor_db = database.MonitorDatabase() + + try: + if section_id: + query = 'SELECT section_id, section_name, section_type, count, parent_count, child_count, ' \ + 'thumb AS library_thumb, custom_thumb_url AS custom_thumb, art, ' \ + 'do_notify, do_notify_created, keep_history ' \ + 'FROM library_sections ' \ + 'WHERE section_id = ? ' + result = monitor_db.select(query, args=[section_id]) + else: + result = [] + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for get_details: %s." % e) + result = [] + + if result: + library_details = {} + for item in result: + if item['custom_thumb'] and item['custom_thumb'] != item['library_thumb']: + library_thumb = item['custom_thumb'] + elif item['library_thumb']: + library_thumb = item['library_thumb'] + else: + library_thumb = common.DEFAULT_COVER_THUMB + + library_details = {'section_id': item['section_id'], + 'section_name': item['section_name'], + 'section_type': item['section_type'], + 'library_thumb': library_thumb, + 'library_art': item['art'], + 'count': item['count'], + 'parent_count': item['parent_count'], + 'child_count': item['child_count'], + 'do_notify': item['do_notify'], + 'do_notify_created': item['do_notify_created'], + 'keep_history': item['keep_history'] + } + return library_details + else: + logger.warn(u"PlexPy Libraries :: Unable to retrieve library from local database. Requesting library list refresh.") + # Let's first refresh the user list to make sure the user isn't newly added and not in the db yet + try: + if section_id: + # Refresh libraries + pmsconnect.refresh_libraries() + query = 'SELECT section_id, section_name, section_type, count, parent_count, child_count, ' \ + 'thumb AS library_thumb, custom_thumb_url AS custom_thumb, art, ' \ + 'do_notify, do_notify_created, keep_history ' \ + 'FROM library_sections ' \ + 'WHERE section_id = ? ' + result = monitor_db.select(query, args=[section_id]) + else: + result = [] + except: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for get_details: %s." % e) + result = [] + + if result: + library_details = {} + for item in result: + if item['custom_thumb'] and item['custom_thumb'] != item['library_thumb']: + library_thumb = item['custom_thumb'] + elif item['library_thumb']: + library_thumb = item['library_thumb'] + else: + library_thumb = common.DEFAULT_COVER_THUMB + + library_details = {'section_id': item['section_id'], + 'section_name': item['section_name'], + 'section_type': item['section_type'], + 'library_thumb': library_thumb, + 'library_art': item['art'], + 'count': item['count'], + 'parent_count': item['parent_count'], + 'child_count': item['child_count'], + 'do_notify': item['do_notify'], + 'do_notify_created': item['do_notify_created'], + 'keep_history': item['keep_history'] + } + return library_details + else: + # If there is no library data we must return something + # Use "Local" user to retain compatibility with PlexWatch database value + return {'section_id': None, + 'section_name': 'Local', + 'section_type': '', + 'library_thumb': common.DEFAULT_COVER_THUMB, + 'library_art': '', + 'count': 0, + 'parent_count': 0, + 'child_count': 0, + 'do_notify': 0, + 'do_notify_created': 0, + 'keep_history': 0 + } + + def get_watch_time_stats(self, section_id=None): + monitor_db = database.MonitorDatabase() + + time_queries = [1, 7, 30, 0] + library_watch_time_stats = [] + + for days in time_queries: + try: + if days > 0: + if str(section_id).isdigit(): + query = 'SELECT (SUM(stopped - started) - ' \ + 'SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \ + 'COUNT(session_history.id) AS total_plays ' \ + 'FROM session_history ' \ + 'JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ + 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ + 'AND section_id = ?' % days + result = monitor_db.select(query, args=[section_id]) + else: + result = [] + else: + if str(section_id).isdigit(): + query = 'SELECT (SUM(stopped - started) - ' \ + 'SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \ + 'COUNT(session_history.id) AS total_plays ' \ + 'FROM session_history ' \ + 'JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ + 'WHERE section_id = ?' + result = monitor_db.select(query, args=[section_id]) + else: + result = [] + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for get_watch_time_stats: %s." % e) + result = [] + + for item in result: + if item['total_time']: + total_time = item['total_time'] + total_plays = item['total_plays'] + else: + total_time = 0 + total_plays = 0 + + row = {'query_days': days, + 'total_time': total_time, + 'total_plays': total_plays + } + + library_watch_time_stats.append(row) + + return library_watch_time_stats + + def get_user_stats(self, section_id=None): + monitor_db = database.MonitorDatabase() + + user_stats = [] + + try: + if str(section_id).isdigit(): + query = 'SELECT (CASE WHEN users.friendly_name IS NULL THEN users.username ' \ + 'ELSE users.friendly_name END) AS user, users.user_id, users.thumb, COUNT(user) AS user_count ' \ + 'FROM session_history ' \ + 'JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \ + 'JOIN users ON users.user_id = session_history.user_id ' \ + 'WHERE section_id = ? ' \ + 'GROUP BY users.user_id ' \ + 'ORDER BY user_count DESC' + result = monitor_db.select(query, args=[section_id]) + else: + result = [] + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for get_user_stats: %s." % e) + result = [] + + for item in result: + row = {'user': item['user'], + 'user_id': item['user_id'], + 'thumb': item['thumb'], + 'total_plays': item['user_count'] + } + user_stats.append(row) + + return user_stats + + def get_recently_watched(self, section_id=None, limit='10'): + monitor_db = database.MonitorDatabase() + recently_watched = [] + + if not limit.isdigit(): + limit = '10' + + try: + if str(section_id).isdigit(): + query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \ + 'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \ + 'year, started, user ' \ + 'FROM session_history_metadata ' \ + 'JOIN session_history ON session_history_metadata.id = session_history.id ' \ + 'WHERE section_id = ? ' \ + 'GROUP BY (CASE WHEN session_history.media_type = "track" THEN session_history.parent_rating_key ' \ + ' ELSE session_history.rating_key END) ' \ + 'ORDER BY started DESC LIMIT ?' + result = monitor_db.select(query, args=[section_id, limit]) + else: + result = [] + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for get_recently_watched: %s." % e) + result = [] + + for row in result: + if row['media_type'] == 'episode' and row['parent_thumb']: + thumb = row['parent_thumb'] + elif row['media_type'] == 'episode': + thumb = row['grandparent_thumb'] + else: + thumb = row['thumb'] + + recent_output = {'row_id': row['id'], + 'media_type': row['media_type'], + 'rating_key': row['rating_key'], + 'title': row['title'], + 'parent_title': row['parent_title'], + 'grandparent_title': row['grandparent_title'], + 'thumb': thumb, + 'media_index': row['media_index'], + 'parent_media_index': row['parent_media_index'], + 'year': row['year'], + 'time': row['started'], + 'user': row['user'] + } + recently_watched.append(recent_output) + + return recently_watched + + def get_sections(self): + monitor_db = database.MonitorDatabase() + + try: + query = 'SELECT section_id, section_name FROM library_sections WHERE deleted_section = 0' + result = monitor_db.select(query=query) + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for get_sections: %s." % e) + return None + + libraries = [] + for item in result: + library = {'section_id': item['section_id'], + 'section_name': item['section_name'] + } + libraries.append(library) + + return libraries + + def delete_all_history(self, section_id=None): + monitor_db = database.MonitorDatabase() + + try: + if section_id.isdigit(): + logger.info(u"PlexPy Libraries :: Deleting all history for library id %s from database." % section_id) + session_history_media_info_del = \ + monitor_db.action('DELETE FROM ' + 'session_history_media_info ' + 'WHERE session_history_media_info.id IN (SELECT session_history_media_info.id ' + 'FROM session_history_media_info ' + 'JOIN session_history_metadata ON session_history_media_info.id = session_history_metadata.id ' + 'WHERE session_history_metadata.section_id = ?)', [section_id]) + session_history_del = \ + monitor_db.action('DELETE FROM ' + 'session_history ' + 'WHERE session_history.id IN (SELECT session_history.id ' + 'FROM session_history ' + 'JOIN session_history_metadata ON session_history.id = session_history_metadata.id ' + 'WHERE session_history_metadata.section_id = ?)', [section_id]) + session_history_metadata_del = \ + monitor_db.action('DELETE FROM ' + 'session_history_metadata ' + 'WHERE session_history_metadata.section_id = ?', [section_id]) + + return 'Deleted all items for section_id %s.' % section_id + else: + return 'Unable to delete items, section_id not valid.' + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for delete_all_history: %s." % e) + + def delete(self, section_id=None): + monitor_db = database.MonitorDatabase() + + try: + if section_id.isdigit(): + self.delete_all_history(section_id) + logger.info(u"PlexPy Libraries :: Deleting library with id %s from database." % section_id) + monitor_db.action('UPDATE library_sections SET deleted_section = 1 WHERE section_id = ?', [section_id]) + monitor_db.action('UPDATE library_sections SET keep_history = 0 WHERE section_id = ?', [section_id]) + monitor_db.action('UPDATE library_sections SET do_notify = 0 WHERE section_id = ?', [section_id]) + monitor_db.action('UPDATE library_sections SET do_notify_created = 0 WHERE section_id = ?', [section_id]) + + library_cards = plexpy.CONFIG.HOME_LIBRARY_CARDS + if section_id in library_cards: + library_cards.remove(section_id) + plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', library_cards) + plexpy.CONFIG.write() + + return 'Deleted library with id %s.' % section_id + else: + return 'Unable to delete library, section_id not valid.' + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for delete: %s." % e) + + def undelete(self, section_id=None, section_name=None): + monitor_db = database.MonitorDatabase() + + try: + if section_id and section_id.isdigit(): + logger.info(u"PlexPy Libraries :: Re-adding library with id %s to database." % section_id) + monitor_db.action('UPDATE library_sections SET deleted_section = 0 WHERE section_id = ?', [section_id]) + monitor_db.action('UPDATE library_sections SET keep_history = 1 WHERE section_id = ?', [section_id]) + monitor_db.action('UPDATE library_sections SET do_notify = 1 WHERE section_id = ?', [section_id]) + monitor_db.action('UPDATE library_sections SET do_notify_created = 1 WHERE section_id = ?', [section_id]) + + return 'Re-added library with id %s.' % section_id + elif section_name: + logger.info(u"PlexPy Libraries :: Re-adding library with name %s to database." % section_name) + monitor_db.action('UPDATE library_sections SET deleted_section = 0 WHERE section_name = ?', [section_name]) + monitor_db.action('UPDATE library_sections SET keep_history = 1 WHERE section_name = ?', [section_name]) + monitor_db.action('UPDATE library_sections SET do_notify = 1 WHERE section_name = ?', [section_name]) + monitor_db.action('UPDATE library_sections SET do_notify_created = 1 WHERE section_name = ?', [section_name]) + + return 'Re-added library with section_name %s.' % section_name + else: + return 'Unable to re-add library, section_id or section_name not valid.' + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to execute database query for undelete: %s." % e) + + def delete_datatable_media_info_cache(self, section_id=None): + import os + + try: + if section_id.isdigit(): + [os.remove(os.path.join(plexpy.CONFIG.CACHE_DIR, f)) for f in os.listdir(plexpy.CONFIG.CACHE_DIR) + if f.startswith('media_info-%s' % section_id) and f.endswith('.json')] + + logger.debug(u"PlexPy Libraries :: Deleted media info table cache for section_id %s." % section_id) + return 'Deleted media info table cache for library with id %s.' % section_id + else: + return 'Unable to delete media info table cache, section_id not valid.' + except Exception as e: + logger.warn(u"PlexPy Libraries :: Unable to delete media info table cache: %s." % e) diff --git a/plexpy/logger.py b/plexpy/logger.py index 19ac0aee..8e11333b 100644 --- a/plexpy/logger.py +++ b/plexpy/logger.py @@ -51,6 +51,17 @@ class LogListHandler(logging.Handler): plexpy.LOG_LIST.insert(0, (helpers.now(), message, record.levelname, record.threadName)) +class NoThreadFilter(logging.Filter): + """ + Log filter for the current thread + """ + def __init__(self, threadName): + self.threadName = threadName + + def filter(self, record): + return not record.threadName == self.threadName + + @contextlib.contextmanager def listener(): """ diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 3bf22332..5ae1c4db 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -13,21 +13,30 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, config, notifiers, database, helpers, plextv, pmsconnect -import plexpy +import re import time +from plexpy import logger, config, notifiers, database, helpers, plextv, pmsconnect +import plexpy + def notify(stream_data=None, notify_action=None): - from plexpy import users + from plexpy import users, libraries if stream_data and notify_action: - # Check if notifications enabled for user + # Check if notifications enabled for user and library user_data = users.Users() - user_details = user_data.get_user_friendly_name(user=stream_data['user']) + user_details = user_data.get_details(user_id=stream_data['user_id']) + + library_data = libraries.Libraries() + library_details = library_data.get_details(section_id=stream_data['section_id']) if not user_details['do_notify']: + # logger.debug(u"PlexPy NotificationHandler :: Notifications for user '%s' is disabled." % user_details['username']) + return + elif not library_details['do_notify']: + # logger.debug(u"PlexPy NotificationHandler :: Notifications for library '%s' is disabled." % library_details['section_name']) return if (stream_data['media_type'] == 'movie' and plexpy.CONFIG.MOVIE_NOTIFY_ENABLE) \ @@ -41,7 +50,10 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) + # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -51,7 +63,9 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -61,7 +75,9 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -71,7 +87,9 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -80,7 +98,9 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -94,7 +114,10 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) + # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -106,7 +129,10 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) + # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -118,7 +144,10 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) + # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -127,7 +156,10 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) + # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -136,7 +168,10 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) + # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -145,7 +180,10 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) + # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) @@ -154,17 +192,20 @@ def notify(stream_data=None, notify_action=None): notify_strings = build_notify_text(session=stream_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) + # Set the notification state in the db set_notify_state(session=stream_data, state=notify_action, agent_info=agent) elif stream_data['media_type'] == 'clip': pass else: - #logger.debug(u"PlexPy Notifier :: Notify called with unsupported media type.") + #logger.debug(u"PlexPy NotificationHandler :: Notify called with unsupported media type.") pass else: - logger.debug(u"PlexPy Notifier :: Notify called but incomplete data received.") + logger.debug(u"PlexPy NotificationHandler :: Notify called but incomplete data received.") def notify_timeline(timeline_data=None, notify_action=None): @@ -181,7 +222,9 @@ def notify_timeline(timeline_data=None, notify_action=None): notify_strings = build_notify_text(timeline=timeline_data, state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) # Set the notification state in the db set_notify_state(session=timeline_data, state=notify_action, agent_info=agent) @@ -192,27 +235,35 @@ def notify_timeline(timeline_data=None, notify_action=None): notify_strings = build_server_notify_text(state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) if agent['on_intdown'] and notify_action == 'intdown': # Build and send notification notify_strings = build_server_notify_text(state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) if agent['on_extup'] and notify_action == 'extup': # Build and send notification notify_strings = build_server_notify_text(state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) if agent['on_intup'] and notify_action == 'intup': # Build and send notification notify_strings = build_server_notify_text(state=notify_action) notifiers.send_notification(config_id=agent['id'], subject=notify_strings[0], - body=notify_strings[1]) + body=notify_strings[1], + notify_action=notify_action, + script_args=notify_strings[2]) else: - logger.debug(u"PlexPy Notifier :: Notify timeline called but incomplete data received.") + logger.debug(u"PlexPy NotificationHandler :: Notify timeline called but incomplete data received.") def get_notify_state(session): @@ -237,6 +288,7 @@ def get_notify_state(session): return notify_states + def get_notify_state_timeline(timeline): monitor_db = database.MonitorDatabase() result = monitor_db.select('SELECT on_created, agent_id ' @@ -289,12 +341,10 @@ def set_notify_state(session, state, agent_info): monitor_db.upsert(table_name='notify_log', key_dict=keys, value_dict=values) else: - logger.error('PlexPy Notifier :: Unable to set notify state.') + logger.error(u"PlexPy NotificationHandler :: Unable to set notify state.") def build_notify_text(session=None, timeline=None, state=None): - import re - # Get the server name server_name = plexpy.CONFIG.PMS_NAME @@ -306,7 +356,7 @@ def build_notify_text(session=None, timeline=None, state=None): updated_at = server_times[0]['updated_at'] server_uptime = helpers.human_duration(int(time.time() - helpers.cast_to_float(updated_at))) else: - logger.error(u"PlexPy Notifier :: Unable to retrieve server uptime.") + logger.error(u"PlexPy NotificationHandler :: Unable to retrieve server uptime.") server_uptime = 'N/A' # Get metadata feed for item @@ -318,22 +368,24 @@ def build_notify_text(session=None, timeline=None, state=None): pms_connect = pmsconnect.PmsConnect() metadata_list = pms_connect.get_metadata_details(rating_key=rating_key) + stream_count = pms_connect.get_current_activity().get('stream_count', '') + if metadata_list: metadata = metadata_list['metadata'] else: - logger.error(u"PlexPy Notifier :: Unable to retrieve metadata for rating_key %s" % str(rating_key)) + logger.error(u"PlexPy NotificationHandler :: Unable to retrieve metadata for rating_key %s" % str(rating_key)) return [] # Check for exclusion tags if metadata['media_type'] == 'movie': # Regex pattern to remove the text in the tags we don't want - pattern = re.compile('\n*[^>]+.\n*|\n*[^>]+.\n*', re.IGNORECASE|re.DOTALL) + pattern = re.compile('\n*[^>]+.\n*|\n*[^>]+.\n*', re.IGNORECASE | re.DOTALL) elif metadata['media_type'] == 'show' or metadata['media_type'] == 'episode': # Regex pattern to remove the text in the tags we don't want - pattern = re.compile('\n*[^>]+.\n*|\n*?[^>]+.\n*', re.IGNORECASE|re.DOTALL) + pattern = re.compile('\n*[^>]+.\n*|\n*?[^>]+.\n*', re.IGNORECASE | re.DOTALL) elif metadata['media_type'] == 'artist' or metadata['media_type'] == 'track': # Regex pattern to remove the text in the tags we don't want - pattern = re.compile('\n*[^>]+.\n*|\n*[^>]+.\n*', re.IGNORECASE|re.DOTALL) + pattern = re.compile('\n*[^>]+.\n*|\n*[^>]+.\n*', re.IGNORECASE | re.DOTALL) else: pattern = None @@ -356,6 +408,7 @@ def build_notify_text(session=None, timeline=None, state=None): on_watched_body = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT)) on_created_subject = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_CREATED_SUBJECT_TEXT)) on_created_body = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_CREATED_BODY_TEXT)) + script_args_text = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_SCRIPTS_ARGS_TEXT)) else: on_start_subject = plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT on_start_body = plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT @@ -371,6 +424,7 @@ def build_notify_text(session=None, timeline=None, state=None): on_watched_body = plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT on_created_subject = plexpy.CONFIG.NOTIFY_ON_CREATED_SUBJECT_TEXT on_created_body = plexpy.CONFIG.NOTIFY_ON_CREATED_BODY_TEXT + script_args_text = plexpy.CONFIG.NOTIFY_SCRIPTS_ARGS_TEXT # Create a title if metadata['media_type'] == 'episode' or metadata['media_type'] == 'track': @@ -453,7 +507,7 @@ def build_notify_text(session=None, timeline=None, state=None): progress_percent = helpers.get_percent(view_offset, duration) # Fix metadata params for notify recently added grandparent - if plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: + if state == 'created' and plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: show_name = metadata['title'] episode_name = '' artist_name = metadata['title'] @@ -465,9 +519,13 @@ def build_notify_text(session=None, timeline=None, state=None): artist_name = metadata['grandparent_title'] album_name = metadata['parent_title'] track_name = metadata['title'] - + available_params = {'server_name': server_name, 'server_uptime': server_uptime, + 'streams': stream_count, + 'action': state, + 'datestamp': time.strftime(helpers.parse_js_date(plexpy.CONFIG.DATE_FORMAT)), + 'timestamp': time.strftime(helpers.parse_js_date(plexpy.CONFIG.TIME_FORMAT)), 'user': user, 'platform': platform, 'player': player, @@ -497,15 +555,16 @@ def build_notify_text(session=None, timeline=None, state=None): 'transcode_audio_codec': transcode_audio_codec, 'transcode_audio_channels': transcode_audio_channels, 'title': full_title, + 'library_name': metadata['library_name'], 'show_name': show_name, 'episode_name': episode_name, 'artist_name': artist_name, 'album_name': album_name, 'track_name': track_name, - 'season_num': metadata['parent_index'].zfill(1), - 'season_num00': metadata['parent_index'].zfill(2), - 'episode_num': metadata['index'].zfill(1), - 'episode_num00': metadata['index'].zfill(2), + 'season_num': metadata['parent_media_index'].zfill(1), + 'season_num00': metadata['parent_media_index'].zfill(2), + 'episode_num': metadata['media_index'].zfill(1), + 'episode_num00': metadata['media_index'].zfill(2), 'year': metadata['year'], 'studio': metadata['studio'], 'content_rating': metadata['content_rating'], @@ -522,6 +581,21 @@ def build_notify_text(session=None, timeline=None, state=None): # Default subject text subject_text = 'PlexPy (%s)' % server_name + # Default scripts args + script_args = [] + + # Regex to match {param} but not "{param}" + params_to_quote = re.compile(r'(?"', script_args_text) + + if script_args_text: + try: + script_args = [unicode(arg).format(**available_params) for arg in script_args_text.split()] + except LookupError as e: + logger.error(u"PlexPy Notifier :: Unable to parse field %s in script argument. Using fallback." % e) + except Exception as e: + logger.error(u"PlexPy Notifier :: Unable to parse custom script arguments %s. Using fallback." % e) + if state == 'play': # Default body text body_text = '%s (%s) is watching %s' % (session['friendly_name'], @@ -532,20 +606,20 @@ def build_notify_text(session=None, timeline=None, state=None): try: subject_text = unicode(on_start_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_start_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] elif state == 'stop': # Default body text body_text = '%s (%s) has stopped %s' % (session['friendly_name'], @@ -556,20 +630,20 @@ def build_notify_text(session=None, timeline=None, state=None): try: subject_text = unicode(on_stop_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_stop_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] elif state == 'pause': # Default body text body_text = '%s (%s) has paused %s' % (session['friendly_name'], @@ -580,20 +654,20 @@ def build_notify_text(session=None, timeline=None, state=None): try: subject_text = unicode(on_pause_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_pause_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] elif state == 'resume': # Default body text body_text = '%s (%s) has resumed %s' % (session['friendly_name'], @@ -604,20 +678,20 @@ def build_notify_text(session=None, timeline=None, state=None): try: subject_text = unicode(on_resume_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_resume_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] elif state == 'buffer': # Default body text body_text = '%s (%s) is buffering %s' % (session['friendly_name'], @@ -628,20 +702,20 @@ def build_notify_text(session=None, timeline=None, state=None): try: subject_text = unicode(on_buffer_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_buffer_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] elif state == 'watched': # Default body text body_text = '%s (%s) has watched %s' % (session['friendly_name'], @@ -652,20 +726,20 @@ def build_notify_text(session=None, timeline=None, state=None): try: subject_text = unicode(on_watched_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_watched_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] elif state == 'created': # Default body text body_text = '%s was recently added to Plex.' % full_title @@ -674,23 +748,24 @@ def build_notify_text(session=None, timeline=None, state=None): try: subject_text = unicode(on_created_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_created_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: return None + def build_server_notify_text(state=None): # Get the server name server_name = plexpy.CONFIG.PMS_NAME @@ -703,7 +778,7 @@ def build_server_notify_text(state=None): updated_at = server_times[0]['updated_at'] server_uptime = helpers.human_duration(int(time.time() - helpers.cast_to_float(updated_at))) else: - logger.error(u"PlexPy Notifier :: Unable to retrieve server uptime.") + logger.error(u"PlexPy NotificationHandler :: Unable to retrieve server uptime.") server_uptime = 'N/A' on_extdown_subject = plexpy.CONFIG.NOTIFY_ON_EXTDOWN_SUBJECT_TEXT @@ -714,13 +789,32 @@ def build_server_notify_text(state=None): on_extup_body = plexpy.CONFIG.NOTIFY_ON_EXTUP_BODY_TEXT on_intup_subject = plexpy.CONFIG.NOTIFY_ON_INTUP_SUBJECT_TEXT on_intup_body = plexpy.CONFIG.NOTIFY_ON_INTUP_BODY_TEXT + script_args_text = plexpy.CONFIG.NOTIFY_SCRIPTS_ARGS_TEXT available_params = {'server_name': server_name, - 'server_uptime': server_uptime} + 'server_uptime': server_uptime, + 'action': state, + 'datestamp': time.strftime(helpers.parse_js_date(plexpy.CONFIG.DATE_FORMAT)), + 'timestamp': time.strftime(helpers.parse_js_date(plexpy.CONFIG.TIME_FORMAT))} # Default text subject_text = 'PlexPy (%s)' % server_name + # Default scripts args + script_args = [] + + # Regex to match {param} but not "{param}" + params_to_quote = re.compile(r'(?"', script_args_text) + + if script_args_text: + try: + script_args = [unicode(arg).format(**available_params) for arg in script_args_text.split()] + except LookupError as e: + logger.error(u"PlexPy Notifier :: Unable to parse field %s in script argument. Using fallback." % e) + except Exception as e: + logger.error(u"PlexPy Notifier :: Unable to parse custom script arguments %s. Using fallback." % e) + if state == 'extdown': # Default body text body_text = 'The Plex Media Server remote access is down.' @@ -729,20 +823,21 @@ def build_server_notify_text(state=None): try: subject_text = unicode(on_extdown_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_extdown_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] + elif state == 'intdown': # Default body text body_text = 'The Plex Media Server is down.' @@ -751,20 +846,20 @@ def build_server_notify_text(state=None): try: subject_text = unicode(on_intdown_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_intdown_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] if state == 'extup': # Default body text body_text = 'The Plex Media Server remote access is back up.' @@ -773,20 +868,20 @@ def build_server_notify_text(state=None): try: subject_text = unicode(on_extup_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_extup_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] elif state == 'intup': # Default body text body_text = 'The Plex Media Server is back up.' @@ -795,25 +890,25 @@ def build_server_notify_text(state=None): try: subject_text = unicode(on_intup_subject).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification subject. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification subject. Using fallback.") try: body_text = unicode(on_intup_body).format(**available_params) except LookupError, e: - logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e) + logger.error(u"PlexPy NotificationHandler :: Unable to parse field %s in notification body. Using fallback." % e) except: - logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.") + logger.error(u"PlexPy NotificationHandler :: Unable to parse custom notification body. Using fallback.") - return [subject_text, body_text] + return [subject_text, body_text, script_args] else: - return [subject_text, body_text] + return [subject_text, body_text, script_args] + else: return None -def strip_tag(data): - import re +def strip_tag(data): p = re.compile(r'<.*?>') - return p.sub('', data) \ No newline at end of file + return p.sub('', data) diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 5fd913de..a23f8b58 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -13,31 +13,32 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, helpers, common, request -from plexpy.helpers import checked, radio - -from xml.dom import minidom -from httplib import HTTPSConnection -from urlparse import parse_qsl -from urllib import urlencode -from pynma import pynma - +from urlparse import urlparse import base64 +import json import cherrypy +from email.mime.text import MIMEText +import email.utils +from httplib import HTTPSConnection +import os +import shlex +import smtplib +import subprocess + +from urllib import urlencode import urllib import urllib2 -import plexpy -import os.path -import subprocess -import gntp.notifier -import json +from urlparse import parse_qsl +from pynma import pynma +import gntp.notifier import oauth2 as oauth import pythontwitter as twitter +import pythonfacebook as facebook -from email.mime.text import MIMEText -import smtplib -import email.utils +import plexpy +from plexpy import logger, helpers, request +from plexpy.helpers import checked AGENT_IDS = {"Growl": 0, "Prowl": 1, @@ -52,8 +53,12 @@ AGENT_IDS = {"Growl": 0, "Email": 10, "Twitter": 11, "IFTTT": 12, - "Telegram": 13} + "Telegram": 13, + "Slack": 14, + "Scripts": 15, + "Facebook": 16} + def available_notification_agents(): agents = [{'name': 'Growl', 'id': AGENT_IDS['Growl'], @@ -275,6 +280,57 @@ def available_notification_agents(): 'on_intdown': plexpy.CONFIG.TELEGRAM_ON_INTDOWN, 'on_extup': plexpy.CONFIG.TELEGRAM_ON_EXTUP, 'on_intup': plexpy.CONFIG.TELEGRAM_ON_INTUP + }, + {'name': 'Slack', + 'id': AGENT_IDS['Slack'], + 'config_prefix': 'slack', + 'has_config': True, + 'state': checked(plexpy.CONFIG.SLACK_ENABLED), + 'on_play': plexpy.CONFIG.SLACK_ON_PLAY, + 'on_stop': plexpy.CONFIG.SLACK_ON_STOP, + 'on_resume': plexpy.CONFIG.SLACK_ON_RESUME, + 'on_pause': plexpy.CONFIG.SLACK_ON_PAUSE, + 'on_buffer': plexpy.CONFIG.SLACK_ON_BUFFER, + 'on_watched': plexpy.CONFIG.SLACK_ON_WATCHED, + 'on_created': plexpy.CONFIG.SLACK_ON_CREATED, + 'on_extdown': plexpy.CONFIG.SLACK_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.SLACK_ON_INTDOWN, + 'on_extup': plexpy.CONFIG.SLACK_ON_EXTUP, + 'on_intup': plexpy.CONFIG.SLACK_ON_INTUP + }, + {'name': 'Scripts', + 'id': AGENT_IDS['Scripts'], + 'config_prefix': 'scripts', + 'has_config': True, + 'state': checked(plexpy.CONFIG.SCRIPTS_ENABLED), + 'on_play': plexpy.CONFIG.SCRIPTS_ON_PLAY, + 'on_stop': plexpy.CONFIG.SCRIPTS_ON_STOP, + 'on_pause': plexpy.CONFIG.SCRIPTS_ON_PAUSE, + 'on_resume': plexpy.CONFIG.SCRIPTS_ON_RESUME, + 'on_buffer': plexpy.CONFIG.SCRIPTS_ON_BUFFER, + 'on_watched': plexpy.CONFIG.SCRIPTS_ON_WATCHED, + 'on_created': plexpy.CONFIG.SCRIPTS_ON_CREATED, + 'on_extdown': plexpy.CONFIG.SCRIPTS_ON_EXTDOWN, + 'on_extup': plexpy.CONFIG.SCRIPTS_ON_EXTUP, + 'on_intdown': plexpy.CONFIG.SCRIPTS_ON_INTDOWN, + 'on_intup': plexpy.CONFIG.SCRIPTS_ON_INTUP + }, + {'name': 'Facebook', + 'id': AGENT_IDS['Facebook'], + 'config_prefix': 'facebook', + 'has_config': True, + 'state': checked(plexpy.CONFIG.FACEBOOK_ENABLED), + 'on_play': plexpy.CONFIG.FACEBOOK_ON_PLAY, + 'on_stop': plexpy.CONFIG.FACEBOOK_ON_STOP, + 'on_pause': plexpy.CONFIG.FACEBOOK_ON_PAUSE, + 'on_resume': plexpy.CONFIG.FACEBOOK_ON_RESUME, + 'on_buffer': plexpy.CONFIG.FACEBOOK_ON_BUFFER, + 'on_watched': plexpy.CONFIG.FACEBOOK_ON_WATCHED, + 'on_created': plexpy.CONFIG.FACEBOOK_ON_CREATED, + 'on_extdown': plexpy.CONFIG.FACEBOOK_ON_EXTDOWN, + 'on_intdown': plexpy.CONFIG.FACEBOOK_ON_INTDOWN, + 'on_extup': plexpy.CONFIG.FACEBOOK_ON_EXTUP, + 'on_intup': plexpy.CONFIG.FACEBOOK_ON_INTUP } ] @@ -301,8 +357,9 @@ def available_notification_agents(): return agents + def get_notification_agent_config(config_id): - if config_id: + if str(config_id).isdigit(): config_id = int(config_id) if config_id == 0: @@ -345,14 +402,24 @@ def get_notification_agent_config(config_id): iftttClient = IFTTT() return iftttClient.return_config_options() elif config_id == 13: - telegramClient = TELEGRAM() - return telegramClient.return_config_options() + telegramClient = TELEGRAM() + return telegramClient.return_config_options() + elif config_id == 14: + slackClient = SLACK() + return slackClient.return_config_options() + elif config_id == 15: + script = Scripts() + return script.return_config_options() + elif config_id == 16: + facebook = FacebookNotifier() + return facebook.return_config_options() else: return [] else: return [] -def send_notification(config_id, subject, body): + +def send_notification(config_id, subject, body, **kwargs): if str(config_id).isdigit(): config_id = int(config_id) @@ -396,12 +463,21 @@ def send_notification(config_id, subject, body): iftttClient = IFTTT() iftttClient.notify(subject=subject, message=body) elif config_id == 13: - telegramClient = TELEGRAM() - telegramClient.notify(message=body, event=subject) + telegramClient = TELEGRAM() + telegramClient.notify(message=body, event=subject) + elif config_id == 14: + slackClient = SLACK() + slackClient.notify(message=body, event=subject) + elif config_id == 15: + scripts = Scripts() + scripts.notify(message=body, subject=subject, **kwargs) + elif config_id == 16: + facebook = FacebookNotifier() + facebook.notify(subject=subject, message=body) else: - logger.debug(u"PlexPy Notifier :: Unknown agent id received.") + logger.debug(u"PlexPy Notifiers :: Unknown agent id received.") else: - logger.debug(u"PlexPy Notifier :: Notification requested but no agent id received.") + logger.debug(u"PlexPy Notifiers :: Notification requested but no agent id received.") class GROWL(object): @@ -449,10 +525,10 @@ class GROWL(object): try: growl.register() except gntp.notifier.errors.NetworkError: - logger.warning(u'Growl notification failed: network error') + logger.warn(u"PlexPy Notifiers :: Growl notification failed: network error") return except gntp.notifier.errors.AuthError: - logger.warning(u'Growl notification failed: authentication error') + logger.warn(u"PlexPy Notifiers :: Growl notification failed: authentication error") return # Fix message @@ -472,14 +548,14 @@ class GROWL(object): description=message, icon=image ) + logger.info(u"PlexPy Notifiers :: Growl notification sent.") except gntp.notifier.errors.NetworkError: - logger.warning(u'Growl notification failed: network error') + logger.warn(u"PlexPy Notifiers :: Growl notification failed: network error") return - logger.info(u"Growl notifications sent.") def updateLibrary(self): - #For uniformity reasons not removed + # For uniformity reasons not removed return def test(self, host, password): @@ -506,6 +582,7 @@ class GROWL(object): return config_option + class PROWL(object): """ Prowl notifications. @@ -532,24 +609,25 @@ class PROWL(object): 'priority': plexpy.CONFIG.PROWL_PRIORITY} http_handler.request("POST", - "/publicapi/add", - headers={'Content-type': "application/x-www-form-urlencoded"}, - body=urlencode(data)) + "/publicapi/add", + headers={'Content-type': "application/x-www-form-urlencoded"}, + body=urlencode(data)) + response = http_handler.getresponse() request_status = response.status if request_status == 200: - logger.info(u"Prowl notifications sent.") - return True + logger.info(u"PlexPy Notifiers :: Prowl notification sent.") + return True elif request_status == 401: - logger.info(u"Prowl auth failed: %s" % response.reason) - return False + logger.warn(u"PlexPy Notifiers :: Prowl notification failed: %s" % response.reason) + return False else: - logger.info(u"Prowl notification failed.") - return False + logger.warn(u"PlexPy Notifiers :: Prowl notification failed.") + return False def updateLibrary(self): - #For uniformity reasons not removed + # For uniformity reasons not removed return def test(self, keys, priority): @@ -577,6 +655,7 @@ class PROWL(object): return config_option + class XBMC(object): """ XBMC notifications @@ -616,33 +695,35 @@ class XBMC(object): header = subject message = message - time = "3000" # in ms + time = "3000" # in ms for host in hosts: - logger.info('Sending notification command to XMBC @ ' + host) + logger.info(u"PlexPy Notifiers :: Sending notification command to XMBC @ " + host) try: version = self._sendjson(host, 'Application.GetProperties', {'properties': ['version']})['version']['major'] - if version < 12: #Eden + if version < 12: # Eden notification = header + "," + message + "," + time notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'} request = self._sendhttp(host, notifycommand) - else: #Frodo + else: # Frodo params = {'title': header, 'message': message, 'displaytime': int(time)} request = self._sendjson(host, 'GUI.ShowNotification', params) if not request: raise Exception + else: + logger.info(u"PlexPy Notifiers :: XBMC notification sent.") except Exception: - logger.error('Error sending notification request to XBMC') + logger.warn(u"PlexPy Notifiers :: XBMC notification filed.") def return_config_options(self): config_option = [{'label': 'XBMC Host:Port', 'value': self.hosts, 'name': 'xbmc_host', - 'description': 'Host running XBMC (e.g. http://localhost:8080). Separate multiple hosts with commas.', + 'description': 'Host running XBMC (e.g. http://localhost:8080). Separate multiple hosts with commas (,).', 'input_type': 'text' }, {'label': 'XBMC Username', @@ -661,6 +742,7 @@ class XBMC(object): return config_option + class Plex(object): def __init__(self): @@ -683,12 +765,12 @@ class Plex(object): base64string = base64.encodestring('%s:%s' % (username, password)).replace('\n', '') req.add_header("Authorization", "Basic %s" % base64string) - logger.info('Plex url: %s' % url) + # logger.info(u"PlexPy Notifiers :: Plex url: %s" % url) try: handle = urllib2.urlopen(req) except Exception as e: - logger.warn('Error opening Plex url: %s' % e) + logger.error(u"PlexPy Notifiers :: Error opening Plex url: %s" % e) return response = handle.read().decode(plexpy.SYS_ENCODING) @@ -701,10 +783,10 @@ class Plex(object): header = subject message = message - time = "3000" # in ms + time = "3000" # in ms for host in hosts: - logger.info('Sending notification command to Plex Media Server @ ' + host) + logger.info(u"PlexPy Notifiers :: Sending notification command to Plex Media Server @ " + host) try: notification = header + "," + message + "," + time notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'} @@ -712,9 +794,11 @@ class Plex(object): if not request: raise Exception + else: + logger.info(u"PlexPy Notifiers :: Plex notification sent.") except: - logger.warn('Error sending notification request to Plex Media Server') + logger.warn(u"PlexPy Notifiers :: Plex notification failed.") def return_config_options(self): config_option = [{'label': 'Plex Client Host:Port', @@ -739,6 +823,7 @@ class Plex(object): return config_option + class NMA(object): def __init__(self): @@ -774,9 +859,10 @@ class NMA(object): response = p.push(title, event, message, priority=nma_priority, batch_mode=batch) if not response[api][u'code'] == u'200': - logger.error(u'Could not send notification to NotifyMyAndroid') + logger.warn(u"PlexPy Notifiers :: NotifyMyAndroid notification failed.") return False else: + logger.info(u"PlexPy Notifiers :: NotifyMyAndroid notification sent.") return True def return_config_options(self): @@ -797,6 +883,7 @@ class NMA(object): return config_option + class PUSHBULLET(object): def __init__(self): @@ -824,10 +911,11 @@ class PUSHBULLET(object): data['channel_tag'] = self.channel_tag http_handler.request("POST", - "/v2/pushes", - headers={'Content-type': "application/json", - 'Authorization': 'Basic %s' % base64.b64encode(plexpy.CONFIG.PUSHBULLET_APIKEY + ":")}, - body=json.dumps(data)) + "/v2/pushes", + headers={'Content-type': "application/json", + 'Authorization': 'Basic %s' % base64.b64encode(plexpy.CONFIG.PUSHBULLET_APIKEY + ":")}, + body=json.dumps(data)) + response = http_handler.getresponse() request_status = response.status # logger.debug(u"PushBullet response status: %r" % request_status) @@ -835,14 +923,14 @@ class PUSHBULLET(object): # logger.debug(u"PushBullet response body: %r" % response.read()) if request_status == 200: - logger.info(u"PushBullet notifications sent.") - return True + logger.info(u"PlexPy Notifiers :: PushBullet notification sent.") + return True elif request_status >= 400 and request_status < 500: - logger.info(u"PushBullet request failed: %s" % response.reason) - return False + logger.warn(u"PlexPy Notifiers :: PushBullet notification failed: %s" % response.reason) + return False else: - logger.info(u"PushBullet notification failed serverside.") - return False + logger.warn(u"PlexPy Notifiers :: PushBullet notification failed.") + return False def test(self, apikey, deviceid): @@ -856,11 +944,12 @@ class PUSHBULLET(object): if plexpy.CONFIG.PUSHBULLET_APIKEY: http_handler = HTTPSConnection("api.pushbullet.com") http_handler.request("GET", "/v2/devices", - headers={'Content-type': "application/json", - 'Authorization': 'Basic %s' % base64.b64encode(plexpy.CONFIG.PUSHBULLET_APIKEY + ":")}) + headers={'Content-type': "application/json", + 'Authorization': 'Basic %s' % base64.b64encode(plexpy.CONFIG.PUSHBULLET_APIKEY + ":")}) + response = http_handler.getresponse() request_status = response.status - + if request_status == 200: data = json.loads(response.read()) devices = data.get('devices', []) @@ -868,10 +957,10 @@ class PUSHBULLET(object): devices.update({'': ''}) return devices elif request_status >= 400 and request_status < 500: - logger.info(u"Unable to retrieve Pushbullet devices list: %s" % response.reason) + logger.warn(u"PlexPy Notifiers :: Unable to retrieve Pushbullet devices list: %s" % response.reason) return {'': ''} else: - logger.info(u"Unable to retrieve Pushbullet devices list.") + logger.warn(u"PlexPy Notifiers :: Unable to retrieve Pushbullet devices list.") return {'': ''} else: @@ -902,6 +991,7 @@ class PUSHBULLET(object): return config_option + class PUSHALOT(object): def __init__(self): @@ -913,9 +1003,9 @@ class PUSHALOT(object): pushalot_authorizationtoken = plexpy.CONFIG.PUSHALOT_APIKEY - #logger.debug(u"Pushalot event: " + event) - #logger.debug(u"Pushalot message: " + message) - #logger.debug(u"Pushalot api: " + pushalot_authorizationtoken) + # logger.debug(u"Pushalot event: " + event) + # logger.debug(u"Pushalot message: " + message) + # logger.debug(u"Pushalot api: " + pushalot_authorizationtoken) http_handler = HTTPSConnection("pushalot.com") @@ -924,25 +1014,25 @@ class PUSHALOT(object): 'Body': message.encode("utf-8")} http_handler.request("POST", - "/api/sendmessage", - headers={'Content-type': "application/x-www-form-urlencoded"}, - body=urlencode(data)) + "/api/sendmessage", + headers={'Content-type': "application/x-www-form-urlencoded"}, + body=urlencode(data)) response = http_handler.getresponse() request_status = response.status - #logger.debug(u"Pushalot response status: %r" % request_status) - #logger.debug(u"Pushalot response headers: %r" % response.getheaders()) - #logger.debug(u"Pushalot response body: %r" % response.read()) + # logger.debug(u"Pushalot response status: %r" % request_status) + # logger.debug(u"Pushalot response headers: %r" % response.getheaders()) + # logger.debug(u"Pushalot response body: %r" % response.read()) if request_status == 200: - logger.info(u"Pushalot notifications sent.") - return True + logger.info(u"PlexPy Notifiers :: Pushalot notification sent.") + return True elif request_status == 410: - logger.info(u"Pushalot auth failed: %s" % response.reason) - return False + logger.warn(u"PlexPy Notifiers :: Pushalot notification failed: %s" % response.reason) + return False else: - logger.info(u"Pushalot notification failed.") - return False + logger.warn(u"PlexPy Notifiers :: Pushalot notification failed.") + return False def return_config_options(self): config_option = [{'label': 'Pushalot API Key', @@ -955,19 +1045,16 @@ class PUSHALOT(object): return config_option + class PUSHOVER(object): def __init__(self): self.enabled = plexpy.CONFIG.PUSHOVER_ENABLED + self.application_token = plexpy.CONFIG.PUSHOVER_APITOKEN self.keys = plexpy.CONFIG.PUSHOVER_KEYS self.priority = plexpy.CONFIG.PUSHOVER_PRIORITY self.sound = plexpy.CONFIG.PUSHOVER_SOUND - if plexpy.CONFIG.PUSHOVER_APITOKEN: - self.application_token = plexpy.CONFIG.PUSHOVER_APITOKEN - else: - self.application_token = "aVny3NZFwZaXC642c831b4wd7KUhQS" - def conf(self, options): return cherrypy.config['config'].get('Pushover', options) @@ -995,17 +1082,17 @@ class PUSHOVER(object): # logger.debug(u"Pushover response body: %r" % response.read()) if request_status == 200: - logger.info(u"Pushover notifications sent.") - return True + logger.info(u"PlexPy Notifiers :: Pushover notification sent.") + return True elif request_status >= 400 and request_status < 500: - logger.info(u"Pushover request failed: %s" % response.reason) - return False + logger.warn(u"PlexPy Notifiers :: Pushover notification failed: %s" % response.reason) + return False else: - logger.info(u"Pushover notification failed.") - return False + logger.warn(u"PlexPy Notifiers :: Pushover notification failed.") + return False def updateLibrary(self): - #For uniformity reasons not removed + # For uniformity reasons not removed return def test(self, keys, priority, sound): @@ -1017,25 +1104,35 @@ class PUSHOVER(object): self.notify('Main Screen Activate', 'Test Message') def get_sounds(self): - http_handler = HTTPSConnection("api.pushover.net") - http_handler.request("GET", "/1/sounds.json?token=" + self.application_token) - response = http_handler.getresponse() - request_status = response.status - - if request_status == 200: - data = json.loads(response.read()) - sounds = data.get('sounds', {}) - sounds.update({'': ''}) - return sounds - elif request_status >= 400 and request_status < 500: - logger.info(u"Unable to retrieve Pushover notification sounds list: %s" % response.reason) - return {'': ''} + if plexpy.CONFIG.PUSHOVER_APITOKEN: + http_handler = HTTPSConnection("api.pushover.net") + http_handler.request("GET", "/1/sounds.json?token=" + self.application_token) + response = http_handler.getresponse() + request_status = response.status + + if request_status == 200: + data = json.loads(response.read()) + sounds = data.get('sounds', {}) + sounds.update({'': ''}) + return sounds + elif request_status >= 400 and request_status < 500: + logger.warn(u"PlexPy Notifiers :: Unable to retrieve Pushover notification sounds list: %s" % response.reason) + return {'': ''} + else: + logger.warn(u"PlexPy Notifiers :: Unable to retrieve Pushover notification sounds list.") + return {'': ''} + else: - logger.info(u"Unable to retrieve Pushover notification sounds list.") return {'': ''} def return_config_options(self): - config_option = [{'label': 'Pushover User or Group Key', + config_option = [{'label': 'Pushover API Token', + 'value': plexpy.CONFIG.PUSHOVER_APITOKEN, + 'name': 'pushover_apitoken', + 'description': 'Your Pushover API token.', + 'input_type': 'text' + }, + {'label': 'Pushover User or Group Key', 'value': self.keys, 'name': 'pushover_keys', 'description': 'Your Pushover user or group key.', @@ -1054,17 +1151,12 @@ class PUSHOVER(object): 'description': 'Set the notification sound. Leave blank for the default sound.', 'input_type': 'select', 'select_options': self.get_sounds() - }, - {'label': 'Pushover API Token', - 'value': plexpy.CONFIG.PUSHOVER_APITOKEN, - 'name': 'pushover_apitoken', - 'description': 'Your Pushover API token. Leave blank to use PlexPy default.', - 'input_type': 'text' } ] return config_option + class TwitterNotifier(object): REQUEST_TOKEN_URL = 'https://api.twitter.com/oauth/request_token' @@ -1090,12 +1182,12 @@ class TwitterNotifier(object): oauth_consumer = oauth.Consumer(key=self.consumer_key, secret=self.consumer_secret) oauth_client = oauth.Client(oauth_consumer) - logger.info('Requesting temp token from Twitter') + logger.info("PlexPy Notifiers :: Requesting temp token from Twitter") resp, content = oauth_client.request(self.REQUEST_TOKEN_URL, 'GET') if resp['status'] != '200': - logger.info('Invalid respond from Twitter requesting temp token: %s' % resp['status']) + logger.warn("PlexPy Notifiers :: Invalid respond from Twitter requesting temp token: %s" % resp['status']) else: request_token = dict(parse_qsl(content)) @@ -1114,27 +1206,28 @@ class TwitterNotifier(object): token = oauth.Token(request_token['oauth_token'], request_token['oauth_token_secret']) token.set_verifier(key) - logger.info('Generating and signing request for an access token using key ' + key) + # logger.debug(u"Generating and signing request for an access token using key " + key) oauth_consumer = oauth.Consumer(key=self.consumer_key, secret=self.consumer_secret) - # logger.debug('oauth_consumer: ' + str(oauth_consumer)) + # logger.debug(u"oauth_consumer: " + str(oauth_consumer)) oauth_client = oauth.Client(oauth_consumer, token) - logger.info('oauth_client: ' + str(oauth_client)) + # logger.debug(u"oauth_client: " + str(oauth_client)) resp, content = oauth_client.request(self.ACCESS_TOKEN_URL, method='POST', body='oauth_verifier=%s' % key) - logger.info('resp, content: ' + str(resp) + ',' + str(content)) + # logger.debug(u"resp, content: " + str(resp) + ',' + str(content)) access_token = dict(parse_qsl(content)) - logger.info('access_token: ' + str(access_token)) + # logger.debug(u"access_token: " + str(access_token)) - logger.info('resp[status] = ' + str(resp['status'])) + # logger.debug(u"resp[status] = " + str(resp['status'])) if resp['status'] != '200': - logger.info('The request for a token with did not succeed: ' + str(resp['status']), logger.ERROR) + logger.error(u"PlexPy Notifiers :: The request for a Twitter token did not succeed: " + str(resp['status']), logger.ERROR) return False else: - logger.info('Your Twitter Access Token key: %s' % access_token['oauth_token']) - logger.info('Access Token secret: %s' % access_token['oauth_token_secret']) + # logger.info(u"PlexPy Notifiers :: Your Twitter Access Token key: %s" % access_token['oauth_token']) + # logger.info(u"PlexPy Notifiers :: Access Token secret: %s" % access_token['oauth_token_secret']) plexpy.CONFIG.TWITTER_USERNAME = access_token['oauth_token'] plexpy.CONFIG.TWITTER_PASSWORD = access_token['oauth_token_secret'] + plexpy.CONFIG.write() return True def _send_tweet(self, message=None): @@ -1143,49 +1236,51 @@ class TwitterNotifier(object): access_token_key = plexpy.CONFIG.TWITTER_USERNAME access_token_secret = plexpy.CONFIG.TWITTER_PASSWORD - logger.info(u"Sending tweet: " + message) + # logger.info(u"PlexPy Notifiers :: Sending tweet: " + message) api = twitter.Api(username, password, access_token_key, access_token_secret) try: api.PostUpdate(message) + logger.info(u"PlexPy Notifiers :: Twitter notification sent.") except Exception as e: - logger.info(u"Error Sending Tweet: %s" % e) + logger.warn(u"PlexPy Notifiers :: Twitter notification failed: %s" % e) return False return True def return_config_options(self): - config_option = [{'label': 'Request Authorisation', - 'value': 'Request Authorisation', + config_option = [{'label': 'Instructions', + 'description': 'Step 1: Click the Request Authorization button below.
      \ + Step 2: Input the Authorization Key you received from Step 1 below.
      \ + Step 3: Click the Verify Key button below.', + 'input_type': 'help' + }, + {'label': 'Request Authorization', + 'value': 'Request Authorization', 'name': 'twitterStep1', - 'description': 'Step 1: Click Request button above. (Ensure you allow the browser pop-up).', + 'description': 'Request Twitter authorization. (Ensure you allow the browser pop-up).', 'input_type': 'button' }, - {'label': 'Authorisation Key', - 'value': '', - 'name': 'twitter_key', - 'description': 'Step 2: Input the authorisation key you received from Step 1.', - 'input_type': 'text' + {'label': 'Authorization Key', + 'value': '', + 'name': 'twitter_key', + 'description': 'Your Twitter authorization key.', + 'input_type': 'text' }, - {'label': 'Verify Key', - 'value': 'Verify Key', - 'name': 'twitterStep2', - 'description': 'Step 3: Verify the key.', - 'input_type': 'button' + {'label': 'Verify Key', + 'value': 'Verify Key', + 'name': 'twitterStep2', + 'description': 'Verify your Twitter authorization key.', + 'input_type': 'button' }, - {'label': 'Test Twitter', - 'value': 'Test Twitter', - 'name': 'testTwitter', - 'description': 'Test if Twitter notifications are working. See logs for troubleshooting.', - 'input_type': 'button' - }, - {'input_type': 'nosave' + {'input_type': 'nosave' } ] return config_option + class OSX_NOTIFY(object): def __init__(self): @@ -1193,7 +1288,7 @@ class OSX_NOTIFY(object): self.objc = __import__("objc") self.AppKit = __import__("AppKit") except: - #logger.error(u"PlexPy Notifier :: Cannot load OSX Notifications agent.") + # logger.error(u"PlexPy Notifiers :: Cannot load OSX Notifications agent.") pass def validate(self): @@ -1210,7 +1305,7 @@ class OSX_NOTIFY(object): def wrapper(self, *args, **kwargs): return func(self, old_IMP, *args, **kwargs) new_IMP = self.objc.selector(wrapper, selector=old_IMP.selector, - signature=old_IMP.signature) + signature=old_IMP.signature) self.objc.classAddMethod(cls, SEL, new_IMP) def notify(self, title, subtitle=None, text=None, sound=True, image=None): @@ -1240,18 +1335,18 @@ class OSX_NOTIFY(object): if image: source_img = self.AppKit.NSImage.alloc().initByReferencingFile_(image) notification.setContentImage_(source_img) - #notification.set_identityImage_(source_img) + # notification.set_identityImage_(source_img) notification.setHasActionButton_(False) notification_center = NSUserNotificationCenter.defaultUserNotificationCenter() notification_center.deliverNotification_(notification) - logger.info(u"OSX Notify notifications sent.") + logger.info(u"PlexPy Notifiers :: OSX Notify notification sent.") del pool return True except Exception as e: - logger.warn('Error sending OS X Notification: %s' % e) + logger.warn(u"PlexPy Notifiers :: OSX notification failed: %s" % e) return False def swizzled_bundleIdentifier(self, original, swizzled): @@ -1269,6 +1364,7 @@ class OSX_NOTIFY(object): return config_option + class BOXCAR(object): def __init__(self): @@ -1291,13 +1387,47 @@ class BOXCAR(object): req = urllib2.Request(self.url) handle = urllib2.urlopen(req, data) handle.close() - logger.info(u"Boxcar2 notifications sent.") + logger.info(u"PlexPy Notifiers :: Boxcar2 notification sent.") return True except urllib2.URLError as e: - logger.warn('Error sending Boxcar2 Notification: %s' % e) + logger.warn(u"PlexPy Notifiers :: Boxcar2 notification failed: %s" % e) return False + def get_sounds(self): + sounds = {'': '', + 'beep-crisp': 'Beep (Crisp)', + 'beep-soft': 'Beep (Soft)', + 'bell-modern': 'Bell (Modern)', + 'bell-one-tone': 'Bell (One Tone)', + 'bell-simple': 'Bell (Simple)', + 'bell-triple': 'Bell (Triple)', + 'bird-1': 'Bird (1)', + 'bird-2': 'Bird (2)', + 'boing': 'Boing', + 'cash': 'Cash', + 'clanging': 'Clanging', + 'detonator-charge': 'Detonator Charge', + 'digital-alarm': 'Digital Alarm', + 'done': 'Done', + 'echo': 'Echo', + 'flourish': 'Flourish', + 'harp': 'Harp', + 'light': 'Light', + 'magic-chime':'Magic Chime', + 'magic-coin': 'Magic Coin', + 'no-sound': 'No Sound', + 'notifier-1': 'Notifier (1)', + 'notifier-2': 'Notifier (2)', + 'notifier-3': 'Notifier (3)', + 'orchestral-long': 'Orchestral (Long)', + 'orchestral-short': 'Orchestral (Short)', + 'score': 'Score', + 'success': 'Success', + 'up': 'Up'} + + return sounds + def return_config_options(self): config_option = [{'label': 'Boxcar Access Token', 'value': plexpy.CONFIG.BOXCAR_TOKEN, @@ -1310,41 +1440,13 @@ class BOXCAR(object): 'name': 'boxcar_sound', 'description': 'Set the notification sound. Leave blank for the default sound.', 'input_type': 'select', - 'select_options': {'': '', - 'beep-crisp': 'Beep (Crisp)', - 'beep-soft': 'Beep (Soft)', - 'bell-modern': 'Bell (Modern)', - 'bell-one-tone': 'Bell (One Tone)', - 'bell-simple': 'Bell (Simple)', - 'bell-triple': 'Bell (Triple)', - 'bird-1': 'Bird (1)', - 'bird-2': 'Bird (2)', - 'boing': 'Boing', - 'cash': 'Cash', - 'clanging': 'Clanging', - 'detonator-charge': 'Detonator Charge', - 'digital-alarm': 'Digital Alarm', - 'done': 'Done', - 'echo': 'Echo', - 'flourish': 'Flourish', - 'harp': 'Harp', - 'light': 'Light', - 'magic-chime':'Magic Chime', - 'magic-coin': 'Magic Coin', - 'no-sound': 'No Sound', - 'notifier-1': 'Notifier (1)', - 'notifier-2': 'Notifier (2)', - 'notifier-3': 'Notifier (3)', - 'orchestral-long': 'Orchestral (Long)', - 'orchestral-short': 'Orchestral (Short)', - 'score': 'Score', - 'success': 'Success', - 'up': 'Up'} + 'select_options': self.get_sounds() } ] return config_option + class Email(object): def __init__(self): @@ -1356,7 +1458,7 @@ class Email(object): message = MIMEText(message, 'plain', "utf-8") message['Subject'] = subject - message['From'] = email.utils.formataddr(('PlexPy', plexpy.CONFIG.EMAIL_FROM)) + message['From'] = email.utils.formataddr((plexpy.CONFIG.EMAIL_FROM_NAME, plexpy.CONFIG.EMAIL_FROM)) message['To'] = plexpy.CONFIG.EMAIL_TO message['CC'] = plexpy.CONFIG.EMAIL_CC @@ -1379,15 +1481,21 @@ class Email(object): mailserver.sendmail(plexpy.CONFIG.EMAIL_FROM, recipients, message.as_string()) mailserver.quit() - logger.info(u"Email notifications sent.") + logger.info(u"PlexPy Notifiers :: Email notification sent.") return True - except Exception, e: - logger.warn('Error sending Email: %s' % e) + except Exception as e: + logger.warn(u"PlexPy Notifiers :: Email notification failed: %s" % e) return False def return_config_options(self): - config_option = [{'label': 'From', + config_option = [{'label': 'From Name', + 'value': plexpy.CONFIG.EMAIL_FROM_NAME, + 'name': 'email_from_name', + 'description': 'The name of the sender.', + 'input_type': 'text' + }, + {'label': 'From', 'value': plexpy.CONFIG.EMAIL_FROM, 'name': 'email_from', 'description': 'The email address of the sender.', @@ -1445,7 +1553,6 @@ class Email(object): return config_option - class IFTTT(object): def __init__(self): @@ -1461,7 +1568,7 @@ class IFTTT(object): data = {'value1': subject.encode("utf-8"), 'value2': message.encode("utf-8")} - # logger.debug("Ifttt SENDING: %s" % json.dumps(data)) + # logger.debug(u"Ifttt SENDING: %s" % json.dumps(data)) http_handler.request("POST", "/trigger/%s/with/key/%s" % (self.event, self.apikey), @@ -1474,14 +1581,14 @@ class IFTTT(object): # logger.debug(u"Ifttt response body: %r" % response.read()) if request_status == 200: - logger.info(u"Ifttt notifications sent.") - return True + logger.info(u"PlexPy Notifiers :: Ifttt notification sent.") + return True elif request_status >= 400 and request_status < 500: - logger.info(u"Ifttt request failed: %s" % response.reason) - return False + logger.warn(u"PlexPy Notifiers :: Ifttt notification failed: %s" % response.reason) + return False else: - logger.info(u"Ifttt notification failed serverside.") - return False + logger.warn(u"PlexPy Notifiers :: Ifttt notification failed.") + return False def test(self): return self.notify('PlexPy', 'Test Message') @@ -1499,17 +1606,13 @@ class IFTTT(object): 'description': 'The Ifttt maker event to fire. The notification subject and body will be sent' ' as value1 and value2 respectively.', 'input_type': 'text' - }, - {'label': 'Test Event', - 'value': 'Test Event', - 'name': 'testIFTTT', - 'description': 'Test if IFTTT notifications are working. See logs for troubleshooting.', - 'input_type': 'button' } + ] return config_option + class TELEGRAM(object): def __init__(self): @@ -1538,17 +1641,17 @@ class TELEGRAM(object): request_status = response.status if request_status == 200: - logger.info(u"Telegram notifications sent.") - return True + logger.info(u"PlexPy Notifiers :: Telegram notification sent.") + return True elif request_status >= 400 and request_status < 500: - logger.info(u"Telegram request failed: %s" % response.reason) - return False + logger.warn(u"PlexPy Notifiers :: Telegram notification failed: %s" % response.reason) + return False else: - logger.info(u"Telegram notification failed serverside.") - return False + logger.warn(u"PlexPy Notifiers :: Telegram notification failed.") + return False def updateLibrary(self): - #For uniformity reasons not removed + # For uniformity reasons not removed return def test(self, bot_token, chat_id): @@ -1574,3 +1677,455 @@ class TELEGRAM(object): ] return config_option + + +class SLACK(object): + """ + Slack Notifications + """ + def __init__(self): + self.enabled = plexpy.CONFIG.SLACK_ENABLED + self.slack_hook = plexpy.CONFIG.SLACK_HOOK + self.channel = plexpy.CONFIG.SLACK_CHANNEL + self.username = plexpy.CONFIG.SLACK_USERNAME + self.icon_emoji = plexpy.CONFIG.SLACK_ICON_EMOJI + + def conf(self, options): + return cherrypy.config['config'].get('Slack', options) + + def notify(self, message, event): + if not message or not event: + return + http_handler = HTTPSConnection("hooks.slack.com") + + data = {'text': event.encode('utf-8') + ': ' + message.encode("utf-8")} + if self.channel != '': data['channel'] = self.channel + if self.username != '': data['username'] = self.username + if self.icon_emoji != '': + if urlparse(self.icon_emoji).scheme == '': + data['icon_emoji'] = self.icon_emoji + else: + data['icon_url'] = self.icon_url + + url = urlparse(self.slack_hook).path + + http_handler.request("POST", + url, + headers={'Content-type': "application/x-www-form-urlencoded"}, + body=json.dumps(data)) + + response = http_handler.getresponse() + request_status = response.status + + if request_status == 200: + logger.info(u"PlexPy Notifiers :: Slack notification sent.") + return True + elif request_status >= 400 and request_status < 500: + logger.warn(u"PlexPy Notifiers :: Slack notification failed: %s" % response.reason) + return False + else: + logger.warn(u"PlexPy Notifiers :: Slack notification failed.") + return False + + def updateLibrary(self): + #For uniformity reasons not removed + return + + def test(self): + self.enabled = True + return self.notify('Main Screen Activate', 'Test Message') + + def return_config_options(self): + config_option = [{'label': 'Slack Hook', + 'value': self.slack_hook, + 'name': 'slack_hook', + 'description': 'Your Slack incoming webhook.', + 'input_type': 'text' + }, + {'label': 'Slack Channel', + 'value': self.channel, + 'name': 'slack_channel', + 'description': 'Your Slack channel name (begin with \'#\'). Leave blank for webhook integration default.', + 'input_type': 'text' + }, + {'label': 'Slack Username', + 'value': self.username, + 'name': 'slack_username', + 'description': 'The Slack username which will be shown. Leave blank for webhook integration default.', + 'input_type': 'text' + }, + {'label': 'Slack Icon', + 'value': self.icon_emoji, + 'description': 'The icon you wish to show, use Slack emoji or image url. Leave blank for webhook integration default.', + 'name': 'slack_icon_emoji', + 'input_type': 'text' + } + ] + + return config_option + + +class Scripts(object): + + def __init__(self, **kwargs): + self.script_exts = ('.bat', '.cmd', '.exe', '.php', '.pl', '.py', '.pyw', '.rb', '.sh') + + def conf(self, options): + return cherrypy.config['config'].get('Scripts', options) + + def updateLibrary(self): + # For uniformity reasons not removed + return + + def test(self, subject, message, *args, **kwargs): + self.notify(subject, message, *args, **kwargs) + return + + def list_scripts(self): + scriptdir = plexpy.CONFIG.SCRIPTS_FOLDER + scripts = {'': ''} + + if scriptdir and not os.path.exists(scriptdir): + return scripts + + for root, dirs, files in os.walk(scriptdir): + for f in files: + name, ext = os.path.splitext(f) + if ext in self.script_exts: + rfp = os.path.join(os.path.relpath(root, scriptdir), f) + fp = os.path.join(root, f) + scripts[fp] = rfp + + return scripts + + def notify(self, subject='', message='', notify_action='', script_args=[], *args, **kwargs): + """ + Args: + subject(string, optional): Head text, + message(string, optional): Body text, + notify_action(string): 'play' + script_args(list): ["python2", '-p', '-zomg'] + """ + logger.debug(u"PlexPy Notifiers :: Trying to run notify script, action: %s, arguments: %s" % + (notify_action if notify_action else None, script_args if script_args else None)) + + if not plexpy.CONFIG.SCRIPTS_FOLDER: + return + + # Make sure we use the correct script.. + if notify_action == 'play': + script = plexpy.CONFIG.SCRIPTS_ON_PLAY_SCRIPT + + elif notify_action == 'stop': + script = plexpy.CONFIG.SCRIPTS_ON_STOP_SCRIPT + + elif notify_action == 'pause': + script = plexpy.CONFIG.SCRIPTS_ON_PAUSE_SCRIPT + + elif notify_action == 'resume': + script = plexpy.CONFIG.SCRIPTS_ON_RESUME_SCRIPT + + elif notify_action == 'buffer': + script = plexpy.CONFIG.SCRIPTS_ON_BUFFER_SCRIPT + + elif notify_action == 'extdown': + script = plexpy.CONFIG.SCRIPTS_ON_EXTDOWN_SCRIPT + + elif notify_action == 'extup': + script = plexpy.CONFIG.SCRIPTS_ON_EXTUP_SCRIPT + + elif notify_action == 'intdown': + script = plexpy.CONFIG.SCRIPTS_ON_INTDOWN_SCRIPT + + elif notify_action == 'intup': + script = plexpy.CONFIG.SCRIPTS_ON_INTUP_SCRIPT + + elif notify_action == 'created': + script = plexpy.CONFIG.SCRIPTS_ON_CREATED_SCRIPT + + elif notify_action == 'watched': + script = plexpy.CONFIG.SCRIPTS_ON_WATCHED_SCRIPT + + else: + # For manual scripts + script = kwargs.get('script', '') + + # Don't try to run the script if the action does not have one + if notify_action and not script: + logger.debug(u"PlexPy Notifiers :: No script selected for action %s, exiting..." % notify_action) + return + elif not script: + logger.debug(u"PlexPy Notifiers :: No script selected, exiting...") + return + + name, ext = os.path.splitext(script) + + if ext == '.py': + prefix = 'python' + elif ext == '.pyw': + prefix = 'pythonw' + elif ext == '.php': + prefix = 'php' + elif ext == '.pl': + prefix = 'perl' + elif ext == '.rb': + prefix = 'ruby' + else: + prefix = '' + + if os.name == 'nt': + script = script.encode(plexpy.SYS_ENCODING, 'ignore') + + if prefix: + script = [prefix, script] + else: + script = [script] + + # For manual notifications + if script_args and isinstance(script_args, basestring): + # attemps for format it for the user + script_args = shlex.split(script_args) + + # Windows handles unicode very badly. + # https://bugs.python.org/issue19264 + if script_args and os.name == 'nt': + script_args = [s.encode(plexpy.SYS_ENCODING, 'ignore') for s in script_args] + + # Allow overrides for shitty systems + if prefix and script_args: + if script_args[0] in ['python2', 'python', 'pythonw', 'php', 'ruby', 'perl']: + script[0] = script_args[0] + del script_args[0] + + script.extend(script_args) + + logger.debug(u"PlexPy Notifiers :: Full script is: %s" % script) + + try: + p = subprocess.Popen(script, stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + cwd=plexpy.CONFIG.SCRIPTS_FOLDER) + + out, error = p.communicate() + status = p.returncode + + if out and status: + out = out.strip() + logger.debug(u"PlexPy Notifiers :: Script returned: %s" % out) + + if error: + error = error.strip() + logger.error(u"PlexPy Notifiers :: Script error: %s" % error) + else: + logger.info(u"PlexPy Notifiers :: Script notification sent.") + + except OSError as e: + logger.error(u"PlexPy Notifiers :: Failed to run script: %s" % e) + + def return_config_options(self): + config_option = [{'label': 'Warning', + 'description': 'Script notifications are currently experimental!

      \ + Supported file types: ' + ', '.join(self.script_exts), + 'input_type': 'help' + }, + {'label': 'Script folder', + 'value': plexpy.CONFIG.SCRIPTS_FOLDER, + 'name': 'scripts_folder', + 'description': 'Add your script folder.', + 'input_type': 'text', + }, + {'label': 'Playback Start', + 'value': plexpy.CONFIG.SCRIPTS_ON_PLAY_SCRIPT, + 'name': 'scripts_on_play_script', + 'description': 'Choose the script for on play.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Playback Stop', + 'value': plexpy.CONFIG.SCRIPTS_ON_STOP_SCRIPT, + 'name': 'scripts_on_stop_script', + 'description': 'Choose the script for on stop.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Playback Pause', + 'value': plexpy.CONFIG.SCRIPTS_ON_PAUSE_SCRIPT, + 'name': 'scripts_on_pause_script', + 'description': 'Choose the script for on pause.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Playback Resume', + 'value': plexpy.CONFIG.SCRIPTS_ON_RESUME_SCRIPT, + 'name': 'scripts_on_resume_script', + 'description': 'Choose the script for on resume.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Watched', + 'value': plexpy.CONFIG.SCRIPTS_ON_WATCHED_SCRIPT, + 'name': 'scripts_on_watched_script', + 'description': 'Choose the script for on watched.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Buffer Warnings', + 'value': plexpy.CONFIG.SCRIPTS_ON_BUFFER_SCRIPT, + 'name': 'scripts_on_buffer_script', + 'description': 'Choose the script for buffer warnings.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Recently Added', + 'value': plexpy.CONFIG.SCRIPTS_ON_CREATED_SCRIPT, + 'name': 'scripts_on_created_script', + 'description': 'Choose the script for recently added.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Plex Remote Access Down', + 'value': plexpy.CONFIG.SCRIPTS_ON_EXTDOWN_SCRIPT, + 'name': 'scripts_on_extdown_script', + 'description': 'Choose the script for Plex remote access down.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Plex Server Down', + 'value': plexpy.CONFIG.SCRIPTS_ON_INTDOWN_SCRIPT, + 'name': 'scripts_on_intdown_script', + 'description': 'Choose the script for Plex server down.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Plex Remote Access Back Up', + 'value': plexpy.CONFIG.SCRIPTS_ON_EXTUP_SCRIPT, + 'name': 'scripts_on_extup_script', + 'description': 'Choose the script for Plex remote access back up.', + 'input_type': 'select', + 'select_options': self.list_scripts() + }, + {'label': 'Plex Server Back Up', + 'value': plexpy.CONFIG.SCRIPTS_ON_INTUP_SCRIPT, + 'name': 'scripts_on_intup_script', + 'description': 'Choose the script for Plex server back up.', + 'input_type': 'select', + 'select_options': self.list_scripts() + } + ] + + return config_option + + +class FacebookNotifier(object): + + def __init__(self): + self.redirect_uri = plexpy.CONFIG.FACEBOOK_REDIRECT_URI + self.app_id = plexpy.CONFIG.FACEBOOK_APP_ID + self.app_secret = plexpy.CONFIG.FACEBOOK_APP_SECRET + self.group_id = plexpy.CONFIG.FACEBOOK_GROUP + + def notify(self, subject, message): + if not subject or not message: + return + else: + self._post_facebook(subject + ': ' + message) + + def test_notify(self): + return self._post_facebook(u"PlexPy Notifiers :: This is a test notification from PlexPy at " + helpers.now()) + + def _get_authorization(self): + return facebook.auth_url(app_id=self.app_id, + canvas_url=self.redirect_uri + '/facebookStep2', + perms=['user_managed_groups','publish_actions']) + + def _get_credentials(self, code): + logger.info(u"PlexPy Notifiers :: Requesting access token from Facebook") + + try: + # Request user access token + api = facebook.GraphAPI(version='2.5') + response = api.get_access_token_from_code(code=code, + redirect_uri=self.redirect_uri + '/facebookStep2', + app_id=self.app_id, + app_secret=self.app_secret) + access_token = response['access_token'] + + # Request extended user access token + api = facebook.GraphAPI(access_token=access_token, version='2.5') + response = api.extend_access_token(app_id=self.app_id, + app_secret=self.app_secret) + access_token = response['access_token'] + + plexpy.CONFIG.FACEBOOK_TOKEN = access_token + plexpy.CONFIG.write() + except Exception as e: + logger.error(u"PlexPy Notifiers :: Error requesting Facebook access token: %s" % e) + return False + + return True + + def _post_facebook(self, message=None): + access_token = plexpy.CONFIG.FACEBOOK_TOKEN + group_id = plexpy.CONFIG.FACEBOOK_GROUP + + if group_id: + api = facebook.GraphAPI(access_token=access_token, version='2.5') + + try: + api.put_wall_post(profile_id=group_id, message=message) + logger.info(u"PlexPy Notifiers :: Facebook notification sent.") + except Exception as e: + logger.warn(u"PlexPy Notifiers :: Error sending Facebook post: %s" % e) + return False + + return True + else: + logger.warn(u"PlexPy Notifiers :: Error sending Facebook post: No Facebook Group ID provided.") + return False + + def return_config_options(self): + config_option = [{'label': 'Instructions', + 'description': 'Facebook notifications are currently experimental!

      \ + Step 1: Visit \ + Facebook Developers to create a new app using advanced setup.
      \ + Step 2: Go to Settings > Advanced and fill in \ + Valid OAuth redirect URIs with your PlexPy URL (i.e. http://localhost:8181).
      \ + Step 3: Fill in the PlexPy URL below with the exact same URL from Step 2.
      \ + Step 4: Fill in the App ID and App Secret below.
      \ + Step 5: Click the Request Authorization button below.', + 'input_type': 'help' + }, + {'label': 'PlexPy URL', + 'value': self.redirect_uri, + 'name': 'facebook_redirect_uri', + 'description': 'Your PlexPy URL. This will tell Facebook where to redirect you after authorization.', + 'input_type': 'text' + }, + {'label': 'Facebook App ID', + 'value': self.app_id, + 'name': 'facebook_app_id', + 'description': 'Your Facebook app ID.', + 'input_type': 'text' + }, + {'label': 'Facebook App Secret', + 'value': self.app_secret, + 'name': 'facebook_app_secret', + 'description': 'Your Facebook app secret.', + 'input_type': 'text' + }, + {'label': 'Request Authorization', + 'value': 'Request Authorization', + 'name': 'facebookStep1', + 'description': 'Request Facebook authorization. (Ensure you allow the browser pop-up).', + 'input_type': 'button' + }, + {'label': 'Facebook Group ID', + 'value': self.group_id, + 'name': 'facebook_group', + 'description': 'Your Facebook Group ID.', + 'input_type': 'text' + } + ] + + return config_option diff --git a/plexpy/plextv.py b/plexpy/plextv.py index 8d4796c6..c45db03f 100644 --- a/plexpy/plextv.py +++ b/plexpy/plextv.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, helpers, users, http_handler, database +from plexpy import logger, helpers, http_handler, database, users import xmltodict import json from xml.dom import minidom @@ -26,7 +26,7 @@ import plexpy def refresh_users(): - logger.info("Requesting users list refresh...") + logger.info(u"PlexPy PlexTV :: Requesting users list refresh...") result = PlexTV().get_full_users_list() monitor_db = database.MonitorDatabase() @@ -55,13 +55,13 @@ def refresh_users(): monitor_db.upsert('users', new_value_dict, control_value_dict) - logger.info("Users list refreshed.") + logger.info(u"PlexPy PlexTV :: Users list refreshed.") else: - logger.warn("Unable to refresh users list.") + logger.warn(u"PlexPy PlexTV :: Unable to refresh users list.") def get_real_pms_url(): - logger.info("Requesting URLs for server...") + logger.info(u"PlexPy PlexTV :: Requesting URLs for server...") # Reset any current PMS_URL value plexpy.CONFIG.__setattr__('PMS_URL', '') @@ -76,23 +76,24 @@ def get_real_pms_url(): result = PlexTV().get_server_urls(include_https=False) process_urls = True else: + result = PlexTV().get_server_urls(include_https=False) process_urls = False if process_urls: - if len(result) > 0: + if result: for item in result: if plexpy.CONFIG.PMS_IS_REMOTE and item['local'] == '0': plexpy.CONFIG.__setattr__('PMS_URL', item['uri']) plexpy.CONFIG.write() - logger.info("Server URL retrieved.") + logger.info(u"PlexPy PlexTV :: Server URL retrieved.") if not plexpy.CONFIG.PMS_IS_REMOTE and item['local'] == '1': plexpy.CONFIG.__setattr__('PMS_URL', item['uri']) plexpy.CONFIG.write() - logger.info("Server URL retrieved.") + logger.info(u"PlexPy PlexTV :: Server URL retrieved.") else: plexpy.CONFIG.__setattr__('PMS_URL', fallback_url) plexpy.CONFIG.write() - logger.warn("Unable to retrieve server URLs. Using user-defined value.") + logger.warn(u"PlexPy PlexTV :: Unable to retrieve server URLs. Using user-defined value.") else: plexpy.CONFIG.__setattr__('PMS_URL', fallback_url) plexpy.CONFIG.write() @@ -138,13 +139,16 @@ class PlexTV(object): plextv_response = self.get_plex_auth(output_format='xml') if plextv_response: - xml_head = plextv_response.getElementsByTagName('user') - if not xml_head: - logger.warn("Error parsing XML for Plex.tv token") + try: + xml_head = plextv_response.getElementsByTagName('user') + if xml_head: + auth_token = xml_head[0].getAttribute('authenticationToken') + else: + logger.warn(u"PlexPy PlexTV :: Could not get Plex authentication token.") + except Exception as e: + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_token: %s." % e) return [] - auth_token = xml_head[0].getAttribute('authenticationToken') - return auth_token else: return [] @@ -212,16 +216,16 @@ class PlexTV(object): try: xml_parse = minidom.parseString(own_account) - except Exception, e: - logger.warn("Error parsing XML for Plex account details: %s" % e) + except Exception as e: + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list own account: %s" % e) return [] except: - logger.warn("Error parsing XML for Plex account details.") + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list own account.") return [] xml_head = xml_parse.getElementsByTagName('user') if not xml_head: - logger.warn("Error parsing XML for Plex account details.") + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list.") else: for a in xml_head: own_details = {"user_id": helpers.get_xml_attr(a, 'id'), @@ -237,14 +241,16 @@ class PlexTV(object): try: xml_parse = minidom.parseString(friends_list) - except Exception, e: - logger.warn("Error parsing XML for Plex friends list: %s" % e) + except Exception as e: + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list friends list: %s" % e) + return [] except: - logger.warn("Error parsing XML for Plex friends list.") + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list friends list.") + return [] xml_head = xml_parse.getElementsByTagName('User') if not xml_head: - logger.warn("Error parsing XML for Plex friends list.") + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_full_users_list.") else: for a in xml_head: friend = {"user_id": helpers.get_xml_attr(a, 'id'), @@ -268,17 +274,17 @@ class PlexTV(object): try: xml_parse = minidom.parseString(sync_list) - except Exception, e: - logger.warn("Error parsing XML for Plex sync lists: %s" % e) + except Exception as e: + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_synced_items: %s" % e) return [] except: - logger.warn("Error parsing XML for Plex sync lists.") + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_synced_items.") return [] xml_head = xml_parse.getElementsByTagName('SyncList') if not xml_head: - logger.warn("Error parsing XML for Plex sync lists.") + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_synced_items.") else: for a in xml_head: client_id = helpers.get_xml_attr(a, 'id') @@ -286,8 +292,8 @@ class PlexTV(object): for device in sync_device: device_user_id = helpers.get_xml_attr(device, 'userID') try: - device_username = user_data.get_user_details(user_id=device_user_id)['username'] - device_friendly_name = user_data.get_user_details(user_id=device_user_id)['friendly_name'] + device_username = user_data.get_details(user_id=device_user_id)['username'] + device_friendly_name = user_data.get_details(user_id=device_user_id)['friendly_name'] except: device_username = '' device_friendly_name = '' @@ -335,12 +341,11 @@ class PlexTV(object): settings_video_quality = helpers.get_xml_attr(settings, 'videoQuality') settings_video_resolution = helpers.get_xml_attr(settings, 'videoResolution') - if helpers.get_xml_attr(item.getElementsByTagName('Location')[0], 'uri').endswith('%2Fchildren'): - clean_uri = helpers.get_xml_attr(item.getElementsByTagName('Location')[0], 'uri')[:-11] - else: - clean_uri = helpers.get_xml_attr(item.getElementsByTagName('Location')[0], 'uri') + for location in item.getElementsByTagName('Location'): + clean_uri = helpers.get_xml_attr(location, 'uri').split('%2F') - rating_key = clean_uri.rpartition('%2F')[-1] + rating_key = next((clean_uri[(idx + 1) % len(clean_uri)] + for idx, item in enumerate(clean_uri) if item == 'metadata'), None) sync_details = {"device_name": helpers.sanitize(device_name), "platform": helpers.sanitize(device_platform), @@ -374,7 +379,7 @@ class PlexTV(object): if plexpy.CONFIG.PMS_IDENTIFIER: server_id = plexpy.CONFIG.PMS_IDENTIFIER else: - logger.error('PlexPy PlexTV connector :: Unable to retrieve server identity.') + logger.error(u"PlexPy PlexTV :: Unable to retrieve server identity.") return [] plextv_resources = self.get_plextv_resources(include_https=include_https) @@ -382,17 +387,17 @@ class PlexTV(object): try: xml_parse = minidom.parseString(plextv_resources) - except Exception, e: - logger.warn("Error parsing XML for Plex resources: %s" % e) + except Exception as e: + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_server_urls: %s" % e) return [] except: - logger.warn("Error parsing XML for Plex resources.") + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_server_urls.") return [] try: xml_head = xml_parse.getElementsByTagName('Device') - except: - logger.warn("Error parsing XML for Plex resources.") + except Exception as e: + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_server_urls: %s." % e) return [] for a in xml_head: @@ -407,52 +412,36 @@ class PlexTV(object): } server_urls.append(server_details) + # Else try to match the PMS_IP and PMS_PORT + else: + connections = a.getElementsByTagName('Connection') + for connection in connections: + if helpers.get_xml_attr(connection, 'address') == plexpy.CONFIG.PMS_IP and \ + int(helpers.get_xml_attr(connection, 'port')) == plexpy.CONFIG.PMS_PORT: + + plexpy.CONFIG.PMS_IDENTIFIER = helpers.get_xml_attr(a, 'clientIdentifier') + + logger.info(u"PlexPy PlexTV :: PMS identifier changed from %s to %s." % \ + (server_id, plexpy.CONFIG.PMS_IDENTIFIER)) + + server_details = {"protocol": helpers.get_xml_attr(connection, 'protocol'), + "address": helpers.get_xml_attr(connection, 'address'), + "port": helpers.get_xml_attr(connection, 'port'), + "uri": helpers.get_xml_attr(connection, 'uri'), + "local": helpers.get_xml_attr(connection, 'local') + } + break return server_urls - def discover(self): - """ Query plex for all servers online. Returns the ones you own in a selectize format """ - result = self.get_plextv_resources(include_https=True, output_format='raw') - servers = xmltodict.parse(result, process_namespaces=True, attr_prefix='') - clean_servers = [] - - try: - if servers: - # Fix if its only one "device" - if int(servers['MediaContainer']['size']) == 1: - servers['MediaContainer']['Device'] = [servers['MediaContainer']['Device']] - - for server in servers['MediaContainer']['Device']: - # Only grab servers online and own - if server.get('presence', None) == '1' and server.get('owned', None) == '1' and server.get('provides', None) == 'server': - # If someone only has one connection.. - if isinstance(server['Connection'], dict): - server['Connection'] = [server['Connection']] - - for s in server['Connection']: - # to avoid circular ref - d = {} - d.update(s) - d.update(server) - d['label'] = d['name'] - d['value'] = d['address'] - del d['Connection'] - clean_servers.append(d) - - except Exception as e: - logger.warn('Failed to get servers from plex %s' % e) - return clean_servers - - return json.dumps(clean_servers, indent=4) - def get_server_times(self): servers = self.get_plextv_server_list(output_format='xml') server_times = [] try: xml_head = servers.getElementsByTagName('Server') - except: - logger.warn("Error parsing XML for Plex servers.") + except Exception as e: + logger.warn(u"PlexPy PlexTV :: Unable to parse XML for get_server_times: %s." % e) return [] for a in xml_head: @@ -462,4 +451,42 @@ class PlexTV(object): }) break - return server_times \ No newline at end of file + return server_times + + def discover(self): + """ Query plex for all servers online. Returns the ones you own in a selectize format """ + servers = self.get_plextv_resources(include_https=True, output_format='xml') + clean_servers = [] + + try: + xml_head = servers.getElementsByTagName('MediaContainer') + except Exception as e: + logger.warn(u"PlexPy PlexTV :: Failed to get servers from plex: %s." % e) + return [] + + for a in xml_head: + if a.getAttribute('size'): + if a.getAttribute('size') == '0': + return [] + + if a.getElementsByTagName('Device'): + devices = a.getElementsByTagName('Device') + + for d in devices: + if helpers.get_xml_attr(d, 'presence') == '1' and \ + helpers.get_xml_attr(d, 'owned') == '1' and \ + helpers.get_xml_attr(d, 'provides') == 'server': + connections = d.getElementsByTagName('Connection') + + for c in connections: + server = {'httpsRequired': helpers.get_xml_attr(d, 'httpsRequired'), + 'clientIdentifier': helpers.get_xml_attr(d, 'clientIdentifier'), + 'label': helpers.get_xml_attr(d, 'name'), + 'ip': helpers.get_xml_attr(c, 'address'), + 'port': helpers.get_xml_attr(c, 'port'), + 'local': helpers.get_xml_attr(c, 'local'), + 'value': helpers.get_xml_attr(c, 'address') + } + clean_servers.append(server) + + return clean_servers \ No newline at end of file diff --git a/plexpy/plexwatch_import.py b/plexpy/plexwatch_import.py index b92be702..533b5bdc 100644 --- a/plexpy/plexwatch_import.py +++ b/plexpy/plexwatch_import.py @@ -26,12 +26,12 @@ def extract_plexwatch_xml(xml=None): try: xml_parse = minidom.parseString(clean_xml) except: - logger.warn("Error parsing XML for Plexwatch database.") + logger.warn(u"PlexPy Importer :: Error parsing XML for Plexwatch database.") return None xml_head = xml_parse.getElementsByTagName('opt') if not xml_head: - logger.warn("Error parsing XML for Plexwatch database.") + logger.warn(u"PlexPy Importer :: Error parsing XML for Plexwatch database.") return None for a in xml_head: @@ -41,6 +41,7 @@ def extract_plexwatch_xml(xml=None): grandparent_thumb = helpers.get_xml_attr(a, 'grandparentThumb') grandparent_title = helpers.get_xml_attr(a, 'grandparentTitle') guid = helpers.get_xml_attr(a, 'guid') + section_id = helpers.get_xml_attr(a, 'librarySectionID') media_index = helpers.get_xml_attr(a, 'index') originally_available_at = helpers.get_xml_attr(a, 'originallyAvailableAt') last_viewed_at = helpers.get_xml_attr(a, 'lastViewedAt') @@ -156,6 +157,7 @@ def extract_plexwatch_xml(xml=None): 'title': title, 'tagline': tagline, 'guid': guid, + 'section_id': section_id, 'media_index': media_index, 'originally_available_at': originally_available_at, 'last_viewed_at': last_viewed_at, @@ -203,23 +205,23 @@ def validate_database(database=None, table_name=None): try: connection = sqlite3.connect(database, timeout=20) except sqlite3.OperationalError: - logger.error('PlexPy Importer :: Invalid database specified.') + logger.error(u"PlexPy Importer :: Invalid database specified.") return 'Invalid database specified.' except ValueError: - logger.error('PlexPy Importer :: Invalid database specified.') + logger.error(u"PlexPy Importer :: Invalid database specified.") return 'Invalid database specified.' except: - logger.error('PlexPy Importer :: Uncaught exception.') + logger.error(u"PlexPy Importer :: Uncaught exception.") return 'Uncaught exception.' try: connection.execute('SELECT ratingKey from %s' % table_name) connection.close() except sqlite3.OperationalError: - logger.error('PlexPy Importer :: Invalid database specified.') + logger.error(u"PlexPy Importer :: Invalid database specified.") return 'Invalid database specified.' except: - logger.error('PlexPy Importer :: Uncaught exception.') + logger.error(u"PlexPy Importer :: Uncaught exception.") return 'Uncaught exception.' return 'success' @@ -230,16 +232,16 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval connection = sqlite3.connect(database, timeout=20) connection.row_factory = sqlite3.Row except sqlite3.OperationalError: - logger.error('PlexPy Importer :: Invalid filename.') + logger.error(u"PlexPy Importer :: Invalid filename.") return None except ValueError: - logger.error('PlexPy Importer :: Invalid filename.') + logger.error(u"PlexPy Importer :: Invalid filename.") return None try: connection.execute('SELECT ratingKey from %s' % table_name) except sqlite3.OperationalError: - logger.error('PlexPy Importer :: Database specified does not contain the required fields.') + logger.error(u"PlexPy Importer :: Database specified does not contain the required fields.") return None logger.debug(u"PlexPy Importer :: PlexWatch data import in progress...") @@ -249,6 +251,8 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval hours=0, minutes=0, seconds=0) plexpy.schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', hours=0, minutes=0, seconds=0) + plexpy.schedule_job(activity_pinger.check_server_response, 'Check for server response', + hours=0, minutes=0, seconds=0) ap = activity_processor.ActivityProcessor() user_data = users.Users() @@ -352,8 +356,8 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval 'title': row['title'], 'parent_title': extracted_xml['parent_title'], 'grandparent_title': row['grandparent_title'], - 'index': extracted_xml['media_index'], - 'parent_index': extracted_xml['parent_media_index'], + 'media_index': extracted_xml['media_index'], + 'parent_media_index': extracted_xml['parent_media_index'], 'thumb': extracted_xml['thumb'], 'parent_thumb': extracted_xml['parent_thumb'], 'grandparent_thumb': extracted_xml['grandparent_thumb'], @@ -370,6 +374,7 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval 'rating': extracted_xml['rating'], 'duration': extracted_xml['duration'], 'guid': extracted_xml['guid'], + 'section_id': extracted_xml['section_id'], 'directors': extracted_xml['directors'], 'writers': extracted_xml['writers'], 'actors': extracted_xml['actors'], @@ -409,4 +414,3 @@ def import_users(): logger.debug(u"PlexPy Importer :: Users imported.") except: logger.debug(u"PlexPy Importer :: Failed to import users.") - diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 2fc84a2f..9dfb77f8 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -13,14 +13,14 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, helpers, users, http_handler, common +from plexpy import logger, helpers, users, http_handler, common, database from urlparse import urlparse import plexpy import urllib2 def get_server_friendly_name(): - logger.info("Requesting name from server...") + logger.info(u"PlexPy Pmsconnect :: Requesting name from server...") server_name = PmsConnect().get_server_pref(pref='FriendlyName') # If friendly name is blank @@ -34,9 +34,55 @@ def get_server_friendly_name(): if server_name and server_name != plexpy.CONFIG.PMS_NAME: plexpy.CONFIG.__setattr__('PMS_NAME', server_name) plexpy.CONFIG.write() + logger.info(u"PlexPy Pmsconnect :: Server name retrieved.") return server_name +def refresh_libraries(): + logger.info(u"PlexPy Pmsconnect :: Requesting libraries list refresh...") + library_sections = PmsConnect().get_library_details() + + server_id = plexpy.CONFIG.PMS_IDENTIFIER + + library_keys = [] + + if library_sections: + monitor_db = database.MonitorDatabase() + + for section in library_sections: + section_keys = {'server_id': server_id, + 'section_id': section['section_id']} + section_values = {'server_id': server_id, + 'section_id': section['section_id'], + 'section_name': section['section_name'], + 'section_type': section['section_type'], + 'thumb': section['thumb'], + 'art': section['art'], + 'count': section['count'], + 'parent_count': section.get('parent_count', None), + 'child_count': section.get('child_count', None), + } + + monitor_db.upsert('library_sections', key_dict=section_keys, value_dict=section_values) + + library_keys.append(section['section_id']) + + + if plexpy.CONFIG.HOME_LIBRARY_CARDS == ['first_run_wizard']: + plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', library_keys) + plexpy.CONFIG.write() + + if plexpy.CONFIG.UPDATE_SECTION_IDS == 1: + from plexpy import libraries + import threading + + threading.Thread(target=libraries.update_section_ids).start() + + logger.info(u"PlexPy Pmsconnect :: Libraries list refreshed.") + else: + logger.warn(u"PlexPy Pmsconnect :: Unable to refresh libraries list.") + + class PmsConnect(object): """ Retrieve data from Plex Server @@ -57,14 +103,14 @@ class PmsConnect(object): port=port, token=plexpy.CONFIG.PMS_TOKEN) - """ - Return current sessions. - - Optional parameters: output_format { dict, json } - - Output: array - """ def get_sessions(self, output_format=''): + """ + Return current sessions. + + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/status/sessions' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -73,15 +119,15 @@ class PmsConnect(object): return request - """ - Return metadata for request item. - - Parameters required: rating_key { Plex ratingKey } - Optional parameters: output_format { dict, json } - - Output: array - """ def get_metadata(self, rating_key='', output_format=''): + """ + Return metadata for request item. + + Parameters required: rating_key { Plex ratingKey } + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/library/metadata/' + rating_key request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -90,15 +136,15 @@ class PmsConnect(object): return request - """ - Return metadata for children of the request item. - - Parameters required: rating_key { Plex ratingKey } - Optional parameters: output_format { dict, json } - - Output: array - """ def get_metadata_children(self, rating_key='', output_format=''): + """ + Return metadata for children of the request item. + + Parameters required: rating_key { Plex ratingKey } + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/library/metadata/' + rating_key + '/children' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -107,15 +153,15 @@ class PmsConnect(object): return request - """ - Return list of recently added items. - - Parameters required: count { number of results to return } - Optional parameters: output_format { dict, json } - - Output: array - """ def get_recently_added(self, count='0', output_format=''): + """ + Return list of recently added items. + + Parameters required: count { number of results to return } + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/library/recentlyAdded?X-Plex-Container-Start=0&X-Plex-Container-Size=' + count request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -124,15 +170,32 @@ class PmsConnect(object): return request - """ - Return list of children in requested library item. + def get_library_recently_added(self, section_id='', count='0', output_format=''): + """ + Return list of recently added items. - Parameters required: rating_key { ratingKey of parent } - Optional parameters: output_format { dict, json } + Parameters required: count { number of results to return } + Optional parameters: output_format { dict, json } + + Output: array + """ + uri = '/library/sections/' + section_id + '/recentlyAdded?X-Plex-Container-Start=0&X-Plex-Container-Size=' + count + request = self.request_handler.make_request(uri=uri, + proto=self.protocol, + request_type='GET', + output_format=output_format) + + return request - Output: array - """ def get_children_list(self, rating_key='', output_format=''): + """ + Return list of children in requested library item. + + Parameters required: rating_key { ratingKey of parent } + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/library/metadata/' + rating_key + '/children' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -141,14 +204,31 @@ class PmsConnect(object): return request - """ - Return list of local servers. + def get_childrens_list(self, rating_key='', output_format=''): + """ + Return list of children in requested library item. - Optional parameters: output_format { dict, json } + Parameters required: rating_key { ratingKey of parent } + Optional parameters: output_format { dict, json } + + Output: array + """ + uri = '/library/metadata/' + rating_key + '/allLeaves' + request = self.request_handler.make_request(uri=uri, + proto=self.protocol, + request_type='GET', + output_format=output_format) + + return request - Output: array - """ def get_server_list(self, output_format=''): + """ + Return list of local servers. + + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/servers' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -157,14 +237,14 @@ class PmsConnect(object): return request - """ - Return the local servers preferences. - - Optional parameters: output_format { dict, json } - - Output: array - """ def get_server_prefs(self, output_format=''): + """ + Return the local servers preferences. + + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/:/prefs' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -173,14 +253,14 @@ class PmsConnect(object): return request - """ - Return the local server identity. - - Optional parameters: output_format { dict, json } - - Output: array - """ def get_local_server_identity(self, output_format=''): + """ + Return the local server identity. + + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/identity' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -189,14 +269,14 @@ class PmsConnect(object): return request - """ - Return list of libraries on server. - - Optional parameters: output_format { dict, json } - - Output: array - """ def get_libraries_list(self, output_format=''): + """ + Return list of libraries on server. + + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/library/sections' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -205,15 +285,17 @@ class PmsConnect(object): return request - """ - Return list of items in library on server. + def get_library_list(self, section_id='', list_type='all', count='0', sort_type='', output_format=''): + """ + Return list of items in library on server. - Optional parameters: output_format { dict, json } + Optional parameters: output_format { dict, json } - Output: array - """ - def get_library_list(self, section_key='', list_type='all', count='0', sort_type='', output_format=''): - uri = '/library/sections/' + section_key + '/' + list_type +'?X-Plex-Container-Start=0&X-Plex-Container-Size=' + count + sort_type + Output: array + """ + count = '&X-Plex-Container-Size=' + count if count else '' + + uri = '/library/sections/' + section_id + '/' + list_type +'?X-Plex-Container-Start=0' + count + sort_type request = self.request_handler.make_request(uri=uri, proto=self.protocol, request_type='GET', @@ -221,15 +303,15 @@ class PmsConnect(object): return request - """ - Return sync item details. - - Parameters required: sync_id { unique sync id for item } - Optional parameters: output_format { dict, json } - - Output: array - """ def get_sync_item(self, sync_id=None, output_format=''): + """ + Return sync item details. + + Parameters required: sync_id { unique sync id for item } + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/sync/items/' + sync_id request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -238,14 +320,14 @@ class PmsConnect(object): return request - """ - Return sync transcode queue. - - Optional parameters: output_format { dict, json } - - Output: array - """ def get_sync_transcode_queue(self, output_format=''): + """ + Return sync transcode queue. + + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/sync/transcodeQueue' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -254,14 +336,14 @@ class PmsConnect(object): return request - """ - Return search results. - - Optional parameters: output_format { dict, json } - - Output: array - """ def get_search(self, query='', track='', output_format=''): + """ + Return search results. + + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/search?query=' + urllib2.quote(query.encode('utf8')) + track request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -270,14 +352,14 @@ class PmsConnect(object): return request - """ - Return account details. - - Optional parameters: output_format { dict, json } - - Output: array - """ def get_account(self, output_format=''): + """ + Return account details. + + Optional parameters: output_format { dict, json } + + Output: array + """ uri = '/myplex/account' request = self.request_handler.make_request(uri=uri, proto=self.protocol, @@ -286,34 +368,38 @@ class PmsConnect(object): return request - """ - Refresh Plex remote access port mapping. - - Optional parameters: None - - Output: None - """ def put_refresh_reachability(self): + """ + Refresh Plex remote access port mapping. + + Optional parameters: None + + Output: None + """ uri = '/myplex/refreshReachability' request = self.request_handler.make_request(uri=uri, proto=self.protocol, request_type='PUT') return request - """ - Return processed and validated list of recently added items. - Parameters required: count { number of results to return } + def get_recently_added_details(self, section_id='', count='0'): + """ + Return processed and validated list of recently added items. - Output: array - """ - def get_recently_added_details(self, count='0'): - recent = self.get_recently_added(count, output_format='xml') + Parameters required: count { number of results to return } + + Output: array + """ + if section_id: + recent = self.get_library_recently_added(section_id, count, output_format='xml') + else: + recent = self.get_recently_added(count, output_format='xml') try: xml_head = recent.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_recently_added.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_recently_added: %s." % e) return [] recents_list = [] @@ -327,15 +413,21 @@ class PmsConnect(object): if a.getElementsByTagName('Directory'): recents_main = a.getElementsByTagName('Directory') for item in recents_main: - recent_type = helpers.get_xml_attr(item, 'type') - recent_items = {'media_type': recent_type, + recent_items = {'media_type': helpers.get_xml_attr(item, 'type'), 'rating_key': helpers.get_xml_attr(item, 'ratingKey'), 'parent_rating_key': helpers.get_xml_attr(item, 'parentRatingKey'), + 'grandparent_rating_key': helpers.get_xml_attr(item, 'grandparentRatingKey'), 'title': helpers.get_xml_attr(item, 'title'), 'parent_title': helpers.get_xml_attr(item, 'parentTitle'), - 'library_id': helpers.get_xml_attr(item, 'librarySectionID'), - 'library_title': helpers.get_xml_attr(item, 'librarySectionTitle'), + 'grandparent_title': helpers.get_xml_attr(item, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(item, 'index'), + 'parent_media_index': helpers.get_xml_attr(item, 'parentIndex'), + 'section_id': helpers.get_xml_attr(item, 'librarySectionID'), + 'library_name': helpers.get_xml_attr(item, 'librarySectionTitle'), + 'year': helpers.get_xml_attr(item, 'year'), 'thumb': helpers.get_xml_attr(item, 'thumb'), + 'parent_thumb': helpers.get_xml_attr(item, 'parentThumb'), + 'grandparent_thumb': helpers.get_xml_attr(item, 'grandparentThumb'), 'added_at': helpers.get_xml_attr(item, 'addedAt') } recents_list.append(recent_items) @@ -343,40 +435,42 @@ class PmsConnect(object): if a.getElementsByTagName('Video'): recents_main = a.getElementsByTagName('Video') for item in recents_main: - recent_type = helpers.get_xml_attr(item, 'type') - - if recent_type == 'movie': - recent_items = {'media_type': recent_type, - 'rating_key': helpers.get_xml_attr(item, 'ratingKey'), - 'title': helpers.get_xml_attr(item, 'title'), - 'parent_title': helpers.get_xml_attr(item, 'parentTitle'), - 'library_id': helpers.get_xml_attr(item, 'librarySectionID'), - 'library_title': helpers.get_xml_attr(item, 'librarySectionTitle'), - 'year': helpers.get_xml_attr(item, 'year'), - 'thumb': helpers.get_xml_attr(item, 'thumb'), - 'added_at': helpers.get_xml_attr(item, 'addedAt') - } - recents_list.append(recent_items) - else: - pass + recent_items = {'media_type': helpers.get_xml_attr(item, 'type'), + 'rating_key': helpers.get_xml_attr(item, 'ratingKey'), + 'parent_rating_key': helpers.get_xml_attr(item, 'parentRatingKey'), + 'grandparent_rating_key': helpers.get_xml_attr(item, 'grandparentRatingKey'), + 'title': helpers.get_xml_attr(item, 'title'), + 'parent_title': helpers.get_xml_attr(item, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(item, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(item, 'index'), + 'parent_media_index': helpers.get_xml_attr(item, 'parentIndex'), + 'section_id': helpers.get_xml_attr(item, 'librarySectionID'), + 'library_name': helpers.get_xml_attr(item, 'librarySectionTitle'), + 'year': helpers.get_xml_attr(item, 'year'), + 'thumb': helpers.get_xml_attr(item, 'thumb'), + 'parent_thumb': helpers.get_xml_attr(item, 'parentThumb'), + 'grandparent_thumb': helpers.get_xml_attr(item, 'grandparentThumb'), + 'added_at': helpers.get_xml_attr(item, 'addedAt') + } + recents_list.append(recent_items) output = {'recently_added': sorted(recents_list, key=lambda k: k['added_at'], reverse=True)} return output - """ - Return processed and validated metadata list for requested item. + def get_metadata_details(self, rating_key='', get_media_info=False): + """ + Return processed and validated metadata list for requested item. - Parameters required: rating_key { Plex ratingKey } + Parameters required: rating_key { Plex ratingKey } - Output: array - """ - def get_metadata_details(self, rating_key=''): + Output: array + """ metadata = self.get_metadata(str(rating_key), output_format='xml') try: xml_head = metadata.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_metadata.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_metadata: %s." % e) return [] metadata_list = [] @@ -397,7 +491,11 @@ class PmsConnect(object): metadata_main = a.getElementsByTagName('Track')[0] metadata_type = helpers.get_xml_attr(metadata_main, 'type') else: - logger.debug(u"Metadata failed") + logger.debug(u"PlexPy Pmsconnect :: Metadata failed") + return None + + section_id = helpers.get_xml_attr(a, 'librarySectionID') + library_name = helpers.get_xml_attr(a, 'librarySectionTitle') genres = [] actors = [] @@ -420,15 +518,54 @@ class PmsConnect(object): for director in metadata_main.getElementsByTagName('Director'): directors.append(helpers.get_xml_attr(director, 'tag')) - if metadata_type == 'show': + if metadata_type == 'movie': metadata = {'media_type': metadata_type, + 'section_id': section_id, + 'library_name': library_name, 'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'), - 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - 'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), - 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), - 'index': helpers.get_xml_attr(metadata_main, 'index'), - 'studio': helpers.get_xml_attr(metadata_main, 'studio'), + 'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'), + 'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'), 'title': helpers.get_xml_attr(metadata_main, 'title'), + 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(metadata_main, 'index'), + 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), + 'studio': helpers.get_xml_attr(metadata_main, 'studio'), + 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), + 'summary': helpers.get_xml_attr(metadata_main, 'summary'), + 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), + 'rating': helpers.get_xml_attr(metadata_main, 'rating'), + 'duration': helpers.get_xml_attr(metadata_main, 'duration'), + 'year': helpers.get_xml_attr(metadata_main, 'year'), + 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), + 'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'), + 'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'), + 'art': helpers.get_xml_attr(metadata_main, 'art'), + 'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'), + 'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'), + 'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'), + 'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'), + 'guid': helpers.get_xml_attr(metadata_main, 'guid'), + 'genres': genres, + 'actors': actors, + 'writers': writers, + 'directors': directors + } + metadata_list = {'metadata': metadata} + + elif metadata_type == 'show': + metadata = {'media_type': metadata_type, + 'section_id': section_id, + 'library_name': library_name, + 'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'), + 'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'), + 'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'), + 'title': helpers.get_xml_attr(metadata_main, 'title'), + 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(metadata_main, 'index'), + 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), + 'studio': helpers.get_xml_attr(metadata_main, 'studio'), 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), @@ -450,18 +587,22 @@ class PmsConnect(object): 'actors': actors } metadata_list = {'metadata': metadata} + elif metadata_type == 'season': parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey') show_details = self.get_metadata_details(parent_rating_key) metadata = {'media_type': metadata_type, + 'section_id': section_id, + 'library_name': library_name, 'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'), 'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'), - 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - 'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), - 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), - 'index': helpers.get_xml_attr(metadata_main, 'index'), - 'studio': show_details['metadata']['studio'], + 'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'), 'title': helpers.get_xml_attr(metadata_main, 'title'), + 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(metadata_main, 'index'), + 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), + 'studio': show_details['metadata']['studio'], 'content_rating': show_details['metadata']['content_rating'], 'summary': show_details['metadata']['summary'], 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), @@ -483,19 +624,22 @@ class PmsConnect(object): 'directors': show_details['metadata']['directors'] } metadata_list = {'metadata': metadata} + elif metadata_type == 'episode': grandparent_rating_key = helpers.get_xml_attr(metadata_main, 'grandparentRatingKey') show_details = self.get_metadata_details(grandparent_rating_key) metadata = {'media_type': metadata_type, + 'section_id': section_id, + 'library_name': library_name, 'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'), 'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'), 'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'), - 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - 'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), - 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), - 'index': helpers.get_xml_attr(metadata_main, 'index'), - 'studio': show_details['metadata']['studio'], 'title': helpers.get_xml_attr(metadata_main, 'title'), + 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(metadata_main, 'index'), + 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), + 'studio': show_details['metadata']['studio'], 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), @@ -517,45 +661,20 @@ class PmsConnect(object): 'directors': directors } metadata_list = {'metadata': metadata} - elif metadata_type == 'movie': - metadata = {'media_type': metadata_type, - 'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'), - 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - 'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), - 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), - 'index': helpers.get_xml_attr(metadata_main, 'index'), - 'studio': helpers.get_xml_attr(metadata_main, 'studio'), - 'title': helpers.get_xml_attr(metadata_main, 'title'), - 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), - 'summary': helpers.get_xml_attr(metadata_main, 'summary'), - 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), - 'rating': helpers.get_xml_attr(metadata_main, 'rating'), - 'duration': helpers.get_xml_attr(metadata_main, 'duration'), - 'year': helpers.get_xml_attr(metadata_main, 'year'), - 'thumb': helpers.get_xml_attr(metadata_main, 'thumb'), - 'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'), - 'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'), - 'art': helpers.get_xml_attr(metadata_main, 'art'), - 'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'), - 'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'), - 'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'), - 'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'), - 'guid': helpers.get_xml_attr(metadata_main, 'guid'), - 'genres': genres, - 'actors': actors, - 'writers': writers, - 'directors': directors - } - metadata_list = {'metadata': metadata} + elif metadata_type == 'artist': metadata = {'media_type': metadata_type, + 'section_id': section_id, + 'library_name': library_name, 'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'), - 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - 'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), - 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), - 'index': helpers.get_xml_attr(metadata_main, 'index'), - 'studio': helpers.get_xml_attr(metadata_main, 'studio'), + 'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'), + 'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'), 'title': helpers.get_xml_attr(metadata_main, 'title'), + 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(metadata_main, 'index'), + 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), + 'studio': helpers.get_xml_attr(metadata_main, 'studio'), 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), @@ -577,18 +696,22 @@ class PmsConnect(object): 'actors': actors } metadata_list = {'metadata': metadata} + elif metadata_type == 'album': parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey') artist_details = self.get_metadata_details(parent_rating_key) metadata = {'media_type': metadata_type, + 'section_id': section_id, + 'library_name': library_name, 'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'), 'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'), - 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - 'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), - 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), - 'index': helpers.get_xml_attr(metadata_main, 'index'), - 'studio': helpers.get_xml_attr(metadata_main, 'studio'), + 'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'), 'title': helpers.get_xml_attr(metadata_main, 'title'), + 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(metadata_main, 'index'), + 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), + 'studio': helpers.get_xml_attr(metadata_main, 'studio'), 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), 'summary': artist_details['metadata']['summary'], 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), @@ -610,19 +733,22 @@ class PmsConnect(object): 'directors': directors } metadata_list = {'metadata': metadata} + elif metadata_type == 'track': parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey') album_details = self.get_metadata_details(parent_rating_key) metadata = {'media_type': metadata_type, + 'section_id': section_id, + 'library_name': library_name, 'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'), 'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'), 'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'), - 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), - 'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), - 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), - 'index': helpers.get_xml_attr(metadata_main, 'index'), - 'studio': helpers.get_xml_attr(metadata_main, 'studio'), 'title': helpers.get_xml_attr(metadata_main, 'title'), + 'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(metadata_main, 'index'), + 'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'), + 'studio': helpers.get_xml_attr(metadata_main, 'studio'), 'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'), 'summary': helpers.get_xml_attr(metadata_main, 'summary'), 'tagline': helpers.get_xml_attr(metadata_main, 'tagline'), @@ -644,25 +770,93 @@ class PmsConnect(object): 'directors': directors } metadata_list = {'metadata': metadata} + else: return None + if get_media_info: + item_media = metadata_main.getElementsByTagName('Media') + for media in item_media: + media_info = {'container': helpers.get_xml_attr(media, 'container'), + 'bitrate': helpers.get_xml_attr(media, 'bitrate'), + 'video_codec': helpers.get_xml_attr(media, 'videoCodec'), + 'video_resolution': helpers.get_xml_attr(media, 'videoResolution'), + 'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'), + 'audio_codec': helpers.get_xml_attr(media, 'audioCodec'), + 'audio_channels': helpers.get_xml_attr(media, 'audioChannels'), + 'file': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'file'), + 'file_size': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'size'), + } + metadata.update(media_info) + return metadata_list - """ - Return processed and validated metadata list for all children of requested item. + def get_metadata_children_details(self, rating_key='', get_children=False, get_media_info=False): + """ + Return processed and validated metadata list for all children of requested item. - Parameters required: rating_key { Plex ratingKey } + Parameters required: rating_key { Plex ratingKey } - Output: array - """ - def get_metadata_children_details(self, rating_key=''): + Output: array + """ metadata = self.get_metadata_children(str(rating_key), output_format='xml') try: xml_head = metadata.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_metadata_children.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_metadata_children: %s." % e) + return {'metadata': []} + + metadata_list = [] + + for a in xml_head: + if a.getAttribute('size'): + if a.getAttribute('size') == '0': + metadata_list = {'metadata': []} + return metadata_list + + if a.getElementsByTagName('Video'): + metadata_main = a.getElementsByTagName('Video') + for item in metadata_main: + child_rating_key = helpers.get_xml_attr(item, 'ratingKey') + metadata = self.get_metadata_details(str(child_rating_key), get_media_info) + if metadata: + metadata_list.append(metadata['metadata']) + + elif a.getElementsByTagName('Track'): + metadata_main = a.getElementsByTagName('Track') + for item in metadata_main: + child_rating_key = helpers.get_xml_attr(item, 'ratingKey') + metadata = self.get_metadata_details(str(child_rating_key), get_media_info) + if metadata: + metadata_list.append(metadata['metadata']) + + elif get_children and a.getElementsByTagName('Directory'): + dir_main = a.getElementsByTagName('Directory') + metadata_main = [d for d in dir_main if helpers.get_xml_attr(d, 'ratingKey')] + for item in metadata_main: + child_rating_key = helpers.get_xml_attr(item, 'ratingKey') + metadata = self.get_metadata_children_details(str(child_rating_key), get_children, get_media_info) + if metadata: + metadata_list.extend(metadata['metadata']) + + output = {'metadata': metadata_list} + return output + + def get_library_metadata_details(self, section_id=''): + """ + Return processed and validated metadata list for requested library. + + Parameters required: section_id { Plex library key } + + Output: array + """ + libraries_data = self.get_libraries_list(output_format='xml') + + try: + xml_head = libraries_data.getElementsByTagName('MediaContainer') + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_library_metadata_details: %s." % e) return [] metadata_list = [] @@ -673,37 +867,41 @@ class PmsConnect(object): metadata_list = {'metadata': None} return metadata_list - if a.getElementsByTagName('Video'): - metadata_main = a.getElementsByTagName('Video') - for item in metadata_main: - child_rating_key = helpers.get_xml_attr(item, 'ratingKey') - metadata = self.get_metadata_details(str(child_rating_key)) - if metadata: - metadata_list.append(metadata['metadata']) + if a.getElementsByTagName('Directory'): + result_data = a.getElementsByTagName('Directory') + for result in result_data: + key = helpers.get_xml_attr(result, 'key') + if key == section_id: + metadata = {'media_type': 'library', + 'section_id': helpers.get_xml_attr(result, 'key'), + 'library': helpers.get_xml_attr(result, 'type'), + 'title': helpers.get_xml_attr(result, 'title'), + 'art': helpers.get_xml_attr(result, 'art'), + 'thumb': helpers.get_xml_attr(result, 'thumb') + } + if metadata['library'] == 'movie': + metadata['section_type'] = 'movie' + elif metadata['library'] == 'show': + metadata['section_type'] = 'episode' + elif metadata['library'] == 'artist': + metadata['section_type'] = 'track' - elif a.getElementsByTagName('Track'): - metadata_main = a.getElementsByTagName('Track') - for item in metadata_main: - child_rating_key = helpers.get_xml_attr(item, 'ratingKey') - metadata = self.get_metadata_details(str(child_rating_key)) - if metadata: - metadata_list.append(metadata['metadata']) - - output = {'metadata': metadata_list} - return output + metadata_list = {'metadata': metadata} + + return metadata_list - """ - Return processed and validated session list. - - Output: array - """ def get_current_activity(self): + """ + Return processed and validated session list. + + Output: array + """ session_data = self.get_sessions(output_format='xml') try: xml_head = session_data.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_sessions.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_sessions: %s." % e) return [] session_list = [] @@ -741,15 +939,15 @@ class PmsConnect(object): return output - """ - Return selected data from current sessions. - This function processes and validates session data - - Parameters required: stream_type { track or video } - session { the session dictionary } - Output: dict - """ def get_session_each(self, stream_type='', session=None): + """ + Return selected data from current sessions. + This function processes and validates session data + + Parameters required: stream_type { track or video } + session { the session dictionary } + Output: dict + """ session_output = None user_data = users.Users() @@ -783,7 +981,7 @@ class PmsConnect(object): transcode_container = '' transcode_protocol = '' - user_details = user_data.get_user_details( + user_details = user_data.get_details( user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title')) if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Track'): @@ -792,6 +990,7 @@ class PmsConnect(object): machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier') session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'), + 'section_id': helpers.get_xml_attr(session, 'librarySectionID'), 'media_index': helpers.get_xml_attr(session, 'index'), 'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'), 'art': helpers.get_xml_attr(session, 'art'), @@ -802,7 +1001,7 @@ class PmsConnect(object): 'user': user_details['username'], 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], - 'user_thumb': user_details['thumb'], + 'user_thumb': user_details['user_thumb'], 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1], 'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), @@ -903,7 +1102,7 @@ class PmsConnect(object): else: use_indexes = 0 - user_details = user_data.get_user_details( + user_details = user_data.get_details( user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title')) if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Video'): @@ -913,6 +1112,7 @@ class PmsConnect(object): if helpers.get_xml_attr(session, 'type') == 'episode': session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'), + 'section_id': helpers.get_xml_attr(session, 'librarySectionID'), 'media_index': helpers.get_xml_attr(session, 'index'), 'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'), 'art': helpers.get_xml_attr(session, 'art'), @@ -923,7 +1123,7 @@ class PmsConnect(object): 'user': user_details['username'], 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], - 'user_thumb': user_details['thumb'], + 'user_thumb': user_details['user_thumb'], 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1], 'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), @@ -970,6 +1170,7 @@ class PmsConnect(object): elif helpers.get_xml_attr(session, 'type') == 'movie': session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'), + 'section_id': helpers.get_xml_attr(session, 'librarySectionID'), 'media_index': helpers.get_xml_attr(session, 'index'), 'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'), 'art': helpers.get_xml_attr(session, 'art'), @@ -980,7 +1181,7 @@ class PmsConnect(object): 'user': user_details['username'], 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], - 'user_thumb': user_details['thumb'], + 'user_thumb': user_details['user_thumb'], 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1], 'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), @@ -1027,6 +1228,7 @@ class PmsConnect(object): elif helpers.get_xml_attr(session, 'type') == 'clip': session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'), + 'section_id': helpers.get_xml_attr(session, 'librarySectionID'), 'media_index': helpers.get_xml_attr(session, 'index'), 'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'), 'art': helpers.get_xml_attr(session, 'art'), @@ -1037,7 +1239,7 @@ class PmsConnect(object): 'user': user_details['username'], 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], - 'user_thumb': user_details['thumb'], + 'user_thumb': user_details['user_thumb'], 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1], 'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), @@ -1108,7 +1310,7 @@ class PmsConnect(object): transcode_container = '' transcode_protocol = '' - user_details = user_data.get_user_details( + user_details = user_data.get_details( user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title')) if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Photo'): @@ -1117,6 +1319,7 @@ class PmsConnect(object): machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier') session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'), + 'section_id': helpers.get_xml_attr(session, 'librarySectionID'), 'media_index': helpers.get_xml_attr(session, 'index'), 'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'), 'art': helpers.get_xml_attr(session, 'art'), @@ -1127,7 +1330,7 @@ class PmsConnect(object): 'user': user_details['username'], 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], - 'user_thumb': user_details['thumb'], + 'user_thumb': user_details['user_thumb'], 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1], 'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), @@ -1170,7 +1373,7 @@ class PmsConnect(object): } else: - logger.warn(u"No known stream types found in session list.") + logger.warn(u"PlexPy Pmsconnect :: No known stream types found in session list.") # Rename Mystery platform names session_output['platform'] = common.PLATFORM_NAME_OVERRIDES.get(session_output['platform'], @@ -1178,18 +1381,18 @@ class PmsConnect(object): return session_output - """ - Return processed and validated children list. - - Output: array - """ def get_item_children(self, rating_key=''): + """ + Return processed and validated children list. + + Output: array + """ children_data = self.get_children_list(rating_key, output_format='xml') try: xml_head = children_data.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_children_list.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_children_list: %s." % e) return [] children_list = [] @@ -1197,7 +1400,7 @@ class PmsConnect(object): for a in xml_head: if a.getAttribute('size'): if a.getAttribute('size') == '0': - logger.debug(u"No children data.") + logger.debug(u"PlexPy Pmsconnect :: No children data.") children_list = {'children_count': '0', 'children_list': [] } @@ -1215,7 +1418,7 @@ class PmsConnect(object): if result_data: for result in result_data: children_output = {'rating_key': helpers.get_xml_attr(result, 'ratingKey'), - 'index': helpers.get_xml_attr(result, 'index'), + 'media_index': helpers.get_xml_attr(result, 'index'), 'title': helpers.get_xml_attr(result, 'title'), 'thumb': helpers.get_xml_attr(result, 'thumb'), 'parent_thumb': helpers.get_xml_attr(a, 'thumb'), @@ -1231,18 +1434,18 @@ class PmsConnect(object): return output - """ - Return the list of local servers. - - Output: array - """ def get_servers_info(self): + """ + Return the list of local servers. + + Output: array + """ recent = self.get_server_list(output_format='xml') try: xml_head = recent.getElementsByTagName('Server') - except: - logger.warn("Unable to parse XML for get_server_list.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_server_list: %s." % e) return [] server_info = [] @@ -1258,18 +1461,18 @@ class PmsConnect(object): return server_info - """ - Return the local machine identity. - - Output: dict - """ def get_server_identity(self): + """ + Return the local machine identity. + + Output: dict + """ identity = self.get_local_server_identity(output_format='xml') try: xml_head = identity.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_local_server_identity.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_local_server_identity: %s." % e) return [] server_identity = {} @@ -1280,21 +1483,21 @@ class PmsConnect(object): return server_identity - """ - Return a specified server preference. - - Parameters required: pref { name of preference } - - Output: string - """ def get_server_pref(self, pref=None): + """ + Return a specified server preference. + + Parameters required: pref { name of preference } + + Output: string + """ if pref: prefs = self.get_server_prefs(output_format='xml') try: xml_head = prefs.getElementsByTagName('Setting') - except: - logger.warn("Unable to parse XML for get_local_server_name.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_local_server_name: %s." % e) return '' pref_value = 'None' @@ -1305,21 +1508,21 @@ class PmsConnect(object): return pref_value else: - logger.debug(u"Server preferences queried but no parameter received.") + logger.debug(u"PlexPy Pmsconnect :: Server preferences queried but no parameter received.") return None - """ - Return processed and validated server libraries list. - - Output: array - """ def get_server_children(self): + """ + Return processed and validated server libraries list. + + Output: array + """ libraries_data = self.get_libraries_list(output_format='xml') try: xml_head = libraries_data.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_libraries_list.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_libraries_list: %s." % e) return [] libraries_list = [] @@ -1327,7 +1530,7 @@ class PmsConnect(object): for a in xml_head: if a.getAttribute('size'): if a.getAttribute('size') == '0': - logger.debug(u"No libraries data.") + logger.debug(u"PlexPy Pmsconnect :: No libraries data.") libraries_list = {'libraries_count': '0', 'libraries_list': [] } @@ -1336,10 +1539,11 @@ class PmsConnect(object): if a.getElementsByTagName('Directory'): result_data = a.getElementsByTagName('Directory') for result in result_data: - libraries_output = {'key': helpers.get_xml_attr(result, 'key'), - 'type': helpers.get_xml_attr(result, 'type'), - 'title': helpers.get_xml_attr(result, 'title'), - 'thumb': helpers.get_xml_attr(result, 'thumb') + libraries_output = {'section_id': helpers.get_xml_attr(result, 'key'), + 'section_type': helpers.get_xml_attr(result, 'type'), + 'section_name': helpers.get_xml_attr(result, 'title'), + 'thumb': helpers.get_xml_attr(result, 'thumb'), + 'art': helpers.get_xml_attr(result, 'art') } libraries_list.append(libraries_output) @@ -1350,70 +1554,129 @@ class PmsConnect(object): return output - """ - Return processed and validated server library items list. + def get_library_children_details(self, section_id='', section_type='', list_type='all', count='', rating_key='', get_media_info=False): + """ + Return processed and validated server library items list. - Parameters required: library_type { movie, show, episode, artist } - section_key { unique library key } + Parameters required: section_type { movie, show, episode, artist } + section_id { unique library key } - Output: array - """ - def get_library_children(self, library_type='', section_key='', list_type='all', sort_type = ''): + Output: array + """ - # Currently only grab the library with 1 items so 'size' is not 0 - count = '1' - - if library_type == 'movie': + if section_type == 'movie': sort_type = '&type=1' - elif library_type == 'show': + elif section_type == 'show': sort_type = '&type=2' - elif library_type == 'episode': + elif section_type == 'season': + sort_type = '&type=3' + elif section_type == 'episode': sort_type = '&type=4' - elif library_type == 'album': - list_type = 'albums' + elif section_type == 'artist': + sort_type = '&type=8' + elif section_type == 'album': + sort_type = '&type=9' + elif section_type == 'track': + sort_type = '&type=10' + elif section_type == 'photo': + sort_type = '' + elif section_type == 'photoAlbum': + sort_type = '&type=14' + elif section_type == 'picture': + sort_type = '&type=13' + else: + sort_type = '' - library_data = self.get_library_list(section_key, list_type, count, sort_type, output_format='xml') - - try: - xml_head = library_data.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_library_children.") + if str(section_id).isdigit(): + library_data = self.get_library_list(section_id, list_type, count, sort_type, output_format='xml') + elif str(rating_key).isdigit(): + library_data = self.get_children_list(rating_key, output_format='xml') + else: + logger.warn(u"PlexPy Pmsconnect :: get_library_children called by invalid section_id or rating_key provided.") return [] - library_list = [] + try: + xml_head = library_data.getElementsByTagName('MediaContainer') + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_library_children_details: %s." % e) + return [] + + childern_list = [] for a in xml_head: if a.getAttribute('size'): if a.getAttribute('size') == '0': - logger.debug(u"No library data.") - library_list = {'library_count': '0', - 'library_list': [] + logger.debug(u"PlexPy Pmsconnect :: No library data.") + childern_list = {'library_count': '0', + 'childern_list': [] } - return library_list + return childern_list + if rating_key: + library_count = helpers.get_xml_attr(xml_head[0], 'size') + else: + library_count = helpers.get_xml_attr(xml_head[0], 'totalSize') + + # Get show/season info from xml_head + + item_main = [] if a.getElementsByTagName('Directory'): - result_data = a.getElementsByTagName('Directory') - for result in result_data: - library_output = {'key': helpers.get_xml_attr(result, 'key'), - 'type': helpers.get_xml_attr(result, 'type'), - 'title': helpers.get_xml_attr(result, 'title'), - 'thumb': helpers.get_xml_attr(result, 'thumb') + dir_main = a.getElementsByTagName('Directory') + item_main += [d for d in dir_main if helpers.get_xml_attr(d, 'ratingKey')] + if a.getElementsByTagName('Video'): + item_main += a.getElementsByTagName('Video') + if a.getElementsByTagName('Track'): + item_main += a.getElementsByTagName('Track') + if a.getElementsByTagName('Photo'): + item_main += a.getElementsByTagName('Photo') + + for item in item_main: + item_info = {'section_id': helpers.get_xml_attr(a, 'librarySectionID'), + 'media_type': helpers.get_xml_attr(item, 'type'), + 'rating_key': helpers.get_xml_attr(item, 'ratingKey'), + 'parent_rating_key': helpers.get_xml_attr(item, 'parentRatingKey'), + 'grandparent_rating_key': helpers.get_xml_attr(a, 'grandparentRatingKey'), + 'title': helpers.get_xml_attr(item, 'title'), + 'parent_title': helpers.get_xml_attr(a, 'parentTitle'), + 'grandparent_title': helpers.get_xml_attr(a, 'grandparentTitle'), + 'media_index': helpers.get_xml_attr(item, 'index'), + 'parent_media_index': helpers.get_xml_attr(a, 'parentIndex'), + 'year': helpers.get_xml_attr(item, 'year'), + 'thumb': helpers.get_xml_attr(item, 'thumb'), + 'parent_thumb': helpers.get_xml_attr(a, 'thumb'), + 'grandparent_thumb': helpers.get_xml_attr(a, 'grandparentThumb'), + 'added_at': helpers.get_xml_attr(item, 'addedAt') + } + + if get_media_info: + item_media = item.getElementsByTagName('Media') + for media in item_media: + media_info = {'container': helpers.get_xml_attr(media, 'container'), + 'bitrate': helpers.get_xml_attr(media, 'bitrate'), + 'video_codec': helpers.get_xml_attr(media, 'videoCodec'), + 'video_resolution': helpers.get_xml_attr(media, 'videoResolution'), + 'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'), + 'audio_codec': helpers.get_xml_attr(media, 'audioCodec'), + 'audio_channels': helpers.get_xml_attr(media, 'audioChannels'), + 'file': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'file'), + 'file_size': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'size'), } - library_list.append(library_output) + item_info.update(media_info) - output = {'library_count': helpers.get_xml_attr(xml_head[0], 'totalSize'), - 'count_type': helpers.get_xml_attr(xml_head[0], 'title2'), - 'library_list': library_list + childern_list.append(item_info) + + output = {'library_count': library_count, + 'childern_list': childern_list } - + return output - """ - Return processed and validated library statistics. + def get_library_details(self): + """ + Return processed and validated library statistics. - Output: array - """ - def get_library_stats(self, library_cards=''): + Output: array + """ server_libraries = self.get_server_children() server_library_stats = [] @@ -1422,49 +1685,66 @@ class PmsConnect(object): libraries_list = server_libraries['libraries_list'] for library in libraries_list: - library_type = library['type'] - section_key = library['key'] - if section_key in library_cards: - library_list = self.get_library_children(library_type, section_key) - else: - continue + section_type = library['section_type'] + section_id = library['section_id'] + children_list = self.get_library_children_details(section_id=section_id, section_type=section_type, count='1') - if library_list['library_count'] != '0': - library_stats = {'title': library['title'], + if children_list and children_list['library_count'] != '0': + library_stats = {'section_id': library['section_id'], + 'section_name': library['section_name'], + 'section_type': section_type, 'thumb': library['thumb'], - 'count': library_list['library_count'], - 'count_type': library_list['count_type'] + 'art': library['art'], + 'count': children_list['library_count'] } - if library_type == 'show': - episode_list = self.get_library_children(library_type='episode', section_key=section_key) - episode_stats = {'episode_count': episode_list['library_count'], - 'episode_count_type': 'All Episodes' - } - library_stats.update(episode_stats) + if section_type == 'show': + parent_list = self.get_library_children_details(section_id=section_id, section_type='season', count='1') + if parent_list: + parent_stats = {'parent_count': parent_list['library_count']} + library_stats.update(parent_stats) - if library_type == 'artist': - album_list = self.get_library_children(library_type='album', section_key=section_key) - album_stats = {'album_count': album_list['library_count'], - 'album_count_type': 'All Albums' - } - library_stats.update(album_stats) + child_list = self.get_library_children_details(section_id=section_id, section_type='episode', count='1') + if child_list: + child_stats = {'child_count': child_list['library_count']} + library_stats.update(child_stats) - server_library_stats.append({'type': library_type, - 'rows': library_stats}) + if section_type == 'artist': + parent_list = self.get_library_children_details(section_id=section_id, section_type='album', count='1') + if parent_list: + parent_stats = {'parent_count': parent_list['library_count']} + library_stats.update(parent_stats) + + child_list = self.get_library_children_details(section_id=section_id, section_type='track', count='1') + if child_list: + child_stats = {'child_count': child_list['library_count']} + library_stats.update(child_stats) + + if section_type == 'photo': + parent_list = self.get_library_children_details(section_id=section_id, section_type='photoAlbum', count='1') + if parent_list: + parent_stats = {'parent_count': parent_list['library_count']} + library_stats.update(parent_stats) + + child_list = self.get_library_children_details(section_id=section_id, section_type='picture', count='1') + if child_list: + child_stats = {'child_count': child_list['library_count']} + library_stats.update(child_stats) + + server_library_stats.append(library_stats) return server_library_stats - """ - Return image data as array. - Array contains the image content type and image binary - - Parameters required: img { Plex image location } - Optional parameters: width { the image width } - height { the image height } - Output: array - """ def get_image(self, img=None, width=None, height=None): + """ + Return image data as array. + Array contains the image content type and image binary + + Parameters required: img { Plex image location } + Optional parameters: width { the image width } + height { the image height } + Output: array + """ if img: if width.isdigit() and height.isdigit(): uri = '/photo/:/transcode?url=http://127.0.0.1:32400' + img + '&width=' + width + '&height=' + height @@ -1478,15 +1758,15 @@ class PmsConnect(object): return [request, content_type] else: - logger.error("Image proxy queries but no input received.") + logger.error(u"PlexPy Pmsconnect :: Image proxy queries but no input received.") return None - """ - Return processed list of search results. - - Output: array - """ def get_search_results(self, query=''): + """ + Return processed list of search results. + + Output: array + """ search_results = self.get_search(query=query, output_format='xml') search_results_tracks = self.get_search(query=query, track='&type=10', output_format='xml') @@ -1500,8 +1780,8 @@ class PmsConnect(object): xml_head += search_results_tracks.getElementsByTagName('MediaContainer') except: pass - except: - logger.warn("Unable to parse XML for get_search_result_details.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_search_result_details: %s." % e) return [] search_results_count = 0 @@ -1519,7 +1799,7 @@ class PmsConnect(object): if a.getAttribute('size'): totalSize += int(a.getAttribute('size')) if totalSize == 0: - logger.debug(u"No search results.") + logger.debug(u"PlexPy Pmsconnect :: No search results.") search_results_list = {'results_count': search_results_count, 'results_list': [] } @@ -1574,12 +1854,12 @@ class PmsConnect(object): return output - """ - Return processed list of grandparent/parent/child rating keys. - - Output: array - """ def get_rating_keys_list(self, rating_key='', media_type=''): + """ + Return processed list of grandparent/parent/child rating keys. + + Output: array + """ if media_type == 'movie': key_list = {0: {'rating_key': int(rating_key)}} @@ -1589,22 +1869,29 @@ class PmsConnect(object): match_type = 'title' else: match_type = 'index' - + + section_id = None + library_name = None + # get grandparent rating key if media_type == 'season' or media_type == 'album': try: metadata = self.get_metadata_details(rating_key=rating_key) rating_key = metadata['metadata']['parent_rating_key'] - except: - logger.warn("Unable to get parent_rating_key for get_rating_keys_list.") + section_id = metadata['metadata']['section_id'] + library_name = metadata['metadata']['library_name'] + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to get parent_rating_key for get_rating_keys_list: %s." % e) return {} elif media_type == 'episode' or media_type == 'track': try: metadata = self.get_metadata_details(rating_key=rating_key) rating_key = metadata['metadata']['grandparent_rating_key'] - except: - logger.warn("Unable to get grandparent_rating_key for get_rating_keys_list.") + section_id = metadata['metadata']['section_id'] + library_name = metadata['metadata']['library_name'] + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to get grandparent_rating_key for get_rating_keys_list: %s." % e) return {} # get parent_rating_keys @@ -1612,8 +1899,8 @@ class PmsConnect(object): try: xml_head = metadata.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_rating_keys_list.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_rating_keys_list: %s." % e) return {} for a in xml_head: @@ -1640,8 +1927,8 @@ class PmsConnect(object): try: xml_head = metadata.getElementsByTagName('MediaContainer') - except: - logger.warn("Unable to parse XML for get_rating_keys_list.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_rating_keys_list: %s." % e) return {} for a in xml_head: @@ -1668,16 +1955,18 @@ class PmsConnect(object): key = int(parent_index) if match_type == 'index' else parent_title parents.update({key: - {'rating_key': int(parent_rating_key), - 'children': children} - }) + {'rating_key': int(parent_rating_key), + 'children': children} + }) key = 0 if match_type == 'index' else title key_list = {key: {'rating_key': int(rating_key), - 'children': parents} - } - + 'children': parents }, + 'section_id': section_id, + 'library_name': library_name + } + return key_list def get_server_response(self): @@ -1687,8 +1976,8 @@ class PmsConnect(object): try: xml_head = account_data.getElementsByTagName('MyPlex') - except: - logger.warn("Unable to parse XML for get_server_response.") + except Exception as e: + logger.warn(u"PlexPy Pmsconnect :: Unable to parse XML for get_server_response: %s." % e) return None server_response = {} @@ -1700,4 +1989,4 @@ class PmsConnect(object): 'public_port': helpers.get_xml_attr(a, 'publicPort') } - return server_response + return server_response \ No newline at end of file diff --git a/plexpy/users.py b/plexpy/users.py index c7adfedd..a737a811 100644 --- a/plexpy/users.py +++ b/plexpy/users.py @@ -21,29 +21,30 @@ class Users(object): def __init__(self): pass - def get_user_list(self, kwargs=None): + def get_datatables_list(self, kwargs=None): data_tables = datatables.DataTables() custom_where = ['users.deleted_user', 0] - columns = ['session_history.id', - 'users.user_id as user_id', - 'users.custom_avatar_url as user_thumb', - '(case when users.friendly_name is null then users.username else \ - users.friendly_name end) as friendly_name', - 'MAX(session_history.started) as last_seen', - 'session_history.ip_address as ip_address', - 'COUNT(session_history.id) as plays', - 'session_history.platform as platform', - 'session_history.player as player', - 'session_history_metadata.full_title as last_watched', + columns = ['users.user_id', + '(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \ + THEN users.username ELSE users.friendly_name END) AS friendly_name', + 'users.thumb AS user_thumb', + 'users.custom_avatar_url AS custom_thumb', + 'COUNT(session_history.id) AS plays', + 'MAX(session_history.started) AS last_seen', + 'MAX(session_history.id) AS id', + 'session_history_metadata.full_title AS last_watched', + 'session_history.ip_address', + 'session_history.platform', + 'session_history.player', 'session_history_metadata.thumb', 'session_history_metadata.parent_thumb', 'session_history_metadata.grandparent_thumb', 'session_history_metadata.media_type', - 'session_history.rating_key as rating_key', + 'session_history.rating_key', 'session_history_media_info.video_decision', - 'users.username as user', + 'session_history_media_info.audio_decision', 'users.do_notify as do_notify', 'users.keep_history as keep_history' ] @@ -62,8 +63,8 @@ class Users(object): ['session_history.id', 'session_history_metadata.id'], ['session_history.id', 'session_history_media_info.id']], kwargs=kwargs) - except: - logger.warn("Unable to execute database query.") + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for get_list: %s." % e) return {'recordsFiltered': 0, 'recordsTotal': 0, 'draw': 0, @@ -74,38 +75,40 @@ class Users(object): rows = [] for item in users: - if item["media_type"] == 'episode' and item["parent_thumb"]: - thumb = item["parent_thumb"] - elif item["media_type"] == 'episode': - thumb = item["grandparent_thumb"] + if item['media_type'] == 'episode' and item['parent_thumb']: + thumb = item['parent_thumb'] + elif item['media_type'] == 'episode': + thumb = item['grandparent_thumb'] else: - thumb = item["thumb"] + thumb = item['thumb'] - if not item['user_thumb'] or item['user_thumb'] == '': - user_thumb = common.DEFAULT_USER_THUMB - else: + if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']: + user_thumb = item['custom_thumb'] + elif item['user_thumb']: user_thumb = item['user_thumb'] + else: + user_thumb = common.DEFAULT_USER_THUMB # Rename Mystery platform names - platform = common.PLATFORM_NAME_OVERRIDES.get(item["platform"], item["platform"]) + platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']) - row = {"id": item['id'], - "plays": item['plays'], - "last_seen": item['last_seen'], - "friendly_name": item['friendly_name'], - "ip_address": item['ip_address'], - "platform": platform, - "player": item["player"], - "last_watched": item['last_watched'], - "thumb": thumb, - "media_type": item['media_type'], - "rating_key": item['rating_key'], - "video_decision": item['video_decision'], - "user_thumb": user_thumb, - "user": item["user"], - "user_id": item['user_id'], - "do_notify": helpers.checked(item['do_notify']), - "keep_history": helpers.checked(item['keep_history']) + row = {'user_id': item['user_id'], + 'friendly_name': item['friendly_name'], + 'user_thumb': user_thumb, + 'plays': item['plays'], + 'last_seen': item['last_seen'], + 'last_watched': item['last_watched'], + 'id': item['id'], + 'ip_address': item['ip_address'], + 'platform': platform, + 'player': item['player'], + 'thumb': thumb, + 'media_type': item['media_type'], + 'rating_key': item['rating_key'], + 'video_decision': item['video_decision'], + 'audio_decision': item['audio_decision'], + 'do_notify': helpers.checked(item['do_notify']), + 'keep_history': helpers.checked(item['keep_history']) } rows.append(row) @@ -114,39 +117,38 @@ class Users(object): 'recordsTotal': query['totalCount'], 'data': rows, 'draw': query['draw'] - } + } return dict - def get_user_unique_ips(self, kwargs=None, custom_where=None): + def get_datatables_unique_ips(self, user_id=None, kwargs=None): data_tables = datatables.DataTables() - # Change custom_where column name due to ambiguous column name after JOIN - custom_where[0][0] = 'custom_user_id' if custom_where[0][0] == 'user_id' else custom_where[0][0] + custom_where = ['users.user_id', user_id] columns = ['session_history.id', - 'session_history.started as last_seen', - 'session_history.ip_address as ip_address', - 'COUNT(session_history.id) as play_count', - 'session_history.platform as platform', - 'session_history.player as player', - 'session_history_metadata.full_title as last_watched', + 'session_history.started AS last_seen', + 'session_history.ip_address', + 'COUNT(session_history.id) AS play_count', + 'session_history.platform', + 'session_history.player', + 'session_history_metadata.full_title AS last_watched', 'session_history_metadata.thumb', 'session_history_metadata.parent_thumb', 'session_history_metadata.grandparent_thumb', 'session_history_metadata.media_type', - 'session_history.rating_key as rating_key', + 'session_history.rating_key', 'session_history_media_info.video_decision', - 'session_history.user as user', + 'session_history.user', 'session_history.user_id as custom_user_id', - '(case when users.friendly_name is null then users.username else \ - users.friendly_name end) as friendly_name' + '(CASE WHEN users.friendly_name IS NULL THEN users.username ELSE \ + users.friendly_name END) AS friendly_name' ] try: query = data_tables.ssp_query(table_name='session_history', columns=columns, - custom_where=custom_where, + custom_where=[custom_where], group_by=['ip_address'], join_types=['JOIN', 'JOIN', @@ -158,8 +160,8 @@ class Users(object): ['session_history.id', 'session_history_metadata.id'], ['session_history.id', 'session_history_media_info.id']], kwargs=kwargs) - except: - logger.warn("Unable to execute database query.") + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for get_unique_ips: %s." % e) return {'recordsFiltered': 0, 'recordsTotal': 0, 'draw': 0, @@ -180,18 +182,18 @@ class Users(object): # Rename Mystery platform names platform = common.PLATFORM_NAME_OVERRIDES.get(item["platform"], item["platform"]) - row = {"id": item['id'], - "last_seen": item['last_seen'], - "ip_address": item['ip_address'], - "play_count": item['play_count'], - "platform": platform, - "player": item['player'], - "last_watched": item['last_watched'], - "thumb": thumb, - "media_type": item['media_type'], - "rating_key": item['rating_key'], - "video_decision": item['video_decision'], - "friendly_name": item['friendly_name'] + row = {'id': item['id'], + 'last_seen': item['last_seen'], + 'ip_address': item['ip_address'], + 'play_count': item['play_count'], + 'platform': platform, + 'player': item['player'], + 'last_watched': item['last_watched'], + 'thumb': thumb, + 'media_type': item['media_type'], + 'rating_key': item['rating_key'], + 'video_decision': item['video_decision'], + 'friendly_name': item['friendly_name'] } rows.append(row) @@ -200,290 +202,173 @@ class Users(object): 'recordsTotal': query['totalCount'], 'data': rows, 'draw': query['draw'] - } + } return dict - # TODO: The getter and setter for this needs to become a config getter/setter for more than just friendlyname - def set_user_friendly_name(self, user=None, user_id=None, friendly_name=None, do_notify=0, keep_history=1): - if user_id: - if friendly_name.strip() == '': - friendly_name = None - + def set_config(self, user_id=None, friendly_name='', custom_thumb='', do_notify=1, keep_history=1): + if str(user_id).isdigit(): monitor_db = database.MonitorDatabase() - control_value_dict = {"user_id": user_id} - new_value_dict = {"friendly_name": friendly_name, - "do_notify": do_notify, - "keep_history": keep_history} + key_dict = {'user_id': user_id} + value_dict = {'friendly_name': friendly_name, + 'custom_avatar_url': custom_thumb, + 'do_notify': do_notify, + 'keep_history': keep_history} try: - monitor_db.upsert('users', new_value_dict, control_value_dict) - except Exception, e: - logger.debug(u"Uncaught exception %s" % e) - if user: - if friendly_name.strip() == '': - friendly_name = None + monitor_db.upsert('users', value_dict, key_dict) + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for set_config: %s." % e) - monitor_db = database.MonitorDatabase() - - control_value_dict = {"username": user} - new_value_dict = {"friendly_name": friendly_name, - "do_notify": do_notify, - "keep_history": keep_history} - try: - monitor_db.upsert('users', new_value_dict, control_value_dict) - except Exception, e: - logger.debug(u"Uncaught exception %s" % e) - - def set_user_profile_url(self, user=None, user_id=None, profile_url=None): - if user_id: - if profile_url.strip() == '': - profile_url = None - - monitor_db = database.MonitorDatabase() - - control_value_dict = {"user_id": user_id} - new_value_dict = {"custom_avatar_url": profile_url} - try: - monitor_db.upsert('users', new_value_dict, control_value_dict) - except Exception, e: - logger.debug(u"Uncaught exception %s" % e) - if user: - if profile_url.strip() == '': - profile_url = None - - monitor_db = database.MonitorDatabase() - - control_value_dict = {"username": user} - new_value_dict = {"custom_avatar_url": profile_url} - try: - monitor_db.upsert('users', new_value_dict, control_value_dict) - except Exception, e: - logger.debug(u"Uncaught exception %s" % e) - - def get_user_friendly_name(self, user=None, user_id=None): - if user_id: - monitor_db = database.MonitorDatabase() - query = 'select username, ' \ - '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END) as friendly_name,' \ - 'do_notify, keep_history, custom_avatar_url as thumb ' \ - 'FROM users WHERE user_id = ?' - result = monitor_db.select(query, args=[user_id]) - if result: - user_detail = {'user_id': user_id, - 'user': result[0]['username'], - 'friendly_name': result[0]['friendly_name'], - 'thumb': result[0]['thumb'], - 'do_notify': helpers.checked(result[0]['do_notify']), - 'keep_history': helpers.checked(result[0]['keep_history']) - } - return user_detail - else: - user_detail = {'user_id': user_id, - 'user': '', - 'friendly_name': '', - 'do_notify': '', - 'thumb': '', - 'keep_history': ''} - return user_detail - elif user: - monitor_db = database.MonitorDatabase() - query = 'select user_id, ' \ - '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END) as friendly_name,' \ - 'do_notify, keep_history, custom_avatar_url as thumb ' \ - 'FROM users WHERE username = ?' - result = monitor_db.select(query, args=[user]) - if result: - user_detail = {'user_id': result[0]['user_id'], - 'user': user, - 'friendly_name': result[0]['friendly_name'], - 'thumb': result[0]['thumb'], - 'do_notify': helpers.checked(result[0]['do_notify']), - 'keep_history': helpers.checked(result[0]['keep_history'])} - return user_detail - else: - user_detail = {'user_id': None, - 'user': user, - 'friendly_name': '', - 'do_notify': '', - 'thumb': '', - 'keep_history': ''} - return user_detail - - return None - - def get_user_id(self, user=None): - if user: - try: - monitor_db = database.MonitorDatabase() - query = 'select user_id FROM users WHERE username = ?' - result = monitor_db.select_single(query, args=[user]) - if result: - return result['user_id'] - else: - return None - except: - return None - - return None - - def get_user_details(self, user=None, user_id=None): + def get_details(self, user_id=None, user=None): from plexpy import plextv monitor_db = database.MonitorDatabase() - - if user: - query = 'SELECT user_id, username, friendly_name, email, ' \ - 'custom_avatar_url as thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \ - 'FROM users ' \ - 'WHERE username = ? ' \ - 'UNION ALL ' \ - 'SELECT null, user, null, null, null, null, null, null, null ' \ - 'FROM session_history ' \ - 'WHERE user = ? ' \ - 'GROUP BY user ' \ - 'LIMIT 1' - result = monitor_db.select(query, args=[user, user]) - elif user_id: - query = 'SELECT user_id, username, friendly_name, email, ' \ - 'custom_avatar_url as thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \ - 'FROM users ' \ - 'WHERE user_id = ? ' \ - 'UNION ALL ' \ - 'SELECT user_id, user, null, null, null, null, null, null, null ' \ - 'FROM session_history ' \ - 'WHERE user_id = ? ' \ - 'GROUP BY user ' \ - 'LIMIT 1' - result = monitor_db.select(query, args=[user_id, user_id]) - else: - result = None + + try: + if str(user_id).isdigit(): + query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \ + 'email, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history ' \ + 'FROM users ' \ + 'WHERE user_id = ? ' + result = monitor_db.select(query, args=[user_id]) + elif user: + query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \ + 'email, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history ' \ + 'FROM users ' \ + 'WHERE username = ? ' + result = monitor_db.select(query, args=[user]) + else: + result = [] + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for get_details: %s." % e) + result = [] if result: user_details = {} for item in result: - if not item['friendly_name']: - friendly_name = item['username'] - else: + if item['friendly_name']: friendly_name = item['friendly_name'] - if not item['thumb'] or item['thumb'] == '': - user_thumb = common.DEFAULT_USER_THUMB else: - user_thumb = item['thumb'] + friendly_name = item['username'] - user_details = {"user_id": item['user_id'], - "username": item['username'], - "friendly_name": friendly_name, - "email": item['email'], - "thumb": user_thumb, - "is_home_user": item['is_home_user'], - "is_allow_sync": item['is_allow_sync'], - "is_restricted": item['is_restricted'], - "do_notify": item['do_notify'] + if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']: + user_thumb = item['custom_thumb'] + elif item['user_thumb']: + user_thumb = item['user_thumb'] + else: + user_thumb = common.DEFAULT_USER_THUMB + + user_details = {'user_id': item['user_id'], + 'username': item['username'], + 'friendly_name': friendly_name, + 'user_thumb': user_thumb, + 'email': item['email'], + 'is_home_user': item['is_home_user'], + 'is_allow_sync': item['is_allow_sync'], + 'is_restricted': item['is_restricted'], + 'do_notify': item['do_notify'], + 'keep_history': item['keep_history'] } return user_details else: - logger.warn(u"PlexPy :: Unable to retrieve user from local database. Requesting user list refresh.") + logger.warn(u"PlexPy Users :: Unable to retrieve user from local database. Requesting user list refresh.") # Let's first refresh the user list to make sure the user isn't newly added and not in the db yet - if user: - # Refresh users - plextv.refresh_users() - query = 'SELECT user_id, username, friendly_name, email, ' \ - 'custom_avatar_url as thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \ - 'FROM users ' \ - 'WHERE username = ? ' \ - 'UNION ALL ' \ - 'SELECT null, user, null, null, null, null, null, null, null ' \ - 'FROM session_history ' \ - 'WHERE user = ? ' \ - 'GROUP BY user ' \ - 'LIMIT 1' - result = monitor_db.select(query, args=[user, user]) - elif user_id: - # Refresh users - plextv.refresh_users() - query = 'SELECT user_id, username, friendly_name, email, ' \ - 'custom_avatar_url as thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \ - 'FROM users ' \ - 'WHERE user_id = ? ' \ - 'UNION ALL ' \ - 'SELECT user_id, user, null, null, null, null, null, null, null ' \ - 'FROM session_history ' \ - 'WHERE user_id = ? ' \ - 'GROUP BY user ' \ - 'LIMIT 1' - result = monitor_db.select(query, args=[user_id, user_id]) - else: - result = None + try: + if str(user_id).isdigit(): + # Refresh users + plextv.refresh_users() + query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \ + 'email, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history ' \ + 'FROM users ' \ + 'WHERE user_id = ? ' + result = monitor_db.select(query, args=[user_id]) + elif user: + query = 'SELECT user_id, username, friendly_name, thumb AS user_thumb, custom_avatar_url AS custom_thumb, ' \ + 'email, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history ' \ + 'FROM users ' \ + 'WHERE username = ? ' + result = monitor_db.select(query, args=[user]) + else: + result = [] + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for get_details: %s." % e) + result = [] if result: user_details = {} for item in result: - if not item['friendly_name']: - friendly_name = item['username'] - else: + if item['friendly_name']: friendly_name = item['friendly_name'] - if not item['thumb'] or item['thumb'] == '': - user_thumb = common.DEFAULT_USER_THUMB else: - user_thumb = item['thumb'] + friendly_name = item['username'] - user_details = {"user_id": item['user_id'], - "username": item['username'], - "friendly_name": friendly_name, - "email": item['email'], - "thumb": user_thumb, - "is_home_user": item['is_home_user'], - "is_allow_sync": item['is_allow_sync'], - "is_restricted": item['is_restricted'], - "do_notify": item['do_notify'] + if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']: + user_thumb = item['custom_thumb'] + elif item['user_thumb']: + user_thumb = item['user_thumb'] + else: + user_thumb = common.DEFAULT_USER_THUMB + + user_details = {'user_id': item['user_id'], + 'username': item['username'], + 'friendly_name': friendly_name, + 'user_thumb': user_thumb, + 'email': item['email'], + 'is_home_user': item['is_home_user'], + 'is_allow_sync': item['is_allow_sync'], + 'is_restricted': item['is_restricted'], + 'do_notify': item['do_notify'], + 'keep_history': item['keep_history'] } return user_details else: # If there is no user data we must return something # Use "Local" user to retain compatibility with PlexWatch database value - return {"user_id": None, - "username": 'Local', - "friendly_name": 'Local', - "email": '', - "thumb": '', - "is_home_user": 0, - "is_allow_sync": 0, - "is_restricted": 0, - "do_notify": 0 + return {'user_id': None, + 'username': 'Local', + 'friendly_name': 'Local', + 'user_thumb': common.DEFAULT_USER_THUMB, + 'email': '', + 'is_home_user': 0, + 'is_allow_sync': 0, + 'is_restricted': 0, + 'do_notify': 0, + 'keep_history': 0 } - def get_user_watch_time_stats(self, user=None, user_id=None): + def get_watch_time_stats(self, user_id=None): monitor_db = database.MonitorDatabase() time_queries = [1, 7, 30, 0] user_watch_time_stats = [] for days in time_queries: - if days > 0: - if user_id: - query = 'SELECT (SUM(stopped - started) - ' \ - 'SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \ - 'COUNT(id) AS total_plays ' \ - 'FROM session_history ' \ - 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ - 'AND user_id = ?' % days - result = monitor_db.select(query, args=[user_id]) - elif user: - query = 'SELECT (SUM(stopped - started) - ' \ - 'SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \ - 'COUNT(id) AS total_plays ' \ - 'FROM session_history ' \ - 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ - 'AND user = ?' % days - result = monitor_db.select(query, args=[user]) - else: - query = 'SELECT (SUM(stopped - started) - ' \ - 'SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \ - 'COUNT(id) AS total_plays ' \ - 'FROM session_history ' \ - 'WHERE user = ?' - result = monitor_db.select(query, args=[user]) + try: + if days > 0: + if str(user_id).isdigit(): + query = 'SELECT (SUM(stopped - started) - ' \ + ' SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \ + 'COUNT(id) AS total_plays ' \ + 'FROM session_history ' \ + 'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \ + 'AND user_id = ?' % days + result = monitor_db.select(query, args=[user_id]) + else: + result = [] + else: + if str(user_id).isdigit(): + query = 'SELECT (SUM(stopped - started) - ' \ + ' SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \ + 'COUNT(id) AS total_plays ' \ + 'FROM session_history ' \ + 'WHERE user_id = ?' + result = monitor_db.select(query, args=[user_id]) + else: + result = [] + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for get_watch_time_stats: %s." % e) + result = [] for item in result: if item['total_time']: @@ -502,14 +387,14 @@ class Users(object): return user_watch_time_stats - def get_user_player_stats(self, user=None, user_id=None): + def get_player_stats(self, user_id=None): monitor_db = database.MonitorDatabase() player_stats = [] result_id = 0 try: - if user_id: + if str(user_id).isdigit(): query = 'SELECT player, COUNT(player) as player_count, platform ' \ 'FROM session_history ' \ 'WHERE user_id = ? ' \ @@ -517,15 +402,10 @@ class Users(object): 'ORDER BY player_count DESC' result = monitor_db.select(query, args=[user_id]) else: - query = 'SELECT player, COUNT(player) as player_count, platform ' \ - 'FROM session_history ' \ - 'WHERE user = ? ' \ - 'GROUP BY player ' \ - 'ORDER BY player_count DESC' - result = monitor_db.select(query, args=[user]) - except: - logger.warn("Unable to execute database query.") - return None + result = [] + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for get_player_stats: %s." % e) + result = [] for item in result: # Rename Mystery platform names @@ -540,3 +420,140 @@ class Users(object): result_id += 1 return player_stats + + def get_recently_watched(self, user_id=None, limit='10'): + monitor_db = database.MonitorDatabase() + recently_watched = [] + + if not limit.isdigit(): + limit = '10' + + try: + if str(user_id).isdigit(): + query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \ + 'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \ + 'year, started, user ' \ + 'FROM session_history_metadata ' \ + 'JOIN session_history ON session_history_metadata.id = session_history.id ' \ + 'WHERE user_id = ? ' \ + 'GROUP BY (CASE WHEN session_history.media_type = "track" THEN session_history.parent_rating_key ' \ + ' ELSE session_history.rating_key END) ' \ + 'ORDER BY started DESC LIMIT ?' + result = monitor_db.select(query, args=[user_id, limit]) + else: + result = [] + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for get_recently_watched: %s." % e) + result = [] + + for row in result: + if row['media_type'] == 'episode' and row['parent_thumb']: + thumb = row['parent_thumb'] + elif row['media_type'] == 'episode': + thumb = row['grandparent_thumb'] + else: + thumb = row['thumb'] + + recent_output = {'row_id': row['id'], + 'media_type': row['media_type'], + 'rating_key': row['rating_key'], + 'title': row['title'], + 'parent_title': row['parent_title'], + 'grandparent_title': row['grandparent_title'], + 'thumb': thumb, + 'media_index': row['media_index'], + 'parent_media_index': row['parent_media_index'], + 'year': row['year'], + 'time': row['started'], + 'user': row['user'] + } + recently_watched.append(recent_output) + + return recently_watched + + def delete_all_history(self, user_id=None): + monitor_db = database.MonitorDatabase() + + try: + if str(user_id).isdigit(): + logger.info(u"PlexPy DataFactory :: Deleting all history for user id %s from database." % user_id) + session_history_media_info_del = \ + monitor_db.action('DELETE FROM ' + 'session_history_media_info ' + 'WHERE session_history_media_info.id IN (SELECT session_history_media_info.id ' + 'FROM session_history_media_info ' + 'JOIN session_history ON session_history_media_info.id = session_history.id ' + 'WHERE session_history.user_id = ?)', [user_id]) + session_history_metadata_del = \ + monitor_db.action('DELETE FROM ' + 'session_history_metadata ' + 'WHERE session_history_metadata.id IN (SELECT session_history_metadata.id ' + 'FROM session_history_metadata ' + 'JOIN session_history ON session_history_metadata.id = session_history.id ' + 'WHERE session_history.user_id = ?)', [user_id]) + session_history_del = \ + monitor_db.action('DELETE FROM ' + 'session_history ' + 'WHERE session_history.user_id = ?', [user_id]) + + return 'Deleted all items for user_id %s.' % user_id + else: + return 'Unable to delete items. Input user_id not valid.' + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for delete_all_history: %s." % e) + + def delete(self, user_id=None): + monitor_db = database.MonitorDatabase() + + try: + if str(user_id).isdigit(): + self.delete_all_history(user_id) + logger.info(u"PlexPy DataFactory :: Deleting user with id %s from database." % user_id) + monitor_db.action('UPDATE users SET deleted_user = 1 WHERE user_id = ?', [user_id]) + monitor_db.action('UPDATE users SET keep_history = 0 WHERE user_id = ?', [user_id]) + monitor_db.action('UPDATE users SET do_notify = 0 WHERE user_id = ?', [user_id]) + + return 'Deleted user with id %s.' % user_id + else: + return 'Unable to delete user, user_id not valid.' + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for delete: %s." % e) + + def undelete(self, user_id=None, username=None): + monitor_db = database.MonitorDatabase() + + try: + if user_id and str(user_id).isdigit(): + logger.info(u"PlexPy DataFactory :: Re-adding user with id %s to database." % user_id) + monitor_db.action('UPDATE users SET deleted_user = 0 WHERE user_id = ?', [user_id]) + monitor_db.action('UPDATE users SET keep_history = 1 WHERE user_id = ?', [user_id]) + monitor_db.action('UPDATE users SET do_notify = 1 WHERE user_id = ?', [user_id]) + + return 'Re-added user with id %s.' % user_id + elif username: + logger.info(u"PlexPy DataFactory :: Re-adding user with username %s to database." % username) + monitor_db.action('UPDATE users SET deleted_user = 0 WHERE username = ?', [username]) + monitor_db.action('UPDATE users SET keep_history = 1 WHERE username = ?', [username]) + monitor_db.action('UPDATE users SET do_notify = 1 WHERE username = ?', [username]) + + return 'Re-added user with username %s.' % username + else: + return 'Unable to re-add user, user_id or username not valid.' + except Exception as e: + logger.warn(u"PlexPy Users :: Unable to execute database query for undelete: %s." % e) + + # Keep method for PlexWatch import + def get_user_id(self, user=None): + if user: + try: + monitor_db = database.MonitorDatabase() + query = 'SELECT user_id FROM users WHERE username = ?' + result = monitor_db.select_single(query, args=[user]) + if result: + return result['user_id'] + else: + return None + except: + return None + + return None \ No newline at end of file diff --git a/plexpy/version.py b/plexpy/version.py index 7f073209..fe9ab267 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.2.16" +PLEXPY_RELEASE_VERSION = "1.3.0" diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py index 1cbd577c..1c37c9de 100644 --- a/plexpy/versioncheck.py +++ b/plexpy/versioncheck.py @@ -250,7 +250,7 @@ def read_changelog(): logfile = open(changelog_file, "r") except IOError, e: logger.error('PlexPy Version Checker :: Unable to open changelog file. %s' % e) - return None + return '

      Unable to open changelog file

      ' if logfile: output = '' diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 0ee08a97..c1cb3df1 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, notifiers, plextv, pmsconnect, common, log_reader, datafactory, graphs, users, helpers +from plexpy import logger, notifiers, plextv, pmsconnect, common, log_reader, datafactory, graphs, users, libraries from plexpy.helpers import checked, radio from mako.lookup import TemplateLookup @@ -64,22 +64,15 @@ class WebInterface(object): else: raise cherrypy.HTTPRedirect("welcome") - @cherrypy.expose - def home(self): - config = { - "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH, - "home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS, - "home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS, - "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER, - "pms_name": plexpy.CONFIG.PMS_NAME - } - return serve_template(templatename="index.html", title="Home", config=config) + + ##### Welcome ##### @cherrypy.expose def welcome(self, **kwargs): config = { "launch_browser": checked(plexpy.CONFIG.LAUNCH_BROWSER), "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP), + "refresh_libraries_on_startup": checked(plexpy.CONFIG.REFRESH_LIBRARIES_ON_STARTUP), "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER, "pms_ip": plexpy.CONFIG.PMS_IP, "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE), @@ -107,6 +100,37 @@ class WebInterface(object): else: return serve_template(templatename="welcome.html", title="Welcome", config=config) + @cherrypy.expose + def discover(self, token=''): + """ + Returns the servers that you own as a + list of dicts (formatted for selectize) + """ + # Need to set token so result doesn't return http 401 + plexpy.CONFIG.__setattr__('PMS_TOKEN', token) + plexpy.CONFIG.write() + + plex_tv = plextv.PlexTV() + servers = plex_tv.discover() + + if servers: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(servers) + + + ##### Home ##### + + @cherrypy.expose + def home(self): + config = { + "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH, + "home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS, + "home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS, + "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER, + "pms_name": plexpy.CONFIG.PMS_NAME + } + return serve_template(templatename="index.html", title="Home", config=config) + @cherrypy.expose def get_date_formats(self): if plexpy.CONFIG.DATE_FORMAT: @@ -124,6 +148,43 @@ class WebInterface(object): cherrypy.response.headers['Content-type'] = 'application/json' return json.dumps(formats) + @cherrypy.expose + def get_current_activity(self, **kwargs): + + try: + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_current_activity() + + data_factory = datafactory.DataFactory() + for session in result['sessions']: + if not session['ip_address']: + ip_address = data_factory.get_session_ip(session['session_key']) + session['ip_address'] = ip_address + + except: + return serve_template(templatename="current_activity.html", data=None) + + if result: + return serve_template(templatename="current_activity.html", data=result) + else: + logger.warn(u"Unable to retrieve data for get_current_activity.") + return serve_template(templatename="current_activity.html", data=None) + + @cherrypy.expose + def get_current_activity_header(self, **kwargs): + + try: + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_current_activity() + except: + return serve_template(templatename="current_activity_header.html", data=None) + + if result: + return serve_template(templatename="current_activity_header.html", data=result['stream_count']) + else: + logger.warn(u"Unable to retrieve data for get_current_activity_header.") + return serve_template(templatename="current_activity_header.html", data=None) + @cherrypy.expose def home_stats(self, **kwargs): data_factory = datafactory.DataFactory() @@ -132,7 +193,7 @@ class WebInterface(object): time_range = plexpy.CONFIG.HOME_STATS_LENGTH stats_type = plexpy.CONFIG.HOME_STATS_TYPE stats_count = plexpy.CONFIG.HOME_STATS_COUNT - stats_cards = plexpy.CONFIG.HOME_STATS_CARDS.split(', ') + stats_cards = plexpy.CONFIG.HOME_STATS_CARDS notify_watched_percent = plexpy.CONFIG.NOTIFY_WATCHED_PERCENT stats_data = data_factory.get_home_stats(grouping=grouping, @@ -146,65 +207,325 @@ class WebInterface(object): @cherrypy.expose def library_stats(self, **kwargs): - pms_connect = pmsconnect.PmsConnect() + data_factory = datafactory.DataFactory() - library_cards = plexpy.CONFIG.HOME_LIBRARY_CARDS.split(', ') - - if library_cards == ['library_statistics_first']: - library_cards = ['library_statistics'] - server_children = pms_connect.get_server_children() - server_libraries = server_children['libraries_list'] - - for library in server_libraries: - library_cards.append(library['key']) - - plexpy.CONFIG.HOME_LIBRARY_CARDS = ', '.join(library_cards) - plexpy.CONFIG.write() - - stats_data = pms_connect.get_library_stats(library_cards=library_cards) + library_cards = plexpy.CONFIG.HOME_LIBRARY_CARDS + stats_data = data_factory.get_library_stats(library_cards=library_cards) + return serve_template(templatename="library_stats.html", title="Library Stats", data=stats_data) @cherrypy.expose - def history(self): - return serve_template(templatename="history.html", title="History") + def get_recently_added(self, count='0', **kwargs): + + try: + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_recently_added_details(count=count) + except IOError, e: + return serve_template(templatename="recently_added.html", data=None) + + if result: + return serve_template(templatename="recently_added.html", data=result['recently_added']) + else: + logger.warn(u"Unable to retrieve data for get_recently_added.") + return serve_template(templatename="recently_added.html", data=None) + + + ##### Libraries ##### + + @cherrypy.expose + def libraries(self): + config = { + "update_section_ids": plexpy.CONFIG.UPDATE_SECTION_IDS + } + + return serve_template(templatename="libraries.html", title="Libraries", config=config) + + @cherrypy.expose + def get_library_list(self, **kwargs): + + library_data = libraries.Libraries() + library_list = library_data.get_datatables_list(kwargs=kwargs) + + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(library_list) + + @cherrypy.expose + def refresh_libraries_list(self, **kwargs): + threading.Thread(target=pmsconnect.refresh_libraries).start() + logger.info(u"Manual libraries list refresh requested.") + + @cherrypy.expose + def library(self, section_id=None): + config = { + "get_file_sizes": plexpy.CONFIG.GET_FILE_SIZES, + "get_file_sizes_hold": plexpy.CONFIG.GET_FILE_SIZES_HOLD + } + + library_data = libraries.Libraries() + if section_id: + try: + library_details = library_data.get_details(section_id=section_id) + except: + logger.warn(u"Unable to retrieve library details for section_id %s " % section_id) + return serve_template(templatename="library.html", title="Library", data=None, config=config) + else: + logger.debug(u"Library page requested but no section_id received.") + return serve_template(templatename="library.html", title="Library", data=None, config=config) + + return serve_template(templatename="library.html", title="Library", data=library_details, config=config) + + @cherrypy.expose + def edit_library_dialog(self, section_id=None, **kwargs): + library_data = libraries.Libraries() + if section_id: + result = library_data.get_details(section_id=section_id) + status_message = '' + else: + result = None + status_message = 'An error occured.' + + return serve_template(templatename="edit_library.html", title="Edit Library", data=result, status_message=status_message) + + @cherrypy.expose + def edit_library(self, section_id=None, **kwargs): + custom_thumb = kwargs.get('custom_thumb', '') + do_notify = kwargs.get('do_notify', 0) + do_notify_created = kwargs.get('do_notify_created', 0) + keep_history = kwargs.get('keep_history', 0) + + library_data = libraries.Libraries() + if section_id: + try: + library_data.set_config(section_id=section_id, + custom_thumb=custom_thumb, + do_notify=do_notify, + do_notify_created=do_notify_created, + keep_history=keep_history) + + status_message = "Successfully updated library." + return status_message + except: + status_message = "Failed to update library." + return status_message + + @cherrypy.expose + def get_library_watch_time_stats(self, section_id=None, **kwargs): + + library_data = libraries.Libraries() + result = library_data.get_watch_time_stats(section_id=section_id) + + if result: + return serve_template(templatename="user_watch_time_stats.html", data=result, title="Watch Stats") + else: + logger.warn(u"Unable to retrieve data for get_library_watch_time_stats.") + return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats") + + @cherrypy.expose + def get_library_user_stats(self, section_id=None, **kwargs): + + library_data = libraries.Libraries() + result = library_data.get_user_stats(section_id=section_id) + + if result: + return serve_template(templatename="library_user_stats.html", data=result, title="Player Stats") + else: + logger.warn(u"Unable to retrieve data for get_library_user_stats.") + return serve_template(templatename="library_user_stats.html", data=None, title="Player Stats") + + @cherrypy.expose + def get_library_recently_watched(self, section_id=None, limit='10', **kwargs): + + library_data = libraries.Libraries() + result = library_data.get_recently_watched(section_id=section_id, limit=limit) + + if result: + return serve_template(templatename="user_recently_watched.html", data=result, title="Recently Watched") + else: + logger.warn(u"Unable to retrieve data for get_library_recently_watched.") + return serve_template(templatename="user_recently_watched.html", data=None, title="Recently Watched") + + @cherrypy.expose + def get_library_recently_added(self, section_id=None, limit='10', **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_recently_added_details(section_id=section_id, count=limit) + + if result: + return serve_template(templatename="library_recently_added.html", data=result['recently_added'], title="Recently Added") + else: + logger.warn(u"Unable to retrieve data for get_library_recently_added.") + return serve_template(templatename="library_recently_added.html", data=None, title="Recently Added") + + @cherrypy.expose + def get_library_media_info(self, section_id=None, section_type=None, rating_key=None, refresh='', **kwargs): + + if refresh == 'true': + refresh = True + else: + refresh = False + + library_data = libraries.Libraries() + result = library_data.get_datatables_media_info(section_id=section_id, + section_type=section_type, + rating_key=rating_key, + refresh=refresh, + kwargs=kwargs) + + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + + @cherrypy.expose + def get_media_info_file_sizes(self, section_id=None, rating_key=None): + get_file_sizes_hold = plexpy.CONFIG.GET_FILE_SIZES_HOLD + section_ids = set(get_file_sizes_hold['section_ids']) + rating_keys = set(get_file_sizes_hold['rating_keys']) + + if (section_id and section_id not in section_ids) or (rating_key and rating_key not in rating_keys): + if section_id: + section_ids.add(section_id) + elif rating_key: + rating_keys.add(rating_key) + plexpy.CONFIG.GET_FILE_SIZES_HOLD = {'section_ids': list(section_ids), 'rating_keys': list(rating_keys)} + + library_data = libraries.Libraries() + result = library_data.get_media_info_file_sizes(section_id=section_id, + rating_key=rating_key) + + if section_id: + section_ids.remove(section_id) + elif rating_key: + rating_keys.remove(rating_key) + plexpy.CONFIG.GET_FILE_SIZES_HOLD = {'section_ids': list(section_ids), 'rating_keys': list(rating_keys)} + else: + result = False + + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'success': result}) + + @cherrypy.expose + def get_library_unwatched(self, section_id=None, section_type=None, **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_library_children_details(section_id=section_id, + section_type=section_type, + get_media_info=True, + kwargs=kwargs) + + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + + @cherrypy.expose + def delete_all_library_history(self, section_id, **kwargs): + library_data = libraries.Libraries() + + if section_id: + delete_row = library_data.delete_all_history(section_id=section_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + @cherrypy.expose + def delete_library(self, section_id, **kwargs): + library_data = libraries.Libraries() + + if section_id: + delete_row = library_data.delete(section_id=section_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + @cherrypy.expose + def undelete_library(self, section_id=None, section_name=None, **kwargs): + library_data = libraries.Libraries() + + if section_id: + delete_row = library_data.undelete(section_id=section_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + elif section_name: + delete_row = library_data.undelete(section_name=section_name) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + @cherrypy.expose + def update_section_ids(self, **kwargs): + + logger.debug(u"Manual database section_id update called.") + + result = libraries.update_section_ids() + + if result: + return "Updated all section_id's in database." + else: + return "Unable to update section_id's in database. See logs for details." + + @cherrypy.expose + def delete_datatable_media_info_cache(self, section_id, **kwargs): + get_file_sizes_hold = plexpy.CONFIG.GET_FILE_SIZES_HOLD + section_ids = set(get_file_sizes_hold['section_ids']) + + if section_id not in section_ids: + if section_id: + library_data = libraries.Libraries() + delete_row = library_data.delete_datatable_media_info_cache(section_id=section_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + else: + return json.dumps({'message': 'Cannot refresh library while getting file sizes.'}) + + ##### Users ##### @cherrypy.expose def users(self): return serve_template(templatename="users.html", title="Users") @cherrypy.expose - def graphs(self): + def get_user_list(self, **kwargs): - config = { - "graph_type": plexpy.CONFIG.GRAPH_TYPE, - "graph_days": plexpy.CONFIG.GRAPH_DAYS, - "graph_tab": plexpy.CONFIG.GRAPH_TAB, - "music_logging_enable": plexpy.CONFIG.MUSIC_LOGGING_ENABLE - } + user_data = users.Users() + user_list = user_data.get_datatables_list(kwargs=kwargs) - return serve_template(templatename="graphs.html", title="Graphs", config=config) + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(user_list) @cherrypy.expose - def sync(self): - return serve_template(templatename="sync.html", title="Synced Items") + def refresh_users_list(self, **kwargs): + threading.Thread(target=plextv.refresh_users).start() + logger.info(u"Manual users list refresh requested.") @cherrypy.expose - def user(self, user=None, user_id=None): + def user(self, user_id=None): user_data = users.Users() if user_id: try: - user_details = user_data.get_user_details(user_id=user_id) + user_details = user_data.get_details(user_id=user_id) except: - logger.warn("Unable to retrieve friendly name for user_id %s " % user_id) - elif user: - try: - user_details = user_data.get_user_details(user=user) - except: - logger.warn("Unable to retrieve friendly name for user %s " % user) + logger.warn(u"Unable to retrieve user details for user_id %s " % user_id) + return serve_template(templatename="user.html", title="User", data=None) else: - logger.debug(u"User page requested but no parameters received.") - raise cherrypy.HTTPRedirect("home") + logger.debug(u"User page requested but no user_id received.") + return serve_template(templatename="user.html", title="User", data=None) return serve_template(templatename="user.html", title="User", data=user_details) @@ -212,10 +533,7 @@ class WebInterface(object): def edit_user_dialog(self, user=None, user_id=None, **kwargs): user_data = users.Users() if user_id: - result = user_data.get_user_friendly_name(user_id=user_id) - status_message = '' - elif user: - result = user_data.get_user_friendly_name(user=user) + result = user_data.get_details(user_id=user_id) status_message = '' else: result = None @@ -224,49 +542,168 @@ class WebInterface(object): return serve_template(templatename="edit_user.html", title="Edit User", data=result, status_message=status_message) @cherrypy.expose - def edit_user(self, user=None, user_id=None, friendly_name=None, **kwargs): - if 'do_notify' in kwargs: - do_notify = kwargs.get('do_notify') - else: - do_notify = 0 - if 'keep_history' in kwargs: - keep_history = kwargs.get('keep_history') - else: - keep_history = 0 - if 'thumb' in kwargs: - custom_avatar = kwargs['thumb'] - else: - custom_avatar = '' + def edit_user(self, user_id=None, **kwargs): + friendly_name = kwargs.get('friendly_name', '') + custom_thumb = kwargs.get('custom_thumb', '') + do_notify = kwargs.get('do_notify', 0) + keep_history = kwargs.get('keep_history', 0) user_data = users.Users() if user_id: try: - user_data.set_user_friendly_name(user_id=user_id, - friendly_name=friendly_name, - do_notify=do_notify, - keep_history=keep_history) - user_data.set_user_profile_url(user_id=user_id, - profile_url=custom_avatar) - + user_data.set_config(user_id=user_id, + friendly_name=friendly_name, + custom_thumb=custom_thumb, + do_notify=do_notify, + keep_history=keep_history) status_message = "Successfully updated user." return status_message except: status_message = "Failed to update user." return status_message - if user: - try: - user_data.set_user_friendly_name(user=user, - friendly_name=friendly_name, - do_notify=do_notify, - keep_history=keep_history) - user_data.set_user_profile_url(user=user, - profile_url=custom_avatar) - status_message = "Successfully updated user." - return status_message - except: - status_message = "Failed to update user." - return status_message + @cherrypy.expose + def get_user_watch_time_stats(self, user=None, user_id=None, **kwargs): + + user_data = users.Users() + result = user_data.get_watch_time_stats(user_id=user_id) + + if result: + return serve_template(templatename="user_watch_time_stats.html", data=result, title="Watch Stats") + else: + logger.warn(u"Unable to retrieve data for get_user_watch_time_stats.") + return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats") + + @cherrypy.expose + def get_user_player_stats(self, user=None, user_id=None, **kwargs): + + user_data = users.Users() + result = user_data.get_player_stats(user_id=user_id) + + if result: + return serve_template(templatename="user_player_stats.html", data=result, title="Player Stats") + else: + logger.warn(u"Unable to retrieve data for get_user_player_stats.") + return serve_template(templatename="user_player_stats.html", data=None, title="Player Stats") + + @cherrypy.expose + def get_user_recently_watched(self, user=None, user_id=None, limit='10', **kwargs): + + user_data = users.Users() + result = user_data.get_recently_watched(user_id=user_id, limit=limit) + + if result: + return serve_template(templatename="user_recently_watched.html", data=result, title="Recently Watched") + else: + logger.warn(u"Unable to retrieve data for get_user_recently_watched.") + return serve_template(templatename="user_recently_watched.html", data=None, title="Recently Watched") + + @cherrypy.expose + def get_user_ips(self, user_id=None, **kwargs): + + user_data = users.Users() + history = user_data.get_datatables_unique_ips(user_id=user_id, kwargs=kwargs) + + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(history) + + @cherrypy.expose + def delete_all_user_history(self, user_id, **kwargs): + user_data = users.Users() + + if user_id: + delete_row = user_data.delete_all_history(user_id=user_id) + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + @cherrypy.expose + def delete_user(self, user_id, **kwargs): + user_data = users.Users() + + if user_id: + delete_row = user_data.delete(user_id=user_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + @cherrypy.expose + def undelete_user(self, user_id=None, username=None, **kwargs): + user_data = users.Users() + + if user_id: + delete_row = user_data.undelete(user_id=user_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + elif username: + delete_row = delete_user.undelete(username=username) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + + ##### History ##### + + @cherrypy.expose + def history(self): + return serve_template(templatename="history.html", title="History") + + @cherrypy.expose + def get_history(self, user=None, user_id=None, grouping=0, **kwargs): + + if grouping == 'false': + grouping = 0 + else: + grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES + + watched_percent = plexpy.CONFIG.NOTIFY_WATCHED_PERCENT + + custom_where = [] + if user_id: + custom_where.append(['session_history.user_id', user_id]) + elif user: + custom_where.append(['session_history.user', user]) + if 'rating_key' in kwargs: + rating_key = kwargs.get('rating_key', "") + custom_where.append(['session_history.rating_key', rating_key]) + if 'parent_rating_key' in kwargs: + rating_key = kwargs.get('parent_rating_key', "") + custom_where.append(['session_history.parent_rating_key', rating_key]) + if 'grandparent_rating_key' in kwargs: + rating_key = kwargs.get('grandparent_rating_key', "") + custom_where.append(['session_history.grandparent_rating_key', rating_key]) + if 'start_date' in kwargs: + start_date = kwargs.get('start_date', "") + custom_where.append(['strftime("%Y-%m-%d", datetime(started, "unixepoch", "localtime"))', start_date]) + if 'reference_id' in kwargs: + reference_id = kwargs.get('reference_id', "") + custom_where.append(['session_history.reference_id', reference_id]) + if 'section_id' in kwargs: + section_id = kwargs.get('section_id', "") + custom_where.append(['session_history_metadata.section_id', section_id]) + if 'media_type' in kwargs: + media_type = kwargs.get('media_type', "") + if media_type != 'all': + custom_where.append(['session_history.media_type', media_type]) + + data_factory = datafactory.DataFactory() + history = data_factory.get_datatables_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping, watched_percent=watched_percent) + + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(history) @cherrypy.expose def get_stream_data(self, row_id=None, user=None, **kwargs): @@ -288,40 +725,217 @@ class WebInterface(object): return serve_template(templatename="ip_address_modal.html", title="IP Address Details", data=ip_address) @cherrypy.expose - def get_user_list(self, **kwargs): + def delete_history_rows(self, row_id, **kwargs): + data_factory = datafactory.DataFactory() - user_data = users.Users() - user_list = user_data.get_user_list(kwargs=kwargs) + if row_id: + delete_row = data_factory.delete_session_history_rows(row_id=row_id) - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(user_list) + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + + ##### Graphs ##### @cherrypy.expose - def checkGithub(self): - from plexpy import versioncheck + def graphs(self): - versioncheck.checkGithub() - raise cherrypy.HTTPRedirect("home") + config = { + "graph_type": plexpy.CONFIG.GRAPH_TYPE, + "graph_days": plexpy.CONFIG.GRAPH_DAYS, + "graph_tab": plexpy.CONFIG.GRAPH_TAB, + "music_logging_enable": plexpy.CONFIG.MUSIC_LOGGING_ENABLE + } + + return serve_template(templatename="graphs.html", title="Graphs", config=config) + + @cherrypy.expose + def set_graph_config(self, graph_type=None, graph_days=None, graph_tab=None): + if graph_type: + plexpy.CONFIG.__setattr__('GRAPH_TYPE', graph_type) + plexpy.CONFIG.write() + if graph_days: + plexpy.CONFIG.__setattr__('GRAPH_DAYS', graph_days) + plexpy.CONFIG.write() + if graph_tab: + plexpy.CONFIG.__setattr__('GRAPH_TAB', graph_tab) + plexpy.CONFIG.write() + + return "Updated graphs config values." + + @cherrypy.expose + def get_plays_by_date(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_per_day(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_by_date.") + + @cherrypy.expose + def get_plays_by_dayofweek(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_per_dayofweek(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_by_dayofweek.") + + @cherrypy.expose + def get_plays_by_hourofday(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_per_hourofday(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_by_hourofday.") + + @cherrypy.expose + def get_plays_per_month(self, y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_per_month(y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_per_month.") + + @cherrypy.expose + def get_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_by_top_10_platforms(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_by_top_10_platforms.") + + @cherrypy.expose + def get_plays_by_top_10_users(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_by_top_10_users(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_by_top_10_users.") + + @cherrypy.expose + def get_plays_by_stream_type(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_per_stream_type(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_by_stream_type.") + + @cherrypy.expose + def get_plays_by_source_resolution(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_by_source_resolution(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_by_source_resolution.") + + @cherrypy.expose + def get_plays_by_stream_resolution(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_total_plays_by_stream_resolution(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_plays_by_stream_resolution.") + + @cherrypy.expose + def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_stream_type_by_top_10_users(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_stream_type_by_top_10_users.") + + @cherrypy.expose + def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', **kwargs): + + graph = graphs.Graphs() + result = graph.get_stream_type_by_top_10_platforms(time_range=time_range, y_axis=y_axis) + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_stream_type_by_top_10_platforms.") + + @cherrypy.expose + def history_table_modal(self, start_date=None, **kwargs): + + return serve_template(templatename="history_table_modal.html", title="History Data", data=start_date) + + + ##### Sync ##### + + @cherrypy.expose + def sync(self): + return serve_template(templatename="sync.html", title="Synced Items") + + @cherrypy.expose + def get_sync(self, machine_id=None, user_id=None, **kwargs): + + if not machine_id: + machine_id = plexpy.CONFIG.PMS_IDENTIFIER + + plex_tv = plextv.PlexTV() + result = plex_tv.get_synced_items(machine_id=machine_id, user_id=user_id) + + if result: + output = {"data": result} + else: + logger.warn(u"Unable to retrieve data for get_sync.") + output = {"data": []} + + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(output) + + + ##### Logs ##### @cherrypy.expose def logs(self): return serve_template(templatename="logs.html", title="Log", lineList=plexpy.LOG_LIST) - @cherrypy.expose - def clearLogs(self): - plexpy.LOG_LIST = [] - logger.info("Web logs cleared") - raise cherrypy.HTTPRedirect("logs") - - @cherrypy.expose - def toggleVerbose(self): - plexpy.VERBOSE = not plexpy.VERBOSE - logger.initLogger(console=not plexpy.QUIET, - log_dir=plexpy.CONFIG.LOG_DIR, verbose=plexpy.VERBOSE) - logger.info("Verbose toggled, set to %s", plexpy.VERBOSE) - logger.debug("If you read this message, debug logging is available") - raise cherrypy.HTTPRedirect("logs") - @cherrypy.expose def getLog(self, start=0, length=100, **kwargs): start = int(start) @@ -371,16 +985,29 @@ class WebInterface(object): try: log_lines = {'data': log_reader.get_log_tail(window=window)} except: - logger.warn("Unable to retrieve Plex Logs.") + logger.warn(u"Unable to retrieve Plex Logs.") cherrypy.response.headers['Content-type'] = 'application/json' return json.dumps(log_lines) @cherrypy.expose - def generateAPI(self): - apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32] - logger.info("New API generated") - return apikey + def clearLogs(self): + plexpy.LOG_LIST = [] + logger.info(u"Web logs cleared") + raise cherrypy.HTTPRedirect("logs") + + @cherrypy.expose + def toggleVerbose(self): + plexpy.VERBOSE = not plexpy.VERBOSE + logger.initLogger(console=not plexpy.QUIET, + log_dir=plexpy.CONFIG.LOG_DIR, verbose=plexpy.VERBOSE) + logger.info(u"Verbose toggled, set to %s", plexpy.VERBOSE) + logger.debug(u"If you read this message, debug logging is available") + raise cherrypy.HTTPRedirect("logs") + + + + ##### Settings ##### @cherrypy.expose def settings(self): @@ -423,6 +1050,7 @@ class WebInterface(object): "pms_uuid": plexpy.CONFIG.PMS_UUID, "date_format": plexpy.CONFIG.DATE_FORMAT, "time_format": plexpy.CONFIG.TIME_FORMAT, + "get_file_sizes": checked(plexpy.CONFIG.GET_FILE_SIZES), "grouping_global_history": checked(plexpy.CONFIG.GROUPING_GLOBAL_HISTORY), "grouping_user_history": checked(plexpy.CONFIG.GROUPING_USER_HISTORY), "grouping_charts": checked(plexpy.CONFIG.GROUPING_CHARTS), @@ -441,6 +1069,8 @@ class WebInterface(object): "monitor_remote_access": checked(plexpy.CONFIG.MONITOR_REMOTE_ACCESS), "monitoring_interval": plexpy.CONFIG.MONITORING_INTERVAL, "monitoring_use_websocket": checked(plexpy.CONFIG.MONITORING_USE_WEBSOCKET), + "refresh_libraries_interval": plexpy.CONFIG.REFRESH_LIBRARIES_INTERVAL, + "refresh_libraries_on_startup": checked(plexpy.CONFIG.REFRESH_LIBRARIES_ON_STARTUP), "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL, "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP), "ip_logging_enable": checked(plexpy.CONFIG.IP_LOGGING_ENABLE), @@ -476,16 +1106,17 @@ class WebInterface(object): "notify_on_extup_body_text": plexpy.CONFIG.NOTIFY_ON_EXTUP_BODY_TEXT, "notify_on_intup_subject_text": plexpy.CONFIG.NOTIFY_ON_INTUP_SUBJECT_TEXT, "notify_on_intup_body_text": plexpy.CONFIG.NOTIFY_ON_INTUP_BODY_TEXT, + "notify_scripts_args_text": plexpy.CONFIG.NOTIFY_SCRIPTS_ARGS_TEXT, "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH, "home_stats_type": checked(plexpy.CONFIG.HOME_STATS_TYPE), "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT, - "home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS, - "home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS, + "home_stats_cards": json.dumps(plexpy.CONFIG.HOME_STATS_CARDS), + "home_library_cards": json.dumps(plexpy.CONFIG.HOME_LIBRARY_CARDS), "buffer_threshold": plexpy.CONFIG.BUFFER_THRESHOLD, "buffer_wait": plexpy.CONFIG.BUFFER_WAIT, "group_history_tables": checked(plexpy.CONFIG.GROUP_HISTORY_TABLES) } - + return serve_template(templatename="settings.html", title="Settings", config=config) @cherrypy.expose @@ -493,12 +1124,13 @@ class WebInterface(object): # Handle the variable config options. Note - keys with False values aren't getting passed checked_configs = [ - "launch_browser", "enable_https", "api_enabled", "freeze_db", "check_github", + "launch_browser", "enable_https", "api_enabled", "freeze_db", "check_github", "get_file_sizes", "grouping_global_history", "grouping_user_history", "grouping_charts", "pms_use_bif", "pms_ssl", "movie_notify_enable", "tv_notify_enable", "music_notify_enable", "monitoring_use_websocket", "tv_notify_on_start", "movie_notify_on_start", "music_notify_on_start", "tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop", - "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", "refresh_users_on_startup", + "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", + "refresh_libraries_on_startup", "refresh_users_on_startup", "ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable", "pms_is_remote", "home_stats_type", "group_history_tables", "notify_consecutive", "notify_recently_added", "notify_recently_added_grandparent", "monitor_remote_access" @@ -519,14 +1151,20 @@ class WebInterface(object): del kwargs[use_config] # Check if we should refresh our data + refresh_libraries = False refresh_users = False reschedule = False + if 'monitoring_interval' in kwargs and 'refresh_libraries_interval' in kwargs: + if (kwargs['monitoring_interval'] != str(plexpy.CONFIG.MONITORING_INTERVAL)) or \ + (kwargs['refresh_libraries_interval'] != str(plexpy.CONFIG.REFRESH_LIBRARIES_INTERVAL)): + reschedule = True + if 'monitoring_interval' in kwargs and 'refresh_users_interval' in kwargs: if (kwargs['monitoring_interval'] != str(plexpy.CONFIG.MONITORING_INTERVAL)) or \ (kwargs['refresh_users_interval'] != str(plexpy.CONFIG.REFRESH_USERS_INTERVAL)): reschedule = True - + if 'notify_recently_added' in kwargs and \ (kwargs['notify_recently_added'] != plexpy.CONFIG.NOTIFY_RECENTLY_ADDED): reschedule = True @@ -537,15 +1175,28 @@ class WebInterface(object): if 'pms_ip' in kwargs: if kwargs['pms_ip'] != plexpy.CONFIG.PMS_IP: + refresh_libraries = True refresh_users = True - + + # Remove config with 'hscard-' prefix and change home_stats_cards to list if 'home_stats_cards' in kwargs: - if kwargs['home_stats_cards'] != 'watch_statistics': - kwargs['home_stats_cards'] = ', '.join(kwargs['home_stats_cards']) + for k in kwargs.keys(): + if k.startswith('hscard-'): + del kwargs[k] + kwargs['home_stats_cards'] = kwargs['home_stats_cards'].split(',') + if kwargs['home_stats_cards'] == ['first_run_wizard']: + kwargs['home_stats_cards'] = plexpy.CONFIG.HOME_STATS_CARDS + + # Remove config with 'hlcard-' prefix and change home_library_cards to list if 'home_library_cards' in kwargs: - if kwargs['home_library_cards'] != 'library_statistics': - kwargs['home_library_cards'] = ', '.join(kwargs['home_library_cards']) + for k in kwargs.keys(): + if k.startswith('hlcard-'): + del kwargs[k] + kwargs['home_library_cards'] = kwargs['home_library_cards'].split(',') + + if kwargs['home_library_cards'] == ['first_run_wizard']: + refresh_libraries = True plexpy.CONFIG.process_kwargs(kwargs) @@ -554,826 +1205,24 @@ class WebInterface(object): # Get new server URLs for SSL communications. plextv.get_real_pms_url() - + + # Get new server friendly name. + pmsconnect.get_server_friendly_name() + # Reconfigure scheduler if intervals changed if reschedule: plexpy.initialize_scheduler() + # Refresh users table if our server IP changes. + if refresh_libraries: + threading.Thread(target=pmsconnect.refresh_libraries).start() + # Refresh users table if our server IP changes. if refresh_users: threading.Thread(target=plextv.refresh_users).start() raise cherrypy.HTTPRedirect("settings") - @cherrypy.expose - def set_notification_config(self, **kwargs): - - for plain_config, use_config in [(x[4:], x) for x in kwargs if x.startswith('use_')]: - # the use prefix is fairly nice in the html, but does not match the actual config - kwargs[plain_config] = kwargs[use_config] - del kwargs[use_config] - - plexpy.CONFIG.process_kwargs(kwargs) - - # Write the config - plexpy.CONFIG.write() - - cherrypy.response.status = 200 - - @cherrypy.expose - def do_state_change(self, signal, title, timer): - message = title - quote = self.random_arnold_quotes() - plexpy.SIGNAL = signal - - return serve_template(templatename="shutdown.html", title=title, - message=message, timer=timer, quote=quote) - - @cherrypy.expose - def get_history(self, user=None, user_id=None, grouping=0, **kwargs): - - if grouping == 'false': - grouping = 0 - else: - grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES - - watched_percent = plexpy.CONFIG.NOTIFY_WATCHED_PERCENT - - custom_where = [] - if user_id: - custom_where.append(['session_history.user_id', user_id]) - elif user: - custom_where.append(['session_history.user', user]) - if 'rating_key' in kwargs: - rating_key = kwargs.get('rating_key', "") - custom_where.append(['session_history.rating_key', rating_key]) - if 'parent_rating_key' in kwargs: - rating_key = kwargs.get('parent_rating_key', "") - custom_where.append(['session_history.parent_rating_key', rating_key]) - if 'grandparent_rating_key' in kwargs: - rating_key = kwargs.get('grandparent_rating_key', "") - custom_where.append(['session_history.grandparent_rating_key', rating_key]) - if 'start_date' in kwargs: - start_date = kwargs.get('start_date', "") - custom_where.append(['strftime("%Y-%m-%d", datetime(started, "unixepoch", "localtime"))', start_date]) - if 'reference_id' in kwargs: - reference_id = kwargs.get('reference_id', "") - custom_where.append(['session_history.reference_id', reference_id]) - if 'media_type' in kwargs: - media_type = kwargs.get('media_type', "") - if media_type != 'all': - custom_where.append(['session_history.media_type', media_type]) - - data_factory = datafactory.DataFactory() - history = data_factory.get_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping, watched_percent=watched_percent) - - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(history) - - @cherrypy.expose - def history_table_modal(self, start_date=None, **kwargs): - - return serve_template(templatename="history_table_modal.html", title="History Data", data=start_date) - - @cherrypy.expose - def shutdown(self): - return self.do_state_change('shutdown', 'Shutting Down', 15) - - @cherrypy.expose - def restart(self): - return self.do_state_change('restart', 'Restarting', 30) - - @cherrypy.expose - def update(self): - return self.do_state_change('update', 'Updating', 120) - - @cherrypy.expose - def api(self, *args, **kwargs): - from plexpy.api import Api - - a = Api() - a.checkParams(*args, **kwargs) - - return a.fetchData() - - @cherrypy.expose - def twitterStep1(self): - cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" - tweet = notifiers.TwitterNotifier() - return tweet._get_authorization() - - @cherrypy.expose - def twitterStep2(self, key): - cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" - tweet = notifiers.TwitterNotifier() - result = tweet._get_credentials(key) - logger.info(u"result: " + str(result)) - if result: - return "Key verification successful" - else: - return "Unable to verify key" - - @cherrypy.expose - def testTwitter(self): - cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" - tweet = notifiers.TwitterNotifier() - result = tweet.test_notify() - if result: - return "Tweet successful, check your twitter to make sure it worked" - else: - return "Error sending tweet" - - @cherrypy.expose - def test_ifttt(self): - cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" - event = notifiers.IFTTT() - result = event.test() - if result: - return "Notification successful." - else: - return "Error sending event." - - @cherrypy.expose - def osxnotifyregister(self, app): - cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" - from osxnotify import registerapp as osxnotify - - result, msg = osxnotify.registerapp(app) - if result: - osx_notify = notifiers.OSX_NOTIFY() - osx_notify.notify('Registered', result, 'Success :-)') - logger.info('Registered %s, to re-register a different app, delete this app first' % result) - else: - logger.warn(msg) - return msg - - @cherrypy.expose - def get_pms_token(self): - - token = plextv.PlexTV() - result = token.get_token() - - if result: - return result - else: - logger.warn('Unable to retrieve Plex.tv token.') - return False - - @cherrypy.expose - def get_pms_sessions_json(self, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_sessions('json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - return False - - @cherrypy.expose - def get_current_activity(self, **kwargs): - - try: - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_current_activity() - - data_factory = datafactory.DataFactory() - for session in result['sessions']: - if not session['ip_address']: - ip_address = data_factory.get_session_ip(session['session_key']) - session['ip_address'] = ip_address - - except: - return serve_template(templatename="current_activity.html", data=None) - - if result: - return serve_template(templatename="current_activity.html", data=result) - else: - logger.warn('Unable to retrieve data.') - return serve_template(templatename="current_activity.html", data=None) - - @cherrypy.expose - def get_current_activity_header(self, **kwargs): - - try: - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_current_activity() - except IOError, e: - return serve_template(templatename="current_activity_header.html", data=None) - - if result: - return serve_template(templatename="current_activity_header.html", data=result['stream_count']) - else: - logger.warn('Unable to retrieve data.') - return serve_template(templatename="current_activity_header.html", data=None) - - @cherrypy.expose - def get_recently_added(self, count='0', **kwargs): - - try: - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_recently_added_details(count) - except IOError, e: - return serve_template(templatename="recently_added.html", data=None) - - if result: - return serve_template(templatename="recently_added.html", data=result['recently_added']) - else: - logger.warn('Unable to retrieve data.') - return serve_template(templatename="recently_added.html", data=None) - - @cherrypy.expose - def pms_image_proxy(self, img='', width='0', height='0', fallback=None, **kwargs): - try: - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_image(img, width, height) - cherrypy.response.headers['Content-type'] = result[1] - return result[0] - except: - logger.warn('Image proxy queried but errors occured.') - if fallback == 'poster': - logger.info('Trying fallback image...') - try: - fallback_image = open(self.interface_dir + common.DEFAULT_POSTER_THUMB, 'rb') - cherrypy.response.headers['Content-type'] = 'image/png' - return fallback_image - except IOError, e: - logger.error('Unable to read fallback image. %s' % e) - elif fallback == 'cover': - logger.info('Trying fallback image...') - try: - fallback_image = open(self.interface_dir + common.DEFAULT_COVER_THUMB, 'rb') - cherrypy.response.headers['Content-type'] = 'image/png' - return fallback_image - except IOError, e: - logger.error('Unable to read fallback image. %s' % e) - - return None - - @cherrypy.expose - def info(self, item_id=None, source=None, **kwargs): - metadata = None - query = None - - config = { - "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER - } - - if source == 'history': - data_factory = datafactory.DataFactory() - metadata = data_factory.get_metadata_details(row_id=item_id) - elif item_id == 'movie': - metadata = {'media_type': 'library', 'library': 'movie', 'media_type_filter': 'movie', 'title': 'Movies'} - elif item_id == 'show': - metadata = {'media_type': 'library', 'library': 'show', 'media_type_filter': 'episode', 'title': 'TV Shows'} - elif item_id == 'artist': - metadata = {'media_type': 'library', 'library': 'artist', 'media_type_filter': 'track', 'title': 'Music'} - else: - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_metadata_details(rating_key=item_id) - if result: - metadata = result['metadata'] - else: - data_factory = datafactory.DataFactory() - query = data_factory.get_search_query(rating_key=item_id) - - if metadata: - return serve_template(templatename="info.html", data=metadata, title="Info", config=config) - else: - logger.warn('Unable to retrieve data.') - return serve_template(templatename="info.html", data=None, query=query, title="Info") - - @cherrypy.expose - def get_user_recently_watched(self, user=None, user_id=None, limit='10', **kwargs): - - data_factory = datafactory.DataFactory() - result = data_factory.get_recently_watched(user_id=user_id, user=user, limit=limit) - - if result: - return serve_template(templatename="user_recently_watched.html", data=result, - title="Recently Watched") - else: - logger.warn('Unable to retrieve data.') - return serve_template(templatename="user_recently_watched.html", data=None, - title="Recently Watched") - - @cherrypy.expose - def get_user_watch_time_stats(self, user=None, user_id=None, **kwargs): - - user_data = users.Users() - result = user_data.get_user_watch_time_stats(user_id=user_id, user=user) - - if result: - return serve_template(templatename="user_watch_time_stats.html", data=result, title="Watch Stats") - else: - logger.warn('Unable to retrieve data.') - return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats") - - @cherrypy.expose - def get_user_player_stats(self, user=None, user_id=None, **kwargs): - - user_data = users.Users() - result = user_data.get_user_player_stats(user_id=user_id, user=user) - - if result: - return serve_template(templatename="user_player_stats.html", data=result, - title="Player Stats") - else: - logger.warn('Unable to retrieve data.') - return serve_template(templatename="user_player_stats.html", data=None, title="Player Stats") - - @cherrypy.expose - def get_item_children(self, rating_key='', **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_item_children(rating_key) - - if result: - return serve_template(templatename="info_children_list.html", data=result, title="Children List") - else: - logger.warn('Unable to retrieve data.') - return serve_template(templatename="info_children_list.html", data=None, title="Children List") - - @cherrypy.expose - def get_metadata_json(self, rating_key='', **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_metadata(rating_key, 'json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_metadata_xml(self, rating_key='', **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_metadata(rating_key) - - if result: - cherrypy.response.headers['Content-type'] = 'application/xml' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_recently_added_json(self, count='0', **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_recently_added(count, 'json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_episode_list_json(self, rating_key='', **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_episode_list(rating_key, 'json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_user_ips(self, user_id=None, user=None, **kwargs): - - custom_where = [] - if user_id: - custom_where = [['user_id', user_id]] - elif user: - custom_where = [['user', user]] - - user_data = users.Users() - history = user_data.get_user_unique_ips(kwargs=kwargs, - custom_where=custom_where) - - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(history) - - @cherrypy.expose - def set_graph_config(self, graph_type=None, graph_days=None, graph_tab=None): - if graph_type: - plexpy.CONFIG.__setattr__('GRAPH_TYPE', graph_type) - plexpy.CONFIG.write() - if graph_days: - plexpy.CONFIG.__setattr__('GRAPH_DAYS', graph_days) - plexpy.CONFIG.write() - if graph_tab: - plexpy.CONFIG.__setattr__('GRAPH_TAB', graph_tab) - plexpy.CONFIG.write() - - return "Updated graphs config values." - - @cherrypy.expose - def get_plays_by_date(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_per_day(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plays_by_dayofweek(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_per_dayofweek(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plays_by_hourofday(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_per_hourofday(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plays_per_month(self, y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_per_month(y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_by_top_10_platforms(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plays_by_top_10_users(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_by_top_10_users(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plays_by_stream_type(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_per_stream_type(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plays_by_source_resolution(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_by_source_resolution(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plays_by_stream_resolution(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_total_plays_by_stream_resolution(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_stream_type_by_top_10_users(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', **kwargs): - - graph = graphs.Graphs() - result = graph.get_stream_type_by_top_10_platforms(time_range=time_range, y_axis=y_axis) - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_friends_list(self, **kwargs): - - plex_tv = plextv.PlexTV() - result = plex_tv.get_plextv_friends('json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_user_details(self, **kwargs): - - plex_tv = plextv.PlexTV() - result = plex_tv.get_plextv_user_details('json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_server_list(self, **kwargs): - - plex_tv = plextv.PlexTV() - result = plex_tv.get_plextv_server_list('json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_sync_lists(self, machine_id='', **kwargs): - - plex_tv = plextv.PlexTV() - result = plex_tv.get_plextv_sync_lists(machine_id=machine_id, output_format='json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_servers(self, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_server_list(output_format='json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_servers_info(self, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_servers_info() - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_server_friendly_name(self, **kwargs): - - result = pmsconnect.get_server_friendly_name() - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_server_prefs(self, pref=None, **kwargs): - - if pref: - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_server_pref(pref=pref) - else: - result = None - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_server_children(self, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_server_children() - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_activity(self, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_current_activity() - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_full_users_list(self, **kwargs): - - plex_tv = plextv.PlexTV() - result = plex_tv.get_full_users_list() - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(result) - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def refresh_users_list(self, **kwargs): - threading.Thread(target=plextv.refresh_users).start() - logger.info('Manual user list refresh requested.') - - @cherrypy.expose - def get_sync(self, machine_id=None, user_id=None, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - server_id = pms_connect.get_server_identity() - - plex_tv = plextv.PlexTV() - if not machine_id: - result = plex_tv.get_synced_items(machine_id=server_id['machine_identifier'], user_id=user_id) - else: - result = plex_tv.get_synced_items(machine_id=machine_id, user_id=user_id) - - if result: - output = {"data": result} - else: - logger.warn('Unable to retrieve sync data for user.') - output = {"data": []} - - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps(output) - - @cherrypy.expose - def get_sync_item(self, sync_id, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_sync_item(sync_id, output_format='json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_sync_transcode_queue(self, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_sync_transcode_queue(output_format='json') - - if result: - cherrypy.response.headers['Content-type'] = 'application/json' - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_server_pref(self, pref=None, **kwargs): - - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_server_pref(pref=pref) - - if result: - return result - else: - logger.warn('Unable to retrieve data.') - - @cherrypy.expose - def get_plexwatch_export_data(self, database_path=None, table_name=None, import_ignore_interval=0, **kwargs): - from plexpy import plexwatch_import - - db_check_msg = plexwatch_import.validate_database(database=database_path, - table_name=table_name) - if db_check_msg == 'success': - threading.Thread(target=plexwatch_import.import_from_plexwatch, - kwargs={'database': database_path, - 'table_name': table_name, - 'import_ignore_interval': import_ignore_interval}).start() - return 'Import has started. Check the PlexPy logs to monitor any problems.' - else: - return db_check_msg - - @cherrypy.expose - def plexwatch_import(self, **kwargs): - return serve_template(templatename="plexwatch_import.html", title="Import PlexWatch Database") - - @cherrypy.expose - def get_server_id(self, hostname=None, port=None, **kwargs): - from plexpy import http_handler - - if hostname and port: - request_handler = http_handler.HTTPHandler(host=hostname, - port=port, - token=None) - uri = '/identity' - request = request_handler.make_request(uri=uri, - proto='http', - request_type='GET', - output_format='', - no_token=True) - if request: - cherrypy.response.headers['Content-type'] = 'application/xml' - return request - else: - logger.warn('Unable to retrieve data.') - return None - else: - return None - - @cherrypy.expose - def random_arnold_quotes(self, **kwargs): - from random import randint - quote_list = ['To crush your enemies, see them driven before you, and to hear the lamentation of their women!', - 'Your clothes, give them to me, now!', - 'Do it!', - 'If it bleeds, we can kill it', - 'See you at the party Richter!', - 'Let off some steam, Bennett', - 'I\'ll be back', - 'Get to the chopper!', - 'Hasta La Vista, Baby!', - 'It\'s not a tumor!', - 'Dillon, you son of a bitch!', - 'Benny!! Screw you!!', - 'Stop whining! You kids are soft. You lack discipline.', - 'Nice night for a walk.', - 'Stick around!', - 'I need your clothes, your boots and your motorcycle.', - 'No, it\'s not a tumor. It\'s not a tumor!', - 'I LIED!', - 'See you at the party, Richter!', - 'Are you Sarah Conner?', - 'I\'m a cop you idiot!', - 'Come with me if you want to live.', - 'Who is your daddy and what does he do?' - ] - - random_number = randint(0, len(quote_list) - 1) - return quote_list[int(random_number)] - @cherrypy.expose def get_notification_agent_config(self, config_id, **kwargs): if config_id.isdigit(): @@ -1410,66 +1259,262 @@ class WebInterface(object): data=this_agent) @cherrypy.expose - def delete_history_rows(self, row_id, **kwargs): - data_factory = datafactory.DataFactory() + def test_notifier(self, config_id=None, subject='PlexPy', body='Test notification', **kwargs): + cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" - if row_id: - delete_row = data_factory.delete_session_history_rows(row_id=row_id) - - if delete_row: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': delete_row}) + if config_id.isdigit(): + agents = notifiers.available_notification_agents() + for agent in agents: + if int(config_id) == agent['id']: + this_agent = agent + break + else: + this_agent = None + + if this_agent: + logger.debug(u"Sending test %s notification." % this_agent['name']) + notifiers.send_notification(this_agent['id'], subject, body, **kwargs) + return "Notification sent." + else: + logger.debug(u"Unable to send test notification, invalid notification agent ID %s." % config_id) + return "Invalid notification agent ID %s." % config_id else: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': 'no data received'}) + logger.debug(u"Unable to send test notification, no notification agent ID received.") + return "No notification agent ID received." + + @cherrypy.expose + def twitterStep1(self): + cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" + tweet = notifiers.TwitterNotifier() + return tweet._get_authorization() @cherrypy.expose - def delete_all_user_history(self, user_id, **kwargs): - data_factory = datafactory.DataFactory() - - if user_id: - delete_row = data_factory.delete_all_user_history(user_id=user_id) - - if delete_row: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': delete_row}) + def twitterStep2(self, key): + cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" + tweet = notifiers.TwitterNotifier() + result = tweet._get_credentials(key) + # logger.info(u"result: " + str(result)) + if result: + return "Key verification successful" else: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': 'no data received'}) + return "Unable to verify key" @cherrypy.expose - def delete_user(self, user_id, **kwargs): - data_factory = datafactory.DataFactory() - - if user_id: - delete_row = data_factory.delete_user(user_id=user_id) - - if delete_row: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': delete_row}) - else: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': 'no data received'}) + def facebookStep1(self): + cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" + facebook = notifiers.FacebookNotifier() + return facebook._get_authorization() @cherrypy.expose - def undelete_user(self, user_id=None, username=None, **kwargs): - data_factory = datafactory.DataFactory() + def facebookStep2(self, code): + cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" + facebook = notifiers.FacebookNotifier() + result = facebook._get_credentials(code) + # logger.info(u"result: " + str(result)) + if result: + return "Key verification successful, PlexPy can send notification to Facebook. You may close this page now." + else: + return "Unable to verify key" + + @cherrypy.expose + def osxnotifyregister(self, app): + cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store" + from osxnotify import registerapp as osxnotify + + result, msg = osxnotify.registerapp(app) + if result: + osx_notify = notifiers.OSX_NOTIFY() + osx_notify.notify('Registered', result, 'Success :-)') + # logger.info(u"Registered %s, to re-register a different app, delete this app first" % result) + else: + logger.warn(msg) + return msg + + @cherrypy.expose + def set_notification_config(self, **kwargs): + + for plain_config, use_config in [(x[4:], x) for x in kwargs if x.startswith('use_')]: + # the use prefix is fairly nice in the html, but does not match the actual config + kwargs[plain_config] = kwargs[use_config] + del kwargs[use_config] + + plexpy.CONFIG.process_kwargs(kwargs) + + # Write the config + plexpy.CONFIG.write() + + cherrypy.response.status = 200 + + @cherrypy.expose + def get_plexwatch_export_data(self, database_path=None, table_name=None, import_ignore_interval=0, **kwargs): + from plexpy import plexwatch_import + + db_check_msg = plexwatch_import.validate_database(database=database_path, + table_name=table_name) + if db_check_msg == 'success': + threading.Thread(target=plexwatch_import.import_from_plexwatch, + kwargs={'database': database_path, + 'table_name': table_name, + 'import_ignore_interval': import_ignore_interval}).start() + return 'Import has started. Check the PlexPy logs to monitor any problems.' + else: + return db_check_msg + + @cherrypy.expose + def plexwatch_import(self, **kwargs): + return serve_template(templatename="plexwatch_import.html", title="Import PlexWatch Database") + + @cherrypy.expose + def get_pms_token(self): + + token = plextv.PlexTV() + result = token.get_token() + + if result: + return result + else: + logger.warn(u"Unable to retrieve Plex.tv token.") + return False + + @cherrypy.expose + def get_server_id(self, hostname=None, port=None, identifier=None, ssl=0, remote=0, **kwargs): + from plexpy import http_handler + + if hostname and port: + # Set PMS attributes to get the real PMS url + plexpy.CONFIG.__setattr__('PMS_IP', hostname) + plexpy.CONFIG.__setattr__('PMS_PORT', port) + plexpy.CONFIG.__setattr__('PMS_IDENTIFIER', identifier) + plexpy.CONFIG.__setattr__('PMS_SSL', ssl) + plexpy.CONFIG.__setattr__('PMS_IS_REMOTE', remote) + plexpy.CONFIG.write() + + plextv.get_real_pms_url() + + pms_connect = pmsconnect.PmsConnect() + request = pms_connect.get_local_server_identity() + + if request: + cherrypy.response.headers['Content-type'] = 'application/xml' + return request + else: + logger.warn(u"Unable to retrieve data for get_server_id.") + return None + else: + return None + + @cherrypy.expose + def get_server_pref(self, pref=None, **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_server_pref(pref=pref) + + if result: + return result + else: + logger.warn(u"Unable to retrieve data for get_server_pref.") + + @cherrypy.expose + def generateAPI(self): + apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32] + logger.info(u"New API key generated.") + return apikey + + @cherrypy.expose + def checkGithub(self): + from plexpy import versioncheck + + versioncheck.checkGithub() + raise cherrypy.HTTPRedirect("home") + + @cherrypy.expose + def do_state_change(self, signal, title, timer): + message = title + quote = self.random_arnold_quotes() + plexpy.SIGNAL = signal + + return serve_template(templatename="shutdown.html", title=title, + message=message, timer=timer, quote=quote) + + @cherrypy.expose + def shutdown(self): + return self.do_state_change('shutdown', 'Shutting Down', 15) + + @cherrypy.expose + def restart(self): + return self.do_state_change('restart', 'Restarting', 30) + + @cherrypy.expose + def update(self): + return self.do_state_change('update', 'Updating', 120) + + + ##### Info ##### + + @cherrypy.expose + def info(self, rating_key=None, source=None, query=None, **kwargs): + metadata = None + + config = { + "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER + } + + if source == 'history': + data_factory = datafactory.DataFactory() + metadata = data_factory.get_metadata_details(rating_key=rating_key) + else: + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_metadata_details(rating_key=rating_key, get_media_info=True) + if result: + metadata = result['metadata'] - if user_id: - delete_row = data_factory.undelete_user(user_id=user_id) - - if delete_row: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': delete_row}) - elif username: - delete_row = data_factory.undelete_user(username=username) - - if delete_row: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': delete_row}) + if metadata: + return serve_template(templatename="info.html", data=metadata, title="Info", config=config, source=source) else: - cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': 'no data received'}) + return self.update_metadata(rating_key, query) + + @cherrypy.expose + def get_item_children(self, rating_key='', **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_item_children(rating_key) + + if result: + return serve_template(templatename="info_children_list.html", data=result, title="Children List") + else: + logger.warn(u"Unable to retrieve data for get_item_children.") + return serve_template(templatename="info_children_list.html", data=None, title="Children List") + + @cherrypy.expose + def pms_image_proxy(self, img='', width='0', height='0', fallback=None, **kwargs): + try: + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_image(img, width, height) + cherrypy.response.headers['Content-type'] = result[1] + return result[0] + except: + logger.warn(u"Image proxy queried but errors occurred.") + if fallback == 'poster': + logger.info(u"Trying fallback image...") + try: + fallback_image = open(self.interface_dir + common.DEFAULT_POSTER_THUMB, 'rb') + cherrypy.response.headers['Content-type'] = 'image/png' + return fallback_image + except IOError, e: + logger.error(u"Unable to read fallback %s image: %s" % (fallback, e)) + elif fallback == 'cover': + logger.info(u"Trying fallback image...") + try: + fallback_image = open(self.interface_dir + common.DEFAULT_COVER_THUMB, 'rb') + cherrypy.response.headers['Content-type'] = 'image/png' + return fallback_image + except IOError, e: + logger.error(u"Unable to read fallback %s image: %s" % (fallback, e)) + + return None + + + ##### Search ##### @cherrypy.expose def search(self, query=''): @@ -1486,7 +1531,7 @@ class WebInterface(object): cherrypy.response.headers['Content-type'] = 'application/json' return json.dumps(result) else: - logger.warn('Unable to retrieve data.') + logger.warn(u"Unable to retrieve data for search_results.") @cherrypy.expose def get_search_results_children(self, query, media_type=None, season_index=None, **kwargs): @@ -1497,36 +1542,57 @@ class WebInterface(object): if media_type: result['results_list'] = {media_type: result['results_list'][media_type]} if media_type == 'season' and season_index: - for season in result['results_list']['season']: - if season['index'] == season_index: - result['results_list']['season'] = [season] - break + result['results_list']['season'] = [season for season in result['results_list']['season'] + if season['media_index'] == season_index] if result: return serve_template(templatename="info_search_results_list.html", data=result, title="Search Result List") else: - logger.warn('Unable to retrieve data.') + logger.warn(u"Unable to retrieve data for get_search_results_children.") return serve_template(templatename="info_search_results_list.html", data=None, title="Search Result List") + + + ##### Update Metadata ##### + @cherrypy.expose - def update_history_rating_key(self, old_rating_key, new_rating_key, media_type, **kwargs): + def update_metadata(self, rating_key=None, query=None, update=False, **kwargs): + query_string = query + update = True if update == 'True' else False + + data_factory = datafactory.DataFactory() + query = data_factory.get_search_query(rating_key=rating_key) + if query and query_string: + query['query_string'] = query_string + + if query: + return serve_template(templatename="update_metadata.html", query=query, update=update, title="Info") + else: + logger.warn(u"Unable to retrieve data for update_metadata.") + return serve_template(templatename="update_metadata.html", query=query, update=update, title="Info") + + @cherrypy.expose + def update_metadata_details(self, old_rating_key, new_rating_key, media_type, **kwargs): data_factory = datafactory.DataFactory() pms_connect = pmsconnect.PmsConnect() - old_key_list = data_factory.get_rating_keys_list(rating_key=old_rating_key, media_type=media_type) - new_key_list = pms_connect.get_rating_keys_list(rating_key=new_rating_key, media_type=media_type) + if new_rating_key: + old_key_list = data_factory.get_rating_keys_list(rating_key=old_rating_key, media_type=media_type) + new_key_list = pms_connect.get_rating_keys_list(rating_key=new_rating_key, media_type=media_type) - update_db = data_factory.update_rating_key(old_key_list=old_key_list, - new_key_list=new_key_list, - media_type=media_type) + result = data_factory.update_metadata(old_key_list=old_key_list, + new_key_list=new_key_list, + media_type=media_type) - if update_db: + if result: cherrypy.response.headers['Content-type'] = 'application/json' - return json.dumps({'message': update_db}) + return json.dumps({'message': result}) else: cherrypy.response.headers['Content-type'] = 'application/json' return json.dumps({'message': 'no data received'}) + + # test code @cherrypy.expose def get_new_rating_keys(self, rating_key='', media_type='', **kwargs): @@ -1538,7 +1604,7 @@ class WebInterface(object): cherrypy.response.headers['Content-type'] = 'application/json' return json.dumps(result) else: - logger.warn('Unable to retrieve data.') + logger.warn(u"Unable to retrieve data for get_new_rating_keys.") @cherrypy.expose def get_old_rating_keys(self, rating_key='', media_type='', **kwargs): @@ -1550,40 +1616,269 @@ class WebInterface(object): cherrypy.response.headers['Content-type'] = 'application/json' return json.dumps(result) else: - logger.warn('Unable to retrieve data.') + logger.warn(u"Unable to retrieve data for get_old_rating_keys.") + + + ##### API ##### @cherrypy.expose - def get_map_rating_keys(self, old_rating_key, new_rating_key, media_type, **kwargs): + def api(self, *args, **kwargs): + from plexpy.api import Api + + a = Api() + a.checkParams(*args, **kwargs) + + return a.fetchData() + + @cherrypy.expose + def get_pms_sessions_json(self, **kwargs): - data_factory = datafactory.DataFactory() pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_sessions('json') - if new_rating_key: - old_key_list = data_factory.get_rating_keys_list(rating_key=old_rating_key, media_type=media_type) - new_key_list = pms_connect.get_rating_keys_list(rating_key=new_rating_key, media_type=media_type) + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_pms_sessions_json.") + return False - result = data_factory.update_rating_key(old_key_list=old_key_list, - new_key_list=new_key_list, - media_type=media_type) + @cherrypy.expose + def get_metadata_json(self, rating_key='', **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_metadata(rating_key, 'json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_metadata_json.") + + @cherrypy.expose + def get_metadata_xml(self, rating_key='', **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_metadata(rating_key) + + if result: + cherrypy.response.headers['Content-type'] = 'application/xml' + return result + else: + logger.warn(u"Unable to retrieve data for get_metadata_xml.") + + @cherrypy.expose + def get_recently_added_json(self, count='0', **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_recently_added(count, 'json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_recently_added_json.") + + @cherrypy.expose + def get_episode_list_json(self, rating_key='', **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_episode_list(rating_key, 'json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_episode_list_json.") + + @cherrypy.expose + def get_friends_list(self, **kwargs): + + plex_tv = plextv.PlexTV() + result = plex_tv.get_plextv_friends('json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_friends_list.") + + @cherrypy.expose + def get_user_details(self, **kwargs): + + plex_tv = plextv.PlexTV() + result = plex_tv.get_plextv_user_details('json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_user_details.") + + @cherrypy.expose + def get_server_list(self, **kwargs): + + plex_tv = plextv.PlexTV() + result = plex_tv.get_plextv_server_list('json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_server_list.") + + @cherrypy.expose + def get_sync_lists(self, machine_id='', **kwargs): + + plex_tv = plextv.PlexTV() + result = plex_tv.get_plextv_sync_lists(machine_id=machine_id, output_format='json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_sync_lists.") + + @cherrypy.expose + def get_servers(self, **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_server_list(output_format='json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_servers.") + + @cherrypy.expose + def get_servers_info(self, **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_servers_info() if result: cherrypy.response.headers['Content-type'] = 'application/json' return json.dumps(result) else: - logger.warn('Unable to retrieve data.') + logger.warn(u"Unable to retrieve data for get_servers_info.") @cherrypy.expose - def discover(self, token=''): - """ - Returns the servers that you own as a - list of dicts (formatted for selectize) - """ - # Need to set token so result dont return http 401 - plexpy.CONFIG.__setattr__('PMS_TOKEN', token) - plexpy.CONFIG.write() + def get_server_friendly_name(self, **kwargs): - result = plextv.PlexTV() - servers = result.discover() - if servers: + result = pmsconnect.get_server_friendly_name() + + if result: cherrypy.response.headers['Content-type'] = 'application/json' - return servers + return result + else: + logger.warn(u"Unable to retrieve data for get_server_friendly_name.") + + @cherrypy.expose + def get_server_prefs(self, pref=None, **kwargs): + + if pref: + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_server_pref(pref=pref) + else: + result = None + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_server_prefs.") + + @cherrypy.expose + def get_library_sections(self, **kwargs): + + library_data = libraries.Libraries() + result = library_data.get_sections() + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_library_sections.") + + @cherrypy.expose + def get_activity(self, **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_current_activity() + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_activity.") + + @cherrypy.expose + def get_full_users_list(self, **kwargs): + + plex_tv = plextv.PlexTV() + result = plex_tv.get_full_users_list() + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps(result) + else: + logger.warn(u"Unable to retrieve data for get_full_users_list.") + + @cherrypy.expose + def get_sync_item(self, sync_id, **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_sync_item(sync_id, output_format='json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_sync_item.") + + @cherrypy.expose + def get_sync_transcode_queue(self, **kwargs): + + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_sync_transcode_queue(output_format='json') + + if result: + cherrypy.response.headers['Content-type'] = 'application/json' + return result + else: + logger.warn(u"Unable to retrieve data for get_sync_transcode_queue.") + + + + + @cherrypy.expose + def random_arnold_quotes(self, **kwargs): + from random import randint + quote_list = ['To crush your enemies, see them driven before you, and to hear the lamentation of their women!', + 'Your clothes, give them to me, now!', + 'Do it!', + 'If it bleeds, we can kill it', + 'See you at the party Richter!', + 'Let off some steam, Bennett', + 'I\'ll be back', + 'Get to the chopper!', + 'Hasta La Vista, Baby!', + 'It\'s not a tumor!', + 'Dillon, you son of a bitch!', + 'Benny!! Screw you!!', + 'Stop whining! You kids are soft. You lack discipline.', + 'Nice night for a walk.', + 'Stick around!', + 'I need your clothes, your boots and your motorcycle.', + 'No, it\'s not a tumor. It\'s not a tumor!', + 'I LIED!', + 'See you at the party, Richter!', + 'Are you Sarah Conner?', + 'I\'m a cop you idiot!', + 'Come with me if you want to live.', + 'Who is your daddy and what does he do?' + ] + + random_number = randint(0, len(quote_list) - 1) + return quote_list[int(random_number)] \ No newline at end of file