v2.6.1

Fix styling of Apple data-detectors in newsletters

.github/workflows/publish-docker.yml

@@ -27,17 +27,21 @@ jobs:
           fi
           echo ::set-output name=commit::${GITHUB_SHA}
           echo ::set-output name=build_date::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-          echo ::set-output name=docker_platforms::linux/amd64,linux/arm64,linux/arm
+          echo ::set-output name=docker_platforms::linux/amd64,linux/arm64/v8,linux/arm/v7,linux/arm/v6
           echo ::set-output name=docker_image::${{ secrets.DOCKER_REPO }}/tautulli
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+
       - name: Set up Docker Buildx
         id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v3
+        uses: docker/setup-buildx-action@v1
         with:
-          buildx-version: latest
+          version: latest
 
       - name: Cache Docker Layers
-        id: cache
         uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
@@ -45,45 +49,39 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
 
-      - name: Docker Buildx (no push)
-        run: |
-          docker buildx build \
-            --cache-from "type=local,src=/tmp/.buildx-cache" \
-            --cache-to "type=local,dest=/tmp/.buildx-cache" \
-            --platform ${{ steps.prepare.outputs.docker_platforms }} \
-            --output "type=image,push=false" \
-            --build-arg "TAG=${{ steps.prepare.outputs.tag }}" \
-            --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \
-            --build-arg "COMMIT=${{ steps.prepare.outputs.commit }}" \
-            --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \
-            --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}" \
-            --file Dockerfile .
-
-      - name: Docker Login
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         if: success()
-        env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: |
-          echo "${DOCKER_PASSWORD}" | docker login --username "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Docker Buildx (push)
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
         if: success()
-        run: |
-          docker buildx build \
-            --cache-from "type=local,src=/tmp/.buildx-cache" \
-            --platform ${{ steps.prepare.outputs.docker_platforms }} \
-            --output "type=image,push=true" \
-            --build-arg "TAG=${{ steps.prepare.outputs.tag }}" \
-            --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \
-            --build-arg "COMMIT=${{ steps.prepare.outputs.commit }}" \
-            --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \
-            --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}" \
-            --file Dockerfile .
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.GHCR_TOKEN }}
 
-      - name: Clear
-        if: always()
-        run: |
-          rm -f ${HOME}/.docker/config.json
+      - name: Docker Build and Push
+        uses: docker/build-push-action@v2
+        if: success()
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          platforms: ${{ steps.prepare.outputs.docker_platforms }}
+          build-args: |
+            TAG=${{ steps.prepare.outputs.tag }}
+            BRANCH=${{ steps.prepare.outputs.branch }}
+            COMMIT=${{ steps.prepare.outputs.commit }}
+            BUILD_DATE=${{ steps.prepare.outputs.build_date }}
+          tags: |
+            ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
+            ghcr.io/${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Post Status to Discord
         uses: sarisia/actions-status-discord@v1

.github/workflows/publish-release.yml

@@ -83,11 +83,11 @@ jobs:
         shell: bash
         run: |
           if [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo ::set-env name=VERSION::${GITHUB_REF#refs/tags/v}
+            echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
             echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
             echo ::set-output name=RELEASE_VERSION::${GITHUB_REF#refs/tags/}
           else
-            echo ::set-env name=VERSION::0.0.0
+            echo "VERSION=0.0.0" >> $GITHUB_ENV
             echo ::set-output name=VERSION::0.0.0
             echo ::set-output name=RELEASE_VERSION::${GITHUB_SHA::7}
           fi

.gitignore

@@ -17,6 +17,7 @@ version.lock
 logs/*
 backups/*
 cache/*
+exports/*
 newsletters/*
 *.mmdb
 version.txt

CHANGELOG.md

@@ -1,5 +1,88 @@
 # Changelog
 
+## v2.6.1 (2020-11-03)
+
+* Other:
+  * Fix: High CPU/memory usage in some instances.
+  * Fix: Logger error preventing Tautulli from starting.
+  * Fix: Database issue with non-unique image hashes.
+
+
+## v2.6.0 (2020-10-31)
+
+* Exporter:
+  * New: New exporter feature that allows you to export the metadata and images for any library, collection, playlist, or media item to csv, json, xml, or m3u8. Refer to the Exporter Guide in the wiki for more details.
+* UI:
+  * Fix: Margin on the homepage activity and statistic/library cards. (Thanks @dotsam)
+  * Fix: Movie ratings not showing on the info page for the new Plex Movie agent.
+  * New: Added ability to browse collections and playlists from the library and user pages.
+  * Change: Updated platform brand logos and colours.
+* API:
+  * New: Added export_metadata, download_export, and delete_export API commands.
+  * New: Added get_collections_table, and get_playlists_table API commands.
+  * New: Added min_version parameter to the register_device API command.
+  * New: Added include_activity parameter to the get_history API command.
+  * New: Added sync_id parameter to the get_metadata API command.
+  * New: Added delete_synced_item API command.
+  * New: Added a stat_id and stats_start parameters to the get_home_stats API command.
+  * New: Allow deleting a mobile device using the registration device_id for the delete_mobile_device API command.
+  * Change: Return Plex server info and Tautulli info from the register_device command.
+* Other:
+  * New: The Docker container is now also built for the arm32v6 architecture.
+  * New: The Docker container is also published to the GitHub Container Registry at ghcr.io/tautulli/tautulli.
+  * Change: Tautulli is now using a forked version of plexapi 3.6.0. This is to support the exporter feature while still maintaining Python 2 compatibility.
+  * Change: Updated systemd script to remove process forking. (Thanks @MichaIng)
+  * Change: Cache GitHub update check on startup.
+
+
+## v2.5.6 (2020-10-02)
+
+* Activity:
+  * Change: Renamed container "Transcode" to "Converting" on activity cards.
+* Notifications:
+  * New: Added a silent notification option for Telegram. (Thanks @JohnnyKing94)
+  * New: Added container_decision notification parameter.
+  * New: Added notification trigger for Playback Error.
+  * New: Added remote access down notification threshold setting.
+* Newsletter:
+  * Change: Stop flooring newsletter start date.
+* UI:
+  * Fix: Unable to purge history from the library edit modal.
+  * Fix: QR code not showing up for localhost address when trying to register a device.
+  * New: Added library name to the fix metadata modal.
+* API:
+  * New: Added default thumb and art to the Live TV library.
+* Other:
+  * Fix: Synced items not loading for guest access.
+  * New: Schedule some more automatic database optimizations.
+  * Change: Added automatic uninstall before installing to the Windows installer.
+
+
+## v2.5.5 (2020-09-06)
+
+* Activity:
+  * Fix: Filter out TV show background theme music sessions.
+* Notifications:
+  * New: Check Plex external guids for notification metadata provider links.
+* UI:
+  * Fix: Incorrect sorting for user/library recently played items.
+* API:
+  * Fix: get_synced_items API command returning error with empty result.
+  * Fix: Download API commands not returning the file.
+  * Fix: get_logs API command encoding error.
+  * Fix: get_user_player_stats API command returning error instead of empty result.
+  * New: Added get_server_info API command.
+  * New: Added external guids to get_metadata API command.
+  * New: Added support for multi-column sorting for datatable API commands.
+  * Change: get_activity API command return thumbnail override for clips.
+  * Change: get_libraries_table API command return custom library artwork.
+* Other:
+  * Fix: Tautulli failed to run with a stale pid file.
+  * New: Added scheduled task to optimize the Tautulli database.
+  * Change: Update plexapi to 3.6.0.
+  * Change: Update some libraries for Python 3 compatibility.
+
+
 ## v2.5.4 (2020-07-31)
 
 * Monitoring:

Dockerfile

@@ -11,13 +11,16 @@ ENV TZ=UTC
 WORKDIR /app
 
 RUN \
+  groupadd -g 1000 tautulli && \
+  useradd -u 1000 -g 1000 tautulli && \
   echo ${BRANCH} > /app/branch.txt && \
   echo ${COMMIT} > /app/version.txt
 
 COPY . /app
 
+CMD [ "python", "Tautulli.py", "--datadir", "/config" ]
 ENTRYPOINT [ "./start.sh" ]
 
 VOLUME /config
 EXPOSE 8181
-HEALTHCHECK  --start-period=90s CMD curl -ILfSs http://localhost:8181/status > /dev/null || curl -ILfkSs https://localhost:8181/status > /dev/null || exit 1
+HEALTHCHECK --start-period=90s CMD curl -ILfSs http://localhost:8181/status > /dev/null || curl -ILfkSs https://localhost:8181/status > /dev/null || exit 1

README.md

@@ -32,6 +32,7 @@ This project is based on code from [Headphones](https://github.com/rembo10/headp
 [![Python](https://img.shields.io/badge/python-2.7.17,%203.6,%203.7,%203.8-blue?style=flat-square)](https://python.org/downloads)
 [![Docker Pulls](https://img.shields.io/docker/pulls/tautulli/tautulli?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
 [![Docker Stars](https://img.shields.io/docker/stars/tautulli/tautulli?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
+[![Downloads](https://img.shields.io/github/downloads/Tautulli/Tautulli/total?style=flat-square)](https://github.com/Tautulli/Tautulli/releases/latest)
 
 | Status | Branch: `master` | Branch: `beta` | Branch: `nightly` |
 | --- | --- | --- | --- |

Tautulli.py

@@ -149,11 +149,13 @@ def main():
             try:
                 with open(plexpy.PIDFILE, 'r') as fp:
                     pid = int(fp.read())
-                os.kill(pid, 0)
             except IOError as e:
                 raise SystemExit("Unable to read PID file: %s", e)
+
+            try:
+                os.kill(pid, 0)
             except OSError:
-                logger.warn("PID file '%s' already exists, but PID %d is " \
+                logger.warn("PID file '%s' already exists, but PID %d is "
                             "not running. Ignoring PID file." %
                             (plexpy.PIDFILE, pid))
             else:

data/interfaces/default/base.html

@@ -13,8 +13,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
+    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
     <link href="${http_root}css/pnotify.custom.min.css" rel="stylesheet" />
+    <link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet" />
+    <link href="${http_root}css/selectize.min.css" rel="stylesheet" />
     <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <link href="${http_root}css/opensans.min.css" rel="stylesheet">
     <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">
@@ -22,21 +24,21 @@
     ${next.headIncludes()}
 
     <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.5">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.5">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.5">
+    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
+    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
+    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
 
     <!-- ICONS -->
     <!-- Android -->
-    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.0.5" crossorigin="use-credentials">
+    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.6.0" crossorigin="use-credentials">
     <meta name="theme-color" content="#282a2d">
     <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.5">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.0.5" color="#282a2d">
+    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.6.0">
+    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.6.0" color="#282a2d">
     <meta name="apple-mobile-web-app-title" content="Tautulli">
     <!-- Microsoft -->
     <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.0.5">
+    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.6.0">
 </head>
 
 <body class="content">
@@ -48,17 +50,17 @@
         % if plexpy.UPDATE_AVAILABLE is None:
         You are running an unknown version of Tautulli.<br />
         % elif plexpy.UPDATE_AVAILABLE == 'release':
-        A <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank">
+        A <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank" rel="noreferrer">
         new release (${plexpy.LATEST_RELEASE})</a> of Tautulli is available!<br />
         % elif plexpy.UPDATE_AVAILABLE == 'commit':
-        A <a href="${anon_url('https://github.com/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION, plexpy.LATEST_VERSION))}" target="_blank">
+        A <a href="${anon_url('https://github.com/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION, plexpy.LATEST_VERSION))}" target="_blank" rel="noreferrer">
         newer version</a> of Tautulli is available!<br />
         You are ${plexpy.COMMITS_BEHIND} commit${'s' if plexpy.COMMITS_BEHIND > 1 else ''} behind.<br />
         % endif
         % if plexpy.INSTALL_TYPE == 'docker':
         Update your Docker container or <a href="#" id="updateDismiss">Dismiss</a>
         % elif plexpy.INSTALL_TYPE in ('windows', 'macos'):
-        <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>
+        <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank" rel="noreferrer">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>
         % else:
         <a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>
         % endif
@@ -136,7 +138,7 @@
                             <li><a href="settings"><i class="fa fa-fw fa-cogs"></i> Settings</a></li>
                             <li role="separator" class="divider"></li>
                             <li><a href="logs"><i class="fa fa-fw fa-list-alt"></i> View Logs</a></li>
-                            <li><a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/Frequently-Asked-Questions' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank"><i class="fa fa-fw fa-question-circle"></i> FAQ</a></li>
+                            <li><a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/Frequently-Asked-Questions' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer"><i class="fa fa-fw fa-question-circle"></i> FAQ</a></li>
                             <li><a href="support"><i class="fa fa-fw fa-comment"></i> Support</a></li>
                             <li role="separator" class="divider"></li>
                             <li><a href="#" data-target="#donate-modal" data-toggle="modal"><i class="fa fa-fw fa-heart"></i> Donate</a></li>
@@ -239,7 +241,7 @@ ${next.modalIncludes()}
                         <p>
                             Click the button below to continue to GitHub.
                         </p>
-                        <a href="${anon_url('https://github.com/sponsors/JonnyWong16')}" target="_blank" class="btn btn-sm btn-default" style="font-weight: 600;">
+                        <a href="${anon_url('https://github.com/sponsors/JonnyWong16')}" target="_blank" rel="noreferrer" class="btn btn-sm btn-default" style="font-weight: 600;">
                             <i class="fa fa-heart fa-sm" style="color: #ea4aaa;"></i>&nbsp; Sponsor
                         </a>
                     </div>
@@ -247,15 +249,15 @@ ${next.modalIncludes()}
                         <p>
                             Click the button below to continue to Patreon.
                         </p>
-                        <a href="${anon_url('https://www.patreon.com/join/tautulli')}" target="_blank">
-                            <img src="images/become_a_patron_button.png" alt="Become a Patron" height="40">
+                        <a href="${anon_url('https://www.patreon.com/join/tautulli')}" target="_blank" rel="noreferrer">
+                            <img src="images/become_a_patron_button.png" alt="Become a Patron" width="170" height="40">
                         </a>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="paypal-donation" style="text-align: center">
                         <p>
                             Click the button below to continue to PayPal.
                         </p>
-                        <a href="${anon_url('https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=6XPPKTDSX9QFL&lc=US&item_name=Tautulli&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted')}" target="_blank">
+                        <a href="${anon_url('https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=6XPPKTDSX9QFL&lc=US&item_name=Tautulli&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted')}" target="_blank" rel="noreferrer">
                             <img src="images/gold-rect-paypal-34px.png" alt="PayPal">
                         </a>
                     </div>
@@ -288,14 +290,17 @@ ${next.modalIncludes()}
     </div>
 </div>
 
-<script src="${http_root}js/jquery-2.1.4.min.js"></script>
+<script src="${http_root}js/jquery-3.5.1.min.js"></script>
 <script src="${http_root}js/bootstrap.min.js"></script>
 <script src="${http_root}js/bootstrap-hover-dropdown.min.js"></script>
+<script src="${http_root}js/moment-with-locales.min.js"></script>
+<script src="${http_root}js/moment-duration-format.min.js"></script>
 <script src="${http_root}js/pnotify.custom.min.js"></script>
 <script src="${http_root}js/platform.min.js"></script>
 <script src="${http_root}js/ipaddr.min.js"></script>
-<script src="${http_root}js/script.js${cache_param}"></script>
+<script src="${http_root}js/selectize.min.js"></script>
 <script src="${http_root}js/jquery.tripleclick.min.js"></script>
+<script src="${http_root}js/script.js${cache_param}"></script>
 <script src="${http_root}js/ajaxNotifications.js"></script>
 <script>
     % if _session['user_group'] == 'admin':
@@ -325,15 +330,15 @@ ${next.modalIncludes()}
                     if (result.update === null) {
                         msg = 'You are running an unknown version of Tautulli.<br />';
                     } else if (result.update === true && result.release === true) {
-                        msg = 'A <a href="' + result.release_url + '" target="_blank">new release (' + result.latest_release + ')</a> of Tautulli is available!<br />';
+                        msg = 'A <a href="' + result.release_url + '" target="_blank" rel="noreferrer">new release (' + result.latest_release + ')</a> of Tautulli is available!<br />';
                     } else if (result.update === true && result.release === false) {
-                        msg = 'A <a href="' + result.compare_url + '" target="_blank">newer version</a> of Tautulli is available!<br />' +
+                        msg = 'A <a href="' + result.compare_url + '" target="_blank" rel="noreferrer">newer version</a> of Tautulli is available!<br />' +
                             'You are '+ result.commits_behind + ' commit' + (result.commits_behind > 1 ? 's' : '') + ' behind.<br />';
                     }
                     if (result.install_type === 'docker') {
                         msg += 'Update your Docker container or <a href="#" id="updateDismiss">Dismiss</a>';
                     } else if (result.install_type === 'windows' || result.install_type === 'macos') {
-                        msg += '<a href="' + result.release_url + '" target="_blank">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>'
+                        msg += '<a href="' + result.release_url + '" target="_blank" rel="noreferrer">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>'
                     } else {
                         msg += '<a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>';
                     }

data/interfaces/default/configuration_table.html

@@ -22,11 +22,11 @@ DOCUMENTATION :: END
         % if plexpy.CURRENT_VERSION:
         <tr>
             <td>Git Branch:</td>
-            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/tree/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH))}" target="_blank">${plexpy.CONFIG.GIT_BRANCH}</a></td>
+            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/tree/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH))}" target="_blank" rel="noreferrer">${plexpy.CONFIG.GIT_BRANCH}</a></td>
         </tr>
         <tr>
             <td>Git Commit Hash:</td>
-            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/commit/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION))}" target="_blank">${plexpy.CURRENT_VERSION}</a></td>
+            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/commit/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION))}" target="_blank" rel="noreferrer">${plexpy.CURRENT_VERSION}</a></td>
         </tr>
         % endif
         <tr>
@@ -49,6 +49,10 @@ DOCUMENTATION :: END
             <td>Cache Directory:</td>
             <td>${plexpy.CONFIG.CACHE_DIR}</td>
         </tr>
+        <tr>
+            <td>Export Directory:</td>
+            <td>${plexpy.CONFIG.EXPORT_DIR}</td>
+        </tr>
         <tr>
             <td>Newsletter Directory:</td>
             <td>${plexpy.CONFIG.NEWSLETTER_DIR}</td>
@@ -74,19 +78,19 @@ DOCUMENTATION :: END
         <tr>
             <td class="top-line">Resources:</td>
             <td class="top-line">
-                <a class="no-highlight" href="${anon_url('https://tautulli.com')}" target="_blank">Tautulli Website</a> |
-                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank">GitHub Source</a> |
-                <a class="no-highlight guidelines-modal-link" href="${anon_url('https://github.com/%s/%s-Issues' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" data-id="issue">GitHub Issues</a> |
-                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s-Wiki' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank">GitHub Wiki</a> |
-                <a class="no-highlight guidelines-modal-link" href="${anon_url('http://feathub.com/%s/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" data-id="feature request">FeatHub Feature Requests</a>
+                <a class="no-highlight" href="${anon_url('https://tautulli.com')}" target="_blank" rel="noreferrer">Tautulli Website</a> |
+                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">GitHub Source</a> |
+                <a class="no-highlight guidelines-modal-link" href="${anon_url('https://github.com/%s/%s-Issues' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" rel="noreferrer" data-id="issue">GitHub Issues</a> |
+                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s-Wiki' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">GitHub Wiki</a> |
+                <a class="no-highlight guidelines-modal-link" href="${anon_url('http://feathub.com/%s/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" rel="noreferrer" data-id="feature request">FeatHub Feature Requests</a>
             </td>
         </tr>
         <tr>
             <td>Support:</td>
             <td>
-                <a class="no-highlight support-modal-link" href="${anon_url('https://tautulli.com/discord')}" target="_blank">Tautulli Discord Server</a> |
-                <a class="no-highlight support-modal-link" href="${anon_url('https://www.reddit.com/r/Tautulli')}" target="_blank">Tautulli Subreddit</a> | 
-                <a class="no-highlight support-modal-link" href="${anon_url('https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242')}" target="_blank">Plex Forums</a>
+                <a class="no-highlight support-modal-link" href="${anon_url('https://tautulli.com/discord')}" target="_blank" rel="noreferrer">Tautulli Discord Server</a> |
+                <a class="no-highlight support-modal-link" href="${anon_url('https://www.reddit.com/r/Tautulli')}" target="_blank" rel="noreferrer">Tautulli Subreddit</a> |
+                <a class="no-highlight support-modal-link" href="${anon_url('https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242')}" target="_blank" rel="noreferrer">Plex Forums</a>
             </td>
         </tr>
     </tbody>

data/interfaces/default/css/dataTables.colVis.css

@@ -71,7 +71,7 @@ ul.ColVis_collection {
 	list-style: none;
 	width: 150px;
 	padding: 8px 8px 4px 8px;
-	margin: 10px 0px 0px 0px;
+	margin: 10px 0px 10px 0px;
 	background-color: #444;
 	overflow: hidden;
 	z-index: 2002;

data/interfaces/default/css/tautulli.css

@@ -1,6 +1,6 @@
 body {
     font-family: 'Open Sans', Arial, sans-serif;
-    color: #fff;
+    color: #eee;
     margin-top: 50px;
     overflow: hidden;
 }
@@ -36,7 +36,7 @@ select.input-sm {
 select[multiple] {
     height: 125px;
     margin: 5px 0 5px 0;
-    color: #fff;
+    color: #eee;
     border: 0px solid #444;
     background: #555;
     padding: 2px 2px;
@@ -48,7 +48,7 @@ select[multiple]:focus {
     outline: 0;
     outline: thin dotted \9;
     color: #555;
-    background-color: #fff;
+    background-color: #eee;
     transition: background-color .3s;
 }
 select[multiple]:focus::-webkit-scrollbar-thumb {
@@ -63,7 +63,7 @@ select[multiple] option {
 select.form-control,
 div.form-control .selectize-input {
     margin: 5px 0 5px 0;
-    color: #fff;
+    color: #eee;
     border: 0px solid #444;
     background: #555;
     padding: 6px 12px;
@@ -76,7 +76,7 @@ select.form-control {
 }
 .react-selectize.root-node .react-selectize-control,
 .selectize-control.form-control .selectize-input {
-    color: #fff !important;
+    color: #eee !important;
     border: 0px solid #444 !important;
     background: #555 !important;
     padding: 1px 2px;
@@ -123,15 +123,15 @@ select.form-control {
     cursor: pointer;
 }
 .react-selectize.root-node .react-selectize-control .react-selectize-placeholder {
-    color: #fff !important;
+    color: #eee !important;
 }
 .react-selectize.root-node .react-selectize-control .react-selectize-toggle-button path {
-    fill: #fff !important;
+    fill: #eee !important;
 }
 .react-selectize.root-node .simple-value,
 .selectize-control.multi .selectize-input > div {
-    background: #444444 !important;
-    color: #ffffff !important;
+    background: #444 !important;
+    color: #eee !important;
     padding-bottom: 2px !important;
     transition: background-color .3s;
 }
@@ -156,7 +156,7 @@ select.form-control:focus,
     outline: 0;
     outline: thin dotted \9;
     color: #555 !important;
-    background-color: #fff !important;
+    background-color: #eee !important;
     transition: background-color .3s;
 }
 .react-selectize.root-node.open .simple-value,
@@ -217,9 +217,13 @@ select.form-control:focus,
 .selectize-dropdown .optgroup-header {
     font-weight: bold;
 }
+.selectize-dropdown [data-selectable].option-disabled {
+  color: #aaa;
+  cursor: default;
+}
 select.form-control option {
     color: #555;
-    background-color: #fff;
+    background-color: #eee;
 }
 img {
     -webkit-box-sizing: content-box;
@@ -278,13 +282,13 @@ object {
 }
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
-  color: #fff;
+  color: #eee;
   background-color: #2f2f2f;
 }
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
-  color: #fff;
+  color: #eee;
   background-color: #2f2f2f;
 }
 .dropdown-menu > .disabled > a,
@@ -327,14 +331,14 @@ object {
   background-color: #3B3B3B;
 }
 .btn-dark:hover {
-  color: #fff;
+  color: #eee;
   background-color: #333;
   border-color: #444;
 }
 .btn-dark:active,
 .btn-dark.active,
 .open > .dropdown-toggle.btn-dark {
-  color: #fff;
+  color: #eee;
   background-color: #333;
   border-color: #444;
 }
@@ -347,7 +351,7 @@ object {
 .btn-dark:active.focus,
 .btn-dark.active.focus,
 .open > .dropdown-toggle.btn-dark.focus {
-  color: #fff;
+  color: #eee;
   background-color: #333;
 }
 .btn-dark:active,
@@ -387,24 +391,24 @@ fieldset[disabled] .btn-dark.active {
   background-color: #3B3B3B;
 }
 .btn-bright {
-  color: #fff;
+  color: #eee;
   background-color: #cc7b19;
   box-shadow: inset 0 1px 0 #e7993b;
 }
 .btn-bright:focus,
 .btn-bright.focus {
-  color: #fff;
+  color: #eee;
   background-color: #eb8600;
 }
 .btn-bright:hover {
-  color: #fff;
+  color: #eee;
   background-color: #e59029;
   box-shadow: inset 0 1px 0 #ebac60;
 }
 .btn-bright:active,
 .btn-bright.active,
 .open > .dropdown-toggle.btn-bright {
-  color: #fff;
+  color: #eee;
   background-color: #cc7b19;
   box-shadow: inset 0 1px 0 #e7993b;
 }
@@ -417,7 +421,7 @@ fieldset[disabled] .btn-dark.active {
 .btn-bright:active.focus,
 .btn-bright.active.focus,
 .open > .dropdown-toggle.btn-bright.focus {
-  color: #fff;
+  color: #eee;
   background-color: #cc7b19;
   box-shadow: inset 0 1px 0 #e7993b;
 }
@@ -448,7 +452,7 @@ fieldset[disabled] .btn-bright.active {
   border-color: #b56d16;
 }
 .btn-bright .badge {
-  color: #fff;
+  color: #eee;
   background-color: #cc7b19;
   box-shadow: inset 0 1px 0 #e7993b;
 }
@@ -459,22 +463,26 @@ fieldset[disabled] .btn-bright.active {
     float: right;
 }
 .btn-danger.btn-edit:hover {
-    color: #fff;
+    color: #eee;
     background-color: #c9302c;
     border-color: #ac2925;
 }
 .btn-danger.btn-edit.active {
-  color: #fff;
+  color: #eee;
   background-color: #c9302c;
   border-color: #ac2925;
 }
 .btn-danger.btn-edit.active:hover {
-  color: #fff;
+  color: #eee;
   background-color: #ac2925;
   border-color: #761c19;
 }
 .btn-group select {
     margin-top: 0;
+    height: 34px;
+}
+.btn-group label {
+    margin-bottom: 0;
 }
 .input-group-addon-form {
     display: inline-block;
@@ -488,9 +496,6 @@ fieldset[disabled] .btn-bright.active {
     width: 100%;
     margin-top: 5px;
 }
-#user-selection label {
-    margin-bottom: 0;
-}
 .alert-edit {
     display: none;
     float: left;
@@ -512,7 +517,7 @@ fieldset[disabled] .btn-bright.active {
     background-color: #222222;
 }
 .modal-body table {
-    color: #fff;
+    color: #eee;
 }
 .modal-body li {
     margin-top: 7px;
@@ -526,7 +531,7 @@ fieldset[disabled] .btn-bright.active {
     color: #E5A00D;
 }
 .modal-body i.fa {
-    color: #fff;
+    color: #eee;
 }
 .modal-body td:hover a .fa,
 .modal-body a:focus i.fa {
@@ -560,7 +565,7 @@ input[type="tel"],
 input[type="color"],
 .uneditable-input {
     margin: 5px 0 5px 0;
-    color: #fff;
+    color: #eee;
     border: 0px solid #444;
     background: #555;
     height: 32px;
@@ -572,7 +577,7 @@ input[type="color"],
 textarea.form-control {
     height: initial;
     margin: 5px 0 5px 0;
-    color: #fff;
+    color: #eee;
     border: 0px solid #444;
     background: #555;
     padding: 6px 12px;
@@ -584,7 +589,7 @@ textarea.form-control {
 textarea.form-control:focus {
     outline: 0;
     color: #555;
-    background-color: #fff;
+    background-color: #eee;
     transition: background-color .3s;
 }
 .pagination > li > a,
@@ -594,7 +599,7 @@ textarea.form-control:focus {
     padding: 6px 12px;
     margin-left: -1px;
     line-height: 1.42857143;
-    color: #fff;
+    color: #eee;
     text-decoration: none;
     background-color: #262626;
     border: 1px solid #444444;
@@ -613,7 +618,7 @@ textarea.form-control:focus {
 .pagination > .active > a:focus,
 .pagination > .active > span:focus {
     z-index: 2;
-    color: #fff;
+    color: #eee;
     cursor: default;
     background-color: #cc7b19;
     border-color: #444444;
@@ -632,7 +637,7 @@ textarea.form-control:focus {
 .nav-pills > li.active > a,
 .nav-pills > li.active > a:hover,
 .nav-pills > li.active > a:focus {
-    color: #fff;
+    color: #eee;
     background-color: #cc7b19;
 }
 .nav-pills > li > a {
@@ -666,11 +671,11 @@ textarea.form-control:focus {
     -webkit-appearance:none;
 }
 .btn-form:hover {
-    color: #fff;
+    color: #eee;
     background-color: #333;
 }
 .btn-form:focus {
-    color: #fff;
+    color: #eee;
 }
 .form-control-feedback {
     color: #E5A00D;
@@ -682,7 +687,7 @@ fieldset[disabled] .form-control {
     background-color: #555;
 }
 .form-control[readonly]:focus {
-    background-color: #fff;
+    background-color: #eee;
 }
 .poster {
     position: relative;
@@ -745,16 +750,17 @@ a .users-poster-face:hover {
     position: relative;
 }
 #dashboard-checking-activity,
-#dashboard-no-activity {
+#dashboard-no-activity,
+#dashboard-checking-recently-added,
+#dashboard-no-recently-added {
     margin-bottom: 20px;
 }
 .dashboard-activity-instance {
     float: left;
     position: relative;
     height: 290px;
-    min-width: 350px;
     max-width: 500px;
-    margin-right: 25px;
+    margin-left: 25px;
     margin-bottom: 25px;
 }
 .dashboard-activity-container {
@@ -1030,7 +1036,7 @@ a .users-poster-face:hover {
     height: 249px;
 }
 .dashboard-activity-container:hover .dashboard-activity-progress {
-	height: 14px;
+    height: 14px;
 }
 .dashboard-activity-container:hover .progress-bar {
     color: rgba(255, 255, 255, 1);
@@ -1071,7 +1077,7 @@ a:hover .dashboard-activity-cover {
     font-size: 13px;
     font-weight: bold;
     line-height: 25px;
-    color: #fff;
+    color: #eee;
 }
 .dashboard-activity-metadata-play_state-icon {
     flex-basis: 25px;
@@ -1155,9 +1161,8 @@ a .dashboard-activity-metadata-user-thumb:hover {
     float: left;
     position: relative;
     height: 160px;
-    min-width: 350px;
     max-width: 500px;
-    margin-right: 25px;
+    margin-left: 25px;
     margin-bottom: 25px;
 }
 .dashboard-stats-container {
@@ -1443,9 +1448,6 @@ a:hover .dashboard-stats-square {
     -moz-box-shadow: inset 0 0 0 2px #e9a049;
     box-shadow: inset 0 0 0 2px #e9a049;
 }
-#dashboard-no-recently-added {
-    margin-bottom: 20px;
-}
 .dashboard-recent-media-row {
     width: 100%;
     margin: 0 auto;
@@ -1534,7 +1536,7 @@ a:hover .dashboard-recent-media-cover {
 }
 .dashboard-recent-media-metacontainer h3 {
     padding: 5px 3px 0 3px;
-    color: #fff;
+    color: #eee;
     text-overflow: ellipsis;
     overflow: hidden;
     position: relative;
@@ -1647,12 +1649,12 @@ a:hover .dashboard-recent-media-cover {
     color: #f9be03;
 }
 .summary-content-title h1 a:hover {
-    color: #fff;
+    color: #eee;
 }
 .summary-content-title h2 {
     margin-top: 0;
     margin-bottom: 10px;
-    color: #fff;
+    color: #eee;
     font-size: 28px;
     line-height: 40px;
     float: left;
@@ -1749,6 +1751,7 @@ a:hover .dashboard-recent-media-cover {
     box-shadow: inset 0 0 0 2px #e9a049;
     opacity: 0;
     transition: opacity .2s;
+    z-index: 2;
 }
 .summary-poster-face-overlay span {
     display: block;
@@ -1806,7 +1809,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
     line-height: 24px;
 }
 .summary-content-details-tag strong {
-    color: #fff;
+    color: #eee;
     margin-left: 2px;
     margin-right: 10px;
 }
@@ -1826,7 +1829,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
 }
 .summary-content-summary {
     overflow: hidden;
-    color: #fff;
+    color: #eee;
     float: left;
     position: relative;
     clear: both;
@@ -1860,7 +1863,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
     display: block;
     font-size: 12px;
     line-height: 18px;
-    color: #fff;
+    color: #eee;
 }
 .summary-content-genres {
     margin-top: 13px;
@@ -1879,7 +1882,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
     display: block;
     font-size: 12px;
     line-height: 18px;
-    color: #fff;
+    color: #eee;
 }
 .summary-content-writers {
     margin-top: 13px;
@@ -1898,7 +1901,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
     display: block;
     font-size: 12px;
     line-height: 18px;
-    color: #fff;
+    color: #eee;
 }
 .star-rating {
     display: inline-block;
@@ -1951,7 +1954,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
     position: relative;
     margin: 0;
     line-height: 22px;
-    color: #fff;
+    color: #eee;
     font-size: 16px;
     text-align: center;
     text-transform: uppercase;
@@ -1962,7 +1965,10 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
 .item-children-instance {
     list-style: none;
     margin: 0;
-    overflow: hidden;
+    overflow: auto;
+}
+.item-children-instance.max-height {
+    max-height: 700px;
 }
 .item-children-instance li {
     float: left;
@@ -2047,7 +2053,7 @@ a:hover .item-children-poster {
 .item-children-instance-text-wrapper h3 {
     width: 100%;
     padding: 5px 3px 0 3px;
-    color: #fff;
+    color: #eee;
     text-overflow: ellipsis;
     overflow: hidden;
     position: relative;
@@ -2098,7 +2104,7 @@ a:hover .item-children-poster {
 }
 .item-children-list-item-title {
     display: inline-block;
-    width: calc(100% - 110px);
+    width: calc(100% - 125px);
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
@@ -2108,11 +2114,19 @@ a:hover .item-children-poster {
     color: #777;
     text-align: right;
     display: inline-block;
-    width: 40px;
+    width: 60px;
     margin-right: 20px;
 }
+.nav-list {
+    float: left;
+    list-style: none;
+    padding: 0;
+}
+.nav-list.nav-pills > li > a {
+    margin-bottom: 0;
+}
 #new_title h3 {
-    color: #f9be03;
+    color: #E5A00D;
     font-size: 14px;
     line-height: 1.42857143;
     font-weight: bold;
@@ -2148,7 +2162,7 @@ span.settings-warning {
     padding-left: 10px;
 }
 #menu_link_show_advanced_settings.active {
-  color: #fff;
+  color: #eee;
   background-color: #cc7b19;
 }
 .advanced-setting {
@@ -2183,33 +2197,18 @@ li.advanced-setting {
 }
 .user-info-username {
     font-size: 24px;
-    color: #fff;
-    padding-top: 27px;
+    color: #eee;
+    padding-top: 15px;
     padding-left: 105px;
 }
 .user-info-nav {
     margin-top: 15px;
-}
-.user-info-nav > .active > a {
-    color: #cc7b19;
+    padding-left: 105px;
 }
 .nav-tabs > .active > a:hover,
 .nav-tabs > .active > a:focus {
     color: #e9a049;
 }
-.user-info-nav a:hover {
-    color: #e9a049;
-    text-decoration: none;
-}
-.user-info-nav ul {
-    list-style: none;
-    padding: 0;
-}
-.user-info-nav li {
-    float: left;
-    margin-left: 10px;
-    margin-right: 10px;
-}
 .user-overview-stats-wrapper {
 }
 .user-overview-stats-wrapper ul {
@@ -2249,7 +2248,7 @@ li.advanced-setting {
     left: 0px;
 }
 .user-overview-stats-instance h3 strong{
-    color: #fff;
+    color: #eee;
 }
 .user-overview-stats-instance h3 {
     font-size: 30px;
@@ -2262,7 +2261,7 @@ li.advanced-setting {
     float: left;
 }
 .user-overview-stats-instance h4 {
-    color: #fff;
+    color: #eee;
     margin-bottom: 25px;
 }
 .user-overview-stats-instance h1 {
@@ -2302,7 +2301,7 @@ li.advanced-setting {
 .user-player-instance-name {
     float: left;
     padding-top: 14px;
-    color: #fff;
+    color: #eee;
     text-overflow: ellipsis;
     overflow: hidden;
     position: relative;
@@ -2361,9 +2360,6 @@ a .library-user-instance-box:hover {
     -moz-box-shadow: inset 0 0 0 2px #e9a049;
     box-shadow: inset 0 0 0 2px #e9a049;
 }
-#watched-stats-days-selection label {
-    margin-bottom: 0;
-}
 .home-padded-header {
     margin: 25px 0;
     height: 34px;
@@ -2441,7 +2437,7 @@ a .library-user-instance-box:hover {
     overflow: hidden;
 }
 .home-platforms-instance-name {
-    color: #fff;
+    color: #eee;
     text-overflow: ellipsis;
     overflow: hidden;
     position: relative;
@@ -2628,7 +2624,7 @@ a .library-user-instance-box:hover {
 }
 .home-platforms-instance-list-name {
     float: left;
-    color: #fff;
+    color: #eee;
     text-overflow: ellipsis;
     overflow: hidden;
     position: relative;
@@ -3043,7 +3039,7 @@ a .home-platforms-list-cover-face:hover
 }
 .submenu a:hover {
     background: #f9be03;
-    color: #FFF;
+    color: #eee;
 }
 .ajaxMsg {
     background-color: rgba(255,255,255,0.075);
@@ -3102,21 +3098,21 @@ div.dataTables_info {
     white-space: normal !important;
 }
 .tooltip.top .tooltip-arrow {
-    border-top-color: #fff;
+    border-top-color: #eee;
 }
 .tooltip.right .tooltip-arrow {
-    border-right-color: #fff;
+    border-right-color: #eee;
 }
 .tooltip.bottom .tooltip-arrow {
-    border-bottom-color: #fff;
+    border-bottom-color: #eee;
 }
 .tooltip.left .tooltip-arrow {
-    border-left-color: #fff;
+    border-left-color: #eee;
 }
 .tooltip-inner {
     max-width: 250px;
     color: #000;
-    background: #fff;
+    background: #eee;
     border: 0;
     font-weight: bold;
     border-radius: 2px;
@@ -3208,7 +3204,7 @@ div.dataTables_info {
 }
 .edit-user-toggles > input[type='checkbox']:checked + label,
 .edit-library-toggles > input[type='checkbox']:checked + label {
-    color: #fff;
+    color: #eee;
     cursor: pointer;
 }
 .edit-user-name > input[type='text'] {
@@ -3296,23 +3292,36 @@ pre::-webkit-scrollbar-track {
 pre::-webkit-scrollbar-thumb {
     background-color: rgba(0,0,0,.15);
 }
+#currentActivity,
+#home-stats,
+#library-stats {
+    margin-left: -25px;
+}
+#currentActivity > *,
+#home-stats > *,
+#library-stats > * {
+    margin-left: 25px;
+}
 
 @media only screen
-  and (min-device-width: 300px)
-  and (max-device-width: 450px) {
+  and (min-width: 300px)
+  and (max-width: 450px) {
     .home-platforms-instance {
         width: calc(100% - 20px);
     }
-    .dashboard-activity-instance {
-        width: 100%;
-    }
+    .dashboard-activity-instance,
     .dashboard-stats-instance {
         width: 100%;
     }
+    #currentActivity,
+    #home-stats,
+    #library-stats {
+        margin-right: 25px;
+    }
 }
 @media only screen
-  and (min-device-width: 300px)
-  and (max-device-width: 740px) {
+  and (min-width: 300px)
+  and (max-width: 740px) {
     .header-bar {
         display: block;
         float: none !important;
@@ -3339,8 +3348,8 @@ pre::-webkit-scrollbar-thumb {
     }
 }
 @media only screen
-  and (min-device-width: 740px)
-  and (max-device-width: 1024px) {
+  and (min-width: 740px)
+  and (max-width: 1024px) {
     .button-bar {
         float: right !important;
     }
@@ -3454,10 +3463,6 @@ pre::-webkit-scrollbar-thumb {
 .activity-queue tr:nth-child(even) td {
     background-color: rgba(255,255,255,0.010);
 }
-#days-selection label,
-#months-selection label {
-    margin-bottom: 0;
-}
 .card-sortable {
     height: 36px;
     padding: 0 20px 0 0;
@@ -3491,6 +3496,9 @@ pre::-webkit-scrollbar-thumb {
 .selectize-input input[type='text'] {
     height: 20px;
 }
+.selectize-input.disabled, .selectize-input.disabled * {
+    cursor: not-allowed !important;
+}
 .small-muted {
     font-size: small;
     color: #777;
@@ -3512,13 +3520,13 @@ pre::-webkit-scrollbar-thumb {
     width: 225px;
 }
 .config-scheduler-table th {
-    color: #fff;
+    color: #eee;
 }
 a.no-highlight {
     color: #777;
 }
 a.no-highlight:hover {
-    color: #fff;
+    color: #eee;
 }
 .top-line {
     border-top: 1px dotted #777;
@@ -3526,7 +3534,7 @@ a.no-highlight:hover {
 }
 .help-bold {
     font-weight: bold;
-    color: #fff;
+    color: #eee;
 }
 .save-button {
     margin-top: 15px;
@@ -3671,7 +3679,7 @@ a.no-highlight:hover {
     margin: 0 2px;
     padding: 2px 5px;
     font-size: 13px;
-    color: #fff;
+    color: #eee;
     background-color: #555;
     border: 0px solid #444;
     border-radius: 3px;
@@ -3689,7 +3697,7 @@ a.no-highlight:hover {
     -webkit-transition: all .1s cubic-bezier(.4,0,1,1);
     -moz-transition: all .1s cubic-bezier(.4,0,1,1);
     -o-transition: all .1s cubic-bezier(.4,0,1,1);
-    text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff;
+    text-shadow: -1px -1px 0 #eee, 1px -1px 0 #eee, -1px 1px 0 #eee, 1px 1px 0 #eee;
 }
 .overlay-refresh-image.left {
     left: 10px;
@@ -3703,7 +3711,7 @@ a.no-highlight:hover {
     cursor: pointer;
 }
 .overlay-refresh-image.info-art:hover {
-    color: #fff;
+    color: #eee;
     text-shadow: none;
 }
 a:hover .overlay-refresh-image {
@@ -3713,6 +3721,20 @@ a:hover .overlay-refresh-image {
 a:hover .overlay-refresh-image:hover {
     opacity: .9;
 }
+.smart-playlist-image {
+    float: left;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    background-color: #8e6191;
+    border-radius: 4px;
+    color: #fff;
+    font-size: 16px;
+    z-index: 1;
+    width: 32px;
+    padding: 5px;
+    text-align: center;
+}
 #ip_error, #isp_error {
     color: #aaa;
     display: none;
@@ -3720,10 +3742,6 @@ a:hover .overlay-refresh-image:hover {
     padding-top: 10px;
     padding-bottom: 10px;
 }
-#plexpy-log-levels label,
-#plex-log-levels label {
-    margin-bottom: 0;
-}
 #plexpy-notifiers-table .friendly_name,
 #notifier-config-modal span.notifier_id,
 #plexpy-newsletters-table .friendly_name,
@@ -3758,7 +3776,7 @@ a:hover .overlay-refresh-image:hover {
 #newsletter-config-modal .nav-tabs > li.active > a,
 #newsletter-config-modal .nav-tabs > li.active > a:hover,
 #newsletter-config-modal .nav-tabs > li.active > a:focus {
-    color: #fff;
+    color: #eee;
     background: #222;
 }
 #notifier-config-modal .nav-tabs > li.active > a,
@@ -3831,19 +3849,19 @@ a:hover .overlay-refresh-image:hover {
     background-position: center !important;
 }
 .platform-android {
-    background-color: #a4ca39;
+    background-color: #3ddc84;
     background-image: url(../images/platforms/android.svg);
 }
 .platform-atv {
-    background-color: #858487;
+    background-color: #a2aaad;
     background-image: url(../images/platforms/atv.svg);
 }
 .platform-chrome {
-    background-color: #ed5e50;
+    background-color: #db4437;
     background-image: url(../images/platforms/chrome.svg);
 }
 .platform-chromecast {
-    background-color: #10a4e8;
+    background-color: #4285f4;
     background-image: url(../images/platforms/chromecast.svg);
 }
 .platform-default {
@@ -3851,11 +3869,11 @@ a:hover .overlay-refresh-image:hover {
     background-image: url(../images/platforms/default.svg);
 }
 .platform-dlna {
-    background-color: #0cb14b;
+    background-color: #4ba32f;
     background-image: url(../images/platforms/dlna.svg);
 }
 .platform-firefox {
-    background-color: #e67817;
+    background-color: #ff7139;
     background-image: url(../images/platforms/firefox.svg);
 }
 .platform-gtv {
@@ -3863,27 +3881,27 @@ a:hover .overlay-refresh-image:hover {
     background-image: url(../images/platforms/gtv.svg);
 }
 .platform-ie {
-    background-color: #00599e;
+    background-color: #18bcef;
     background-image: url(../images/platforms/ie.svg);
 }
 .platform-ios {
-    background-color: #858487;
+    background-color: #a2aaad;
     background-image: url(../images/platforms/ios.svg);
 }
 .platform-kodi {
-    background-color: #31afe1;
+    background-color: #30aada;
     background-image: url(../images/platforms/kodi.svg);
 }
 .platform-lg {
-    background-color: #a50034;
+    background-color: #990033;
     background-image: url(../images/platforms/lg.svg);
 }
 .platform-linux {
-    background-color: #1793d0;
+    background-color: #0099cc;
     background-image: url(../images/platforms/linux.svg);
 }
 .platform-macos {
-    background-color: #858487;
+    background-color: #a2aaad;
     background-image: url(../images/platforms/macos.svg);
 }
 .platform-msedge {
@@ -3891,11 +3909,11 @@ a:hover .overlay-refresh-image:hover {
     background-image: url(../images/platforms/msedge.svg);
 }
 .platform-opera {
-    background-color: #ff1b2d;
+    background-color: #fa1e4e;
     background-image: url(../images/platforms/opera.svg);
 }
 .platform-playstation {
-    background-color: #034da2;
+    background-color: #003087;
     background-image: url(../images/platforms/playstation.svg);
 }
 .platform-plex {
@@ -3907,11 +3925,11 @@ a:hover .overlay-refresh-image:hover {
     background-image: url(../images/platforms/plexamp.svg);
 }
 .platform-roku {
-    background-color: #6d3c97;
+    background-color: #673293;
     background-image: url(../images/platforms/roku.svg);
 }
 .platform-safari {
-    background-color: #00a9ec;
+    background-color: #00d3f9;
     background-image: url(../images/platforms/safari.svg);
 }
 .platform-samsung {
@@ -3931,7 +3949,7 @@ a:hover .overlay-refresh-image:hover {
     background-image: url(../images/platforms/wiiu.svg);
 }
 .platform-windows {
-    background-color: #2fc0f5;
+    background-color: #0078d7;
     background-image: url(../images/platforms/windows.svg);
 }
 .platform-wp {
@@ -3947,55 +3965,55 @@ a:hover .overlay-refresh-image:hover {
     background-image: url(../images/platforms/xbox.svg);
 }
 .platform-android-rgba {
-    background-color: rgba(164, 202, 57, 0.40);
+    background-color: rgba(61, 220, 132, 0.40);
 }
 .platform-atv-rgba {
-    background-color: rgba(133, 132, 135, 0.40);
+    background-color: rgba(162, 170, 173, 0.40);
 }
 .platform-chrome-rgba {
-    background-color: rgba(237, 94, 80, 0.40);
+    background-color: rgba(219, 68, 55, 0.40);
 }
 .platform-chromecast-rgba {
-    background-color: rgba(16, 164, 232, 0.40);
+    background-color: rgba(66, 133, 244, 0.40);
 }
 .platform-default-rgba {
     background-color: rgba(229, 160, 13, 0.40);
 }
 .platform-dlna-rgba {
-    background-color: rgba(12, 177, 75, 0.40);
+    background-color: rgba(75, 163, 47, 0.40);
 }
 .platform-firefox-rgba {
-    background-color: rgba(230, 120, 23, 0.40);
+    background-color: rgba(255, 113, 57, 0.40);
 }
 .platform-gtv-rgba {
     background-color: rgba(0, 139, 207, 0.40);
 }
 .platform-ie-rgba {
-    background-color: rgba(0, 89, 158, 0.40);
+    background-color: rgba(24, 188, 239, 0.40);
 }
 .platform-ios-rgba {
-    background-color: rgba(133, 132, 135, 0.40);
+    background-color: rgba(162, 170, 173, 0.40);
 }
 .platform-kodi-rgba {
-    background-color: rgba(49, 175, 225, 0.40);
+    background-color: rgba(48, 170, 218, 0.40);
 }
 .platform-lg-rgba {
-    background-color: rgba(165, 0, 52, 0.40);
+    background-color: rgba(153, 0, 51, 0.40);
 }
 .platform-linux-rgba {
-    background-color: rgba(23, 147, 208, 0.40);
+    background-color: rgba(0, 153, 204, 0.40);
 }
 .platform-macos-rgba {
-    background-color: rgba(133, 132, 135, 0.40);
+    background-color: rgba(162, 170, 173, 0.40);
 }
 .platform-msedge-rgba {
     background-color: rgba(0, 120, 215, 0.40);
 }
 .platform-opera-rgba {
-    background-color: rgba(255, 27, 45, 0.40);
+    background-color: rgba(250, 30, 78, 0.40);
 }
 .platform-playstation-rgba {
-    background-color: rgba(3, 77, 162, 0.40);
+    background-color: rgba(0, 48, 135, 0.40);
 }
 .platform-plex-rgba {
     background-color: rgba(229, 160, 13, 0.40);
@@ -4004,10 +4022,10 @@ a:hover .overlay-refresh-image:hover {
     background-color: rgba(229, 160, 13, 0.40);
 }
 .platform-roku-rgba {
-    background-color: rgba(109, 60, 151, 0.40);
+    background-color: rgba(103, 50, 147, 0.40);
 }
 .platform-safari-rgba {
-    background-color: rgba(0, 169, 236, 0.40);
+    background-color: rgba(0, 211, 249, 0.40);
 }
 .platform-samsung-rgba {
     background-color: rgba(3, 78, 162, 0.40);
@@ -4022,7 +4040,7 @@ a:hover .overlay-refresh-image:hover {
     background-color: rgba(3, 169, 244, 0.40);
 }
 .platform-windows-rgba {
-    background-color: rgba(47, 192, 245, 0.40);
+    background-color: rgba(0, 120, 215, 0.40);
 }
 .platform-wp-rgba {
     background-color: rgba(104, 33, 122, 0.40);
@@ -4117,7 +4135,7 @@ a:hover .overlay-refresh-image:hover {
     flex-shrink: 0;
 }
 #info-modal .stream-info-item .sub-value {
-    color: #fff;
+    color: #eee;
     font-weight: bold;
     margin-left: 10px;
     text-align: left;
@@ -4140,7 +4158,7 @@ a:hover .overlay-refresh-image:hover {
 .stream-info th:first-child {
     width: 125px;
     height: 30px;
-    color: #fff;
+    color: #eee;
     font-size: 12px;
     text-align: right;
     text-transform: uppercase;
@@ -4263,7 +4281,7 @@ a[data-tab-destination] {
     transform: translate(-50%, -50%);
 }
 .iframe-button {
-    color: #fff;
+    color: #eee;
     border-radius: 20px;
     text-align: center;
     cursor: pointer;
@@ -4280,7 +4298,7 @@ a[data-tab-destination] {
 }
 .iframe-button:hover,
 .iframe-button:focus {
-    color: #fff;
+    color: #eee;
     box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 0px 99999px inset, rgba(0, 0, 0, 0.2) 0px 1px 5px 0px, rgba(0, 0, 0, 0.14) 0px 2px 2px 0px, rgba(0, 0, 0, 0.12) 0px 3px 1px -2px;
 }
 .iframe-button:active {
@@ -4345,7 +4363,7 @@ a[data-tab-destination] {
     display: inline !important;
     background: none !important;
     padding: 0 !important;
-    color: #fff;
+    color: #eee;
 }
 .news-body a:hover {
     color: #f9be03;

data/interfaces/default/current_activity_instance.html

@@ -118,9 +118,7 @@ DOCUMENTATION :: END
                         <div id="poster-${sk}" class="dashboard-activity-cover" style="background-image: url(${page('pms_image_proxy', data['parent_thumb'], data['parent_rating_key'], 300, 300, fallback='cover', refresh=True)});"></div>
                     </a>
                     % elif data['media_type'] in ('photo', 'clip'):
-                        % if data['extra_type']:
-                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['art'].replace('/art', '/thumb') or data['thumb'], data['rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
-                        % elif data['parent_thumb']:
+                        % if data['parent_thumb']:
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['parent_thumb'], data['parent_rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
                         % else:
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
@@ -220,7 +218,7 @@ DOCUMENTATION :: END
                                 <div class="sub-heading">Container</div>
                                 <div class="sub-value" id="transcode_container-${sk}">
                                     % if data['stream_container_decision'] == 'transcode':
-                                    Transcode (${data['container'].upper()} <i class="fa fa-long-arrow-right"></i> ${data['stream_container'].upper()})
+                                    Converting (${data['container'].upper()} <i class="fa fa-long-arrow-right"></i> ${data['stream_container'].upper()})
                                     % else:
                                     Direct Play (${data['stream_container'].upper()})
                                     % endif
@@ -399,7 +397,7 @@ DOCUMENTATION :: END
         </div>
     </div>
     <div class="dashboard-activity-metadata-wrapper">
-        <a href="${user_href}" title="${data['friendly_name']}">
+        <a href="${user_href}" title="${data['username']}">
             <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${data['user_thumb']});"></div>
         </a>
         <div class="dashboard-activity-metadata-title-container">
@@ -410,6 +408,10 @@ DOCUMENTATION :: END
                 <i class="fa fa-fw fa-pause"></i>&nbsp;
                 % elif data['state'] == 'buffering':
                 <i class="fa fa-fw fa-spinner"></i>&nbsp;
+                % elif data['state'] == 'error':
+                <i class="fa fa-fw fa-exclamation-triangle"></i>&nbsp;
+                % else:
+                <i class="fa fa-fw fa-question-circle"></i>&nbsp;
                 % endif
             </div>
             <div class="dashboard-activity-metadata-title">
@@ -521,7 +523,7 @@ DOCUMENTATION :: END
                 % endif
             </div>
             <div class="dashboard-activity-metadata-user">
-                <a href="${user_href}" title="${data['friendly_name']}">${data['friendly_name']}</a>
+                <a href="${user_href}" title="${data['username']}">${data['friendly_name']}</a>
             </div>
         </div>
     </div>

data/interfaces/default/edit_library.html

@@ -115,21 +115,13 @@ DOCUMENTATION :: END
         var msg = 'Are you REALLY sure you want to purge all history for the <strong>${data["section_name"]}</strong> library?<br>' + 
             'This is permanent and cannot be undone!';
         var url = 'delete_all_library_history';
-        confirmAjaxCall(url, msg, { section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
+        confirmAjaxCall(url, msg, { server_id: '${server_id}', section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
     });
 
     $('#undelete-library').click(function () {
-        var msg = 'Are you sure you want to undelete this user?';
+        var msg = 'Are you sure you want to undelete this library?';
         var url = 'undelete_library';
         confirmAjaxCall(url, msg, { section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
     });
-
-    $(document).ready(function() {
-        // Move #confirm-modal to parent container
-        if (!($('#edit-library-modal').next().is('#confirm-modal-purge'))) {
-            $('#confirm-modal-purge').appendTo($('#edit-library-modal').parent());
-        }
-        $('#edit-library-modal > #confirm-modal-purge').remove();
-    });
 </script>
 % endif

data/interfaces/default/edit_user.html

@@ -134,13 +134,5 @@ DOCUMENTATION :: END
         var url = 'undelete_user';
         confirmAjaxCall(url, msg, { user_id: '${data["user_id"]}' }, null, function () { location.reload(); });
     });
-
-    $(document).ready(function() {
-        // Move #confirm-modal-purge to parent container
-        if (!($('#edit-user-modal').next().is('#confirm-modal-purge'))) {
-            $('#confirm-modal-purge').appendTo($('#edit-user-modal').parent());
-        }
-        $('#edit-user-modal > #confirm-modal-purge').remove();
-    });
 </script>
 % endif

data/interfaces/default/export_modal.html

@@ -0,0 +1,289 @@
+<%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:           export_modal.html
+Version:            0.1
+Variable names:     data [list]
+
+data :: Usable parameters
+
+== Global keys ==
+
+DOCUMENTATION :: END
+</%doc>
+<%
+    import plexpy
+    from plexpy import exporter
+    from plexpy.helpers import anon_url
+    export = exporter.Export()
+    thumb_media_types = ', '.join([export.PLURAL_MEDIA_TYPES[k] for k, v in export.MEDIA_TYPES.items() if v[0]])
+    art_media_types = ', '.join([export.PLURAL_MEDIA_TYPES[k] for k, v in export.MEDIA_TYPES.items() if v[1]])
+%>
+<div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title" id="info-modal-title">
+                ${title}
+            </h4>
+        </div>
+        <div class="modal-body">
+            <form method="post" class="form" id="export_metadata_form">
+                <input type="hidden" id="export_section_id" name="export_section_id" value="${section_id or ''}" />
+                <input type="hidden" id="export_user_id" name="export_user_id" value="${user_id or ''}" />
+                <input type="hidden" id="export_rating_key" name="export_rating_key" value="${rating_key or ''}" />
+                <input type="hidden" id="export_media_type" name="export_media_type" value="${media_type or ''}" />
+                <input type="hidden" id="export_sub_media_type" name="export_sub_media_type" value="${sub_media_type or ''}" />
+                <input type="hidden" id="export_export_type" name="export_export_type" value="${export_type or ''}" />
+                <div class="form-group">
+                    <label>Instructions</label>
+                    <p class="help-block">
+                        Please see the <a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/Exporter-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Exporter Guide</a> for more details about each option.
+                    </p>
+                </div>
+                <div class="form-group">
+                    <label for="export_file_format">Data File Format</label>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <select class="form-control" id="export_file_format" name="export_file_format">
+                                % for format in file_formats:
+                                <option value="${format}">${format.upper()}</option>
+                                % endfor
+                            </select>
+                        </div>
+                    </div>
+                    <p class="help-block">Select the export data file format.</p>
+                </div>
+                % if not rating_key:
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="export_individual_files" name="export_individual_files" value="1"> Export Individual Files
+                    </label>
+                    <p class="help-block">Enable to export one file for each ${media_type} instead of a single file containing all ${media_type}s.</p>
+                </div>
+                % endif
+                <div class="form-group">
+                    <label for="export_metadata_level">Metadata Export Level</label>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <select class="form-control" id="export_metadata_level" name="export_metadata_level">
+                                <option value="0">Level 0 - None / Custom</option>
+                                <option value="1" selected>Level 1 - Basic Metadata</option>
+                                <option value="2">Level 2 - Extended Metadata</option>
+                                <option value="3">Level 3 - Advanced Metadata</option>
+                                <option value="9">Level 9 - All Metadata</option>
+                            </select>
+                        </div>
+                    </div>
+                    <p class="help-block">Select the metadata export level. Higher levels include all fields from the lower levels.</p>
+                </div>
+                <div class="form-group">
+                    <label for="export_custom_metadata_fields">Custom Metadata Fields</label>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <input type="text" class="form-control" id="export_custom_metadata_fields" name="export_custom_metadata_fields" data-field_type="Metadata">
+                        </div>
+                    </div>
+                    <p class="help-block">Add additional fields to the selected metadata export level.</p>
+                </div>
+                <div class="form-group">
+                    <label for="export_media_info_level">Media Info Export Level</label>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <select class="form-control" id="export_media_info_level" name="export_media_info_level">
+                                <option value="0">Level 0 - None / Custom</option>
+                                <option value="1" selected>Level 1 - Basic Media Info</option>
+                                <option value="2">Level 2 - Extended Media Info</option>
+                                <option value="3">Level 3 - Advanced Media Info</option>
+                                <option value="9">Level 9 - All Media Info</option>
+                            </select>
+                        </div>
+                    </div>
+                    <p class="help-block">Select the media info export level. Higher levels include all fields from the lower levels.</p>
+                </div>
+                <div class="form-group">
+                    <label for="export_custom_media_info_fields">Custom Media Info Fields</label>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <input type="text" class="form-control" id="export_custom_media_info_fields" name="export_custom_media_info_fields" data-field_type="Media Info">
+                        </div>
+                    </div>
+                    <p class="help-block">Add additional fields to the selected media info export level.</p>
+                </div>
+                <div class="form-group">
+                    <label for="export_thumb_level">Poster and Cover Image Export Level</label>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <select class="form-control" id="export_thumb_level" name="export_thumb_level">
+                                <option value="0" selected>Level 0 - None / Custom</option>
+                                <option value="1">Level 1 - Uploaded and Selected Posters and Covers Only</option>
+                                <option value="2">Level 2 - Selected and Locked Posters and Covers Only</option>
+                                <option value="9">Level 9 - All Selected Posters and Covers</option>
+                            </select>
+                        </div>
+                    </div>
+                    <p class="help-block">
+                        Select the level to export poster and cover image files.<br>Note: Only applies to ${thumb_media_types}.
+                    </p>
+                </div>
+                <div class="form-group">
+                    <label for="export_art_level">Background Artwork Image Export Level</label>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <select class="form-control" id="export_art_level" name="export_art_level">
+                                <option value="0" selected>Level 0 - None / Custom</option>
+                                <option value="1">Level 1 - Uploaded and Selected Artwork Only</option>
+                                <option value="2">Level 2 - Selected and Locked Artwork Only</option>
+                                <option value="9">Level 9 - All Selected Artwork</option>
+                            </select>
+                        </div>
+                    </div>
+                    <p class="help-block">
+                        Select the level to export background artwork image files.<br>Note: Only applies to ${art_media_types}.
+                    </p>
+                </div>
+                <p class="help-block">
+                    Warning: Exporting images may take a long time! Images will be saved to a folder alongside the data file.
+                </p>
+            </form>
+        </div>
+        <div class="modal-footer">
+            <div>
+                <input type="button" class="btn btn-bright btn-ok" data-dismiss="modal" id="export_metadata" value="Export">
+            </div>
+        </div>
+    </div>
+</div>
+<script src="${http_root}js/selectize.plugin.disable-options.js"></script>
+<script>
+    $('#export_metadata_form').submit(function(e) {
+        e.preventDefault();
+    })
+
+    var optgroups = (function () {
+        var optgroups = [];
+        for (var i = 0; i <= 9; i++) {
+            optgroups.push({$order: i+1, value: i});
+        }
+        return optgroups
+    })()
+
+    var $export_custom_fields = $('#export_custom_metadata_fields, #export_custom_media_info_fields').selectize({
+        plugins: {
+            'remove_button': {},
+            'disable_options': {
+                disableField: 'level'
+            }
+        },
+        maxItems: null,
+        valueField: 'field',
+        labelField: 'field',
+        sortField: 'field',
+        searchField: ['field'],
+        optgroupField: 'level',
+        optgroups: optgroups,
+        lockOptgroupOrder: true,
+        render: {
+            optgroup_header: function(data, escape) {
+                return '<div class="optgroup-header">' + escape(this.$input.data('field_type') + ' Level: ' + data.value) + '</div>';
+            },
+            option: function (item, escape) {
+                return '<div data-field="' + escape(item.field) + '" data-level="' + escape(item.level) + '">' + escape(item.field) +'</div>';
+            }
+        }
+    });
+    var export_custom_metadata_fields = $export_custom_fields[0].selectize;
+    var export_custom_media_info_fields = $export_custom_fields[1].selectize;
+
+    function setDisabledFields() {
+        var metadata_export_level = $('#export_metadata_level option:selected').val();
+        var media_info_export_level = $('#export_media_info_level option:selected').val();
+        export_custom_metadata_fields.setDisabledOptions([...Array(parseInt(metadata_export_level) + 1).keys()]);
+        export_custom_media_info_fields.setDisabledOptions([...Array(parseInt(media_info_export_level) + 1).keys()]);
+    }
+
+    $('#export_metadata_level, #export_media_info_level').on('change', setDisabledFields);
+
+    function getExportFields() {
+        $.ajax({
+            url: 'get_export_fields',
+            async: true,
+            data: {
+                media_type: $('#export_media_type').val(),
+                sub_media_type: $('#export_sub_media_type').val()
+            },
+            success: function (result) {
+                if (result) {
+                    export_custom_metadata_fields.addOption(result.metadata_fields);
+                    export_custom_media_info_fields.addOption(result.media_info_fields);
+                    setDisabledFields();
+                }
+            }
+        })
+    }
+    getExportFields();
+
+    $('#export_file_format').on('change', function() {
+        if ($(this).val() === 'm3u8') {
+            $('#export_metadata_level').prop('disabled', true);
+            $('#export_media_info_level').prop('disabled', true);
+            $("#export_thumb_level").prop('disabled', true);
+            $("#export_art_level").prop('disabled', true);
+            export_custom_metadata_fields.disable();
+            export_custom_media_info_fields.disable();
+        } else {
+            $('#export_metadata_level').prop('disabled', false);
+            $('#export_media_info_level').prop('disabled', false);
+            $("#export_thumb_level").prop('disabled', false);
+            $("#export_art_level").prop('disabled', false);
+            export_custom_metadata_fields.enable();
+            export_custom_media_info_fields.enable();
+        }
+    })
+
+    $("#export_metadata").click(function() {
+        var section_id = $('#export_section_id').val();
+        var user_id = $('#export_user_id').val();
+        var rating_key = $('#export_rating_key').val();
+        var metadata_export_level = $('#export_metadata_level option:selected').val();
+        var media_info_export_level = $('#export_media_info_level option:selected').val();
+        var file_format = $('#export_file_format option:selected').val();
+        var thumb_level = $("#export_thumb_level option:selected").val();
+        var art_level = $("#export_art_level option:selected").val();
+        var custom_fields = [
+            $('#export_custom_metadata_fields').val(),
+            $('#export_custom_media_info_fields').val()
+        ].filter(Boolean).join(',');
+        var export_type = $('#export_export_type').val()
+        var individual_files = $('#export_individual_files').is(':checked')
+
+        $.ajax({
+            url: 'export_metadata',
+            data: {
+                section_id: section_id,
+                user_id: user_id,
+                rating_key: rating_key,
+                metadata_level: metadata_export_level,
+                media_info_level: media_info_export_level,
+                file_format: file_format,
+                thumb_level: thumb_level,
+                art_level: art_level,
+                custom_fields: custom_fields,
+                export_type: export_type,
+                individual_files: individual_files
+            },
+            async: true,
+            success: function (data) {
+                if (data.result === 'success') {
+                    $("#nav-tabs-export").click();
+                    redrawExportTable();
+                    showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
+                } else {
+                    showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
+                }
+            }
+        });
+    });
+</script>

data/interfaces/default/graphs.html

@@ -40,14 +40,14 @@
 			</div>
         </div>
     </div>
-    <div class='table-card-back'>
-        <ul class="nav nav-pills" role="tablist" id="graph-tabs">
-            <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by Period</a></li>
-            <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
-            <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
+    <div class="table-card-back">
+        <ul class="nav nav-list nav-pills" role="tablist" id="graph-tabs">
+            <li role="presentation"><a id="nav-tabs-plays" href="#tabs-plays" aria-controls="tabs-plays" data-toggle="tab" role="tab">Plays by Period</a></li>
+            <li role="presentation"><a id="nav-tabs-stream" href="#tabs-stream" aria-controls="tabs-stream" data-toggle="tab" role="tab">Stream Info</a></li>
+            <li role="presentation"><a id="nav-tabs-total" href="#tabs-total" aria-controls="tabs-total" data-toggle="tab" role="tab">Play Totals</a></li>
         </ul>
         <div class="tab-content">
-            <div role="tabpanel" class="tab-pane" id="tabs-1">
+            <div role="tabpanel" class="tab-pane" id="tabs-plays">
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text">Play count</span> <small>Last <span class="days">30</span> days</small></h4>
@@ -123,7 +123,7 @@
                     </div>
                 </div>
             </div>
-            <div role="tabpanel" class="tab-pane" id="tabs-2">
+            <div role="tabpanel" class="tab-pane" id="tabs-stream">
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-video-camera"></i> Daily Stream type breakdown <small>Last <span class="days">30</span> days</small></h4>
@@ -195,7 +195,7 @@
                     </div>
                 </div>
             </div>
-            <div role="tabpanel" class="tab-pane" id="tabs-3">
+            <div role="tabpanel" class="tab-pane" id="tabs-total">
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-calendar"></i> Plays by month <small>Last <span class="months">12</span> months</small></h4>
@@ -225,8 +225,6 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/moment-with-locale.js"></script>
-<script src="${http_root}js/moment-duration-format.js"></script>
 <script src="${http_root}js/highcharts/js/highcharts.js"></script>
 <script src="${http_root}js/jquery.dataTables.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
@@ -341,14 +339,29 @@
         var yaxis = getLocalStorage('graph_type', 'plays');
         var current_day_range = getLocalStorage('graph_days', 30);
         var current_month_range = getLocalStorage('graph_months', 12);
-        var current_tab = '#' + getLocalStorage('graph_tab', 'tabs-1');
+        var current_tab = '#' + getLocalStorage('graph_tab', 'tabs-plays');
+
+        // Update tab values from upgrading
+        switch (current_tab) {
+            case '#tabs-1':
+                current_tab = '#tabs-plays'
+                break
+            case '#tabs-2':
+                current_tab = '#tabs-stream'
+                break
+            case '#tabs-3':
+                current_tab = '#tabs-total'
+                break
+            default:
+                break
+        }
 
         $('#yaxis-' + yaxis).prop('checked', true);
         $('#yaxis-' + yaxis).closest('label').addClass('active');
         $('#graph-days').val(current_day_range);
         $('#graph-months').val(current_month_range);
-        $('#graph-tabs a[href="' + current_tab + '"]').closest('li').addClass('active');
-        $(current_tab).addClass('active');
+        $('#nav-' + current_tab.replace('#', '')).tab('show').trigger('show.bs.tab');
+        //$(current_tab).addClass('active');
 
 
         $('.days').html(current_day_range);
@@ -469,7 +482,7 @@
                 }
             });
 
-            $('#graph-tabs a[href="#tabs-1"]').tab('show')
+            $('#nav-tabs-plays').tab('show');
         }
 
         function loadGraphsTab2(time_range, yaxis) {
@@ -562,7 +575,7 @@
                 }
             });
 
-            $('#graph-tabs a[href="#tabs-2"]').tab('show')
+            $('#nav-tabs-2').tab('show');
         }
 
         function loadGraphsTab3(time_range, yaxis) {
@@ -586,16 +599,16 @@
                 }
             });
 
-            $('#graph-tabs a[href="#tabs-3"]').tab('show')
+            $('#nav-tabs-total').tab('show');
         }
 
         // Set initial state
-        if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-        if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-        if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+        if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
+        if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
+        if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
 
         // Tab1 opened
-        $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) {
+        $('#nav-tabs-plays').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -603,7 +616,7 @@
         });
 
         // Tab2 opened
-        $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) {
+        $('#nav-tabs-stream').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -611,7 +624,7 @@
         });
 
         // Tab3 opened
-        $('#graph-tabs a[href="#tabs-3"]').on('shown.bs.tab', function (e) {
+        $('#nav-tabs-total').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -624,8 +637,8 @@
             forceMinMax($(this));
             current_day_range = $(this).val();
             setLocalStorage('graph_days', current_day_range);
-            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
             $('.days').html(current_day_range);
         });
         
@@ -635,25 +648,25 @@
             forceMinMax($(this));
             current_month_range = $(this).val();
             setLocalStorage('graph_months', current_month_range);
-            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
             $('.months').html(current_month_range);
         });
 
         // User changed
         $('#graph-user').on('change', function() {
             selected_user_id = $(this).val() || null;
-            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
         });
         
         // Y-axis changed
         $('#yaxis-selection').on('change', function() {
             yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val();
             setLocalStorage('graph_type', yaxis);
-            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
         });
 
         function setGraphFormat(type) {

data/interfaces/default/history.html

@@ -117,7 +117,6 @@
 <script src="${http_root}js/dataTables.colVis.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
 <script>
     $(document).ready(function () {

data/interfaces/default/home_stats.html

@@ -104,7 +104,7 @@ DOCUMENTATION :: END
             </div>
             % elif stat_id == 'top_users':
             <% user_href = page('user', row0['user_id']) if row0['user_id'] else '#' %>
-            <a id="stats-thumb-url-${stat_id}" href="${user_href}" title="${row0['friendly_name']}" class="hidden-xs">
+            <a id="stats-thumb-url-${stat_id}" href="${user_href}" title="${row0['user']}" class="hidden-xs">
                 <div id="stats-thumb-${stat_id}" class="dashboard-stats-circle" style="background-image: url(${row0['user_thumb'] or 'images/gravatar-default.png'})"></div>
             </a>
             % elif stat_id == 'top_platforms':
@@ -122,7 +122,7 @@ DOCUMENTATION :: END
                     % elif stat_id.startswith('popular'):
                     <span class="dashboard-stats-stats-units">users</span>
                     % elif stat_id == 'last_watched':
-                    <span class="dashboard-stats-stats-units" id="last-watched-header-info">${row0['friendly_name']}</span>
+                    <span class="dashboard-stats-stats-units" id="last-watched-header-info" title="${row0['user']}">${row0['friendly_name']}</span>
                     % elif stat_id == 'most_concurrent':
                     <span class="dashboard-stats-stats-units" id="most-concurrent-header-info">streams</span>
                     % endif
@@ -134,7 +134,7 @@ DOCUMENTATION :: END
                             <li class="dashboard-stats-info-item ${'expanded' if loop.index == 0 else ''}" data-stat_id="${stat_id}"
                                 data-rating_key="${row.get('rating_key')}" data-guid="${row.get('guid')}" data-title="${row.get('title')}"
                                 data-art="${row.get('art')}" data-thumb="${row.get('thumb')}" data-platform="${row.get('platform_name')}"
-                                data-user_id="${row.get('user_id')}" data-friendly_name="${row.get('friendly_name')}" data-user_thumb="${row.get('user_thumb')}"
+                                data-user_id="${row.get('user_id')}" data-user="${row.get('user')}" data-friendly_name="${row.get('friendly_name')}" data-user_thumb="${row.get('user_thumb')}"
                                 data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}" data-live="${row.get('live')}">
                                 <div class="sub-list">${loop.index + 1}</div>
                                 <div class="sub-value">
@@ -152,7 +152,7 @@ DOCUMENTATION :: END
                                     </a>
                                     % elif stat_id == 'top_users':
                                     <% user_href = page('user', row['user_id']) if row['user_id'] else '#' %>
-                                    <a href="${user_href}" title="${row['friendly_name']}">
+                                    <a href="${user_href}" title="${row['user']}">
                                         ${row['friendly_name']}
                                     </a>
                                     % elif stat_id == 'top_platforms':

data/interfaces/default/images/favicon/browserconfig.xml

@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="mstile-150x150.png?v=2.0.5"/>
+            <square150x150logo src="mstile-150x150.png?v=2.6.0"/>
             <TileColor>#282a2d</TileColor>
         </tile>
     </msapplication>

data/interfaces/default/images/favicon/manifest.json

@@ -6,12 +6,12 @@
     "scope": "../../",
     "icons": [
         {
-            "src": "android-chrome-192x192.png?v=2.0.5",
+            "src": "android-chrome-192x192.png?v=2.6.0",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "android-chrome-256x256.png?v=2.0.5",
+            "src": "android-chrome-256x256.png?v=2.6.0",
             "sizes": "256x256",
             "type": "image/png"
         }

data/interfaces/default/images/favicon/safari-pinned-tab.svg

@@ -1 +1,32 @@
-<svg version="1" xmlns="http://www.w3.org/2000/svg" width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000" preserveAspectRatio="xMidYMid meet"><g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)" fill="#000000" stroke="none"><path d="M5695 6555 c-135 -34 -244 -94 -342 -189 -40 -39 -73 -76 -73 -83 0 -7 -4 -13 -10 -13 -14 0 -87 -156 -106 -225 -22 -83 -26 -234 -8 -320 17 -79 86 -230 133 -288 l30 -39 -48 -71 c-39 -57 -159 -228 -251 -357 -69 -97 -398 -564 -416 -590 -13 -19 -60 -87 -105 -150 -45 -63 -107 -151 -138 -195 -30 -44 -59 -84 -63 -90 -7 -9 -251 -354 -346 -490 -92 -131 -173 -245 -175 -245 -1 0 -34 9 -72 21 -130 38 -325 31 -454 -18 -168 -63 -313 -196 -385 -354 -39 -87 -65 -183 -68 -256 0 -24 -3 -43 -4 -43 -2 0 -43 46 -91 102 -49 57 -100 117 -115 133 -14 17 -128 149 -253 295 -125 146 -251 292 -279 324 -56 65 -77 89 -108 126 -58 68 -152 178 -172 200 -12 14 -50 57 -83 96 l-61 71 27 44 c58 93 91 217 92 342 2 161 -38 294 -125 412 -133 181 -316 279 -542 292 -470 27 -833 -434 -699 -887 74 -251 275 -437 530 -490 132 -28 334 -6 421 45 l42 24 173 -197 c96 -108 186 -210 200 -227 15 -16 163 -187 330 -380 458 -529 491 -567 526 -605 18 -19 31 -35 30 -36 -6 -5 -265 -161 -277 -167 -8 -4 -34 -20 -58 -35 -194 -124 -634 -382 -651 -382 -12 0 -46 20 -75 44 -60 49 -180 112 -242 127 -21 5 -48 12 -59 15 -11 4 -65 9 -121 11 -81 4 -117 1 -182 -15 -261 -66 -462 -270 -528 -537 -10 -40 -11 -217 -2 -258 5 -23 11 -51 14 -61 29 -145 147 -312 284 -403 123 -82 224 -114 370 -118 83 -3 124 2 240 29 36 9 133 57 187 94 60 41 111 91 153 152 14 19 28 37 32 40 19 15 71 140 89 217 17 73 20 107 16 198 -4 61 -7 121 -9 134 -3 28 -46 0 482 321 179 108 379 228 444 265 104 59 120 65 133 52 13 -13 12 -22 -10 -78 -49 -123 -58 -165 -62 -262 -7 -149 25 -286 89 -383 47 -72 91 -128 125 -158 19 -17 39 -36 45 -42 27 -25 136 -94 150 -94 8 0 17 -4 20 -9 3 -5 16 -11 28 -14 13 -3 50 -12 83 -21 74 -19 278 -15 345 7 198 65 358 196 435 358 16 34 20 36 49 28 17 -4 49 -10 71 -14 22 -3 99 -16 170 -30 72 -13 144 -26 160 -29 28 -5 101 -18 170 -31 17 -3 80 -14 140 -25 61 -11 124 -22 140 -25 17 -4 49 -9 72 -12 40 -5 42 -7 48 -47 14 -98 29 -147 73 -235 36 -75 61 -110 121 -171 154 -154 280 -210 480 -213 134 -2 180 5 273 40 212 83 371 262 427 481 24 93 25 255 2 342 -64 241 -245 428 -481 501 -62 18 -97 23 -200 22 -107 0 -136 -4 -205 -26 -44 -15 -109 -43 -145 -64 -83 -48 -208 -171 -250 -245 -17 -32 -35 -60 -38 -61 -4 -2 -46 4 -93 13 -48 10 -104 20 -125 23 -22 3 -46 8 -54 11 -8 3 -33 7 -55 10 -38 5 -58 9 -122 21 -16 3 -53 10 -83 15 -30 6 -66 12 -79 15 -13 2 -103 19 -200 36 -169 30 -207 42 -196 60 10 16 -28 155 -62 224 -19 39 -54 96 -78 127 l-45 58 40 52 c96 125 143 266 143 433 1 164 -27 263 -108 391 -19 30 -35 57 -35 61 0 3 31 49 69 102 57 81 450 638 625 889 28 40 62 88 76 107 14 18 194 274 400 568 291 414 379 534 393 531 10 -2 27 -6 37 -9 78 -25 240 -29 338 -9 433 87 677 573 489 974 -93 200 -255 332 -478 389 -87 22 -227 25 -304 6z"/></g></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="350.000000pt" height="350.000000pt" viewBox="0 0 350.000000 350.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,350.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1566 3489 c-433 -46 -867 -274 -1141 -601 -404 -481 -526 -1100
+-334 -1688 91 -278 283 -569 498 -756 676 -589 1646 -589 2322 0 215 187 407
+478 498 756 142 436 113 895 -84 1305 -320 666 -1027 1061 -1759 984z m1147
+-604 c87 -36 146 -118 154 -214 10 -111 -39 -203 -137 -254 -49 -26 -63 -28
+-131 -25 l-76 3 -109 -154 c-60 -85 -190 -269 -290 -409 l-181 -255 26 -46
+c22 -38 26 -59 26 -121 0 -63 -5 -84 -29 -132 -27 -54 -28 -59 -13 -76 22 -24
+47 -86 47 -117 0 -14 6 -28 13 -30 6 -3 91 -16 187 -30 157 -23 175 -24 183
+-10 38 68 115 118 199 130 103 15 220 -51 268 -151 26 -52 29 -154 6 -207 -19
+-48 -82 -114 -129 -138 -151 -77 -346 22 -373 189 -7 46 15 39 -222 74 -142
+20 -155 21 -163 6 -65 -116 -225 -163 -347 -102 -116 58 -167 187 -126 323 8
+29 13 55 11 57 -3 3 -65 -33 -138 -79 -74 -46 -162 -100 -196 -120 l-62 -38 6
+-47 c11 -100 -46 -207 -136 -254 -43 -23 -66 -28 -121 -28 -77 0 -124 16 -175
+62 -48 41 -76 99 -82 167 -7 72 9 129 50 183 85 112 256 132 372 44 l31 -24
+174 109 c96 60 180 111 185 113 6 2 -2 16 -16 32 -35 39 -412 468 -414 471 0
+1 -21 -5 -45 -13 -57 -20 -142 -14 -196 14 -162 84 -197 288 -71 419 102 108
+291 101 386 -14 62 -75 78 -185 40 -273 l-21 -49 23 -28 c13 -16 102 -118 198
+-227 l175 -198 20 61 c26 78 64 125 124 155 63 31 117 39 177 26 49 -11 51
+-11 72 17 21 26 533 749 548 773 4 6 -4 28 -17 48 -88 133 -44 307 94 376 61
+31 163 36 221 11z"/>
+</g>
+</svg>

data/interfaces/default/images/platforms/android.svg

@@ -1,8 +1,5 @@
 <!-- Generated by IcoMoon.io -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
 <title>android</title>
-<path fill="#fff" d="M31.944 21.318c5.556 0 11.113 0 16.67 0 0.042 0 0.084-0 0.126 0.001 0.548 0.012 0.554 0.012 0.554 0.555 0.002 2.526 0.001 5.052 0.001 7.577 0 5.789 0.003 11.577-0.002 17.365-0.001 1.197-0.344 2.274-1.205 3.155-0.759 0.777-1.671 1.191-2.753 1.22-0.757 0.019-1.515 0.011-2.273 0.016-0.772 0.005-0.774 0.006-0.774 0.751-0.001 2.505-0.032 5.010 0.013 7.514 0.024 1.305-0.386 2.363-1.302 3.29-1.214 1.23-3.457 1.485-4.769 0.396-1.051-0.873-1.725-1.978-1.715-3.423 0.019-2.547 0.010-5.093 0.003-7.64-0.003-1.010 0.144-0.869-0.858-0.876-1.158-0.008-2.315-0.005-3.473-0.001-0.829 0.003-0.76-0.103-0.76 0.794-0.002 2.505-0.027 5.010 0.010 7.514 0.019 1.278-0.377 2.325-1.281 3.235-1.199 1.208-3.371 1.494-4.716 0.437-1.067-0.838-1.779-1.932-1.77-3.386 0.017-2.61 0.005-5.219 0.005-7.829 0-0.147-0.008-0.295 0-0.442 0.013-0.24-0.092-0.339-0.334-0.335-0.736 0.012-1.473 0.002-2.209 0.022-0.575 0.015-1.129-0.058-1.673-0.251-1.682-0.597-2.691-2.017-2.737-3.858-0.063-2.566-0.031-5.135-0.035-7.703-0.007-5.304-0.010-10.608-0.016-15.912-0.001-0.568-0.017-1.136-0.018-1.704-0-0.464 0.006-0.472 0.494-0.479 0.989-0.013 1.978-0.023 2.968-0.023 4.609-0.002 9.219-0.001 13.829-0.001-0.001 0.006-0.001 0.014-0.001 0.021z"></path>
-<path fill="#fff" d="M31.944 19.89c-5.535 0-11.071 0.002-16.606-0.002-0.717-0-0.772 0.153-0.687-0.747 0.189-2.003 0.58-3.948 1.437-5.784 1.041-2.228 2.47-4.152 4.433-5.648 0.864-0.658 1.646-1.43 2.624-1.932 0.216-0.111 0.25-0.23 0.129-0.443-0.363-0.64-0.715-1.286-1.059-1.937-0.441-0.835-0.877-1.674-1.302-2.518-0.247-0.491-0.206-0.765 0.103-0.941 0.342-0.194 0.625-0.077 0.892 0.415 0.721 1.329 1.429 2.664 2.142 3.997 0.069 0.13 0.141 0.258 0.215 0.386 0.226 0.39 0.228 0.394 0.671 0.218 2.478-0.987 5.051-1.43 7.715-1.338 2.143 0.074 4.214 0.501 6.214 1.273 0.118 0.045 0.241 0.081 0.35 0.142 0.186 0.102 0.303 0.067 0.405-0.126 0.534-1.023 1.075-2.043 1.617-3.062 0.297-0.557 0.592-1.115 0.908-1.66 0.189-0.325 0.514-0.408 0.809-0.253 0.292 0.153 0.366 0.43 0.175 0.817-0.39 0.79-0.791 1.575-1.204 2.353-0.383 0.725-0.789 1.438-1.18 2.159-0.19 0.351-0.181 0.348 0.158 0.573 1.666 1.102 3.266 2.297 4.577 3.814 1.895 2.192 3.115 4.723 3.574 7.598 0.119 0.746 0.175 1.503 0.266 2.254 0.038 0.311-0.097 0.421-0.393 0.394-0.146-0.014-0.295-0.002-0.442-0.002-5.514 0-11.028 0-16.543 0zM25.561 12.038c-0.063-1.117-0.623-1.553-1.433-1.566-0.833-0.014-1.419 0.462-1.455 1.603-0.025 0.776 0.66 1.407 1.463 1.409 0.79 0.001 1.421-0.64 1.424-1.445zM39.872 13.483c0.788-0.007 1.497-0.676 1.439-1.441-0.076-0.997-0.486-1.549-1.506-1.576-0.841-0.022-1.403 0.67-1.386 1.605 0.016 0.816 0.635 1.418 1.453 1.411z"></path>
-<path fill="#fff" d="M50.587 32.655c0-2.715-0.003-5.429 0.001-8.143 0.003-1.77 0.853-2.959 2.453-3.698 0.717-0.331 1.433-0.52 2.172-0.287 0.794 0.251 1.537 0.649 2.123 1.273 0.519 0.552 0.839 1.207 0.944 1.957 0.052 0.374 0.082 0.754 0.083 1.131 0.005 5.282-0.005 10.564 0.010 15.846 0.004 1.249-0.402 2.288-1.278 3.179-1.245 1.267-3.35 1.546-4.76 0.479-1.076-0.815-1.719-1.943-1.745-3.342-0.019-1.010-0.013-2.020-0.014-3.030-0.002-1.789-0.001-3.578-0.001-5.366 0.004-0 0.008-0 0.012-0z"></path>
-<path fill="#fff" d="M13.369 32.464c0 2.335-0.001 4.669 0.001 7.004 0 0.63 0.047 1.263 0.002 1.889-0.072 1.003-0.541 1.811-1.23 2.554-0.931 1.004-2.059 1.18-3.323 1.058-1.55-0.15-3.156-2.028-3.181-3.665-0.004-0.231-0.015-0.462-0.014-0.694 0.003-5.406 0.007-10.812 0.011-16.218 0.001-1.655 0.863-2.749 2.268-3.501 0.683-0.366 1.397-0.602 2.158-0.402 1.622 0.427 3.305 1.697 3.292 3.834-0.016 2.713-0.004 5.427-0.004 8.141 0.007-0 0.013-0 0.020 0z"></path>
+<path fill="#fff" d="M46.73 40.88c-0.003 0-0.007 0-0.010 0-1.475 0-2.67-1.195-2.67-2.67s1.195-2.67 2.67-2.67c1.475 0 2.67 1.195 2.67 2.67v0c0 0 0 0 0 0 0 1.471-1.19 2.664-2.659 2.67h-0.001zM17.27 40.88c-1.475 0-2.67-1.195-2.67-2.67s1.195-2.67 2.67-2.67c1.475 0 2.67 1.195 2.67 2.67v0c0 0.003 0 0.007 0 0.010 0 1.469-1.191 2.66-2.66 2.66-0.003 0-0.007 0-0.011 0h0.001zM47.68 24.83l5.32-9.23c0.095-0.159 0.151-0.351 0.151-0.557 0-0.405-0.219-0.76-0.546-0.951l-0.005-0.003c-0.16-0.095-0.354-0.152-0.56-0.152-0.407 0-0.764 0.22-0.957 0.547l-0.003 0.005-5.38 9.34c-4.027-1.851-8.738-2.93-13.7-2.93s-9.673 1.079-13.909 3.016l0.209-0.086-5.39-9.34c-0.204-0.28-0.531-0.46-0.9-0.46-0.613 0-1.11 0.497-1.11 1.11 0 0.167 0.037 0.325 0.103 0.467l-0.003-0.007 5.33 9.23c-9.153 5.047-15.453 14.286-16.323 25.059l-0.007 0.111h64c-0.875-10.883-7.171-20.121-16.158-25.088l-0.162-0.082z"></path>
 </svg>

data/interfaces/default/index.html

@@ -24,17 +24,13 @@
             </div>
             <div id="currentActivity">
                 % if PLEX_SERVER_UP:
-                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i> Checking for activity...</div>
+                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i>&nbsp; Checking for activity...</div>
                 % elif config['pms_is_cloud']:
                 <div id="dashboard-no-activity" class="text-muted">Plex Cloud server is sleeping.</div>
                 % elif not config['first_run_complete']:
                 <div id="dashboard-no-activity" class="text-muted">The Tautulli setup wizard has not been completed. Please click <a href="welcome">here</a> to go to the setup wizard.</div>
                 % else:
-                <div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.
-                    % if _session['user_group'] == 'admin':
-                    Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.
-                    % endif
-                </div>
+                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is connecting to the Plex server...</div>
                 % endif
             </div>
         </div>
@@ -65,7 +61,7 @@
     <div class="row">
         <div class="col-md-12">
             <div id="home-stats" class="home-platforms">
-                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Loading stats...</div>
+                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading stats...</div>
                 <br>
             </div>
         </div>
@@ -84,7 +80,7 @@
     <div class="row">
         <div class="col-md-12">
             <div id="library-stats" class="library-platforms">
-                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Loading stats...</div>
+                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading stats...</div>
                 <br>
             </div>
         </div>
@@ -132,17 +128,12 @@
         <div class="col-md-12">
             <div id="recentlyAdded" style="margin-right: -15px;">
                 % if PLEX_SERVER_UP:
-                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Looking for new items...</div>
+                <div id="dashboard-checking-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Looking for new items...</div>
                 % elif config['pms_is_cloud']:
                 <div class="text-muted">Plex Cloud server is sleeping.</div>
                 % else:
-                <div class="text-muted">There was an error communicating with your Plex Server.
-                    % if _session['user_group'] == 'admin':
-                    Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.
-                    % endif
-                </div>
+                <div id="dashboard-no-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is connecting to your Plex server...</div>
                 % endif
-                <br>
             </div>
         </div>
     </div>
@@ -179,10 +170,10 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Terminate Session</h4>
+                <h4 class="modal-title">Terminate Stream</h4>
             </div>
             <div class="modal-body" style="text-align: center;">
-                <p>Are you sure you want to terminate this session?</p>
+                <p>Are you sure you want to terminate this stream?</p>
                 <p>
                     <strong>
                         <span id="terminate-user"></span><br />
@@ -229,8 +220,6 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-<% from plexpy import PLEX_SERVER_UP %>
-<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/jquery.scrollbar.min.js"></script>
 <script src="${http_root}js/jquery.mousewheel.min.js"></script>
 <script>
@@ -260,8 +249,33 @@
             }
         });
     }
+
+    % if _session['user_group'] == 'admin':
+    var msg_settings = ' Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.';
+    % else:
+    var msg_settings = '';
+    % endif
+
+    var error_msg = 'There was an error communicating with your Plex Server.' + msg_settings;
+
+    var server_status;
+    server_status = setInterval(function() {
+        $.getJSON('server_status', function (data) {
+            if (data.connected === true) {
+                clearInterval(server_status);
+                $('#currentActivity').html('<div id="dashboard-checking-activity" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Checking for activity...</div>');
+                $('#recentlyAdded').html('<div id="dashboard-checking-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Looking for new items...</div>');
+                activityConnected();
+                recentlyAddedConnected();
+            } else if (data.connected === false) {
+                clearInterval(server_status);
+                $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">' + error_msg + '</div>');
+                $('#recentlyAdded').html('<div id="dashboard-no-recently-added" class="text-muted">' + error_msg + '</div>');
+            }
+        });
+    }, 1000);
 </script>
-% if 'current_activity' in config['home_sections'] and PLEX_SERVER_UP:
+% if 'current_activity' in config['home_sections']:
 <script>
     var defaultHandler = {
         get: function(target, name) {
@@ -272,7 +286,7 @@
     var create_instances = [];
     var activity_ready = true;
 
-     $('#currentActivityHeader-bandwidth-tooltip').tooltip({ container: 'body', placement: 'right', delay: 50 });
+    $('#currentActivityHeader-bandwidth-tooltip').tooltip({ container: 'body', placement: 'right', delay: 50 });
 
     function getCurrentActivity() {
         activity_ready = false;
@@ -298,13 +312,8 @@
                 }
 
                 if (!(current_activity)) {
-                    % if _session['user_group'] == 'admin':
-                    var msg_settings = ' Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.';
-                    % else:
-                    var msg_settings = '';
-                    % endif
                     $('#currentActivityHeader').hide();
-                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.' + msg_settings + '</div>');
+                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">' + error_msg + '</div>');
                     return
                 }
 
@@ -377,6 +386,9 @@
                             case 'buffering':
                                 state_icon = '<i class="fa fa-fw fa-spinner"></i>&nbsp;';
                                 break;
+                            case 'error':
+                                state_icon = '<i class="fa fa-fw fa-exclamation-triangle"></i>&nbsp;';
+                                break;
                             default:
                                 state_icon = '<i class="fa fa-fw fa-question-circle"></i>&nbsp;';
                         }
@@ -431,7 +443,7 @@
 
                         var transcode_container = '';
                         if (s.stream_container_decision === 'transcode') {
-                            transcode_container = 'Transcode (' + s.container.toUpperCase() + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_container.toUpperCase() + ')';
+                            transcode_container = 'Converting (' + s.container.toUpperCase() + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_container.toUpperCase() + ')';
                         } else {
                             transcode_container = 'Direct Play (' + s.stream_container.toUpperCase() + ')';
                         }
@@ -546,7 +558,7 @@
                         }
 
                         // Update the progress bars, percent - 3 because of 3px padding-right
-                        $('#buffer-bar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%')
+                        $('#buffer-bar-' + key).css({width: parseInt(s.transcode_progress) - 3 + '%'}).html(s.transcode_progress + '%')
                             .attr('data-original-title', 'Transcoder Progress ' + s.transcode_progress + '%');
                         if (s.live !== 1) {
                             var progress_bar = $('#progress-bar-' + key);
@@ -623,34 +635,36 @@
         });
     }
 
-    getCurrentActivity();
-    setInterval(function () {
-        if (!(create_instances.length) && activity_ready) {
-            getCurrentActivity();
-        }
-    }, ${config['home_refresh_interval'] * 1000});
+    function activityConnected() {
+        getCurrentActivity();
+        setInterval(function () {
+            if (!(create_instances.length) && activity_ready) {
+                getCurrentActivity();
+            }
+        }, ${config['home_refresh_interval'] * 1000});
 
-    setInterval(function(){
-        $('.progress_time_offset').each(function () {
-            if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
-                var view_offset = parseInt($(this).data('view_offset'));
-                var stream_duration = parseInt($(this).data('stream_duration'));
-                var timestamp = millisecondsToMinutes(Math.min(view_offset, stream_duration), false);
-                $(this).html(timestamp).data('view_offset', Math.min(view_offset + 1000, stream_duration))
-            }
-        });
-        $('.progress-bar').each(function () {
-            if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
-                var view_offset = parseInt($(this).data('view_offset'));
-                var stream_duration = parseInt($(this).data('stream_duration'));
-                var progress_percent = Math.floor(view_offset / stream_duration * 100);
-                progress_percent = (progress_percent >= 0) ? Math.min(progress_percent, 100) : 100;
-                $(this).width(progress_percent - 3 + '%').html(progress_percent + '%')
-                    .attr('data-original-title', 'Stream Progress ' + progress_percent + '%')
-                    .data('view_offset', Math.min(view_offset + 1000, stream_duration));
-            }
-        });
-    }, 1000);
+        setInterval(function(){
+            $('.progress_time_offset').each(function () {
+                if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
+                    var view_offset = parseInt($(this).data('view_offset'));
+                    var stream_duration = parseInt($(this).data('stream_duration'));
+                    var timestamp = millisecondsToMinutes(Math.min(view_offset, stream_duration), false);
+                    $(this).html(timestamp).data('view_offset', Math.min(view_offset + 1000, stream_duration))
+                }
+            });
+            $('.progress-bar').each(function () {
+                if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
+                    var view_offset = parseInt($(this).data('view_offset'));
+                    var stream_duration = parseInt($(this).data('stream_duration'));
+                    var progress_percent = Math.floor(view_offset / stream_duration * 100);
+                    progress_percent = (progress_percent >= 0) ? Math.min(progress_percent, 100) : 100;
+                    $(this).css({width: progress_percent - 3 + '%'}).html(progress_percent + '%')
+                        .attr('data-original-title', 'Stream Progress ' + progress_percent + '%')
+                        .data('view_offset', Math.min(view_offset + 1000, stream_duration));
+                }
+            });
+        }, 1000);
+    }
 
     $('#currentActivity').on('click', '.external_ip-modal', function () {
         $.get('get_ip_address_details', {
@@ -756,7 +770,7 @@
                 if (user_id) {
                     href = page('user', user_id);
                 }
-                $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('friendly_name'));
+                $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('user'));
             } else if (stat_id === 'top_platforms') {
                 $('#stats-thumb-' + stat_id).removeClass(function (index, className) {
                     return (className.match (/(^|\s)platform-\S+/g) || []).join(' ');
@@ -874,7 +888,7 @@
     getLibraryStats();
 </script>
 % endif
-% if 'recently_added' in config['home_sections'] and PLEX_SERVER_UP:
+% if 'recently_added' in config['home_sections']:
 <script>
     function recentlyAdded(recently_added_count, recently_added_type) {
         showMsg("Loading recently added items...", true, false, 0);
@@ -902,7 +916,9 @@
     $('#recently-added-toggle-' + recently_added_type).closest('label').addClass('active');
     $('#recently-added-count').val(recently_added_count);
 
-    recentlyAdded(recently_added_count, recently_added_type);
+    function recentlyAddedConnected() {
+        recentlyAdded(recently_added_count, recently_added_type);
+    }
 
     function highlightAddedScrollerButton() {
         var scroller = $("#recently-added-row-scroller");

data/interfaces/default/info.html

@@ -41,7 +41,7 @@ DOCUMENTATION :: END
 
     from plexpy import notifiers
     from plexpy.common import MEDIA_TYPE_HEADERS, MEDIA_FLAGS_AUDIO, MEDIA_FLAGS_VIDEO
-    from plexpy.helpers import page, get_percent
+    from plexpy.helpers import page, get_percent, cast_to_int
 
     # Get audio codec file
     def af(codec):
@@ -84,8 +84,10 @@ DOCUMENTATION :: END
 %>
 <div class="container-fluid">
     <div class="row">
+        % if data['media_type'] not in ('photo_album', 'photo', 'playlist'):
         <% fallback = 'art-live-full' if data['live'] else None %>
         <div class="art-face" style="background-image:url(${page('pms_image_proxy', data['art'], data['rating_key'], 1920, 1080, fallback=fallback)})"></div>
+        % endif
         % if _session['user_group'] == 'admin':
         <span class="overlay-refresh-image info-art" title="Refresh background image"><i class="fa fa-refresh refresh_pms_image"></i></span>
         % endif
@@ -150,6 +152,29 @@ DOCUMENTATION :: END
                         <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
                         <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
                         <li class="active metadata-xml">Track ${data['media_index']} - ${data['title']}</li>
+                        % elif data['media_type'] == 'photo_album':
+                        <li><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
+                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
+                            % if data['parent_title']:
+                            <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
+                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
+                            % endif
+                        <li class="active metadata-xml">${data['title']}</li>
+                        % elif data['media_type'] in ('photo', 'clip'):
+                        <li class="hidden-xs hidden-sm"><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
+                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
+                        <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
+                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
+                        <li class="active metadata-xml">${data['title']}</li>
+                        % elif data['media_type'] == 'playlist':
+                            % if user_info.get('user_id'):
+                            <li><a href="${page('user', user_info.get('user_id'))}">${user_info.get('friendly_name')}</a></li>
+                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
+                            % elif data['section_id']:
+                            <li><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
+                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
+                            % endif
+                        <li class="active metadata-xml">${data['title']}</li>
                         % endif
                         </ul>
                     </div>
@@ -158,10 +183,13 @@ DOCUMENTATION :: END
             <div class="summary-content-title-wrapper">
                 <div class="col-md-9">
                     <div class="summary-content-poster hidden-xs hidden-sm">
-                        % if data['media_type'] == 'track':
-                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['parent_rating_key']}" target="_blank" title="View on Plex Web">
+                        <% legacy = '&legacy=1' if data['media_type'] in ('photo_album', 'photo', 'clip') else '' %>
+                        % if data['media_type'] in ('track', 'photo'):
+                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['parent_rating_key']}${legacy}" target="_blank" rel="noreferrer" title="View on Plex Web">
+                        % elif data['media_type'] == 'playlist':
+                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/playlist?key=%2Fplaylists%2F${data['rating_key']}" target="_blank" rel="noreferrer" title="View on Plex Web">
                         % elif not data['live']:
-                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['rating_key']}" target="_blank" title="View on Plex Web">
+                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['rating_key']}${legacy}" target="_blank" rel="noreferrer" title="View on Plex Web">
                         % endif
                         % if data['live']:
                             <div class="summary-poster-face" style="background-image: url(${page('pms_image_proxy', data['grandparent_thumb'] or data['thumb'], data['rating_key'], 300, 450, fallback='poster-live')});">
@@ -179,11 +207,14 @@ DOCUMENTATION :: END
                             % if _session['user_group'] == 'admin':
                             <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                             % endif
-                            % elif data['media_type'] == 'artist' or data['media_type'] == 'album' or data['media_type'] == 'track':
+                            % elif data['media_type'] in ('artist', 'album', 'track', 'playlist', 'photo_album', 'photo', 'clip'):
                             <div class="summary-poster-face-track" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 500, 500, fallback='cover')});">
                                 <div class="summary-poster-face-overlay">
                                     <span></span>
                                 </div>
+                                    % if data['media_type'] == 'playlist' and data['smart']:
+                                    <span class="smart-playlist-image" title="Smart Playlist"><i class="fa fa-cog"></i></span>
+                                    % endif
                             </div>
                             % if _session['user_group'] == 'admin':
                             <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
@@ -214,7 +245,7 @@ DOCUMENTATION :: END
                             <h3 class="hidden-xs">S${data['parent_media_index']} &middot; E${data['media_index']}</h3>
                             % endif
                             % endif
-                        % elif data['media_type'] in ('movie', 'show', 'artist', 'collection'):
+                        % elif data['media_type'] in ('movie', 'show', 'artist', 'collection', 'playlist', 'photo_album'):
                         <h1>&nbsp;</h1><h1>${data['title']}</h1>
                         % elif data['media_type'] == 'season':
                         <h1>&nbsp;</h1><h1><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></h1>
@@ -230,26 +261,30 @@ DOCUMENTATION :: END
                         <h1><a href="${page('info', data['grandparent_rating_key'])}">${data['original_title'] or data['grandparent_title']}</a></h1>
                         <h2><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a> - ${data['title']}</h2>
                         <h3 class="hidden-xs">T${data['media_index']}</h3>
+                        % elif data['media_type'] in ('photo', 'clip'):
+                        <h1><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></h1>
+                        <h2>${data['title']}</h2>
                         % endif
                     </div>
                 </div>
             </div>
             <div class="summary-content-wrapper">
                 <div class="col-md-9">
-                    % if data['media_type'] == 'movie' or data['live']:
-                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 305px;">
-                    % elif data['media_type'] in ('show', 'season', 'collection'):
-                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 270px;">
-                    % elif data['media_type'] == 'episode':
-                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 70px;">
-                    % elif data['media_type'] == 'artist' or data['media_type'] == 'album':
-                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 150px;">
-                    % elif data['media_type'] == 'track':
-                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 180px;">
-                    % else:
-                    <div class="summary-content-padding hidden-xs hidden-sm">
-                    % endif
-                        % if data['media_type'] in ('movie', 'episode', 'track'):
+                    <%
+                        padding_height = ''
+                        if data['media_type'] == 'movie' or data['live']:
+                            padding_height = 'height: 305px;'
+                        elif data['media_type'] in ('show', 'season', 'collection'):
+                            padding_height = 'height: 270px;'
+                        elif data['media_type'] == 'episode':
+                            padding_height = 'height: 70px;'
+                        elif data['media_type'] in ('artist', 'album', 'playlist', 'photo_album', 'photo'):
+                            padding_height = 'height: 150px;'
+                        elif data['media_type'] in ('track', 'clip'):
+                            padding_height = 'height: 180px;'
+                    %>
+                    <div class="summary-content-padding hidden-xs hidden-sm" style="${padding_height}">
+                        % if data['media_type'] in ('movie', 'episode', 'track', 'clip'):
                         <div class="summary-content-media-info-wrapper">
                             % if data['media_type'] != 'track' and media_info['video_codec']:
                             <img class="summary-content-media-flag" title="${media_info['video_codec']}" src="${http_root}images/media_flags/video_codec/${media_info['video_codec'] | vf}.png" />
@@ -268,16 +303,17 @@ DOCUMENTATION :: END
                     </div>
                     <div class="summary-content">
                         <div class="summary-content-details-wrapper">
-                            % if data['rating']:
-                            % if data['rating_image']:
-                            % if data['rating_image'].startswith('imdb://'):
-                            <div class="critic-rating hidden-xs hidden-sm" title="${data['rating']}">
-                                <span class="rating-image rating-imdb"><strong>${data['rating']}</strong></span>
+                            <% rating = data['rating'] or data['audience_rating'] %>
+                            % if rating:
+                            % if data['audience_rating_image']:
+                            % if data['audience_rating_image'].startswith('imdb://'):
+                            <div class="critic-rating hidden-xs hidden-sm" title="${rating}">
+                                <span class="rating-image rating-imdb"><strong>${rating}</strong></span>
                             </div>
                             % endif
-                            % if data['rating_image'].startswith('themoviedb://'):
-                            <div class="critic-rating hidden-xs hidden-sm" title="${data['rating']}">
-                                <span class="rating-image rating-themoviedb"><strong>${get_percent(data['rating'], 10)}%</strong></span>
+                            % if data['audience_rating_image'].startswith('themoviedb://'):
+                            <div class="critic-rating hidden-xs hidden-sm" title="${rating}">
+                                <span class="rating-image rating-themoviedb"><strong>${get_percent(rating, 10)}%</strong></span>
                             </div>
                             % endif
                             % if data['audience_rating_image'].startswith('rottentomatoes://'):
@@ -291,11 +327,24 @@ DOCUMENTATION :: END
                             </div>
                             % endif
                             % else:
-                            <div class="critic-rating hidden-xs hidden-sm" title="${data['rating']}">
-                                <i class="star-icon fa fa-star"></i> <strong>${get_percent(data['rating'], 10)}%</strong>
+                            <div class="critic-rating hidden-xs hidden-sm" title="${rating}">
+                                <i class="star-icon fa fa-star"></i> <strong>${get_percent(rating, 10)}%</strong>
                             </div>
                             % endif
                             % endif
+                            <div class="summary-content-details-tag">
+                                % if data['media_type'] in ('collection', 'playlist') and data['children_count']:
+                                <%
+                                    if data['media_type'] == 'collection':
+                                        suffix = MEDIA_TYPE_HEADERS[data['sub_media_type']]
+                                    elif data['media_type'] == 'playlist':
+                                        suffix = MEDIA_TYPE_HEADERS[data['playlist_type']]
+                                    if data['children_count'] == 1:
+                                        suffix = suffix[:-1]
+                                %>
+                                Items <strong> ${data['children_count']} ${suffix} </strong>
+                                % endif
+                            </div>
                             <div class="summary-content-details-tag">
                                 % if data['directors']:
                                 Directed by <strong> ${data['directors'][0]}</strong>
@@ -315,6 +364,8 @@ DOCUMENTATION :: END
                                 Aired <strong> <span id="airdate">${data['originally_available_at']}</span></strong>
                                 % elif data['media_type'] == 'album' or data['media_type'] == 'track':
                                 Released <strong> ${data['year']}</strong>
+                                % elif data['media_type'] in ('photo', 'clip'):
+                                Taken <strong> <span id="airdate">${data['originally_available_at']}</span></strong>
                                 % elif data['media_type'] == 'collection':
                                 Year <strong> ${data['min_year']} - ${data['max_year']}</strong>
                                 % elif data['year']:
@@ -323,7 +374,7 @@ DOCUMENTATION :: END
                             </div>
                             <div class="summary-content-details-tag">
                                 % if data['duration']:
-                                Runtime <strong> <span id="runtime">${data['duration']}</span> mins</strong>
+                                Runtime <strong> <span id="runtime">${data['duration']}</span></strong>
                                 % endif
                             </div>
                             <div class="summary-content-details-tag">
@@ -439,6 +490,17 @@ DOCUMENTATION :: END
                         <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading track list...</div>
                     </div>
                 </div>
+                % elif data['media_type'] == 'photo_album':
+                <div class="col-md-12">
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span>Photo List for <strong>${data['title']}</strong></span>
+                        </div>
+                    </div>
+                    <div class="table-card-back">
+                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading photo list...</div>
+                    </div>
+                </div>
                 % elif data['media_type'] == 'collection':
                 <div class="col-md-12">
                     <div class="table-card-header">
@@ -447,30 +509,36 @@ DOCUMENTATION :: END
                         </div>
                     </div>
                     <div class="table-card-back">
-                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading movies list...</div>
+                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading collection items...</div>
                     </div>
                 </div>
                 <div id="collection-related-list-container" style="display: none;">
                 </div>
-                % endif
-                % if data['media_type'] != 'collection':
+                % elif data['media_type'] == 'playlist':
                 <div class="col-md-12">
                     <div class="table-card-header">
                         <div class="header-bar">
-                            % if data['media_type'] in ('artist', 'album', 'track'):
-                            <span>Play History for <strong>${data['title']}</strong></span>
-                            % else:
-                            <span>Watch History for <strong>${data['title']}</strong></span>
-                            % endif
+                            <span>${MEDIA_TYPE_HEADERS[data['playlist_type']]} List for <strong>${data['title']}</strong></span>
                         </div>
+                    </div>
+                    <div class="table-card-back">
+                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading playlist items...</div>
+                    </div>
+                </div>
+                % endif
+                <%
+                    history_type = data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track')
+                    history_active = 'active' if history_type else ''
+                    export_active = 'active' if not history_type else ''
+                %>
+                % if history_type and _session['user_group'] == 'admin':
+                <div class="col-md-12">
+                    <div class="table-card-header">
+                        <ul class="nav nav-list nav-pills" role="tablist">
+                            <li class="${history_active}"><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
+                            <li class="${export_active}"><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
+                        </ul>
                         <div class="button-bar">
-                            % if _session['user_group'] == 'admin':
-                            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
-                            <div class="btn-group">
-                                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                                    <i class="fa fa-trash-o"></i> Delete mode
-                                </button>&nbsp;
-                            </div>
                             % if source == 'history':
                             <div class="btn-group">
                                 <a href="update_metadata?rating_key=${data['rating_key']}&update=True" class="btn btn-danger btn-edit" id="fix-metadata">
@@ -510,37 +578,117 @@ DOCUMENTATION :: END
                                 </button>
                             </div>
                             % endif
-                            % endif
-                            <div class="btn-group">
-                                <button class="btn btn-dark refresh-history-button" id="refresh-history-list"><i class="fa fa-refresh"></i> Refresh history</button>
-                            </div>
-                            <div class="btn-group colvis-button-bar"></div>
                         </div>
                     </div>
-                    <div class="table-card-back">
-                        <table class="display history_table" id="history_table-RK-${data['rating_key']}" width="100%">
-                            <thead>
-                                <tr>
-                                    <th align="left" id="delete">Delete</th>
-                                    <th align="left" id="date">Date</th>
-                                    <th align="left" id="friendly_name">User</th>
-                                    <th align="left" id="ip_address">IP Address</th>
-                                    <th align="left" id="platform">Platform</th>
-                                    <th align="left" id="product">Product</th>
-                                    <th align="left" id="player">Player</th>
-                                    <th align="left" id="title">Title</th>
-                                    <th align="left" id="started">Started</th>
-                                    <th align="left" id="paused_counter">Paused</th>
-                                    <th align="left" id="stopped">Stopped</th>
-                                    <th align="left" id="duration">Duration</th>
-                                    <th align="left" id="percent_complete"></th>
-                                </tr>
-                            </thead>
-                            <tbody></tbody>
-                        </table>
-                    </div>
                 </div>
                 % endif
+                <div class="tab-content">
+                    % if history_type:
+                    <div role="tabpanel" class="tab-pane ${history_active}" id="tabs-history">
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class="table-card-header">
+                                        <div class="header-bar">
+                                            % if data['media_type'] in ('artist', 'album', 'track'):
+                                            <span>Play History for <strong>${data['title']}</strong></span>
+                                            % else:
+                                            <span>Watch History for <strong>${data['title']}</strong></span>
+                                            % endif
+                                        </div>
+                                        <div class="button-bar">
+                                            % if _session['user_group'] == 'admin':
+                                            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
+                                            <div class="btn-group">
+                                                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
+                                                    <i class="fa fa-trash-o"></i> Delete mode
+                                                </button>&nbsp;
+                                            </div>
+                                            % endif
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-history-button" id="refresh-history-list"><i class="fa fa-refresh"></i> Refresh history</button>
+                                            </div>
+                                            <div class="btn-group colvis-button-bar" id="button-bar-history"></div>
+                                        </div>
+                                    </div>
+                                    <div class="table-card-back">
+                                        <table class="display history_table" id="history_table-RK-${data['rating_key']}" width="100%">
+                                            <thead>
+                                                <tr>
+                                                    <th align="left" id="delete">Delete</th>
+                                                    <th align="left" id="date">Date</th>
+                                                    <th align="left" id="friendly_name">User</th>
+                                                    <th align="left" id="ip_address">IP Address</th>
+                                                    <th align="left" id="platform">Platform</th>
+                                                    <th align="left" id="product">Product</th>
+                                                    <th align="left" id="player">Player</th>
+                                                    <th align="left" id="title">Title</th>
+                                                    <th align="left" id="started">Started</th>
+                                                    <th align="left" id="paused_counter">Paused</th>
+                                                    <th align="left" id="stopped">Stopped</th>
+                                                    <th align="left" id="duration">Duration</th>
+                                                    <th align="left" id="percent_complete"></th>
+                                                </tr>
+                                            </thead>
+                                            <tbody></tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    % endif
+                    % if not data['live'] and _session['user_group'] == 'admin':
+                    <div role="tabpanel" class="tab-pane ${export_active}" id="tabs-export">
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class="table-card-header">
+                                        <div class="header-bar">
+                                            <span>Metadata Exports for <strong>${data['title']}</strong></span>
+                                        </div>
+                                        <div class="button-bar">
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
+                                                        data-section_id="${data['section_id']}" data-rating_key="${data['rating_key']}"
+                                                        data-media_type="${data['media_type']}" data-sub_media_type="${data['sub_media_type'] or data['playlist_type'] or ''}">
+                                                    <i class="fa fa-file-export"></i> Export metadata
+                                                </button>
+                                            </div>
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-export-table-button" id="refresh-export-table">
+                                                    <i class="fa fa-refresh"></i> Refresh exports
+                                                </button>
+                                            </div>
+                                            <div class="btn-group colvis-button-bar" id="button-bar-export"></div>
+                                        </div>
+                                    </div>
+                                    <div class="table-card-back">
+                                        <table class="display export_table" id="export_table-RK-${data['rating_key']}" width="100%">
+                                            <thead>
+                                                <tr>
+                                                    <th align="left" id="timestamp">Exported At</th>
+                                                    <th align="left" id="media_type_title">Media Type</th>
+                                                    <th align="left" id="rating_key">Rating Key</th>
+                                                    <th align="left" id="filename">Filename</th>
+                                                    <th align="left" id="file_format">File Format</th>
+                                                    <th align="left" id="metadata_level">Metadata Level</th>
+                                                    <th align="left" id="media_info_level">Media Info Level</th>
+                                                    <th align="left" id="media_info_level">Custom Fields</th>
+                                                    <th align="left" id="file_size">File Size</th>
+                                                    <th align="left" id="complete">Download</th>
+                                                    <th align="left" id="delete">Delete</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody></tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    % endif
+                </div>
             </div>
         </div>
     </div>
@@ -629,6 +777,8 @@ DOCUMENTATION :: END
     </div>
 </div>
 % endif
+<div id="export-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="export-modal">
+</div>
 </%def>
 
 <%def name="javascriptIncludes()">
@@ -636,13 +786,14 @@ DOCUMENTATION :: END
 <script src="${http_root}js/dataTables.colVis.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/moment-with-locale.js"></script>
 
 % if metadata:
 <%
     data = defaultdict(None, **metadata)
+    history_user_id = '' if _session['user_group'] == 'admin' else _session['user_id']
 %>
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
+<script src="${http_root}js/tables/export_table.js${cache_param}"></script>
 % if data['live']:
 <script>
     function get_history() {
@@ -653,7 +804,7 @@ DOCUMENTATION :: END
                 return {
                     json_data: JSON.stringify( d ),
                     guid: "${data['guid']}",
-                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
+                    user_id: "${history_user_id}"
                 };
             }
         }
@@ -669,7 +820,7 @@ DOCUMENTATION :: END
                 return { 
                     json_data: JSON.stringify( d ),
                     grandparent_rating_key: "${data['rating_key']}",
-                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
+                    user_id: "${history_user_id}"
                 };
             }
         }
@@ -685,7 +836,7 @@ DOCUMENTATION :: END
                 return { 
                     json_data: JSON.stringify( d ),
                     parent_rating_key: "${data['rating_key']}",
-                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
+                    user_id: "${history_user_id}"
                 };
             }
         }
@@ -701,96 +852,43 @@ DOCUMENTATION :: END
                 return { 
                     json_data: JSON.stringify( d ),
                     rating_key: "${data['rating_key']}",
-                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
+                    user_id: "${history_user_id}"
                 };
             }
         }
     }
 </script>
 % endif
-% if data['media_type'] != 'collection':
+% if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track'):
 <script>
-    $(document).ready(function () {
+    function loadHistoryTable() {
         get_history();
         history_table = $('#history_table-RK-${data["rating_key"]}').DataTable(history_table_options);
         var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 12] });
-        $(colvis.button()).appendTo('div.colvis-button-bar');
+        $(colvis.button()).appendTo('#button-bar-history');
 
         clearSearchButton('history_table-RK-${data["rating_key"]}', history_table);
+    }
 
-        $('#row-edit-mode').on('click', function() {
-            $('#row-edit-mode-alert').fadeIn(200);
-
-            if ($(this).hasClass('active')) {
-                if (history_to_delete.length > 0) {
-                    $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal-delete').modal();
-                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        $.ajax({
-                            url: 'delete_history_rows',
-                            type: 'POST',
-                            data: { row_ids: history_to_delete.join(',') },
-                            async: true,
-                            success: function (data) {
-                                var msg = "History deleted";
-                                showMsg(msg, false, true, 2000);
-                                history_table.draw();
-                            }
-                        });
-                    });
-                }
-
-                $('.delete-control').each(function () {
-                    $(this).addClass('hidden');
-                    $('#row-edit-mode-alert').fadeOut(200);
-                });
-
-            } else {
-                history_to_delete = [];
-                $('.delete-control').each(function() {
-                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                    $(this).removeClass('hidden');
-                });
-            }
-        });
+    $(document).ready(function () {
+        loadHistoryTable();
     });
 
     $("#refresh-history-list").click(function () {
         history_table.draw();
     });
-
-    // Send recently added notification
-    $('#send-recently-added-notification').on('click', function () {
-        var rating_key = $(this).data('id');
-
-        $('#send-recently-added-modal').modal();
-        $('#send-recently-added-modal').one('click', '#confirm-send-notification', function () {
-            $.ajax({
-                url: 'send_manual_on_created',
-                data: {
-                    rating_key: rating_key,
-                    notifier_id: $('#send-notification-notifier option:selected').val()
-                    },
-                async: true,
-                success: function (data) {
-                    if (data.result === 'success') {
-                        showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
-                    } else {
-                        showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
-                    }
-                }
-            });
-        });
-    });
 </script>
 % endif
-% if data['media_type'] in ('show', 'season', 'artist', 'album', 'collection'):
+% if data['media_type'] in ('show', 'season', 'artist', 'album', 'photo_album', 'collection', 'playlist'):
 <script>
     $.ajax({
         url: 'get_item_children',
         type: 'GET',
         async: true,
-        data: { rating_key : "${data['rating_key']}" },
+        data: {
+            rating_key: "${data['rating_key']}",
+            media_type: "${data['media_type']}"
+        },
         complete: function(xhr, status) {
             $("#children-list").html(xhr.responseText);
         }
@@ -804,7 +902,7 @@ DOCUMENTATION :: END
         type: 'GET',
         async: true,
         data: {
-            rating_key : "${data['rating_key']}",
+            rating_key: "${data['rating_key']}",
             title: "${data['title']}"
         },
         complete: function(xhr, status) {
@@ -814,12 +912,29 @@ DOCUMENTATION :: END
 </script>
 % endif
 <script>
-    $('.metadata-xml').on('tripleclick', function () {
-        openPlexXML("/library/metadata/${data['rating_key']}");
+    $(document).ready(function () {
+        // Javascript to enable link to tab
+        var hash = document.location.hash;
+        var prefix = "tab_";
+        if (hash) {
+            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
+        }
+
+        // Change hash for page-reload
+        $('.nav-list a').on('shown.bs.tab', function (e) {
+            window.location.hash = e.target.hash.replace("#", "#" + prefix);
+        });
     });
 
-    $("#airdate").html(moment($("#airdate").text()).format('MMM DD, YYYY'));
-    $("#runtime").html(millisecondsToMinutes($("#runtime").text(), true));
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
+    });
+
+    var airdate = $("#airdate")
+    var runtime = $("#runtime")
+    airdate.html(moment(airdate.text()).format('MMM DD, YYYY'));
+    runtime.html(humanDuration(runtime.text()));
+
     $('div.art-face').animate({ opacity: 0.2 }, { duration: 1000 });
     $('#channel-icon').popover({
         selector: '[data-toggle=popover]',
@@ -833,6 +948,127 @@ DOCUMENTATION :: END
         }
     });
 </script>
+% if _session['user_group'] == 'admin':
+<script>
+    $("#toggle-export-modal").click(function() {
+        $.ajax({
+            url: 'export_metadata_modal',
+            data: {
+                section_id: $(this).data('section_id'),
+                rating_key: $(this).data('rating_key'),
+                media_type: $(this).data('media_type'),
+                sub_media_type: $(this).data('sub_media_type')
+            },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#export-modal").html(xhr.responseText);
+            }
+        });
+    });
+
+    function loadExportTable() {
+        // Build export table
+        export_table_options.ajax = {
+            url: 'get_export_list',
+            type: 'POST',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    rating_key: "${data['rating_key']}"
+                };
+            }
+        };
+        export_table = $('#export_table-RK-${data["rating_key"]}').DataTable(export_table_options);
+        export_table.columns([2, 7]).visible(false);
+
+        var colvis = new $.fn.dataTable.ColVis(export_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
+        $(colvis.button()).appendTo('#button-bar-export');
+
+        clearSearchButton('export_table-RK-${data["rating_key"]}', export_table);
+    }
+
+    $('#nav-tabs-export').on('shown.bs.tab', function() {
+        if (typeof(export_table) === 'undefined') {
+            loadExportTable();
+        }
+    });
+
+    $(document).ready(function () {
+        if (!($('#tabs-history').length)) {
+            loadExportTable();
+        }
+    });
+
+    $("#refresh-export-table").click(function () {
+        export_table.draw();
+    });
+
+    $('#row-edit-mode').on('click', function() {
+        $('#row-edit-mode-alert').fadeIn(200);
+
+        if ($(this).hasClass('active')) {
+            if (history_to_delete.length > 0) {
+                $('#deleteCount').text(history_to_delete.length);
+                $('#confirm-modal-delete').modal();
+                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
+                    $.ajax({
+                        url: 'delete_history_rows',
+                        type: 'POST',
+                        data: { row_ids: history_to_delete.join(',') },
+                        async: true,
+                        success: function (data) {
+                            var msg = "History deleted";
+                            showMsg(msg, false, true, 2000);
+                            history_table.draw();
+                        }
+                    });
+                });
+            }
+
+            $('.delete-control').each(function () {
+                $(this).addClass('hidden');
+                $('#row-edit-mode-alert').fadeOut(200);
+            });
+
+        } else {
+            history_to_delete = [];
+            $('.delete-control').each(function() {
+                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+                $(this).removeClass('hidden');
+            });
+        }
+    });
+
+    // Send recently added notification
+    $('#send-recently-added-notification').on('click', function () {
+        var rating_key = $(this).data('id');
+
+        $('#send-recently-added-modal').modal();
+        $('#send-recently-added-modal').one('click', '#confirm-send-notification', function () {
+            $.ajax({
+                url: 'send_manual_on_created',
+                data: {
+                    rating_key: rating_key,
+                    notifier_id: $('#send-notification-notifier option:selected').val()
+                },
+                async: true,
+                success: function (data) {
+                    if (data.result === 'success') {
+                        showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
+                    } else {
+                        showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
+                    }
+                }
+            });
+        });
+    });
+
+    $('.metadata-xml').on('tripleclick', function () {
+        openPlexXML("/library/metadata/${data['rating_key']}");
+    });
+</script>
+% endif
 % if data.get('poster_url'):
 <script>
     $('#hosted-poster').popover({

data/interfaces/default/info_children_list.html

@@ -28,14 +28,15 @@ DOCUMENTATION :: END
 
 % if data != None:
 <%
-    from plexpy.helpers import page
+    from plexpy.helpers import cast_to_int, page
 %>
 % if data['children_count'] > 0:
 <div class="item-children-wrapper">
-    <ul class="item-children-instance list-unstyled">
+    <% max_height ='max-height' if data['children_type'] in ('track', 'photo') or media_type == 'playlist' else '' %>
+    <ul class="item-children-instance ${max_height} list-unstyled">
         % for child in data['children_list']:
         % if child['rating_key']:
-        % if data['children_type'] == 'track':
+        % if data['children_type'] in ('track', 'photo') or media_type == 'playlist':
         <li class="item-children-list-item">
         % else:
         <li>
@@ -123,37 +124,144 @@ DOCUMENTATION :: END
                 </h3>
             </div>
             % elif data['children_type'] == 'track':
-                % if loop.index % 2 == 0:
-                <div class="item-children-list-item-even">
-                    <span class="item-children-list-item-index">&nbsp;${child['media_index']}</span>
-                    <span class="item-children-list-item-title"><a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                    % if child['original_title']:
+                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
+                <div class="item-children-list-item-${e}">
+                    <span class="item-children-list-item-index">${child['media_index']}</span>
+                    <span class="item-children-list-item-title">
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>
+                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
+                                ${child['title']}
+                            </span>
+                        </a>
+                        % if child['original_title']:
                         <span class="text-muted"> - ${child['original_title']}</span>
-                    % endif
+                        % endif
                     </span>
                     <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
-                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("m:ss"));</script>
+                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
+                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
                     </span>
                 </div>
-                % else:
-                <div class="item-children-list-item-odd">
-                    <span class="item-children-list-item-index">&nbsp;${child['media_index']}</span>
-                    <span class="item-children-list-item-title"><a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                    % if child['original_title']:
-                        <span class="text-muted"> - ${child['original_title']}</span>
-                    % endif
+            % elif data['children_type'] == 'photo':
+                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
+                <div class="item-children-list-item-${e}">
+                    <span class="item-children-list-item-index">${loop.index + 1}</span>
+                    <span class="item-children-list-item-title">
+                        % if child['media_type'] == 'photo_album':
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-camera fa-fw"></i></span>
+                        % elif child['media_type'] == 'clip':
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-video-camera fa-fw"></i></span>
+                        % else:
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>
+                        % endif
+                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
+                                ${child['title']}
+                            </span>
+                        </a>
                     </span>
+                    % if child['duration']:
                     <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
-                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("m:ss"));</script>
+                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
+                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
                     </span>
+                    % endif
+                </div>
+            % elif media_type == 'playlist':
+                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
+                <div class="item-children-list-item-${e}">
+                    <span class="item-children-list-item-index">${loop.index + 1}</span>
+                    <span class="item-children-list-item-title">
+                        % if child['media_type'] == 'movie':
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>
+                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
+                                ${child['title']}
+                            </span>
+                        </a>
+                        <span class="text-muted"> (${child['year']})</span>
+                        % elif child['media_type'] == 'episode':
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>
+                        <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
+                                ${child['grandparent_title']}
+                            </span>
+                        </a> -
+                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
+                                ${child['title']}
+                            </span>
+                        </a>
+                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">S${child['parent_media_index']}</a> &middot; <a class="no-highlight" href="${page('info', child['rating_key'])}" title="${child['title']}">E${child['media_index']}</a>)</span>
+                        % elif child['media_type'] == 'track':
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>
+                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
+                                ${child['title']}
+                            </span>
+                        </a> -
+                        <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
+                                ${child['grandparent_title']}
+                            </span>
+                        </a>
+                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
+                        % elif child['media_type'] == 'photo':
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>
+                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
+                                ${child['title']}
+                            </span>
+                        </a>
+                            % if child['grandparent_title']:
+                            - <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
+                                <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
+                                    ${child['grandparent_title']}
+                                </span>
+                            </a>
+                            % endif
+                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
+                        % elif child['media_type'] == 'clip':
+                        <span class="media-type-tooltip" data-toggle="tooltip" title="Video"><i class="fa fa-video-camera fa-fw"></i></span>
+                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
+                                ${child['title']}
+                            </span>
+                        </a>
+                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
+                        % endif
+                    </span>
+                    % if child['duration']:
+                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
+                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
+                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
+                    </span>
+                    % endif
                 </div>
-                % endif
             % endif
         </li>
         % endif
         % endfor
     </ul>
 </div>
+<script>
+    $('body').tooltip({
+        selector: '[data-toggle="tooltip"]',
+        container: 'body'
+    });
+    $('body').popover({
+        selector: '[data-toggle="popover"]',
+        html: true,
+        container: 'body',
+        trigger: 'hover',
+        placement: 'right',
+        template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
+        content: function () {
+            return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
+        }
+    });
+</script>
 % endif
 % endif
 

data/interfaces/default/info_search_results_list.html

@@ -65,7 +65,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['collection']:
         <li>
-            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
+            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -90,7 +90,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['movie']:
         <li>
-            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
+            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -115,7 +115,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['show']:
         <li>
-            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
+            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -140,7 +140,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['season']:
         <li>
-            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
+            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -165,7 +165,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['episode']:
         <li>
-            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
+            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face episode-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 500, 280, fallback='art')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -191,7 +191,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['artist']:
         <li>
-            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
+            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -215,7 +215,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['album']:
         <li>
-            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
+            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -240,7 +240,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['track']:
         <li>
-            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
+            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')});">
                         <div class="item-children-card-overlay">

data/interfaces/default/js/dataTables.colVis.js

@@ -790,6 +790,9 @@ ColVis.prototype = {
 		oStyle.top = oPos.top+"px";
 		oStyle.left = iDivX+"px";
 
+		var iDocWidth = $(document).width();
+		var iDocHeight = $(document).height();
+
 		document.body.appendChild( nBackground );
 		document.body.appendChild( nHidden );
 		document.body.appendChild( this.dom.catcher );
@@ -819,12 +822,17 @@ ColVis.prototype = {
 
 			var iDivWidth = $(nHidden).outerWidth();
 			var iDivHeight = $(nHidden).outerHeight();
-			var iDocWidth = $(document).width();
+			var iDivMarginTop = parseInt($(nHidden).css("marginTop"), 10);
+			var iDivMarginBottom = parseInt($(nHidden).css("marginBottom"), 10);
 
 			if ( iLeft + iDivWidth > iDocWidth )
 			{
 				nHidden.style.left = (iDocWidth-iDivWidth)+"px";
 			}
+			if ( iDivY + iDivHeight > iDocHeight )
+			{
+				nHidden.style.top = (oPos.top - iDivHeight - iDivMarginTop - iDivMarginBottom)+"px";
+			}
 		}
 
 		this.s.hidden = false;
@@ -846,7 +854,8 @@ ColVis.prototype = {
 			this.s.hidden = true;
 
 			$(this.dom.collection).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
-				this.style.display = "none";
+				// this.style.display = "none";
+				document.body.removeChild( this );
 			} );
 
 			$(this.dom.background).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {

data/interfaces/default/js/moment-duration-format.js

@@ -1,482 +0,0 @@
-/*! Moment Duration Format v1.3.0
- *  https://github.com/jsmreese/moment-duration-format 
- *  Date: 2014-07-15
- *
- *  Duration format plugin function for the Moment.js library
- *  http://momentjs.com/
- *
- *  Copyright 2014 John Madhavan-Reese
- *  Released under the MIT license
- */
-
-(function (root, undefined) {
-
-	// repeatZero(qty)
-	// returns "0" repeated qty times
-	function repeatZero(qty) {
-		var result = "";
-		
-		// exit early
-		// if qty is 0 or a negative number
-		// or doesn't coerce to an integer
-		qty = parseInt(qty, 10);
-		if (!qty || qty < 1) { return result; }
-		
-		while (qty) {
-			result += "0";
-			qty -= 1;
-		}
-		
-		return result;
-	}
-	
-	// padZero(str, len [, isRight])
-	// pads a string with zeros up to a specified length
-	// will not pad a string if its length is aready
-	// greater than or equal to the specified length
-	// default output pads with zeros on the left
-	// set isRight to `true` to pad with zeros on the right
-	function padZero(str, len, isRight) {
-		if (str == null) { str = ""; }
-		str = "" + str;
-		
-		return (isRight ? str : "") + repeatZero(len - str.length) + (isRight ? "" : str);
-	}
-	
-	// isArray
-	function isArray(array) {
-		return Object.prototype.toString.call(array) === "[object Array]";
-	}
-	
-	// isObject
-	function isObject(obj) {
-		return Object.prototype.toString.call(obj) === "[object Object]";
-	}
-	
-	// findLast
-	function findLast(array, callback) {
-		var index = array.length;
-
-		while (index -= 1) {
-			if (callback(array[index])) { return array[index]; }
-		}
-	}
-
-	// find
-	function find(array, callback) {
-		var index = 0,
-			max = array.length,
-			match;
-			
-		if (typeof callback !== "function") {
-			match = callback;
-			callback = function (item) {
-				return item === match;
-			};
-		}
-
-		while (index < max) {
-			if (callback(array[index])) { return array[index]; }
-			index += 1;
-		}
-	}
-	
-	// each
-	function each(array, callback) {
-		var index = 0,
-			max = array.length;
-			
-		if (!array || !max) { return; }
-
-		while (index < max) {
-			if (callback(array[index], index) === false) { return; }
-			index += 1;
-		}
-	}
-	
-	// map
-	function map(array, callback) {
-		var index = 0,
-			max = array.length,
-			ret = [];
-
-		if (!array || !max) { return ret; }
-				
-		while (index < max) {
-			ret[index] = callback(array[index], index);
-			index += 1;
-		}
-		
-		return ret;
-	}
-	
-	// pluck
-	function pluck(array, prop) {
-		return map(array, function (item) {
-			return item[prop];
-		});
-	}
-	
-	// compact
-	function compact(array) {
-		var ret = [];
-		
-		each(array, function (item) {
-			if (item) { ret.push(item); }
-		});
-		
-		return ret;
-	}
-	
-	// unique
-	function unique(array) {
-		var ret = [];
-		
-		each(array, function (_a) {
-			if (!find(ret, _a)) { ret.push(_a); }
-		});
-		
-		return ret;
-	}
-	
-	// intersection
-	function intersection(a, b) {
-		var ret = [];
-		
-		each(a, function (_a) {
-			each(b, function (_b) {
-				if (_a === _b) { ret.push(_a); }
-			});
-		});
-		
-		return unique(ret);
-	}
-	
-	// rest
-	function rest(array, callback) {
-		var ret = [];
-		
-		each(array, function (item, index) {
-			if (!callback(item)) {
-				ret = array.slice(index);
-				return false;
-			}
-		});
-		
-		return ret;
-	}
-
-	// initial
-	function initial(array, callback) {
-		var reversed = array.slice().reverse();
-		
-		return rest(reversed, callback).reverse();
-	}
-	
-	// extend
-	function extend(a, b) {
-		for (var key in b) {
-			if (b.hasOwnProperty(key)) { a[key] = b[key]; }
-		}
-		
-		return a;
-	}
-			
-	// define internal moment reference
-	var moment;
-
-	if (typeof require === "function") {
-		try { moment = require('moment'); } 
-		catch (e) {}
-	} 
-	
-	if (!moment && root.moment) {
-		moment = root.moment;
-	}
-	
-	if (!moment) {
-		throw "Moment Duration Format cannot find Moment.js";
-	}
-	
-	// moment.duration.format([template] [, precision] [, settings])
-	moment.duration.fn.format = function () {
-
-		var tokenizer, tokens, types, typeMap, momentTypes, foundFirst, trimIndex,
-			args = [].slice.call(arguments),
-			settings = extend({}, this.format.defaults),
-			// keep a shadow copy of this moment for calculating remainders
-			remainder = moment.duration(this);
-
-		// add a reference to this duration object to the settings for use
-		// in a template function
-		settings.duration = this;
-
-		// parse arguments
-		each(args, function (arg) {
-			if (typeof arg === "string" || typeof arg === "function") {
-				settings.template = arg;
-				return;
-			}
-
-			if (typeof arg === "number") {
-				settings.precision = arg;
-				return;
-			}
-
-			if (isObject(arg)) {
-				extend(settings, arg);
-			}
-		});
-
-		// types
-		types = settings.types = (isArray(settings.types) ? settings.types : settings.types.split(" "));
-
-		// template
-		if (typeof settings.template === "function") {
-			settings.template = settings.template.apply(settings);
-		}
-
-		// tokenizer regexp
-		tokenizer = new RegExp(map(types, function (type) {
-			return settings[type].source;
-		}).join("|"), "g");
-
-		// token type map function
-		typeMap = function (token) {
-			return find(types, function (type) {
-				return settings[type].test(token);
-			});
-		};
-
-		// tokens array
-		tokens = map(settings.template.match(tokenizer), function (token, index) {
-			var type = typeMap(token),
-				length = token.length;
-
-			return {
-				index: index,
-				length: length,
-
-				// replace escaped tokens with the non-escaped token text
-				token: (type === "escape" ? token.replace(settings.escape, "$1") : token),
-
-				// ignore type on non-moment tokens
-				type: ((type === "escape" || type === "general") ? null : type)
-
-				// calculate base value for all moment tokens
-				//baseValue: ((type === "escape" || type === "general") ? null : this.as(type))
-			};
-		}, this);
-
-		// unique moment token types in the template (in order of descending magnitude)
-		momentTypes = intersection(types, unique(compact(pluck(tokens, "type"))));
-
-		// exit early if there are no momentTypes
-		if (!momentTypes.length) {
-			return pluck(tokens, "token").join("");
-		}
-
-		// calculate values for each token type in the template
-		each(momentTypes, function (momentType, index) {
-			var value, wholeValue, decimalValue, isLeast, isMost;
-
-			// calculate integer and decimal value portions
-			value = remainder.as(momentType);
-			wholeValue = (value > 0 ? Math.floor(value) : Math.ceil(value));
-			decimalValue = value - wholeValue;
-
-			// is this the least-significant moment token found?
-			isLeast = ((index + 1) === momentTypes.length);
-
-			// is this the most-significant moment token found?
-			isMost = (!index);
-
-			// update tokens array
-			// using this algorithm to not assume anything about
-			// the order or frequency of any tokens
-			each(tokens, function (token) {
-				if (token.type === momentType) {
-					extend(token, {
-						value: value,
-						wholeValue: wholeValue,
-						decimalValue: decimalValue,
-						isLeast: isLeast,
-						isMost: isMost
-					});
-
-					if (isMost) {
-						// note the length of the most-significant moment token:
-						// if it is greater than one and forceLength is not set, default forceLength to `true`
-						if (settings.forceLength == null && token.length > 1) {
-							settings.forceLength = true;
-						}
-
-						// rationale is this:
-						// if the template is "h:mm:ss" and the moment value is 5 minutes, the user-friendly output is "5:00", not "05:00"
-						// shouldn't pad the `minutes` token even though it has length of two
-						// if the template is "hh:mm:ss", the user clearly wanted everything padded so we should output "05:00"
-						// if the user wanted the full padded output, they can set `{ trim: false }` to get "00:05:00"
-					}
-				}
-			});
-
-			// update remainder
-			remainder.subtract(wholeValue, momentType);
-		});
-	
-		// trim tokens array
-		if (settings.trim) {
-			tokens = (settings.trim === "left" ? rest : initial)(tokens, function (token) {
-				// return `true` if:
-				// the token is not the least moment token (don't trim the least moment token)
-				// the token is a moment token that does not have a value (don't trim moment tokens that have a whole value)
-				return !(token.isLeast || (token.type != null && token.wholeValue));
-			});
-		}
-		
-		
-		// build output
-
-		// the first moment token can have special handling
-		foundFirst = false;
-
-		// run the map in reverse order if trimming from the right
-		if (settings.trim === "right") {
-			tokens.reverse();
-		}
-
-		tokens = map(tokens, function (token) {
-			var val,
-				decVal;
-
-			if (!token.type) {
-				// if it is not a moment token, use the token as its own value
-				return token.token;
-			}
-
-			// apply negative precision formatting to the least-significant moment token
-			if (token.isLeast && (settings.precision < 0)) {
-				val = (Math.floor(token.wholeValue * Math.pow(10, settings.precision)) * Math.pow(10, -settings.precision)).toString();
-			} else {
-				val = token.wholeValue.toString();
-			}
-			
-			// remove negative sign from the beginning
-			val = val.replace(/^\-/, "");
-
-			// apply token length formatting
-			// special handling for the first moment token that is not the most significant in a trimmed template
-			if (token.length > 1 && (foundFirst || token.isMost || settings.forceLength)) {
-				val = padZero(val, token.length);
-			}
-
-			// add decimal value if precision > 0
-			if (token.isLeast && (settings.precision > 0)) {
-				decVal = token.decimalValue.toString().replace(/^\-/, "").split(/\.|e\-/);
-				switch (decVal.length) {
-					case 1:
-						val += "." + padZero(decVal[0], settings.precision, true).slice(0, settings.precision);
-						break;
-						
-					case 2:
-						val += "." + padZero(decVal[1], settings.precision, true).slice(0, settings.precision);		
-						break;
-						
-					case 3:
-						val += "." + padZero(repeatZero((+decVal[2]) - 1) + (decVal[0] || "0") + decVal[1], settings.precision, true).slice(0, settings.precision);		
-						break;
-					
-					default:
-						throw "Moment Duration Format: unable to parse token decimal value.";
-				}
-			}
-			
-			// add a negative sign if the value is negative and token is most significant
-			if (token.isMost && token.value < 0) {
-				val = "-" + val;
-			}
-
-			foundFirst = true;
-
-			return val;
-		});
-
-		// undo the reverse if trimming from the right
-		if (settings.trim === "right") {
-			tokens.reverse();
-		}
-
-		return tokens.join("");
-	};
-
-	moment.duration.fn.format.defaults = {
-		// token definitions
-		escape: /\[(.+?)\]/,
-		years: /[Yy]+/,
-		months: /M+/,
-		weeks: /[Ww]+/,
-		days: /[Dd]+/,
-		hours: /[Hh]+/,
-		minutes: /m+/,
-		seconds: /s+/,
-		milliseconds: /S+/,
-		general: /.+?/,
-
-		// token type names
-		// in order of descending magnitude
-		// can be a space-separated token name list or an array of token names
-		types: "escape years months weeks days hours minutes seconds milliseconds general",
-
-		// format options
-
-		// trim
-		// "left" - template tokens are trimmed from the left until the first moment token that has a value >= 1
-		// "right" - template tokens are trimmed from the right until the first moment token that has a value >= 1
-		// (the final moment token is not trimmed, regardless of value)
-		// `false` - template tokens are not trimmed
-		trim: "left",
-
-		// precision
-		// number of decimal digits to include after (to the right of) the decimal point (positive integer)
-		// or the number of digits to truncate to 0 before (to the left of) the decimal point (negative integer)
-		precision: 0,
-
-		// force first moment token with a value to render at full length even when template is trimmed and first moment token has length of 1
-		forceLength: null,
-
-		// template used to format duration
-		// may be a function or a string
-		// template functions are executed with the `this` binding of the settings object
-		// so that template strings may be dynamically generated based on the duration object
-		// (accessible via `this.duration`)
-		// or any of the other settings
-		template: function () {
-			var types = this.types,
-				dur = this.duration,
-				lastType = findLast(types, function (type) {
-					return dur._data[type];
-				});
-
-			// default template strings for each duration dimension type
-			switch (lastType) {
-				case "seconds":
-					return "h:mm:ss";
-				case "minutes":
-					return "d[d] h:mm";
-				case "hours":
-					return "d[d] h[h]";
-				case "days":
-					return "M[m] d[d]";
-				case "weeks":
-					return "y[y] w[w]";
-				case "months":
-					return "y[y] M[m]";
-				case "years":
-					return "y[y]";
-				default:
-					return "y[y] M[m] d[d] h:mm:ss";
-			}
-		}
-	};
-
-})(this);

data/interfaces/default/js/script.js

@@ -330,31 +330,24 @@ function humanTime(seconds) {
     }
 }
 
-function humanTimeClean(seconds) {
-    var text;
-    if (seconds >= 86400) {
-        text = Math.floor(moment.duration(seconds, 'seconds').asDays()) + ' days ' + Math.floor(moment.duration((
-            seconds % 86400), 'seconds').asHours()) + ' hrs ' + Math.floor(moment.duration(
-            ((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
-        return text;
-    } else if (seconds >= 3600) {
-        text = Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + ' hrs ' + Math.floor(moment.duration(
-            ((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
-        return text;
-    } else if (seconds >= 60) {
-        text = Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
-        return text;
-    } else {
-        text = '0';
-        return text;
-    }
-}
 String.prototype.toProperCase = function () {
     return this.replace(/\w\S*/g, function (txt) {
         return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
     });
 };
 
+function getPercent(value1, value2) {
+    value1 = parseFloat(value1) | 0
+    value2 = parseFloat(value2) | 0
+
+    var percent = 0;
+    if (value1 !== 0 && value2 !== 0) {
+        percent = (value1 / value2) * 100
+    }
+
+    return Math.round(percent)
+}
+
 function millisecondsToMinutes(ms, roundToMinute) {
     if (ms > 0) {
       var minutes = Math.floor(ms / 60000);
@@ -372,6 +365,61 @@ function millisecondsToMinutes(ms, roundToMinute) {
         }
     }
 }
+
+function humanDuration(ms, sig='dhm', units='ms', return_seconds=300000) {
+    var factors = {
+        d: 86400000,
+        h: 3600000,
+        m: 60000,
+        s: 1000,
+        ms: 1
+    }
+
+    ms = parseInt(ms);
+    var d, h, m, s;
+
+    if (ms > 0) {
+        if (return_seconds && ms < return_seconds) {
+            sig = 'dhms'
+        }
+
+        ms = ms * factors[units];
+
+        h =  ms % factors['d'];
+        d = Math.trunc(ms / factors['d']);
+
+        m = h % factors['h'];
+        h = Math.trunc(h / factors['h']);
+
+        s = m % factors['m'];
+        m = Math.trunc(m / factors['m']);
+
+        ms = s % factors['s'];
+        s = Math.trunc(s / factors['s']);
+
+        var hd_list = [];
+        if (sig >= 'd' && d > 0) {
+            d = (sig === 'd' && h >= 12) ? d + 1 : d;
+            hd_list.push(d.toString() + ' day' + ((d > 1) ? 's' : ''));
+        }
+        if (sig >= 'dh' && h > 0) {
+            h = (sig === 'dh' && m >= 30) ? h + 1 : h;
+            hd_list.push(h.toString() + ' hr' + ((h > 1) ? 's' : ''));
+        }
+        if (sig >= 'dhm' && m > 0) {
+            m = (sig === 'dhm' && s >= 30) ? m + 1 : m;
+            hd_list.push(m.toString() + ' min' + ((m > 1) ? 's' : ''));
+        }
+        if (sig >= 'dhms' && s > 0) {
+            hd_list.push(s.toString() + ' sec' + ((s > 1) ? 's' : ''));
+        }
+
+        return hd_list.join(' ')
+    } else {
+        return '0'
+    }
+}
+
 // Our countdown plugin takes a callback, a duration, and an optional message
 $.fn.countdown = function (callback, duration, message) {
     // If no message is provided, we use an empty string
@@ -555,16 +603,18 @@ function PopupCenter(url, title, w, h) {
 
 
 function setLocalStorage(key, value, path) {
+    var key_path = key;
     if (path !== false) {
-        key = key + '_' + window.location.pathname;
+        key_path = key_path + '_' + window.location.pathname;
     }
-    localStorage.setItem(key, value);
+    localStorage.setItem(key_path, value);
 }
 function getLocalStorage(key, default_value, path) {
+    var key_path = key;
     if (path !== false) {
-        key = key + '_' + window.location.pathname;
+        key_path = key_path + '_' + window.location.pathname;
     }
-    var value = localStorage.getItem(key);
+    var value = localStorage.getItem(key_path);
     if (value !== null) {
         return value
     } else if (default_value !== undefined) {
@@ -803,3 +853,16 @@ function user_page(user_id, user) {
 
     return params;
 }
+
+MEDIA_TYPE_HEADERS = {
+    'movie': 'Movies',
+    'show': 'TV Shows',
+    'season': 'Seasons',
+    'episode': 'Episodes',
+    'artist': 'Artists',
+    'album': 'Albums',
+    'track': 'Tracks',
+    'video': 'Videos',
+    'audio': 'Tracks',
+    'photo': 'Photos'
+}

data/interfaces/default/js/selectize.plugin.disable-options.js

@@ -0,0 +1,87 @@
+/**
+ * Plugin: "disable_options" (selectize.js)
+ * Copyright (c) 2013 Mondo Robot & contributors
+ *
+ * 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.
+ *
+ * @authors Jake Myers <jmyers0022@gmail.com>, Vaughn Draughon <vaughn@rocksolidwebdesign.com>
+ */
+
+ Selectize.define('disable_options', function(options) {
+  var self = this;
+
+  options = $.extend({
+	'disableField': '',
+    'disableOptions': []
+  }, options);
+
+  self.refreshOptions = (function() {
+    var original = self.refreshOptions;
+
+    return function() {
+      original.apply(this, arguments);
+
+      $.each(options.disableOptions, function(index, option) {
+        self.$dropdown_content.find('[data-' + options.disableField + '="' + String(option) + '"]').addClass('option-disabled');
+      });
+    };
+  })();
+
+  self.onOptionSelect = (function() {
+    var original = self.onOptionSelect;
+
+    return function(e) {
+      var value, $target, $option;
+
+      if (e.preventDefault) {
+        e.preventDefault();
+        e.stopPropagation();
+      }
+
+      $target = $(e.currentTarget);
+
+      if ($target.hasClass('option-disabled')) {
+        return;
+      }
+      return original.apply(this, arguments);
+    };
+  })();
+
+  self.disabledOptions = function() {
+    return options.disableOptions;
+  }
+
+  self.setDisabledOptions = function( values ) {
+    options.disableOptions = values
+  }
+
+  self.disableOptions = function( values ) {
+    if ( ! ( values instanceof Array ) ) {
+      values = [ values ]
+    }
+    values.forEach( function( val ) {
+      if ( options.disableOptions.indexOf( val ) == -1 ) {
+        options.disableOptions.push( val )
+      }
+    } );
+  }
+
+  self.enableOptions = function( values ) {
+    if ( ! ( values instanceof Array ) ) {
+      values = [ values ]
+    }
+    values.forEach( function( val ) {
+      var remove = options.disableOptions.indexOf( val );
+      if ( remove + 1 ) {
+        options.disableOptions.splice( remove, 1 );
+      }
+    } );
+  }
+});

data/interfaces/default/js/tables/collections_table.js

@@ -0,0 +1,111 @@
+collections_table_options = {
+    "destroy": true,
+    "language": {
+        "search": "Search: ",
+        "lengthMenu": "Show _MENU_ entries per page",
+        "info": "Showing _START_ to _END_ of _TOTAL_ collections",
+        "infoEmpty": "Showing 0 to 0 of 0 entries",
+        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
+        "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+    },
+    "pagingType": "full_numbers",
+    "stateSave": true,
+    "stateDuration": 0,
+    "processing": false,
+    "serverSide": true,
+    "pageLength": 25,
+    "order": [0, 'asc'],
+    "autoWidth": false,
+    "scrollX": true,
+    "columnDefs": [
+        {
+            "targets": [0],
+            "data": "titleSort",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['ratingKey'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + '</span>';
+                    $(td).html('<a href="' + page('info', rowData['ratingKey']) + '"><i class="fa fa-blank fa-fw"></i>' + thumb_popover + '</a>');
+                }
+            },
+            "width": "50%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [1],
+            "data": "collectionMode",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var mode = '';
+                    if (cellData === -1) {
+                        mode = 'Library default';
+                    } else if (cellData === 0) {
+                        mode = 'Hide collection';
+                    } else if (cellData === 1) {
+                        mode = 'Hide items in this collection';
+                    } else if (cellData === 2) {
+                        mode = 'Show this collection and its items';
+                    }
+                    $(td).html(mode);
+                }
+            },
+            "width": "20%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [2],
+            "data": "collectionSort",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var sort = '';
+                    if (cellData === 0) {
+                        sort = 'Release date';
+                    } else if (cellData === 1) {
+                        sort = 'Alphabetical';
+                    }
+                    $(td).html(sort);
+                }
+            },
+            "width": "20%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [3],
+            "data": "childCount",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var type = MEDIA_TYPE_HEADERS[rowData['subtype']] || '';
+                    if (rowData['childCount'] == 1) {
+                        type = type.slice(0, -1);
+                    }
+                    $(td).html(cellData + ' ' + type);
+                }
+            },
+            "width": "10%",
+            "className": "no-wrap"
+        }
+    ],
+    "drawCallback": function (settings) {
+        // Jump to top of page
+        //$('html,body').scrollTop(0);
+        $('#ajaxMsg').fadeOut();
+
+        $('body').popover({
+            selector: '[data-toggle="popover"]',
+            html: true,
+            container: 'body',
+            trigger: 'hover',
+            placement: 'right',
+            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
+            content: function () {
+                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
+            }
+        });
+    },
+    "preDrawCallback": function(settings) {
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
+        showMsg(msg, false, false, 0);
+    },
+    "rowCallback": function (row, rowData, rowIndex) {
+    }
+};

data/interfaces/default/js/tables/export_table.js

@@ -0,0 +1,251 @@
+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;
+    }
+});
+
+export_table_options = {
+    "destroy": true,
+    "language": {
+        "search": "Search: ",
+        "lengthMenu": "Show _MENU_ entries per page",
+        "info": "Showing _START_ to _END_ of _TOTAL_ export items",
+        "infoEmpty": "Showing 0 to 0 of 0 entries",
+        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
+        "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+    },
+    "pagingType": "full_numbers",
+    "stateSave": true,
+    "stateDuration": 0,
+    "processing": false,
+    "serverSide": true,
+    "pageLength": 25,
+    "order": [0, 'desc'],
+    "autoWidth": false,
+    "scrollX": true,
+    "columnDefs": [
+        {
+            "targets": [0],
+            "data": "timestamp",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    $(td).html(moment(cellData, "X").format(date_format + ' ' + time_format));
+                }
+            },
+            "width": "8%",
+            "className": "no-wrap",
+            "searchable": false
+        },
+        {
+            "targets": [1],
+            "data": "media_type_title",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    $(td).html(cellData);
+                }
+            },
+            "width": "7%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [2],
+            "data": "rating_key",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== null) {
+                    $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
+                }
+            },
+            "width": "6%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [3],
+            "data": "title",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var tooltip;
+                    var filename;
+                    if (!rowData['individual_files']) {
+                        tooltip = '<span data-toggle="tooltip" title="Single File"><i class="fa fa-file-alt fa-fw"></i></span>';
+                        filename = cellData + '.' + rowData['file_format']
+                    } else {
+                        tooltip = '<span data-toggle="tooltip" title="Multiple Files"><i class="fa fa-folder fa-fw"></i></span>';
+                        filename = cellData
+                    }
+
+                    if (rowData['complete'] === 1 && rowData['exists'] && !rowData['individual_files']) {
+                        $(td).html('<a href="view_export?export_id=' + rowData['export_id'] + '" target="_blank">' + tooltip + '&nbsp;' + filename + '</a>');
+                    } else {
+                        $(td).html(tooltip + '&nbsp;' + filename);
+                    }
+                }
+            },
+            "width": "40%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [4],
+            "data": "file_format",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var images = '';
+                    if (rowData['thumb_level'] || rowData['art_level']) {
+                        images = ' + images';
+                    }
+                    $(td).html(cellData + images);
+                }
+            },
+            "width": "7%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [5],
+            "data": "metadata_level",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== null) {
+                    $(td).html(cellData);
+                }
+            },
+            "width": "6%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [6],
+            "data": "media_info_level",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== null) {
+                    $(td).html(cellData);
+                }
+            },
+            "width": "6%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [7],
+            "data": "custom_fields",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    $(td).html(cellData.replace(/,/g, ', '));
+                }
+            },
+            "width": "6%",
+            "className": "datatable-wrap"
+        },
+        {
+            "targets": [8],
+            "data": "file_size",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '' && cellData !== null) {
+                    $(td).html(humanFileSize(cellData));
+                }
+            },
+            "width": "6%",
+            "className": "no-wrap",
+            "searchable": false
+        },
+        {
+            "targets": [9],
+            "data": "complete",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData === 1 && rowData['exists']) {
+                    var tooltip_title = '';
+                    var icon = '';
+                    if (rowData['thumb_level'] || rowData['art_level'] || rowData['individual_files']) {
+                        tooltip_title = 'Zip Archive';
+                        icon = 'fa-file-archive';
+                    } else {
+                        tooltip_title = rowData['file_format'].toUpperCase() + ' File';
+                        icon = 'fa-file-download';
+                    }
+                    var icon = (rowData['thumb_level'] || rowData['art_level'] || rowData['individual_files']) ? 'fa-file-archive' : 'fa-file-download';
+                    $(td).html('<button class="btn btn-xs btn-success pull-left" data-id="' + rowData['export_id'] + '"><span data-toggle="tooltip" data-placement="left"  title="' + tooltip_title + '"><i class="fa ' + icon + ' fa-fw"></i> Download</span></button>');
+                } else if (cellData === 0) {
+                    var percent = Math.min(getPercent(rowData['exported_items'], rowData['total_items']), 99)
+                    $(td).html('<span class="btn btn-xs btn-dark pull-left export-processing" data-id="' + rowData['export_id'] + '" disabled><i class="fa fa-spinner fa-spin fa-fw"></i> ' + percent + '%</span>');
+                } else if (cellData === -1) {
+                    $(td).html('<span class="btn btn-xs btn-dark pull-left" data-id="' + rowData['export_id'] + '" disabled><i class="fa fa-exclamation-circle fa-fw"></i> Failed</span>');
+                } else {
+                    $(td).html('<span class="btn btn-xs btn-dark pull-left" data-id="' + rowData['export_id'] + '" disabled><i class="fa fa-question-circle fa-fw"></i> Not Found</span>');
+                }
+            },
+            "width": "7%",
+            "className": "export_download",
+            "searchable": false
+        },
+        {
+            "targets": [10],
+            "data": null,
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (rowData['complete'] !== 0) {
+                    $(td).html('<button class="btn btn-xs btn-danger pull-left" data-id="' + rowData['export_id'] + '"><i class="fa fa-trash-o fa-fw"></i> Delete</button>');
+                } else {
+                    $(td).html('<span class="btn btn-xs btn-danger pull-left" data-id="' + rowData['export_id'] + '" disabled><i class="fa fa-trash-o fa-fw"></i> Delete</span>');
+                }
+            },
+            "width": "7%",
+            "className": "export_delete",
+            "searchable": false
+        }
+    ],
+    "drawCallback": function (settings) {
+        // Jump to top of page
+        //$('html,body').scrollTop(0);
+        $('#ajaxMsg').fadeOut();
+
+        // Create the tooltips.
+        $('body').tooltip({
+            selector: '[data-toggle="tooltip"]',
+            container: 'body'
+        });
+
+        if (export_processing_timer) {
+            clearTimeout(export_processing_timer);
+        }
+        if ($('.export-processing').length) {
+            export_processing_timer = setTimeout(redrawExportTable.bind(null, false), 2000);
+        }
+    },
+    "preDrawCallback": function(settings) {
+        if (!export_processing_timer) {
+            var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
+            showMsg(msg, false, false, 0)
+        }
+    },
+    "rowCallback": function (row, rowData, rowIndex) {
+        if (rowData['complete'] === 0) {
+            $(row).addClass('current-activity-row');
+        }
+    }
+};
+
+$('.export_table').on('click', '> tbody > tr > td.export_download > button', function (e) {
+    var tr = $(this).closest('tr');
+    var row = export_table.row(tr);
+    var rowData = row.data();
+
+    e.preventDefault();
+    window.location.href = 'download_export?export_id=' + rowData['export_id'];
+});
+
+$('.export_table').on('click', '> tbody > tr > td.export_delete > button', function (e) {
+    var tr = $(this).closest('tr');
+    var row = export_table.row(tr);
+    var rowData = row.data();
+
+    var msg = 'Are you sure you want to delete the following export?<br /><br /><strong>' + rowData['title'] + '</strong>';
+    var url = 'delete_export?export_id=' + rowData['export_id'];
+    confirmAjaxCall(url, msg, null, null, redrawExportTable);
+});
+
+function redrawExportTable(paging) {
+    export_table.draw(paging);
+}
+
+var export_processing_timer;

data/interfaces/default/js/tables/history_table.js

@@ -55,13 +55,17 @@ history_table_options = {
                 if (rowData['state'] !== null) {
                     var state = '';
                     if (rowData['state'] === 'playing') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Playing"><i class="fa fa-play fa-fw"></i></span>';
+                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Playing"><i class="fa fa-fw fa-play"></i></span>';
                     } else if (rowData['state'] === 'paused') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Paused"><i class="fa fa-pause fa-fw"></i></span>';
+                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Paused"><i class="fa fa-fw fa-pause"></i></span>';
                     } else if (rowData['state'] === 'buffering') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Buffering"><i class="fa fa-spinner fa-fw"></i></span>';
+                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Buffering"><i class="fa fa-fw fa-spinner"></i></span>';
+                    } else if (rowData['state'] === 'error') {
+                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Playback Error"><i class="fa fa-fw fa-exclamation-triangle"></i></span>';
                     } else if (rowData['state'] === 'stopped') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Stopped"><i class="fa fa-stop fa-fw"></i></span>';
+                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Stopped"><i class="fa fa-fw fa-stop"></i></span>';
+                    } else {
+                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Unknown"><i class="fa fa-fw fa-question-circle"></i></span>';
                     }
                     $(td).html('<div><div style="float: left;">' + state + '&nbsp;' + date + '</div></div>');
                 } else if (rowData['group_count'] > 1) {
@@ -81,9 +85,9 @@ history_table_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     if (rowData['user_id']) {
-                        $(td).html('<a href="' + page('user', rowData['user_id']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['user'] + '">' + cellData + '</a>');
                     } else {
-                        $(td).html('<a href="' + page('user', null, rowData['user']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="' + page('user', null, rowData['user']) + '" title="' + rowData['user'] + '">' + cellData + '</a>');
                     }
                 } else {
                     $(td).html(cellData);
@@ -184,7 +188,9 @@ history_table_options = {
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + cellData + parent_info + '</span>';
                         $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], history, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'clip') {
-                        $(td).html(cellData);
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Clip"><i class="fa fa-video-camera fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
+                        $(td).html('<div class="history-title"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></div>');
                     } else {
                         $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
                     }

data/interfaces/default/js/tables/libraries.js

@@ -192,7 +192,7 @@ libraries_list_table_options = {
             "data": "duration",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
-                    $(td).html(humanTimeClean(cellData));
+                    $(td).html(humanDuration(cellData, 'dhm', 's'));
                 }
             },
             "searchable": false,

data/interfaces/default/js/tables/media_info_table.js

@@ -107,15 +107,15 @@ media_info_table_options = {
                     } else if (rowData['media_type'] === 'photo_album') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Photo Album"><i class="fa fa-camera fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></div>');
+                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'photo') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></div>');
+                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'clip') {
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Video"><i class="fa fa-video-camera fa-fw"></i></span>';
                         thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 500, 280, null, null, null, 'art') + '" data-height="80" data-width="140">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></div>');
+                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else {
                         $(td).html(cellData);
                     }

data/interfaces/default/js/tables/playlists_table.js

@@ -0,0 +1,100 @@
+playlists_table_options = {
+    "destroy": true,
+    "language": {
+        "search": "Search: ",
+        "lengthMenu": "Show _MENU_ entries per page",
+        "info": "Showing _START_ to _END_ of _TOTAL_ playlists",
+        "infoEmpty": "Showing 0 to 0 of 0 entries",
+        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
+        "emptyTable": "No data in table",
+        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+    },
+    "pagingType": "full_numbers",
+    "stateSave": true,
+    "stateDuration": 0,
+    "processing": false,
+    "serverSide": true,
+    "pageLength": 25,
+    "order": [0, 'asc'],
+    "autoWidth": false,
+    "scrollX": true,
+    "columnDefs": [
+        {
+            "targets": [0],
+            "data": "title",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var smart = '<i class="fa fa-blank fa-fw"></i>';
+                    if (rowData['smart']) {
+                        smart = '<span class="media-type-tooltip" data-toggle="tooltip" title="Smart Playlist"><i class="fa fa-cog fa-fw"></i></span>&nbsp;'
+                    }
+                    var breadcrumb = '';
+                    if (rowData['userID']) {
+                        breadcrumb = '&user_id=' + rowData['userID'];
+                    } else if (rowData['librarySectionID']) {
+                        breadcrumb = '&section_id=' + rowData['librarySectionID'];
+                    }
+                    var thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['composite'], rowData['ratingKey'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + smart + cellData + '</span>';
+                    $(td).html('<a href="' + page('info', rowData['ratingKey']) + breadcrumb +'">' + thumb_popover + '</a>');
+                }
+            },
+            "width": "60%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [1],
+            "data": "leafCount",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var type = MEDIA_TYPE_HEADERS[rowData['playlistType']] || '';
+                    if (rowData['leafCount'] === 1) {
+                        type = type.slice(0, -1);
+                    }
+                    $(td).html(cellData + ' ' + type);
+                }
+            },
+            "width": "20%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [2],
+            "data": "duration",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    $(td).html(humanDuration(cellData, 'dhm'));
+                }
+            },
+            "width": "20%",
+            "className": "no-wrap"
+        }
+    ],
+    "drawCallback": function (settings) {
+        // Jump to top of page
+        //$('html,body').scrollTop(0);
+        $('#ajaxMsg').fadeOut();
+
+        // Create the tooltips.
+        $('body').tooltip({
+            selector: '[data-toggle="tooltip"]',
+            container: 'body'
+        });
+        $('body').popover({
+            selector: '[data-toggle="popover"]',
+            html: true,
+            container: 'body',
+            trigger: 'hover',
+            placement: 'right',
+            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
+            content: function () {
+                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
+            }
+        });
+    },
+    "preDrawCallback": function(settings) {
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
+        showMsg(msg, false, false, 0);
+        $('[data-toggle="tooltip"]').tooltip('destroy');
+    },
+    "rowCallback": function (row, rowData, rowIndex) {
+    }
+};

data/interfaces/default/js/tables/sync_table.js

@@ -51,9 +51,9 @@ sync_table_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     if (rowData['user_id']) {
-                        $(td).html('<a href="' + page('user', rowData['user_id']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['username'] + '">' + cellData + '</a>');
                     } else {
-                        $(td).html('<a href="' + page('user', null, rowData['user']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="' + page('user', null, rowData['user']) + '" title="' + rowData['username'] + '">' + cellData + '</a>');
                     }
                 } else {
                     $(td).html(cellData);

data/interfaces/default/js/tables/users.js

@@ -62,9 +62,9 @@ users_list_table_options = {
                 var inactive = '';
                 if (!rowData['is_active']) { inactive = '<span class="inactive-user-tooltip" data-toggle="tooltip" title="User not on Plex server"><i class="fa fa-exclamation-triangle"></i></span>'; }
                 if (cellData === '') {
-                    $(td).html('<a href="' + page('user', rowData['user_id']) + '"><div class="users-poster-face" style="background-image: url(../../images/gravatar-default-80x80.png);">' + inactive + '</div></a>');
+                    $(td).html('<a href="' + page('user', rowData['user_id']) + '"" title="' + rowData['username'] + '"><div class="users-poster-face" style="background-image: url(../../images/gravatar-default-80x80.png);">' + inactive + '</div></a>');
                 } else {
-                    $(td).html('<a href="' + page('user', rowData['user_id']) + '"><div class="users-poster-face" style="background-image: url(' + rowData['user_thumb'] + ');">' + inactive + '</div></a>');
+                    $(td).html('<a href="' + page('user', rowData['user_id']) + '"" title="' + rowData['username'] + '"><div class="users-poster-face" style="background-image: url(' + rowData['user_thumb'] + ');">' + inactive + '</div></a>');
                 }
             },
             "orderable": false,
@@ -78,7 +78,7 @@ users_list_table_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
                     $(td).html('<div class="edit-user-name" data-id="' + rowData['row_id'] + '">' +
-                        '<a href="' + page('user', rowData['user_id']) + '">' + cellData + '</a>' +
+                        '<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['username'] + '">' + cellData + '</a>' +
                         '<input type="text" class="hidden" value="' + cellData + '">' +
                         '</div>');
                 } else {
@@ -212,7 +212,7 @@ users_list_table_options = {
             "data": "duration",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
-                    $(td).html(humanTimeClean(cellData));
+                    $(td).html(humanDuration(cellData, 'dhm', 's'));
                 }
             },
             "searchable": false,

data/interfaces/default/libraries.html

@@ -79,7 +79,6 @@
 <script src="${http_root}js/dataTables.colVis.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/tables/libraries.js${cache_param}"></script>
 <script>
     $(document).ready(function () {

data/interfaces/default/library.html

@@ -87,12 +87,19 @@ DOCUMENTATION :: END
                                 % endif
                             </div>
                             <div class="user-info-nav">
-                                <ul class="user-info-nav" role="tablist">
-                                    <li class="active"><a href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
-                                    <li><a id="history-tab-btn" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
-                                    % if _session['user_group'] == 'admin':
+                                <ul class="nav nav-list nav-pills" role="tablist">
+                                    <li class="active"><a id="nav-tabs-profile" href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
+                                    <li><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
                                     % if data['section_id'] != LIVE_TV_SECTION_ID:
-                                    <li><a id="media-info-tab-btn" href="#tabs-mediainfo" role="tab" data-toggle="tab">Media Info</a></li>
+                                    % if _session['user_group'] == 'admin':
+                                    <li><a id="nav-tabs-mediainfo" href="#tabs-mediainfo" role="tab" data-toggle="tab">Media Info</a></li>
+                                    % endif
+                                    % if data['section_type'] != 'artist':
+                                    <li><a id="nav-tabs-collections" href="#tabs-collections" role="tab" data-toggle="tab">Collections</a></li>
+                                    % endif
+                                    <li><a id="nav-tabs-playlists" href="#tabs-playlists" role="tab" data-toggle="tab">Playlists</a></li>
+                                    % if _session['user_group'] == 'admin':
+                                    <li><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
                                     % endif
                                     % endif
                                 </ul>
@@ -242,23 +249,22 @@ DOCUMENTATION :: END
                             </div>
                         </div>
                     </div>
+                    % if _session['user_group'] == 'admin':
                     <div role="tabpanel" class="tab-pane" id="tabs-mediainfo">
                         <div class="container-fluid">
                             <div class="row">
                                 <div class="col-md-12">
                                     % if config['get_file_sizes'] and data['section_id'] in config['get_file_sizes_hold']['section_ids']:
                                     <div id="get_file_sizes_message" style="text-align: center; margin-top: 20px;">
-                                    % else:
-                                    <div id="get_file_sizes_message" style="text-align: center; margin-top: 20px; display: none;">
-                                    % endif
                                         <i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is calculating the file sizes for the library's media info. This could take a few minutes depending on the size of your library.
                                         <br />
                                         You may leave this page and check back later.
                                     </div>
+                                    % endif
                                     <div class='table-card-header'>
                                         <div class="header-bar">
                                             <span>
-                                                <i class="fa fa-history"></i> Media Info for <strong>
+                                                <i class="fa fa-info-circle"></i> Media Info for <strong>
                                                     <span class="set-username">${data['section_name']}</span>
                                                 </strong>
                                             </span>
@@ -305,6 +311,157 @@ DOCUMENTATION :: END
                             </div>
                         </div>
                     </div>
+                    % endif
+                    % if data['section_type'] != 'artist':
+                    <div role="tabpanel" class="tab-pane" id="tabs-collections">
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class='table-card-header'>
+                                        <div class="header-bar">
+                                            <span>
+                                                <i class="fa fa-folder-open"></i> Collections for <strong>
+                                                    <span class="set-username">${data['section_name']}</span>
+                                                </strong>
+                                            </span>
+                                        </div>
+                                        <div class="button-bar">
+                                            % if _session['user_group'] == 'admin':
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
+                                                        data-section_id="${data['section_id']}" data-media_type="collection" data-sub_media_type="${data['section_type']}"
+                                                        data-export_type="collection">
+                                                    <i class="fa fa-file-export"></i> Export collections
+                                                </button>
+                                            </div>
+                                            % endif
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-collections-table-button" id="refresh-collections-table">
+                                                    <i class="fa fa-refresh"></i> Refresh collections
+                                                </button>
+                                            </div>
+                                            <div class="btn-group colvis-button-bar" id="button-bar-collections"></div>
+                                        </div>
+                                    </div>
+                                    <div class="table-card-back">
+                                        <table class="display collections_table" id="collections_table-SID-${data['section_id']}" width="100%">
+                                            <thead>
+                                                <tr>
+                                                    <th align="left" id="collectionTitle">Collection Title</th>
+                                                    <th align="left" id="collectionMode">Collection Mode</th>
+                                                    <th align="left" id="collectionSort">Collection Sort</th>
+                                                    <th align="left" id="collectionItems">Collection Items</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody></tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    % endif
+                    <div role="tabpanel" class="tab-pane" id="tabs-playlists">
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class='table-card-header'>
+                                        <div class="header-bar">
+                                            <span>
+                                                <i class="fa fa-list-alt"></i> Playlists for <strong>
+                                                    <span class="set-username">${data['section_name']}</span>
+                                                </strong>
+                                            </span>
+                                        </div>
+                                        <div class="button-bar">
+                                            % if _session['user_group'] == 'admin':
+                                            <% playlist_sub_media_type = {'movie': 'video', 'show': 'video', 'artist': 'audio', 'photo': 'photo'} %>
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
+                                                        data-section_id="${data['section_id']}" data-media_type="playlist" data-sub_media_type="${playlist_sub_media_type.get(data['section_type'])}"
+                                                        data-export_type="playlist">
+                                                    <i class="fa fa-file-export"></i> Export playlists
+                                                </button>
+                                            </div>
+                                            % endif
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-playlists-table-button" id="refresh-playlists-table">
+                                                    <i class="fa fa-refresh"></i> Refresh playlists
+                                                </button>
+                                            </div>
+                                            <div class="btn-group colvis-button-bar" id="button-bar-playlists"></div>
+                                        </div>
+                                    </div>
+                                    <div class="table-card-back">
+                                        <table class="display playlists_table" id="playlists_table-SID-${data['section_id']}" width="100%">
+                                            <thead>
+                                                <tr>
+                                                    <th align="left" id="playlistTitle">Playlist Title</th>
+                                                    <th align="left" id="playlistLeafCount">Playlist Items</th>
+                                                    <th align="left" id="playlistDuration">Playlist Duration</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody></tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    % if _session['user_group'] == 'admin':
+                    <div role="tabpanel" class="tab-pane" id="tabs-export">
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class='table-card-header'>
+                                        <div class="header-bar">
+                                            <span>
+                                                <i class="fa fa-file-export"></i> Metadata Exports for <strong>
+                                                    <span class="set-username">${data['section_name']}</span>
+                                                </strong>
+                                            </span>
+                                        </div>
+                                        <div class="button-bar">
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
+                                                        data-section_id="${data['section_id']}" data-media_type="${'photoalbum' if data['section_type'] == 'photo' else data['section_type']}"
+                                                        data-export_type="all">
+                                                    <i class="fa fa-file-export"></i> Export metadata
+                                                </button>
+                                            </div>
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-export-table-button" id="refresh-export-table">
+                                                    <i class="fa fa-refresh"></i> Refresh exports
+                                                </button>
+                                            </div>
+                                            <div class="btn-group colvis-button-bar" id="button-bar-export"></div>
+                                        </div>
+                                    </div>
+                                    <div class="table-card-back">
+                                        <table class="display export_table" id="export_table-SID-${data['section_id']}" width="100%">
+                                            <thead>
+                                                <tr>
+                                                    <th align="left" id="timestamp">Exported At</th>
+                                                    <th align="left" id="media_type_title">Media Type</th>
+                                                    <th align="left" id="rating_key">Rating Key</th>
+                                                    <th align="left" id="filename">Filename</th>
+                                                    <th align="left" id="file_format">File Format</th>
+                                                    <th align="left" id="metadata_level">Metadata Level</th>
+                                                    <th align="left" id="media_info_level">Media Info Level</th>
+                                                    <th align="left" id="media_info_level">Custom Fields</th>
+                                                    <th align="left" id="file_size">File Size</th>
+                                                    <th align="left" id="complete">Download</th>
+                                                    <th align="left" id="delete">Delete</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody></tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    % endif
                 </div>
             </div>
         </div>
@@ -335,8 +492,7 @@ DOCUMENTATION :: END
 </%def>
 
 <%def name="modalIncludes()">
-<div id="edit-library-modal" class="modal fade" tabindex="-1" role="dialog"
-        aria-labelledby="edit-library-modal">
+<div id="edit-library-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="edit-library-modal">
 </div>
 <div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
 </div>
@@ -360,6 +516,8 @@ DOCUMENTATION :: END
         </div>
     </div>
 </div>
+<div id="export-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="export-modal">
+</div>
 </%def>
 
 <%def name="javascriptIncludes()">
@@ -369,6 +527,9 @@ DOCUMENTATION :: END
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
 % if data:
 <% from plexpy.common import LIVE_TV_SECTION_ID %>
+<%
+    history_user_id = '' if _session['user_group'] == 'admin' else _session['user_id']
+%>
 <script>
     % if str(data['section_id']).isdigit():
     var section_id = ${data['section_id']};
@@ -384,14 +545,18 @@ DOCUMENTATION :: END
     var get_file_sizes = null;
     % endif
 </script>
-<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
 <script src="${http_root}js/tables/media_info_table.js${cache_param}"></script>
+<script src="${http_root}js/tables/collections_table.js${cache_param}"></script>
+<script src="${http_root}js/tables/playlists_table.js${cache_param}"></script>
+<script src="${http_root}js/tables/export_table.js${cache_param}"></script>
 <script>
     $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
         $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
     });
 
+    $(".inactive-library-tooltip").tooltip();
+
     function loadHistoryTable() {
         // Build watch history table
         history_table_options.ajax = {
@@ -401,7 +566,7 @@ DOCUMENTATION :: END
                 return {
                     json_data: JSON.stringify( d ),
                     section_id: section_id,
-                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
+                    user_id: "${history_user_id}"
                 };
             }
         };
@@ -413,7 +578,7 @@ DOCUMENTATION :: END
         clearSearchButton('history_table-SID-${data["section_id"]}', history_table);
     }
 
-    $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-history').on('shown.bs.tab', function() {
         if (typeof(history_table) === 'undefined') {
             loadHistoryTable();
         }
@@ -422,97 +587,70 @@ DOCUMENTATION :: END
     $("#refresh-history-list").click(function () {
         history_table.draw();
     });
-
-    $(".inactive-library-tooltip").tooltip();
-
-    % if _session['user_group'] == 'admin':
-    function loadMediaInfoTable() {
-        // Build media info table
-        media_info_table_options.ajax = {
-            url: 'get_library_media_info',
+</script>
+% if data['section_type'] != 'artist':
+<script>
+    function loadCollectionsTable() {
+        // Build collections table
+        collections_table_options.ajax = {
+            url: 'get_collections_list',
             type: 'POST',
             data: function ( d ) {
                 return {
                     json_data: JSON.stringify( d ),
-                    section_id: section_id,
-                    refresh: refresh_table
+                    section_id: section_id
                 };
             }
         };
-        media_info_table = $('#media_info_table-SID-${data["section_id"]}').DataTable(media_info_table_options);
+        collections_table = $('#collections_table-SID-${data["section_id"]}').DataTable(collections_table_options);
 
-        var colvis = new $.fn.dataTable.ColVis(media_info_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-        $(colvis.button()).appendTo('#button-bar-media-info');
+        var colvis = new $.fn.dataTable.ColVis(collections_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
+        $(colvis.button()).appendTo('#button-bar-collections');
 
-        clearSearchButton('media_info_table-SID-${data["section_id"]}', media_info_table);
+        clearSearchButton('collections_table-SID-${data["section_id"]}', collections_table);
     }
 
-    $('a[href="#tabs-mediainfo"]').on('shown.bs.tab', function() {
-        if (typeof(media_info_table) === 'undefined') {
-            loadMediaInfoTable();
+    $('#nav-tabs-collections').on('shown.bs.tab', function() {
+        if (typeof(collections_table) === 'undefined') {
+            loadCollectionsTable();
         }
     });
 
-    $("#refresh-media-info-table").click(function () {
-        media_info_child_table = {};
-        refresh_table = true;
-        refresh_child_tables = true;
-        media_info_table.draw();
-        refresh_table = false;
+    $("#refresh-collections-table").click(function () {
+        collections_table.draw();
     });
-
-    $("#edit-library-tooltip").tooltip();
-
-    // Load edit library modal
-    $("#toggle-edit-library-modal").click(function() {
-        $("#edit-library-tooltip").tooltip('hide');
-        $.ajax({
-            url: 'edit_library_dialog',
-            data: { section_id: section_id },
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#edit-library-modal").html(xhr.responseText);
+</script>
+% endif
+<script>
+    function loadPlaylistsTable() {
+        // Build playlists table
+        playlists_table_options.ajax = {
+            url: 'get_playlists_list',
+            type: 'POST',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    section_id: section_id
+                };
             }
-        });
-    });
+        };
+        playlists_table = $('#playlists_table-SID-${data["section_id"]}').DataTable(playlists_table_options);
 
-    $('#row-edit-mode').on('click', function() {
-        $('#row-edit-mode-alert').fadeIn(200);
+        var colvis = new $.fn.dataTable.ColVis(playlists_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
+        $(colvis.button()).appendTo('#button-bar-playlists');
 
-        if ($(this).hasClass('active')) {
-            if (history_to_delete.length > 0) {
-                $('#deleteCount').text(history_to_delete.length);
-                $('#confirm-modal-delete').modal();
-                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                    $.ajax({
-                        url: 'delete_history_rows',
-                        type: 'POST',
-                        data: { row_ids: history_to_delete.join(',') },
-                        async: true,
-                        success: function (data) {
-                            var msg = "History deleted";
-                            showMsg(msg, false, true, 2000);
-                            history_table.draw();
-                        }
-                    });
-                });
-            }
+        clearSearchButton('playlists_table-SID-${data["section_id"]}', playlists_table);
+    }
 
-            $('.delete-control').each(function () {
-                $(this).addClass('hidden');
-                $('#row-edit-mode-alert').fadeOut(200);
-            });
-
-        } else {
-            history_to_delete = [];
-            $('.delete-control').each(function() {
-                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                $(this).removeClass('hidden');
-            });
+    $('#nav-tabs-playlists').on('shown.bs.tab', function() {
+        if (typeof(playlists_table) === 'undefined') {
+            loadPlaylistsTable();
         }
     });
-    % endif
+
+    $("#refresh-playlists-table").click(function () {
+        playlists_table.draw();
+    });
 
     function recentlyWatched() {
         // Populate recently watched
@@ -634,11 +772,11 @@ DOCUMENTATION :: END
         var hash = document.location.hash;
         var prefix = "tab_";
         if (hash) {
-            $('.user-info-nav a[href='+hash.replace(prefix,"")+']').tab('show').trigger('show.bs.tab');
+            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
         }
 
         // Change hash for page-reload
-        $('.user-info-nav a').on('shown.bs.tab', function (e) {
+        $('.nav-list a').on('shown.bs.tab', function (e) {
             window.location.hash = e.target.hash.replace("#", "#" + prefix);
         });
 
@@ -664,5 +802,143 @@ DOCUMENTATION :: END
 
     });
 </script>
+% if _session['user_group'] == 'admin':
+<script>
+    function loadMediaInfoTable() {
+        // Build media info table
+        media_info_table_options.ajax = {
+            url: 'get_library_media_info',
+            type: 'POST',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    section_id: section_id,
+                    refresh: refresh_table
+                };
+            }
+        };
+        media_info_table = $('#media_info_table-SID-${data["section_id"]}').DataTable(media_info_table_options);
+
+        var colvis = new $.fn.dataTable.ColVis(media_info_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
+        $(colvis.button()).appendTo('#button-bar-media-info');
+
+        clearSearchButton('media_info_table-SID-${data["section_id"]}', media_info_table);
+    }
+
+    $('#nav-tabs-mediainfo').on('shown.bs.tab', function() {
+        if (typeof(media_info_table) === 'undefined') {
+            loadMediaInfoTable();
+        }
+    });
+
+    $("#refresh-media-info-table").click(function () {
+        media_info_child_table = {};
+        refresh_table = true;
+        refresh_child_tables = true;
+        media_info_table.draw();
+        refresh_table = false;
+    });
+
+    function loadExportTable() {
+        // Build export table
+        export_table_options.ajax = {
+            url: 'get_export_list',
+            type: 'POST',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    section_id: section_id
+                };
+            }
+        };
+        export_table = $('#export_table-SID-${data["section_id"]}').DataTable(export_table_options);
+        export_table.columns([7]).visible(false);
+
+        var colvis = new $.fn.dataTable.ColVis(export_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
+        $(colvis.button()).appendTo('#button-bar-export');
+
+        clearSearchButton('export_table-SID-${data["section_id"]}', export_table);
+    }
+
+    $('#nav-tabs-export').on('shown.bs.tab', function() {
+        if (typeof(export_table) === 'undefined') {
+            loadExportTable();
+        }
+    });
+
+    $("#refresh-export-table").click(function () {
+        export_table.draw();
+    });
+
+    $("#edit-library-tooltip").tooltip();
+
+    // Load edit library modal
+    $("#toggle-edit-library-modal").click(function() {
+        $("#edit-library-tooltip").tooltip('hide');
+        $.ajax({
+            url: 'edit_library_dialog',
+            data: { section_id: section_id },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#edit-library-modal").html(xhr.responseText);
+            }
+        });
+    });
+
+    $(".export-button").click(function() {
+        $.ajax({
+            url: 'export_metadata_modal',
+            data: {
+                section_id: $(this).data('section_id'),
+                media_type: $(this).data('media_type'),
+                sub_media_type: $(this).data('sub_media_type'),
+                export_type: $(this).data('export_type')
+            },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#export-modal").html(xhr.responseText);
+            }
+        });
+    });
+
+    $('#row-edit-mode').on('click', function() {
+        $('#row-edit-mode-alert').fadeIn(200);
+
+        if ($(this).hasClass('active')) {
+            if (history_to_delete.length > 0) {
+                $('#deleteCount').text(history_to_delete.length);
+                $('#confirm-modal-delete').modal();
+                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
+                    $.ajax({
+                        url: 'delete_history_rows',
+                        type: 'POST',
+                        data: { row_ids: history_to_delete.join(',') },
+                        async: true,
+                        success: function (data) {
+                            var msg = "History deleted";
+                            showMsg(msg, false, true, 2000);
+                            history_table.draw();
+                        }
+                    });
+                });
+            }
+
+            $('.delete-control').each(function () {
+                $(this).addClass('hidden');
+                $('#row-edit-mode-alert').fadeOut(200);
+            });
+
+        } else {
+            history_to_delete = [];
+            $('.delete-control').each(function() {
+                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+                $(this).removeClass('hidden');
+            });
+        }
+    });
+</script>
+% endif
 % endif
 </%def>

data/interfaces/default/library_user_stats.html

@@ -25,11 +25,11 @@ DOCUMENTATION :: END
     <div class="user-player-instance">
         <li>
             % if a['user_id']:
-            <a href="${page('user', a['user_id'])}" title="${a['friendly_name']}">
+            <a href="${page('user', a['user_id'])}" title="${a['username']}">
                 <div class="library-user-instance-box" style="background-image: url(${a['user_thumb']});"></div>
             </a>
             <div class=" user-player-instance-name">
-                <a href="${page('user', a['user_id'])}" title="${a['friendly_name']}">${a['friendly_name']}</a>
+                <a href="${page('user', a['user_id'])}" title="${a['username']}">${a['friendly_name']}</a>
             </div>
             % else:
             <div class="library-user-instance-box" style="background-image: url(${a['user_thumb']});"></div>

data/interfaces/default/login.html

@@ -11,28 +11,28 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
+    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
     <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <link href="${http_root}css/opensans.min.css" rel="stylesheet">
     <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">
     <link href="${http_root}css/font-awesome.v4-shims.min.css" rel="stylesheet">
 
     <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.5">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.5">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.5">
+    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
+    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
+    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
 
     <!-- ICONS -->
     <!-- Android -->
-    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.0.5" crossorigin="use-credentials">
+    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.6.0" crossorigin="use-credentials">
     <meta name="theme-color" content="#282a2d">
     <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.5">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.0.5" color="#282a2d">
+    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.6.0">
+    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.6.0" color="#282a2d">
     <meta name="apple-mobile-web-app-title" content="Tautulli">
     <!-- Microsoft -->
     <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.0.5">
+    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.6.0">
 </head>
 
 <body style="margin: 0; overflow: auto;">
@@ -109,7 +109,7 @@
     </div>
 </div>
 
-<script src="${http_root}js/jquery-2.1.4.min.js"></script>
+<script src="${http_root}js/jquery-3.5.1.min.js"></script>
 <script src="${http_root}js/platform.min.js"></script>
 <script src="${http_root}js/script.js${cache_param}"></script>
 <script>

data/interfaces/default/logs.html

@@ -208,7 +208,6 @@
 <script src="${http_root}js/jquery.dataTables.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/tables/logs.js${cache_param}"></script>
 <script src="${http_root}js/tables/plex_logs.js${cache_param}"></script>
 <script src="${http_root}js/tables/notification_logs.js${cache_param}"></script>

data/interfaces/default/newsletter_auth.html

@@ -8,7 +8,7 @@
     <meta charset="utf-8">
     <title>Tautulli - ${title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
+    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
     <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <link href="${http_root}css/opensans.min.css" rel="stylesheet">
     <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">

data/interfaces/default/newsletter_config.html

@@ -50,7 +50,7 @@
                                         </div>
                                         <p class="help-block">
                                             <span id="simple_cron_message">Set the schedule for the newsletter.</span>
-                                            <span id="custom_cron_message">Set the schedule for the newsletter using a <a href="${anon_url('https://crontab.guru')}" target="_blank">custom crontab</a>. Only standard cron values are valid.</span>
+                                            <span id="custom_cron_message">Set the schedule for the newsletter using a <a href="${anon_url('https://crontab.guru')}" target="_blank" rel="noreferrer">custom crontab</a>. Only standard cron values are valid.</span>
                                         </p>
                                     </div>
                                     <div class="form-group">

data/interfaces/default/newsletter_preview.html

@@ -8,9 +8,9 @@
     <meta charset="utf-8">
     <title>Tautulli - ${title} | ${server_name}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.5">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.5">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.5">
+    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
+    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
+    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
     <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <style>
         * {
@@ -31,7 +31,7 @@
     </div>
 </div>
 
-<script src="${http_root}js/jquery-2.1.4.min.js"></script>
+<script src="${http_root}js/jquery-3.5.1.min.js"></script>
 <script>
 $(document).ready(function () {
     var frame = $('<iframe></iframe>', {

data/interfaces/default/recently_added.html

@@ -32,7 +32,7 @@ DOCUMENTATION :: END
 
 % if data != None:
 <%
-    from plexpy.helpers import page
+    from plexpy.helpers import cast_to_int, page
 %>
 % if data:
 <div class="dashboard-recent-media-row">
@@ -87,7 +87,7 @@ DOCUMENTATION :: END
                             <a href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
                         </h3>
                         <h3 class="text-muted">
-                            ${item['child_count']} Seasons
+                            ${item['child_count']} Season${'s' if cast_to_int(item['child_count']) > 1 else ''}
                         </h3>
                         <h3 class="text-muted">&nbsp;</h3>
                     </div>
@@ -151,7 +151,7 @@ DOCUMENTATION :: END
                             <a href="${page('info', item['rating_key'])}" title="Episode ${item['media_index']}">E${item['media_index']}</a>
                         </h3>
                     </div>
-				    % elif item['media_type'] == 'album':
+                    % elif item['media_type'] == 'album':
                     <a href="${page('info', item['rating_key'])}" title="${item['parent_title']}">
                         <div class="dashboard-recent-media-cover">
                             <div class="dashboard-recent-media-cover-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 300, fallback='cover')});">
@@ -177,7 +177,7 @@ DOCUMENTATION :: END
                         </h3>
                         <h3 class="text-muted">&nbsp;</h3>
                     </div>
-				    % endif
+                    % endif
                 </li>
             </div>
             % endfor

data/interfaces/default/scheduler_table.html

@@ -44,9 +44,9 @@ DOCUMENTATION :: END
         % elif job_type == 'websocket' and plexpy.WS_CONNECTED:
         <tr>
             % if job == 'Check for active sessions':
-            <td><a class="queue-modal-link" href="#" data-queue="active sessions">${job}</a></td>
+            <td><a class="queue-modal-link no-highlight" href="#" data-queue="active sessions">${job}</a></td>
             % elif job == 'Check for recently added items':
-            <td><a class="queue-modal-link" href="#" data-queue="recently added">${job}</a></td>
+            <td><a class="queue-modal-link no-highlight" href="#" data-queue="recently added">${job}</a></td>
             % else:
             <td>${job}</td>
             % endif

data/interfaces/default/settings.html

@@ -17,8 +17,6 @@
 </%def>
 
 <%def name="headerIncludes()">
-<link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet" />
-<link href="${http_root}css/selectize.min.css" rel="stylesheet" />
 </%def>
 
 <%def name="body()">
@@ -48,17 +46,17 @@
         <!-- Nav tabs -->
         <div class="col-md-3">
             <ul class="nav-settings list-unstyled" role="tablist">
-                <li role="presentation" class="active"><a href="#tabs-help_info" aria-controls="tabs-help_info" role="tab" data-toggle="tab">Help & Info</a></li>
-                <li role="presentation"><a href="#tabs-general" aria-controls="tabs-general" role="tab" data-toggle="tab">General</a></li>
-                <li role="presentation"><a href="#tabs-homepage" aria-controls="tabs-homepage" role="tab" data-toggle="tab">Homepage</a></li>
-                <li role="presentation"><a href="#tabs-web_interface" aria-controls="tabs-web_interface" role="tab" data-toggle="tab">Web Interface</a></li>
-                <li role="presentation"><a href="#tabs-plex_media_server" aria-controls="tabs-plex_media_server" role="tab" data-toggle="tab">Plex Media Server</a></li>
-                <li role="presentation"><a href="#tabs-notifications" aria-controls="tabs-notifications" role="tab" data-toggle="tab">Notifications & Newsletters</a></li>
-                <li role="presentation"><a href="#tabs-notification_agents" aria-controls="tabs-notification_agents" role="tab" data-toggle="tab">Notification Agents</a></li>
-                <li role="presentation"><a href="#tabs-newsletter_agents" aria-controls="tabs-newsletter_agents" role="tab" data-toggle="tab">Newsletter Agents</a></li>
-                <li role="presentation"><a href="#tabs-3rd_party_apis" aria-controls="tabs-3rd_party_apis" role="tab" data-toggle="tab">3rd Party APIs</a></li>
-                <li role="presentation"><a href="#tabs-import_backups" aria-controls="tabs-import_backups" role="tab" data-toggle="tab">Import & Backups</a></li>
-                <li role="presentation"><a href="#tabs-android_app" aria-controls="tabs-android_app" role="tab" data-toggle="tab">Tautulli Remote Android App <sup><small>beta</small></sup></a></li>
+                <li role="presentation" class="active"><a id="nav-help_info" href="#tabs-help_info" aria-controls="tabs-help_info" role="tab" data-toggle="tab">Help & Info</a></li>
+                <li role="presentation"><a id="nav-tabs-general" href="#tabs-general" aria-controls="tabs-general" role="tab" data-toggle="tab">General</a></li>
+                <li role="presentation"><a id="nav-tabs-homepage" href="#tabs-homepage" aria-controls="tabs-homepage" role="tab" data-toggle="tab">Homepage</a></li>
+                <li role="presentation"><a id="nav-tabs-web_interface" href="#tabs-web_interface" aria-controls="tabs-web_interface" role="tab" data-toggle="tab">Web Interface</a></li>
+                <li role="presentation"><a id="nav-tabs-plex_media_server" href="#tabs-plex_media_server" aria-controls="tabs-plex_media_server" role="tab" data-toggle="tab">Plex Media Server</a></li>
+                <li role="presentation"><a id="nav-tabs-notifications" href="#tabs-notifications" aria-controls="tabs-notifications" role="tab" data-toggle="tab">Notifications & Newsletters</a></li>
+                <li role="presentation"><a id="nav-tabs-notification_agents" href="#tabs-notification_agents" aria-controls="tabs-notification_agents" role="tab" data-toggle="tab">Notification Agents</a></li>
+                <li role="presentation"><a id="nav-tabs-newsletter_agents" href="#tabs-newsletter_agents" aria-controls="tabs-newsletter_agents" role="tab" data-toggle="tab">Newsletter Agents</a></li>
+                <li role="presentation"><a id="nav-tabs-3rd_party_apis" href="#tabs-3rd_party_apis" aria-controls="tabs-3rd_party_apis" role="tab" data-toggle="tab">3rd Party APIs</a></li>
+                <li role="presentation"><a id="nav-tabs-import_backups" href="#tabs-import_backups" aria-controls="tabs-import_backups" role="tab" data-toggle="tab">Import & Backups</a></li>
+                <li role="presentation"><a id="nav-tabs-android_app" href="#tabs-android_app" aria-controls="tabs-android_app" role="tab" data-toggle="tab">Tautulli Remote Android App <sup><small>beta</small></sup></a></li>
             </ul>
         </div>
         <div class="col-md-9">
@@ -830,7 +828,7 @@
                             <p class="help-block">
                                 Optional: Set your Plex logs folder to use Tautulli as a log viewer. Plex logs are not needed for Tautulli to function.
                                 A complete folder path is required, shortcuts are not recognized, and the logs must be accessible from the machine where Tautulli is installed.
-                                <a href="${anon_url('https://support.plex.tv/hc/en-us/articles/200250417-Plex-Media-Server-Log-Files')}" target="_blank">Click here</a> for help.
+                                <a href="${anon_url('https://support.plex.tv/hc/en-us/articles/200250417-Plex-Media-Server-Log-Files')}" target="_blank" rel="noreferrer">Click here</a> for help.
                             </p>
                         </div>
                         <div class="checkbox advanced-setting">
@@ -1037,7 +1035,7 @@
                             </p>
                         </div>
                         <div class="form-group">
-                            <label for="notify_recently_added_delay">Notification Delay</label>
+                            <label for="notify_recently_added_delay">Recently Added Notification Delay</label>
                             <div class="row">
                                 <div class="col-md-2">
                                     <input type="text" class="form-control" data-parsley-type="integer" id="notify_recently_added_delay" name="notify_recently_added_delay" value="${config['notify_recently_added_delay']}" size="5" data-parsley-min="60" data-parsley-trigger="change" data-parsley-errors-container="#notify_recently_added_delay_error" required>
@@ -1070,6 +1068,21 @@
                             </p>
                         </div>-->
 
+                        <div class="padded-header">
+                            <h3>Remote Access Notifications</h3>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="notify_remote_access_threshold">Remote Access Down Threshold</label>
+                            <div class="row">
+                                <div class="col-md-2">
+                                    <input type="text" class="form-control" data-parsley-type="integer" id="notify_remote_access_threshold" name="notify_remote_access_threshold" value="${config['notify_remote_access_threshold']}" size="5" data-parsley-min="60" data-parsley-trigger="change" data-parsley-errors-container="#notify_remote_access_threshold_error" required>
+                                </div>
+                                <div id="notify_remote_access_threshold_error" class="alert alert-danger settings-alert" role="alert"></div>
+                            </div>
+                            <p class="help-block">The duration (in seconds) for Plex remote access to be down before sending a notification. Minimum 60, default 60.</p>
+                        </div>
+
                         <div class="padded-header">
                             <h3>Newsletters</h3>
                         </div>
@@ -1164,7 +1177,7 @@
                             Add a new notification agent, or configure an existing notification agent by clicking the settings icon on the right.
                         </p>
                         <p class="help-block">
-                            Please see the <a target='_blank' href='${anon_url('https://github.com/%s/%s-Wiki/wiki/Notification-Agents-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}'>Notification Agents Guide</a> for instructions on setting up each notification agent.
+                            Please see the <a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/Notification-Agents-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Notification Agents Guide</a> for instructions on setting up each notification agent.
                         </p>
                         <br />
                         <div id="plexpy-notifiers-table">
@@ -1226,7 +1239,7 @@
                         <div id="imgur_upload_options" style="overlfow: hidden; display: ${'none' if config['notify_upload_posters'] != 1 else 'block'}">
                             <div class="form-group">
                                 <p class="help-block">
-                                    Please see the <a target='_blank' href='${anon_url('https://github.com/%s/%s-Wiki/wiki/3rd-Party-APIs-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}'>3rd Party APIs Guide</a> for instructions on setting up Imgur.<br>
+                                    Please see the <a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/3rd-Party-APIs-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">3rd Party APIs Guide</a> for instructions on setting up Imgur.<br>
                                     Warning: Imgur uploads are rate-limited and newsletters may exceed the limit. Please use Cloudinary for newsletters instead.
                                 </p>
                             </div>
@@ -1249,7 +1262,7 @@
                         <div id="cloudinary_upload_options" style="overlfow: hidden; display: ${'none' if config['notify_upload_posters'] != 3 else 'block'}">
                             <div class="form-group">
                                 <p class="help-block">
-                                    Please see the <a target='_blank' href='${anon_url('https://github.com/%s/%s-Wiki/wiki/3rd-Party-APIs-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}'>3rd Party APIs Guide</a> for instructions on setting up Cloudinary.
+                                    Please see the <a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/3rd-Party-APIs-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">3rd Party APIs Guide</a> for instructions on setting up Cloudinary.
                                 </p>
                             </div>
                             <div class="form-group">
@@ -1442,6 +1455,22 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="export_dir">Export Directory</label> ${docker_msg | n}
+                            <div class="row">
+                                <div class="col-md-7">
+                                    <div class="input-group">
+                                        <input type="text" class="form-control directory-settings" id="export_dir" name="export_dir" value="${config['export_dir']}" ${docker_setting}>
+                                        <span class="input-group-btn">
+                                            <button class="btn btn-form" type="button" id="export_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#export_dir" ${docker_setting}>Browse</button>
+                                        </span>
+                                    </div>
+                                    <div class="btn-group">
+                                        <button class="btn btn-form" type="button" id="clear_exports">Clear All Exports</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
 
                         <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
 
@@ -1456,9 +1485,9 @@
                         <div class="form-group">
                             <label>Get the App</label>
                             <p class="help-block">
-                                Get the <a href="${anon_url('https://play.google.com/store/apps/details?id=com.williamcomartin.plexpyremote')}" target="_blank">Tautulli Remote</a> app on Google Play<sup>TM</sup> to access Tautulli from your Android device!<br />
+                                Get the <a href="${anon_url('https://play.google.com/store/apps/details?id=com.williamcomartin.plexpyremote')}" target="_blank" rel="noreferrer">Tautulli Remote</a> app on Google Play<sup>TM</sup> to access Tautulli from your Android device!<br />
                                 <span class="google-play-badge">
-                                    <a href="${anon_url('https://play.google.com/store/apps/details?id=com.williamcomartin.plexpyremote')}" target="_blank"><img alt="Get it on Google Play" src="images/en-play-badge.png" /></a>
+                                    <a href="${anon_url('https://play.google.com/store/apps/details?id=com.williamcomartin.plexpyremote')}" target="_blank" rel="noreferrer"><img alt="Get it on Google Play" src="images/en-play-badge.png" /></a>
                                 </span>
                             </p>
                         </div>
@@ -1494,14 +1523,14 @@
             </div>
             <div class="modal-body">
                 <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-                    <strong>Please read the <a href="${anon_url('https://github.com/%s/%s-Issues/blob/master/README.md' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank">guidelines</a>
+                    <strong>Please read the <a href="${anon_url('https://github.com/%s/%s-Issues/blob/master/README.md' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">guidelines</a>
                         in the README document <br />before submitting a new <span id="guidelines-type"></span>!</strong>
                     <br /><br />
                     Your post may be removed for failure to follow the guidelines.
                 </div>
             </div>
             <div class="modal-footer">
-                <a href="#" target="_blank" id="guidelines-continue" class="btn btn-bright">Continue</a>
+                <a href="#" target="_blank" rel="noreferrer" id="guidelines-continue" class="btn btn-bright">Continue</a>
             </div>
         </div>
     </div>
@@ -1516,12 +1545,12 @@
             </div>
             <div class="modal-body">
                 <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-                    <strong>Please read the <a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/Frequently-Asked-Questions' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank">FAQ</a>
+                    <strong>Please read the <a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/Frequently-Asked-Questions' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">FAQ</a>
                         before asking for help!</strong>
                 </div>
             </div>
             <div class="modal-footer">
-                <a href="#" target="_blank" id="support-continue" class="btn btn-bright">Continue</a>
+                <a href="#" target="_blank" rel="noreferrer" id="support-continue" class="btn btn-bright">Continue</a>
             </div>
         </div>
     </div>
@@ -1971,8 +2000,7 @@ Rating: {rating}/10   --> Rating: /10
 <%def name="javascriptIncludes()">
 <script src="${http_root}js/parsley.min.js"></script>
 <script src="${http_root}js/Sortable.min.js"></script>
-<script src="${http_root}js/selectize.min.js"></script>
-<script src="${http_root}js/moment-with-locale.js"></script>
+<script src="${http_root}js/jquery.inputaffix.min.js"></script>
 <script src="${http_root}js/jquery.qrcode.min.js"></script>
 <script>
     function getConfigurationTable() {
@@ -2124,9 +2152,9 @@ $(document).ready(function() {
 
     // Javascript to enable link to tab
     var hash = document.location.hash;
-    var prefix = "tab_";
+    var prefix = "tabs_";
     if (hash) {
-        $('.nav-settings a[href='+hash.replace(prefix,"")+']').tab('show');
+        $('.nav-settings #nav-' + hash.replace('#' + prefix, "")).tab('show');
     }
 
     // Change hash for page-reload
@@ -2151,6 +2179,7 @@ $(document).ready(function() {
 
     function preSaveChecks(_callback) {
         verifyPMSWebURL();
+        setBaseURLSuffix(true);
         if (serverChanged) {
             verifyServer(_callback);
         } else if (typeof _callback === "function") {
@@ -2170,6 +2199,7 @@ $(document).ready(function() {
         getNewslettersTable();
         getMobileDevicesTable();
         loadUpdateDistros();
+        setBaseURLSuffix();
         settingsChanged = false;
     }
 
@@ -2292,6 +2322,12 @@ $(document).ready(function() {
         confirmAjaxCall(url, msg);
     });
 
+    $("#clear_exports").click(function () {
+        var msg = 'Are you sure you want to clear the Tautulli metadata exports?';
+        var url = 'delete_export?delete_all=true';
+        confirmAjaxCall(url, msg);
+    });
+
     $("#clear_logs").click(function () {
         var msg = 'Are you sure you want to clear the Tautulli logs?';
         var url = 'delete_logs';
@@ -2879,6 +2915,19 @@ $(document).ready(function() {
        $(this).val($(this).val().replace(/\/*$/, ''));
     });
 
+    $('#http_root').change(function() {
+        setBaseURLSuffix();
+    });
+
+    function setBaseURLSuffix(clear) {
+        if (clear){
+            $('#http_base_url').suffix("");
+        } else {
+            $('#http_base_url').suffix($('#http_root').val());
+        }
+    }
+    setBaseURLSuffix();
+
     function apiEnabled() {
         var api_enabled = $('#api_enabled').prop('checked');
         $('#app_api_msg').toggle(!(api_enabled));
@@ -2997,7 +3046,7 @@ $(document).ready(function() {
     });
 
     function gotoSetting(tab, setting){
-        $("a[href=#tabs-" + tab + "]").click();
+        $("#nav-tabs-" + tab).click();
         if (setting) {
             _setting = '#' + setting;
             if ($(_setting).closest('.advanced-setting').length && !$('#menu_link_show_advanced_settings').hasClass('active')) {

data/interfaces/default/support.html

@@ -16,10 +16,10 @@
         </div>
         <div class="button-bar">
             <div class="btn-group">
-                <a class="btn btn-dark" href="${anon_url('https://tautulli.com/discord')}" target="_blank"><i class="fab fa-discord"></i>&nbsp; Join Discord</a>
+                <a class="btn btn-dark" href="${anon_url('https://tautulli.com/discord')}" target="_blank" rel="noreferrer"><i class="fab fa-discord"></i>&nbsp; Join Discord</a>
             </div>
             <div class="btn-group">
-                <a class="btn btn-dark" href="${anon_url('https://www.reddit.com/r/Tautulli')}" target="_blank"><i class="fab fa-reddit"></i>&nbsp; Join Reddit</a>
+                <a class="btn btn-dark" href="${anon_url('https://www.reddit.com/r/Tautulli')}" target="_blank" rel="noreferrer"><i class="fab fa-reddit"></i>&nbsp; Join Reddit</a>
             </div>
             <div class="btn-group">
                 <button class="btn btn-dark" id="popout-iframe-button"><i class="fa fa-external-link"></i> Pop Out Chat</button>

data/interfaces/default/update_metadata.html

@@ -171,6 +171,7 @@ DOCUMENTATION :: END
                 </p>
                 <p> with </p>
                 <p><span id="new_title"></span></p>
+                <p>from the <strong><span id="new_library"></span></strong> library?</p>
                 % if query['media_type'] != 'movie':
                 <p>All items for <strong>${query['grandparent_title']}</strong> will also be updated.</p>
                 % endif
@@ -211,10 +212,12 @@ DOCUMENTATION :: END
 
     $(document).on('click', '#search-results-list a', function (e) {
         e.preventDefault();
-        var new_rating_key = $(this).attr('id');
+        var new_rating_key = $(this).data('rating_key');
+        var new_library_section = $(this).data('library_name');
         var new_href = $(this).attr('href');
 
         $('#new_title').html($(this).find('.item-children-instance-text-wrapper').html());
+        $('#new_library').text(new_library_section);
 
         $('#confirm-modal-update').modal();
         $('#confirm-modal-update').one('click', '#confirm-update', function () {

data/interfaces/default/user.html

@@ -43,7 +43,9 @@ DOCUMENTATION :: END
             <div class="summary-navbar">
                 <div class="col-md-12">
                     <div class="summary-navbar-list">
-                        <ul class="list-unstyled breadcrumb"></ul>
+                        <ul class="list-unstyled breadcrumb">
+                            <li class="active">${data['friendly_name']}</li>
+                        </ul>
                     </div>
                 </div>
             </div>
@@ -67,12 +69,16 @@ DOCUMENTATION :: END
                                 % endif
                             </div>
                             <div class="user-info-nav">
-                                <ul class="user-info-nav" role="tablist">
-                                    <li class="active"><a href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
-                                    <li><a id="history-tab-btn" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
-                                    <li><a id="sync-tab-btn" href="#tabs-synceditems" role="tab" data-toggle="tab">Synced Items</a></li>
-                                    <li><a id="ip-tab-btn" href="#tabs-ipaddresses" role="tab" data-toggle="tab">IP Addresses</a></li>
-                                    <li><a id="login-tab-btn" href="#tabs-tautullilogins" role="tab" data-toggle="tab">Tautulli Logins</a></li>
+                                <ul class="nav nav-list nav-pills" role="tablist">
+                                    <li class="active"><a id="nav-tabs-profile" href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
+                                    <li><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
+                                    <li><a id="nav-tabs-playlists" href="#tabs-playlists" role="tab" data-toggle="tab">Playlists</a></li>
+                                    % if _session['user_group'] == 'admin':
+                                    <li><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
+                                    % endif
+                                    <li><a id="nav-tabs-synceditems" href="#tabs-synceditems" role="tab" data-toggle="tab">Synced Items</a></li>
+                                    <li><a id="nav-tabs-ipaddresses" href="#tabs-ipaddresses" role="tab" data-toggle="tab">IP Addresses</a></li>
+                                    <li><a id="nav-tabs-tautullilogins" href="#tabs-tautullilogins" role="tab" data-toggle="tab">Tautulli Logins</a></li>
                                 </ul>
                             </div>
                         </div>
@@ -210,6 +216,99 @@ DOCUMENTATION :: END
                             </div>
                         </div>
                     </div>
+                    <div role="tabpanel" class="tab-pane" id="tabs-playlists">
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class='table-card-header'>
+                                        <div class="header-bar">
+                                            <span>
+                                                <i class="fa fa-list-alt"></i> Playlists for <strong>
+                                                    <span class="set-username">${data['friendly_name']}</span>
+                                                </strong>
+                                            </span>
+                                        </div>
+                                        <div class="button-bar">
+                                            % if _session['user_group'] == 'admin':
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
+                                                        data-user_id="${data['user_id']}" data-media_type="playlist" data-sub_media_type="video,audio,photo"
+                                                        data-export_type="playlist">
+                                                    <i class="fa fa-file-export"></i> Export playlists
+                                                </button>
+                                            </div>
+                                            % endif
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-playlists-table-button" id="refresh-playlists-table">
+                                                    <i class="fa fa-refresh"></i> Refresh playlists
+                                                </button>
+                                            </div>
+                                            <div class="btn-group colvis-button-bar" id="button-bar-playlists"></div>
+                                        </div>
+                                    </div>
+                                    <div class="table-card-back">
+                                        <table class="display playlists_table" id="playlists_table-SID-${data['user_id']}" width="100%">
+                                            <thead>
+                                                <tr>
+                                                    <th align="left" id="playlistTitle">Playlist Title</th>
+                                                    <th align="left" id="playlistLeafCount">Playlist Items</th>
+                                                    <th align="left" id="playlistDuration">Playlist Duration</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody></tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    % if _session['user_group'] == 'admin':
+                    <div role="tabpanel" class="tab-pane" id="tabs-export">
+                        <div class="container-fluid">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div class='table-card-header'>
+                                        <div class="header-bar">
+                                            <span>
+                                                <i class="fa fa-file-export"></i> Metadata Exports for <strong>
+                                                    <span class="set-username">${data['friendly_name']}</span>
+                                                </strong>
+                                            </span>
+                                        </div>
+                                        <div class="button-bar">
+                                            <div class="btn-group">
+                                                <button class="btn btn-dark refresh-export-table-button" id="refresh-export-table">
+                                                    <i class="fa fa-refresh"></i> Refresh exports
+                                                </button>
+                                            </div>
+                                            <div class="btn-group colvis-button-bar" id="button-bar-export"></div>
+                                        </div>
+                                    </div>
+                                    <div class="table-card-back">
+                                        <table class="display export_table" id="export_table-SID-${data['user_id']}" width="100%">
+                                            <thead>
+                                                <tr>
+                                                    <th align="left" id="timestamp">Exported At</th>
+                                                    <th align="left" id="media_type_title">Media Type</th>
+                                                    <th align="left" id="rating_key">Rating Key</th>
+                                                    <th align="left" id="filename">Filename</th>
+                                                    <th align="left" id="file_format">File Format</th>
+                                                    <th align="left" id="metadata_level">Metadata Level</th>
+                                                    <th align="left" id="media_info_level">Media Info Level</th>
+                                                    <th align="left" id="media_info_level">Custom Fields</th>
+                                                    <th align="left" id="file_size">File Size</th>
+                                                    <th align="left" id="complete">Download</th>
+                                                    <th align="left" id="delete">Delete</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody></tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    % endif
                     <div role="tabpanel" class="tab-pane" id="tabs-synceditems">
                         <div class="container-fluid">
                             <div class="row">
@@ -278,6 +377,7 @@ DOCUMENTATION :: END
                                             <div class="btn-group">
                                                 <button class="btn btn-dark refresh-ip-address-button" id="refresh-ip-address-list"><i class="fa fa-refresh"></i> Refresh IP addresses</button>
                                             </div>
+                                            <div class="btn-group colvis-button-bar" id="button-bar-ip-address"></div>
                                         </div>
                                     </div>
                                     <div class="table-card-back">
@@ -393,6 +493,8 @@ DOCUMENTATION :: END
         </div>
     </div>
 </div>
+<div id="export-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="export-modal">
+</div>
 </%def>
 
 <%def name="javascriptIncludes()">
@@ -410,8 +512,9 @@ DOCUMENTATION :: END
 
     var username = '${data['username'].replace("'", "\\'")}';
 </script>
-<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
+<script src="${http_root}js/tables/playlists_table.js${cache_param}"></script>
+<script src="${http_root}js/tables/export_table.js${cache_param}"></script>
 <script src="${http_root}js/tables/user_ips.js${cache_param}"></script>
 <script src="${http_root}js/tables/sync_table.js${cache_param}"></script>
 <script src="${http_root}js/tables/login_logs.js${cache_param}"></script>
@@ -420,6 +523,8 @@ DOCUMENTATION :: END
         $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
     });
 
+    $(".inactive-user-tooltip").tooltip();
+
     function loadHistoryTable(media_type) {
         // Build watch history table
         history_table_options.ajax = {
@@ -451,6 +556,49 @@ DOCUMENTATION :: END
         });
     }
 
+    $('#nav-tabs-history').on('shown.bs.tab', function() {
+        if (typeof(history_table) === 'undefined') {
+            var media_type = getLocalStorage('user_' + user_id + '-history_media_type', 'all');
+            $('#history-' + media_type).prop('checked', true);
+            $('#history-' + media_type).closest('label').addClass('active');
+            loadHistoryTable(media_type);
+        }
+    });
+
+    $("#refresh-history-list").click(function () {
+        history_table.draw();
+    });
+
+    function loadPlaylistsTable() {
+        // Build playlists table
+        playlists_table_options.ajax = {
+            url: 'get_playlists_list',
+            type: 'POST',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    user_id: user_id
+                };
+            }
+        };
+        playlists_table = $('#playlists_table-SID-${data["user_id"]}').DataTable(playlists_table_options);
+
+        var colvis = new $.fn.dataTable.ColVis(playlists_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
+        $(colvis.button()).appendTo('#button-bar-playlists');
+
+        clearSearchButton('playlists_table-SID-${data["user_id"]}', playlists_table);
+    }
+
+    $('#nav-tabs-playlists').on('shown.bs.tab', function() {
+        if (typeof(playlists_table) === 'undefined') {
+            loadPlaylistsTable();
+        }
+    });
+
+    $("#refresh-playlists-table").click(function () {
+        playlists_table.draw();
+    });
+
     function loadSyncTable() {
         // Build user sync table
         sync_table_options.ajax = {
@@ -466,6 +614,16 @@ DOCUMENTATION :: END
         clearSearchButton('sync_table-UID-${data["user_id"]}', sync_table);
     }
 
+    $('#nav-tabs-synceditems').on('shown.bs.tab', function() {
+        if (typeof(sync_table) === 'undefined') {
+            loadSyncTable(user_id);
+        }
+    });
+
+    $("#refresh-syncs-list").click(function() {
+        sync_table.ajax.reload();
+    });
+
     function loadIPAddressTable() {
         // Build user IP table
         user_ip_table_options.ajax = {
@@ -480,9 +638,22 @@ DOCUMENTATION :: END
         };
         user_ip_table = $('#user_ip_table-UID-${data["user_id"]}').DataTable(user_ip_table_options);
 
+        var colvis_user_ip = new $.fn.dataTable.ColVis( user_ip_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark'} );
+        $( colvis_user_ip.button() ).appendTo('#button-bar-ip-address');
+
         clearSearchButton('user_ip_table-UID-${data["user_id"]}', user_ip_table);
     }
 
+    $('#nav-tabs-ipaddresses').on('shown.bs.tab', function() {
+        if (typeof(user_ip_table) === 'undefined') {
+            loadIPAddressTable(user_id);
+        }
+    });
+
+    $("#refresh-ip-address-list").click(function () {
+        user_ip_table.draw();
+    });
+
     function loadLoginTable() {
         // Build user login table
         login_log_table_options.ajax = {
@@ -504,52 +675,141 @@ DOCUMENTATION :: END
         clearSearchButton('login_log_table-UID-${data["user_id"]}', login_log_table);
     }
 
-    $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
-        if (typeof(history_table) === 'undefined') {
-            var media_type = getLocalStorage('user_' + user_id + '-history_media_type', 'all');
-            $('#history-' + media_type).prop('checked', true);
-            $('#history-' + media_type).closest('label').addClass('active');
-            loadHistoryTable(media_type);
-        }
-    });
-
-    $('a[href="#tabs-synceditems"]').on('shown.bs.tab', function() {
-        if (typeof(sync_table) === 'undefined') {
-            loadSyncTable(user_id);
-        }
-    });
-
-    $('a[href="#tabs-ipaddresses"]').on('shown.bs.tab', function() {
-        if (typeof(user_ip_table) === 'undefined') {
-            loadIPAddressTable(user_id);
-        }
-    });
-
-    $('a[href="#tabs-tautullilogins"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-tautullilogins').on('shown.bs.tab', function() {
         if (typeof(login_log_table) === 'undefined') {
             loadLoginTable(user_id);
         }
     });
 
-    $("#refresh-history-list").click(function () {
-        history_table.draw();
-    });
-
-    $("#refresh-syncs-list").click(function() {
-        sync_table.ajax.reload();
-    });
-
-    $("#refresh-ip-address-list").click(function () {
-        user_ip_table.draw();
-    });
-
     $("#refresh-login-list").click(function () {
         login_log_table.draw();
     });
 
-    $(".inactive-user-tooltip").tooltip();
+    function recentlyWatched() {
+        // Populate recently watched
+        $.ajax({
+            url: 'get_user_recently_watched',
+            async: true,
+            data: {
+                user_id: user_id,
+                limit: 50
+            },
+            complete: function(xhr, status) {
+                $("#user-recently-watched").html(xhr.responseText);
+                highlightWatchedScrollerButton();
+            }
+        });
+    }
+
+    recentlyWatched();
+
+    function highlightWatchedScrollerButton() {
+        var scroller = $("#recently-watched-row-scroller");
+        var numElems = scroller.find("li").length;
+        scroller.width(numElems * 175);
+        if (scroller.width() > $("#user-recently-watched").width()) {
+            $("#recently-watched-page-right").removeClass("disabled");
+        } else {
+            $("#recently-watched-page-right").addClass("disabled");
+        }
+    }
+
+    $(window).resize(function() {
+        highlightWatchedScrollerButton();
+    });
+
+    var leftTotal = 0;
+    $(".paginate").click(function (e) {
+        e.preventDefault();
+        var scroller = $("#recently-watched-row-scroller");
+        var containerWidth = $("#user-recently-watched").width();
+        var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
+        var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
+
+        leftTotal = Math.max(Math.min(leftTotal + scrollAmount, 0), leftMax);
+        scroller.animate({ left: leftTotal }, 250);
+
+        if (leftTotal == 0) {
+            $("#recently-watched-page-left").addClass("disabled").blur();
+        } else {
+            $("#recently-watched-page-left").removeClass("disabled");
+        }
+
+        if (leftTotal == leftMax) {
+            $("#recently-watched-page-right").addClass("disabled").blur();
+        } else {
+            $("#recently-watched-page-right").removeClass("disabled");
+        }
+    });
+
+    $(document).ready(function () {
+        // Javascript to enable link to tab
+        var hash = document.location.hash;
+        var prefix = "tab_";
+        if (hash) {
+            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
+        }
+
+        // Change hash for page-reload
+        $('.nav-list a').on('shown.bs.tab', function (e) {
+            window.location.hash = e.target.hash.replace("#", "#" + prefix);
+        });
+
+        // Populate watch time stats
+        $.ajax({
+            url: 'user_watch_time_stats',
+            async: true,
+            data: { user_id: user_id, user: username },
+            complete: function(xhr, status) {
+                $("#user-time-stats").html(xhr.responseText);
+            }
+        });
+
+        // Populate platform stats
+        $.ajax({
+            url: 'user_player_stats',
+            async: true,
+            data: { user_id: user_id, user: username },
+            complete: function(xhr, status) {
+                $("#user-player-stats").html(xhr.responseText);
+            }
+        });
+
+    });
+</script>
+% if _session['user_group'] == 'admin':
+<script>
+    function loadExportTable() {
+        // Build export table
+        export_table_options.ajax = {
+            url: 'get_export_list',
+            type: 'POST',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    user_id: user_id
+                };
+            }
+        };
+        export_table = $('#export_table-SID-${data["user_id"]}').DataTable(export_table_options);
+        export_table.columns([2, 7]).visible(false);
+
+        var colvis = new $.fn.dataTable.ColVis(export_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
+        $(colvis.button()).appendTo('#button-bar-export');
+
+        clearSearchButton('export_table-SID-${data["user_id"]}', export_table);
+    }
+
+    $('#nav-tabs-export').on('shown.bs.tab', function() {
+        if (typeof(export_table) === 'undefined') {
+            loadExportTable();
+        }
+    });
+
+    $("#refresh-export-table").click(function () {
+        export_table.draw();
+    });
 
-    % if _session['user_group'] == 'admin':
     $("#edit-user-tooltip").tooltip();
 
     // Load edit user modal
@@ -566,6 +826,23 @@ DOCUMENTATION :: END
         });
     });
 
+    $(".export-button").click(function() {
+        $.ajax({
+            url: 'export_metadata_modal',
+            data: {
+                user_id: $(this).data('user_id'),
+                media_type: $(this).data('media_type'),
+                sub_media_type: $(this).data('sub_media_type'),
+                export_type: $(this).data('export_type')
+            },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#export-modal").html(xhr.responseText);
+            }
+        });
+    });
+
     $('#row-edit-mode').on('click', function() {
         $('#row-edit-mode-alert').fadeIn(200);
 
@@ -644,100 +921,7 @@ DOCUMENTATION :: END
             });
         }
     });
-    % endif
-
-    function recentlyWatched() {
-        // Populate recently watched
-        $.ajax({
-            url: 'get_user_recently_watched',
-            async: true,
-            data: {
-                user_id: user_id,
-                limit: 50
-            },
-            complete: function(xhr, status) {
-                $("#user-recently-watched").html(xhr.responseText);
-                highlightWatchedScrollerButton();
-            }
-        });
-    }
-
-    recentlyWatched();
-
-    function highlightWatchedScrollerButton() {
-        var scroller = $("#recently-watched-row-scroller");
-        var numElems = scroller.find("li").length;
-        scroller.width(numElems * 175);
-        if (scroller.width() > $("#user-recently-watched").width()) {
-            $("#recently-watched-page-right").removeClass("disabled");
-        } else {
-            $("#recently-watched-page-right").addClass("disabled");
-        }
-    }
-
-    $(window).resize(function() {
-        highlightWatchedScrollerButton();
-    });
-
-    var leftTotal = 0;
-    $(".paginate").click(function (e) {
-        e.preventDefault();
-        var scroller = $("#recently-watched-row-scroller");
-        var containerWidth = $("#user-recently-watched").width();
-        var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
-        var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
-
-        leftTotal = Math.max(Math.min(leftTotal + scrollAmount, 0), leftMax);
-        scroller.animate({ left: leftTotal }, 250);
-
-        if (leftTotal == 0) {
-            $("#recently-watched-page-left").addClass("disabled").blur();
-        } else {
-            $("#recently-watched-page-left").removeClass("disabled");
-        }
-
-        if (leftTotal == leftMax) {
-            $("#recently-watched-page-right").addClass("disabled").blur();
-        } else {
-            $("#recently-watched-page-right").removeClass("disabled");
-        }
-    });
-
-    $(document).ready(function () {
-
-        // Javascript to enable link to tab
-        var hash = document.location.hash;
-        var prefix = "tab_";
-        if (hash) {
-            $('.user-info-nav a[href='+hash.replace(prefix,"")+']').tab('show').trigger('show.bs.tab');
-        }
-
-        // Change hash for page-reload
-        $('.user-info-nav a').on('shown.bs.tab', function (e) {
-            window.location.hash = e.target.hash.replace("#", "#" + prefix);
-        });
-
-        // Populate watch time stats
-        $.ajax({
-            url: 'user_watch_time_stats',
-            async: true,
-            data: { user_id: user_id, user: username },
-            complete: function(xhr, status) {
-                $("#user-time-stats").html(xhr.responseText);
-            }
-        });
-
-        // Populate platform stats
-        $.ajax({
-            url: 'user_player_stats',
-            async: true,
-            data: { user_id: user_id, user: username },
-            complete: function(xhr, status) {
-                $("#user-player-stats").html(xhr.responseText);
-            }
-        });
-
-    });
 </script>
 % endif
+% endif
 </%def>

data/interfaces/default/users.html

@@ -82,7 +82,6 @@
 <script src="${http_root}js/dataTables.colVis.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/tables/users.js${cache_param}"></script>
 <script>
     $(document).ready(function () {

data/interfaces/default/welcome.html

@@ -12,7 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
+    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
     <link href="${http_root}css/bootstrap-wizard.css" rel="stylesheet">
     <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet">
@@ -21,21 +21,21 @@
     <link href="${http_root}css/font-awesome.v4-shims.min.css" rel="stylesheet">
 
     <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.5">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.5">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.5">
+    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
+    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
+    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
 
     <!-- ICONS -->
     <!-- Android -->
-    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.0.5" crossorigin="use-credentials">
+    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.6.0" crossorigin="use-credentials">
     <meta name="theme-color" content="#282a2d">
     <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.5">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.0.5" color="#282a2d">
+    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.6.0">
+    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.6.0" color="#282a2d">
     <meta name="apple-mobile-web-app-title" content="Tautulli">
     <!-- Microsoft -->
     <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.0.5">
+    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.6.0">
 </head>
 
 <body>
@@ -248,7 +248,7 @@
     </div>
 </div>
 
-<script src="${http_root}js/jquery-2.1.4.min.js"></script>
+<script src="${http_root}js/jquery-3.5.1.min.js"></script>
 <script src="${http_root}js/bootstrap.min.js"></script>
 <script src="${http_root}js/selectize.min.js"></script>
 <script src="${http_root}js/platform.min.js"></script>

data/interfaces/newsletters/recently_added.html

@@ -521,7 +521,7 @@
                 line-height: 100%;
             }
 
-            .apple-link a {
+            a[x-apple-data-detectors] {
                 color: inherit !important;
                 font-family: inherit !important;
                 font-size: inherit !important;
@@ -546,7 +546,7 @@
                 <span class="preheader" style="color: transparent;display: none;height: 0;max-height: 0;max-width: 0;opacity: 0;overflow: hidden;mso-hide: all;visibility: hidden;width: 0;">Tautulli Newsletter  - ${subject}</span>
                 % if base_url and not preview:
                 <div class="view-full" style="clear: both;color: #282A2D;font-size: 12px;margin-bottom: 10px;text-align: center;width: 100%;">  <!-- IGNORE SAVE -->
-                    <a href="${base_url + uuid}" title="View full newsletter" target="_blank" style="text-decoration: underline;color: #282A2D;">Click here to view the full newsletter.</a>  <!-- IGNORE SAVE -->
+                    <a href="${base_url + uuid}" title="View full newsletter" target="_blank" rel="noreferrer" style="text-decoration: underline;color: #282A2D;">Click here to view the full newsletter.</a>  <!-- IGNORE SAVE -->
                 </div>  <!-- IGNORE SAVE -->
                 % endif
                 <table border="0" cellpadding="3" cellspacing="0" class="main" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background: #282A2D;border-radius: 3px;color: #ffffff;">
@@ -599,7 +599,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + movie['thumb_hash']) if base_url_image else movie['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
                                                                     <tr>
                                                                         <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" style="text-decoration: underline;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" rel="noreferrer" style="text-decoration: underline;">
                                                                                 <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
                                                                             </a>
                                                                         </td>
@@ -610,7 +610,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
                                                                     <tr>
                                                                         <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${movie['title']}</a>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" rel="noreferrer" style="text-decoration: none;color: #ffffff;">${movie['title']}</a>
                                                                         </td>
                                                                     </tr>
                                                                     <tr>
@@ -728,7 +728,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + show['thumb_hash']) if base_url_image else show['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
                                                                     <tr>
                                                                         <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" style="text-decoration: underline;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" rel="noreferrer" style="text-decoration: underline;">
                                                                                 <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
                                                                             </a>
                                                                         </td>
@@ -739,7 +739,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
                                                                     <tr>
                                                                         <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${show['title']}</a>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" rel="noreferrer" style="text-decoration: none;color: #ffffff;">${show['title']}</a>
                                                                         </td>
                                                                     </tr>
                                                                     <tr>
@@ -872,7 +872,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + album['thumb_hash']) if base_url_image else album['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
                                                                     <tr>
                                                                         <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" style="text-decoration: underline;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" rel="noreferrer" style="text-decoration: underline;">
                                                                                 <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-cover.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-cover.png'}" width="150" height="150" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
                                                                             </a>
                                                                         </td>
@@ -883,7 +883,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
                                                                     <tr>
                                                                         <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${album['title']}</a>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" rel="noreferrer" style="text-decoration: none;color: #ffffff;">${album['title']}</a>
                                                                         </td>
                                                                     </tr>
                                                                     <tr>
@@ -986,7 +986,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + video['thumb_hash']) if base_url_image else video['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
                                                                     <tr>
                                                                         <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" style="text-decoration: underline;">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" rel="noreferrer" style="text-decoration: underline;">
                                                                                 <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
                                                                             </a>
                                                                         </td>
@@ -997,7 +997,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
                                                                     <tr>
                                                                         <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" style="text-decoration: none;color: #ffffff;">${video['title']}</a>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" rel="noreferrer" style="text-decoration: none;color: #ffffff;">${video['title']}</a>
                                                                         </td>
                                                                     </tr>
                                                                     <tr>
@@ -1087,4 +1087,4 @@
 </table>
 </body>
 </html>
-% endif
+% endif

data/interfaces/newsletters/recently_added.internal.html

@@ -521,7 +521,7 @@
                 line-height: 100%;
             }
 
-            .apple-link a {
+            a[x-apple-data-detectors] {
                 color: inherit !important;
                 font-family: inherit !important;
                 font-size: inherit !important;
@@ -546,7 +546,7 @@
                 <span class="preheader">Tautulli Newsletter  - ${subject}</span>
                 % if base_url and not preview:
                 <div class="view-full">  <!-- IGNORE SAVE -->
-                    <a href="${base_url + uuid}" title="View full newsletter" target="_blank">Click here to view the full newsletter.</a>  <!-- IGNORE SAVE -->
+                    <a href="${base_url + uuid}" title="View full newsletter" target="_blank" rel="noreferrer">Click here to view the full newsletter.</a>  <!-- IGNORE SAVE -->
                 </div>  <!-- IGNORE SAVE -->
                 % endif
                 <table border="0" cellpadding="3" cellspacing="0" class="main">
@@ -599,7 +599,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + movie['thumb_hash']) if base_url_image else movie['thumb_url']})">
                                                                     <tr>
                                                                         <td>
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" rel="noreferrer">
                                                                                 <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
                                                                             </a>
                                                                         </td>
@@ -610,7 +610,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
                                                                     <tr>
                                                                         <td class="card-info-title nowrap">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank">${movie['title']}</a>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" rel="noreferrer">${movie['title']}</a>
                                                                         </td>
                                                                     </tr>
                                                                     <tr>
@@ -728,7 +728,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + show['thumb_hash']) if base_url_image else show['thumb_url']})">
                                                                     <tr>
                                                                         <td>
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" rel="noreferrer">
                                                                                 <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
                                                                             </a>
                                                                         </td>
@@ -739,7 +739,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
                                                                     <tr>
                                                                         <td class="card-info-title nowrap">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank">${show['title']}</a>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" rel="noreferrer">${show['title']}</a>
                                                                         </td>
                                                                     </tr>
                                                                     <tr>
@@ -872,7 +872,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + album['thumb_hash']) if base_url_image else album['thumb_url']})">
                                                                     <tr>
                                                                         <td>
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" rel="noreferrer">
                                                                                 <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-cover.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-cover.png'}" width="150" height="150">
                                                                             </a>
                                                                         </td>
@@ -883,7 +883,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
                                                                     <tr>
                                                                         <td class="card-info-title nowrap">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank">${album['title']}</a>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" rel="noreferrer">${album['title']}</a>
                                                                         </td>
                                                                     </tr>
                                                                     <tr>
@@ -986,7 +986,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + video['thumb_hash']) if base_url_image else video['thumb_url']})">
                                                                     <tr>
                                                                         <td>
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank">
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" rel="noreferrer">
                                                                                 <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
                                                                             </a>
                                                                         </td>
@@ -997,7 +997,7 @@
                                                                 <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
                                                                     <tr>
                                                                         <td class="card-info-title nowrap">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank">${video['title']}</a>
+                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" rel="noreferrer">${video['title']}</a>
                                                                         </td>
                                                                     </tr>
                                                                     <tr>
@@ -1087,4 +1087,4 @@
 </table>
 </body>
 </html>
-% endif
+% endif

init-scripts/init.systemd

@@ -52,9 +52,7 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/python3 /opt/Tautulli/Tautulli.py --config /opt/Tautulli/config.ini --datadir /opt/Tautulli --quiet --daemon --nolaunch
-GuessMainPID=no
-Type=forking
+ExecStart=/usr/bin/python3 /opt/Tautulli/Tautulli.py --config /opt/Tautulli/config.ini --datadir /opt/Tautulli --quiet --nolaunch
 User=tautulli
 Group=tautulli
 Restart=on-abnormal

lib/backports/__init__.py

@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+__import__('pkg_resources').declare_namespace(__name__)

lib/backports/csv.py

@@ -0,0 +1,979 @@
+# -*- coding: utf-8 -*-
+"""A port of Python 3's csv module to Python 2.
+
+The API of the csv module in Python 2 is drastically different from
+the csv module in Python 3. This is due, for the most part, to the
+difference between str in Python 2 and Python 3.
+
+The semantics of Python 3's version are more useful because they support
+unicode natively, while Python 2's csv does not.
+"""
+from __future__ import unicode_literals, absolute_import
+
+__all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE",
+            "Error", "Dialect", "__doc__", "excel", "excel_tab",
+            "field_size_limit", "reader", "writer",
+            "register_dialect", "get_dialect", "list_dialects", "Sniffer",
+            "unregister_dialect", "__version__", "DictReader", "DictWriter" ]
+
+import re
+import numbers
+from io import StringIO
+from csv import (
+    QUOTE_MINIMAL, QUOTE_ALL, QUOTE_NONNUMERIC, QUOTE_NONE,
+    __version__, __doc__, Error, field_size_limit,
+)
+
+# Stuff needed from six
+import sys
+PY3 = sys.version_info[0] == 3
+if PY3:
+    string_types = str
+    text_type = str
+    binary_type = bytes
+    unichr = chr
+else:
+    string_types = basestring
+    text_type = unicode
+    binary_type = str
+
+
+class QuoteStrategy(object):
+    quoting = None
+
+    def __init__(self, dialect):
+        if self.quoting is not None:
+            assert dialect.quoting == self.quoting
+        self.dialect = dialect
+        self.setup()
+
+        escape_pattern_quoted = r'({quotechar})'.format(
+            quotechar=re.escape(self.dialect.quotechar or '"'))
+        escape_pattern_unquoted = r'([{specialchars}])'.format(
+            specialchars=re.escape(self.specialchars))
+
+        self.escape_re_quoted = re.compile(escape_pattern_quoted)
+        self.escape_re_unquoted = re.compile(escape_pattern_unquoted)
+
+    def setup(self):
+        """Optional method for strategy-wide optimizations."""
+
+    def quoted(self, field=None, raw_field=None, only=None):
+        """Determine whether this field should be quoted."""
+        raise NotImplementedError(
+            'quoted must be implemented by a subclass')
+
+    @property
+    def specialchars(self):
+        """The special characters that need to be escaped."""
+        raise NotImplementedError(
+            'specialchars must be implemented by a subclass')
+
+    def escape_re(self, quoted=None):
+        if quoted:
+            return self.escape_re_quoted
+        return self.escape_re_unquoted
+
+    def escapechar(self, quoted=None):
+        if quoted and self.dialect.doublequote:
+            return self.dialect.quotechar
+        return self.dialect.escapechar
+
+    def prepare(self, raw_field, only=None):
+        field = text_type(raw_field if raw_field is not None else '')
+        quoted = self.quoted(field=field, raw_field=raw_field, only=only)
+
+        escape_re = self.escape_re(quoted=quoted)
+        escapechar = self.escapechar(quoted=quoted)
+
+        if escape_re.search(field):
+            escapechar = '\\\\' if escapechar == '\\' else escapechar
+            if not escapechar:
+                raise Error('No escapechar is set')
+            escape_replace = r'{escapechar}\1'.format(escapechar=escapechar)
+            field = escape_re.sub(escape_replace, field)
+
+        if quoted:
+            field = '{quotechar}{field}{quotechar}'.format(
+                quotechar=self.dialect.quotechar, field=field)
+
+        return field
+
+
+class QuoteMinimalStrategy(QuoteStrategy):
+    quoting = QUOTE_MINIMAL
+
+    def setup(self):
+        self.quoted_re = re.compile(r'[{specialchars}]'.format(
+            specialchars=re.escape(self.specialchars)))
+
+    @property
+    def specialchars(self):
+        return (
+            self.dialect.lineterminator +
+            self.dialect.quotechar +
+            self.dialect.delimiter +
+            (self.dialect.escapechar or '')
+        )
+
+    def quoted(self, field, only, **kwargs):
+        if field == self.dialect.quotechar and not self.dialect.doublequote:
+            # If the only character in the field is the quotechar, and
+            # doublequote is false, then just escape without outer quotes.
+            return False
+        return field == '' and only or bool(self.quoted_re.search(field))
+
+
+class QuoteAllStrategy(QuoteStrategy):
+    quoting = QUOTE_ALL
+
+    @property
+    def specialchars(self):
+        return self.dialect.quotechar
+
+    def quoted(self, **kwargs):
+        return True
+
+
+class QuoteNonnumericStrategy(QuoteStrategy):
+    quoting = QUOTE_NONNUMERIC
+
+    @property
+    def specialchars(self):
+        return (
+            self.dialect.lineterminator +
+            self.dialect.quotechar +
+            self.dialect.delimiter +
+            (self.dialect.escapechar or '')
+        )
+
+    def quoted(self, raw_field, **kwargs):
+        return not isinstance(raw_field, numbers.Number)
+
+
+class QuoteNoneStrategy(QuoteStrategy):
+    quoting = QUOTE_NONE
+
+    @property
+    def specialchars(self):
+        return (
+            self.dialect.lineterminator +
+            (self.dialect.quotechar or '') +
+            self.dialect.delimiter +
+            (self.dialect.escapechar or '')
+        )
+
+    def quoted(self, field, only, **kwargs):
+        if field == '' and only:
+            raise Error('single empty field record must be quoted')
+        return False
+
+
+class writer(object):
+    def __init__(self, fileobj, dialect='excel', **fmtparams):
+        if fileobj is None:
+            raise TypeError('fileobj must be file-like, not None')
+
+        self.fileobj = fileobj
+
+        if isinstance(dialect, text_type):
+            dialect = get_dialect(dialect)
+
+        try:
+            self.dialect = Dialect.combine(dialect, fmtparams)
+        except Error as e:
+            raise TypeError(*e.args)
+
+        strategies = {
+            QUOTE_MINIMAL: QuoteMinimalStrategy,
+            QUOTE_ALL: QuoteAllStrategy,
+            QUOTE_NONNUMERIC: QuoteNonnumericStrategy,
+            QUOTE_NONE: QuoteNoneStrategy,
+        }
+        self.strategy = strategies[self.dialect.quoting](self.dialect)
+
+    def writerow(self, row):
+        if row is None:
+            raise Error('row must be an iterable')
+
+        row = list(row)
+        only = len(row) == 1
+        row = [self.strategy.prepare(field, only=only) for field in row]
+
+        line = self.dialect.delimiter.join(row) + self.dialect.lineterminator
+        return self.fileobj.write(line)
+
+    def writerows(self, rows):
+        for row in rows:
+            self.writerow(row)
+
+
+START_RECORD = 0
+START_FIELD = 1
+ESCAPED_CHAR = 2
+IN_FIELD = 3
+IN_QUOTED_FIELD = 4
+ESCAPE_IN_QUOTED_FIELD = 5
+QUOTE_IN_QUOTED_FIELD = 6
+EAT_CRNL = 7
+AFTER_ESCAPED_CRNL = 8
+
+
+class reader(object):
+    def __init__(self, fileobj, dialect='excel', **fmtparams):
+        self.input_iter = iter(fileobj)
+
+        if isinstance(dialect, text_type):
+            dialect = get_dialect(dialect)
+
+        try:
+            self.dialect = Dialect.combine(dialect, fmtparams)
+        except Error as e:
+            raise TypeError(*e.args)
+
+        self.fields = None
+        self.field = None
+        self.line_num = 0
+
+    def parse_reset(self):
+        self.fields = []
+        self.field = []
+        self.state = START_RECORD
+        self.numeric_field = False
+
+    def parse_save_field(self):
+        field = ''.join(self.field)
+        self.field = []
+        if self.numeric_field:
+            field = float(field)
+            self.numeric_field = False
+        self.fields.append(field)
+
+    def parse_add_char(self, c):
+        if len(self.field) >= field_size_limit():
+            raise Error('field size limit exceeded')
+        self.field.append(c)
+
+    def parse_process_char(self, c):
+        switch = {
+            START_RECORD: self._parse_start_record,
+            START_FIELD: self._parse_start_field,
+            ESCAPED_CHAR: self._parse_escaped_char,
+            AFTER_ESCAPED_CRNL: self._parse_after_escaped_crnl,
+            IN_FIELD: self._parse_in_field,
+            IN_QUOTED_FIELD: self._parse_in_quoted_field,
+            ESCAPE_IN_QUOTED_FIELD: self._parse_escape_in_quoted_field,
+            QUOTE_IN_QUOTED_FIELD: self._parse_quote_in_quoted_field,
+            EAT_CRNL: self._parse_eat_crnl,
+        }
+        return switch[self.state](c)
+
+    def _parse_start_record(self, c):
+        if c == '\0':
+            return
+        elif c == '\n' or c == '\r':
+            self.state = EAT_CRNL
+            return
+
+        self.state = START_FIELD
+        return self._parse_start_field(c)
+
+    def _parse_start_field(self, c):
+        if c == '\n' or c == '\r' or c == '\0':
+            self.parse_save_field()
+            self.state = START_RECORD if c == '\0' else EAT_CRNL
+        elif (c == self.dialect.quotechar and
+              self.dialect.quoting != QUOTE_NONE):
+            self.state = IN_QUOTED_FIELD
+        elif c == self.dialect.escapechar:
+            self.state = ESCAPED_CHAR
+        elif c == ' ' and self.dialect.skipinitialspace:
+            pass  # Ignore space at start of field
+        elif c == self.dialect.delimiter:
+            # Save empty field
+            self.parse_save_field()
+        else:
+            # Begin new unquoted field
+            if self.dialect.quoting == QUOTE_NONNUMERIC:
+                self.numeric_field = True
+            self.parse_add_char(c)
+            self.state = IN_FIELD
+
+    def _parse_escaped_char(self, c):
+        if c == '\n' or c == '\r':
+            self.parse_add_char(c)
+            self.state = AFTER_ESCAPED_CRNL
+            return
+        if c == '\0':
+            c = '\n'
+        self.parse_add_char(c)
+        self.state = IN_FIELD
+
+    def _parse_after_escaped_crnl(self, c):
+        if c == '\0':
+            return
+        return self._parse_in_field(c)
+
+    def _parse_in_field(self, c):
+        # In unquoted field
+        if c == '\n' or c == '\r' or c == '\0':
+            # End of line - return [fields]
+            self.parse_save_field()
+            self.state = START_RECORD if c == '\0' else EAT_CRNL
+        elif c == self.dialect.escapechar:
+            self.state = ESCAPED_CHAR
+        elif c == self.dialect.delimiter:
+            self.parse_save_field()
+            self.state = START_FIELD
+        else:
+            # Normal character - save in field
+            self.parse_add_char(c)
+
+    def _parse_in_quoted_field(self, c):
+        if c == '\0':
+            pass
+        elif c == self.dialect.escapechar:
+            self.state = ESCAPE_IN_QUOTED_FIELD
+        elif (c == self.dialect.quotechar and
+              self.dialect.quoting != QUOTE_NONE):
+            if self.dialect.doublequote:
+                self.state = QUOTE_IN_QUOTED_FIELD
+            else:
+                self.state = IN_FIELD
+        else:
+            self.parse_add_char(c)
+
+    def _parse_escape_in_quoted_field(self, c):
+        if c == '\0':
+            c = '\n'
+
+        self.parse_add_char(c)
+        self.state = IN_QUOTED_FIELD
+
+    def _parse_quote_in_quoted_field(self, c):
+        if (self.dialect.quoting != QUOTE_NONE and
+                c == self.dialect.quotechar):
+            # save "" as "
+            self.parse_add_char(c)
+            self.state = IN_QUOTED_FIELD
+        elif c == self.dialect.delimiter:
+            self.parse_save_field()
+            self.state = START_FIELD
+        elif c == '\n' or c == '\r' or c == '\0':
+            # End of line = return [fields]
+            self.parse_save_field()
+            self.state = START_RECORD if c == '\0' else EAT_CRNL
+        elif not self.dialect.strict:
+            self.parse_add_char(c)
+            self.state = IN_FIELD
+        else:
+            # illegal
+            raise Error("{delimiter}' expected after '{quotechar}".format(
+                delimiter=self.dialect.delimiter,
+                quotechar=self.dialect.quotechar,
+            ))
+
+    def _parse_eat_crnl(self, c):
+        if c == '\n' or c == '\r':
+            pass
+        elif c == '\0':
+            self.state = START_RECORD
+        else:
+            raise Error('new-line character seen in unquoted field - do you '
+                        'need to open the file in universal-newline mode?')
+
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        self.parse_reset()
+
+        while True:
+            try:
+                lineobj = next(self.input_iter)
+            except StopIteration:
+                if len(self.field) != 0 or self.state == IN_QUOTED_FIELD:
+                    if self.dialect.strict:
+                        raise Error('unexpected end of data')
+                    self.parse_save_field()
+                if self.fields:
+                    break
+                raise
+
+            if not isinstance(lineobj, text_type):
+                typ = type(lineobj)
+                typ_name = 'bytes' if typ == bytes else typ.__name__
+                err_str = ('iterator should return strings, not {0}'
+                           ' (did you open the file in text mode?)')
+                raise Error(err_str.format(typ_name))
+
+            self.line_num += 1
+            for c in lineobj:
+                if c == '\0':
+                    raise Error('line contains NULL byte')
+                self.parse_process_char(c)
+
+            self.parse_process_char('\0')
+
+            if self.state == START_RECORD:
+                break
+
+        fields = self.fields
+        self.fields = None
+        return fields
+
+    next = __next__
+
+
+_dialect_registry = {}
+def register_dialect(name, dialect='excel', **fmtparams):
+    if not isinstance(name, text_type):
+        raise TypeError('"name" must be a string')
+
+    dialect = Dialect.extend(dialect, fmtparams)
+
+    try:
+        Dialect.validate(dialect)
+    except:
+        raise TypeError('dialect is invalid')
+
+    assert name not in _dialect_registry
+    _dialect_registry[name] = dialect
+
+def unregister_dialect(name):
+    try:
+        _dialect_registry.pop(name)
+    except KeyError:
+        raise Error('"{name}" not a registered dialect'.format(name=name))
+
+def get_dialect(name):
+    try:
+        return _dialect_registry[name]
+    except KeyError:
+        raise Error('Could not find dialect {0}'.format(name))
+
+def list_dialects():
+    return list(_dialect_registry)
+
+
+class Dialect(object):
+    """Describe a CSV dialect.
+    This must be subclassed (see csv.excel).  Valid attributes are:
+    delimiter, quotechar, escapechar, doublequote, skipinitialspace,
+    lineterminator, quoting, strict.
+    """
+    _name = ""
+    _valid = False
+    # placeholders
+    delimiter = None
+    quotechar = None
+    escapechar = None
+    doublequote = None
+    skipinitialspace = None
+    lineterminator = None
+    quoting = None
+    strict = None
+
+    def __init__(self):
+        self.validate(self)
+        if self.__class__ != Dialect:
+            self._valid = True
+
+    @classmethod
+    def validate(cls, dialect):
+        dialect = cls.extend(dialect)
+
+        if not isinstance(dialect.quoting, int):
+            raise Error('"quoting" must be an integer')
+
+        if dialect.delimiter is None:
+            raise Error('delimiter must be set')
+        cls.validate_text(dialect, 'delimiter')
+
+        if dialect.lineterminator is None:
+            raise Error('lineterminator must be set')
+        if not isinstance(dialect.lineterminator, text_type):
+            raise Error('"lineterminator" must be a string')
+
+        if dialect.quoting not in [
+                QUOTE_NONE, QUOTE_MINIMAL, QUOTE_NONNUMERIC, QUOTE_ALL]:
+            raise Error('Invalid quoting specified')
+
+        if dialect.quoting != QUOTE_NONE:
+            if dialect.quotechar is None and dialect.escapechar is None:
+                raise Error('quotechar must be set if quoting enabled')
+            if dialect.quotechar is not None:
+                cls.validate_text(dialect, 'quotechar')
+
+    @staticmethod
+    def validate_text(dialect, attr):
+        val = getattr(dialect, attr)
+        if not isinstance(val, text_type):
+            if type(val) == bytes:
+                raise Error('"{0}" must be string, not bytes'.format(attr))
+            raise Error('"{0}" must be string, not {1}'.format(
+                attr, type(val).__name__))
+
+        if len(val) != 1:
+            raise Error('"{0}" must be a 1-character string'.format(attr))
+
+    @staticmethod
+    def defaults():
+        return {
+            'delimiter': ',',
+            'doublequote': True,
+            'escapechar': None,
+            'lineterminator': '\r\n',
+            'quotechar': '"',
+            'quoting': QUOTE_MINIMAL,
+            'skipinitialspace': False,
+            'strict': False,
+        }
+
+    @classmethod
+    def extend(cls, dialect, fmtparams=None):
+        if isinstance(dialect, string_types):
+            dialect = get_dialect(dialect)
+
+        if fmtparams is None:
+            return dialect
+
+        defaults = cls.defaults()
+
+        if any(param not in defaults for param in fmtparams):
+            raise TypeError('Invalid fmtparam')
+
+        specified = dict(
+            (attr, getattr(dialect, attr, None))
+            for attr in cls.defaults()
+        )
+
+        specified.update(fmtparams)
+        return type(str('ExtendedDialect'), (cls,), specified)
+
+    @classmethod
+    def combine(cls, dialect, fmtparams):
+        """Create a new dialect with defaults and added parameters."""
+        dialect = cls.extend(dialect, fmtparams)
+        defaults = cls.defaults()
+        specified = dict(
+            (attr, getattr(dialect, attr, None))
+            for attr in defaults
+            if getattr(dialect, attr, None) is not None or
+                attr in ['quotechar', 'delimiter', 'lineterminator', 'quoting']
+        )
+
+        defaults.update(specified)
+        dialect = type(str('CombinedDialect'), (cls,), defaults)
+        cls.validate(dialect)
+        return dialect()
+
+    def __delattr__(self, attr):
+        if self._valid:
+            raise AttributeError('dialect is immutable.')
+        super(Dialect, self).__delattr__(attr)
+
+    def __setattr__(self, attr, value):
+        if self._valid:
+            raise AttributeError('dialect is immutable.')
+        super(Dialect, self).__setattr__(attr, value)
+
+
+class excel(Dialect):
+    """Describe the usual properties of Excel-generated CSV files."""
+    delimiter = ','
+    quotechar = '"'
+    doublequote = True
+    skipinitialspace = False
+    lineterminator = '\r\n'
+    quoting = QUOTE_MINIMAL
+register_dialect("excel", excel)
+
+class excel_tab(excel):
+    """Describe the usual properties of Excel-generated TAB-delimited files."""
+    delimiter = '\t'
+register_dialect("excel-tab", excel_tab)
+
+class unix_dialect(Dialect):
+    """Describe the usual properties of Unix-generated CSV files."""
+    delimiter = ','
+    quotechar = '"'
+    doublequote = True
+    skipinitialspace = False
+    lineterminator = '\n'
+    quoting = QUOTE_ALL
+register_dialect("unix", unix_dialect)
+
+
+class DictReader(object):
+    def __init__(self, f, fieldnames=None, restkey=None, restval=None,
+                 dialect="excel", *args, **kwds):
+        self._fieldnames = fieldnames   # list of keys for the dict
+        self.restkey = restkey          # key to catch long rows
+        self.restval = restval          # default value for short rows
+        self.reader = reader(f, dialect, *args, **kwds)
+        self.dialect = dialect
+        self.line_num = 0
+
+    def __iter__(self):
+        return self
+
+    @property
+    def fieldnames(self):
+        if self._fieldnames is None:
+            try:
+                self._fieldnames = next(self.reader)
+            except StopIteration:
+                pass
+        self.line_num = self.reader.line_num
+        return self._fieldnames
+
+    @fieldnames.setter
+    def fieldnames(self, value):
+        self._fieldnames = value
+
+    def __next__(self):
+        if self.line_num == 0:
+            # Used only for its side effect.
+            self.fieldnames
+        row = next(self.reader)
+        self.line_num = self.reader.line_num
+
+        # unlike the basic reader, we prefer not to return blanks,
+        # because we will typically wind up with a dict full of None
+        # values
+        while row == []:
+            row = next(self.reader)
+        d = dict(zip(self.fieldnames, row))
+        lf = len(self.fieldnames)
+        lr = len(row)
+        if lf < lr:
+            d[self.restkey] = row[lf:]
+        elif lf > lr:
+            for key in self.fieldnames[lr:]:
+                d[key] = self.restval
+        return d
+
+    next = __next__
+
+
+class DictWriter(object):
+    def __init__(self, f, fieldnames, restval="", extrasaction="raise",
+                 dialect="excel", *args, **kwds):
+        self.fieldnames = fieldnames    # list of keys for the dict
+        self.restval = restval          # for writing short dicts
+        if extrasaction.lower() not in ("raise", "ignore"):
+            raise ValueError("extrasaction (%s) must be 'raise' or 'ignore'"
+                             % extrasaction)
+        self.extrasaction = extrasaction
+        self.writer = writer(f, dialect, *args, **kwds)
+
+    def writeheader(self):
+        header = dict(zip(self.fieldnames, self.fieldnames))
+        self.writerow(header)
+
+    def _dict_to_list(self, rowdict):
+        if self.extrasaction == "raise":
+            wrong_fields = [k for k in rowdict if k not in self.fieldnames]
+            if wrong_fields:
+                raise ValueError("dict contains fields not in fieldnames: "
+                                 + ", ".join([repr(x) for x in wrong_fields]))
+        return (rowdict.get(key, self.restval) for key in self.fieldnames)
+
+    def writerow(self, rowdict):
+        return self.writer.writerow(self._dict_to_list(rowdict))
+
+    def writerows(self, rowdicts):
+        return self.writer.writerows(map(self._dict_to_list, rowdicts))
+
+# Guard Sniffer's type checking against builds that exclude complex()
+try:
+    complex
+except NameError:
+    complex = float
+
+class Sniffer(object):
+    '''
+    "Sniffs" the format of a CSV file (i.e. delimiter, quotechar)
+    Returns a Dialect object.
+    '''
+    def __init__(self):
+        # in case there is more than one possible delimiter
+        self.preferred = [',', '\t', ';', ' ', ':']
+
+
+    def sniff(self, sample, delimiters=None):
+        """
+        Returns a dialect (or None) corresponding to the sample
+        """
+
+        quotechar, doublequote, delimiter, skipinitialspace = \
+                   self._guess_quote_and_delimiter(sample, delimiters)
+        if not delimiter:
+            delimiter, skipinitialspace = self._guess_delimiter(sample,
+                                                                delimiters)
+
+        if not delimiter:
+            raise Error("Could not determine delimiter")
+
+        class dialect(Dialect):
+            _name = "sniffed"
+            lineterminator = '\r\n'
+            quoting = QUOTE_MINIMAL
+            # escapechar = ''
+
+        dialect.doublequote = doublequote
+        dialect.delimiter = delimiter
+        # _csv.reader won't accept a quotechar of ''
+        dialect.quotechar = quotechar or '"'
+        dialect.skipinitialspace = skipinitialspace
+
+        return dialect
+
+
+    def _guess_quote_and_delimiter(self, data, delimiters):
+        """
+        Looks for text enclosed between two identical quotes
+        (the probable quotechar) which are preceded and followed
+        by the same character (the probable delimiter).
+        For example:
+                         ,'some text',
+        The quote with the most wins, same with the delimiter.
+        If there is no quotechar the delimiter can't be determined
+        this way.
+        """
+
+        matches = []
+        for restr in ('(?P<delim>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?P=delim)', # ,".*?",
+                      '(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?P<delim>[^\w\n"\'])(?P<space> ?)',   #  ".*?",
+                      '(?P<delim>>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?:$|\n)',  # ,".*?"
+                      '(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?:$|\n)'):                            #  ".*?" (no delim, no space)
+            regexp = re.compile(restr, re.DOTALL | re.MULTILINE)
+            matches = regexp.findall(data)
+            if matches:
+                break
+
+        if not matches:
+            # (quotechar, doublequote, delimiter, skipinitialspace)
+            return ('', False, None, 0)
+        quotes = {}
+        delims = {}
+        spaces = 0
+        groupindex = regexp.groupindex
+        for m in matches:
+            n = groupindex['quote'] - 1
+            key = m[n]
+            if key:
+                quotes[key] = quotes.get(key, 0) + 1
+            try:
+                n = groupindex['delim'] - 1
+                key = m[n]
+            except KeyError:
+                continue
+            if key and (delimiters is None or key in delimiters):
+                delims[key] = delims.get(key, 0) + 1
+            try:
+                n = groupindex['space'] - 1
+            except KeyError:
+                continue
+            if m[n]:
+                spaces += 1
+
+        quotechar = max(quotes, key=quotes.get)
+
+        if delims:
+            delim = max(delims, key=delims.get)
+            skipinitialspace = delims[delim] == spaces
+            if delim == '\n': # most likely a file with a single column
+                delim = ''
+        else:
+            # there is *no* delimiter, it's a single column of quoted data
+            delim = ''
+            skipinitialspace = 0
+
+        # if we see an extra quote between delimiters, we've got a
+        # double quoted format
+        dq_regexp = re.compile(
+                               r"((%(delim)s)|^)\W*%(quote)s[^%(delim)s\n]*%(quote)s[^%(delim)s\n]*%(quote)s\W*((%(delim)s)|$)" % \
+                               {'delim':re.escape(delim), 'quote':quotechar}, re.MULTILINE)
+
+
+
+        if dq_regexp.search(data):
+            doublequote = True
+        else:
+            doublequote = False
+
+        return (quotechar, doublequote, delim, skipinitialspace)
+
+
+    def _guess_delimiter(self, data, delimiters):
+        """
+        The delimiter /should/ occur the same number of times on
+        each row. However, due to malformed data, it may not. We don't want
+        an all or nothing approach, so we allow for small variations in this
+        number.
+          1) build a table of the frequency of each character on every line.
+          2) build a table of frequencies of this frequency (meta-frequency?),
+             e.g.  'x occurred 5 times in 10 rows, 6 times in 1000 rows,
+             7 times in 2 rows'
+          3) use the mode of the meta-frequency to determine the /expected/
+             frequency for that character
+          4) find out how often the character actually meets that goal
+          5) the character that best meets its goal is the delimiter
+        For performance reasons, the data is evaluated in chunks, so it can
+        try and evaluate the smallest portion of the data possible, evaluating
+        additional chunks as necessary.
+        """
+
+        data = list(filter(None, data.split('\n')))
+
+        ascii = [unichr(c) for c in range(127)] # 7-bit ASCII
+
+        # build frequency tables
+        chunkLength = min(10, len(data))
+        iteration = 0
+        charFrequency = {}
+        modes = {}
+        delims = {}
+        start, end = 0, min(chunkLength, len(data))
+        while start < len(data):
+            iteration += 1
+            for line in data[start:end]:
+                for char in ascii:
+                    metaFrequency = charFrequency.get(char, {})
+                    # must count even if frequency is 0
+                    freq = line.count(char)
+                    # value is the mode
+                    metaFrequency[freq] = metaFrequency.get(freq, 0) + 1
+                    charFrequency[char] = metaFrequency
+
+            for char in charFrequency.keys():
+                items = list(charFrequency[char].items())
+                if len(items) == 1 and items[0][0] == 0:
+                    continue
+                # get the mode of the frequencies
+                if len(items) > 1:
+                    modes[char] = max(items, key=lambda x: x[1])
+                    # adjust the mode - subtract the sum of all
+                    # other frequencies
+                    items.remove(modes[char])
+                    modes[char] = (modes[char][0], modes[char][1]
+                                   - sum(item[1] for item in items))
+                else:
+                    modes[char] = items[0]
+
+            # build a list of possible delimiters
+            modeList = modes.items()
+            total = float(chunkLength * iteration)
+            # (rows of consistent data) / (number of rows) = 100%
+            consistency = 1.0
+            # minimum consistency threshold
+            threshold = 0.9
+            while len(delims) == 0 and consistency >= threshold:
+                for k, v in modeList:
+                    if v[0] > 0 and v[1] > 0:
+                        if ((v[1]/total) >= consistency and
+                            (delimiters is None or k in delimiters)):
+                            delims[k] = v
+                consistency -= 0.01
+
+            if len(delims) == 1:
+                delim = list(delims.keys())[0]
+                skipinitialspace = (data[0].count(delim) ==
+                                    data[0].count("%c " % delim))
+                return (delim, skipinitialspace)
+
+            # analyze another chunkLength lines
+            start = end
+            end += chunkLength
+
+        if not delims:
+            return ('', 0)
+
+        # if there's more than one, fall back to a 'preferred' list
+        if len(delims) > 1:
+            for d in self.preferred:
+                if d in delims.keys():
+                    skipinitialspace = (data[0].count(d) ==
+                                        data[0].count("%c " % d))
+                    return (d, skipinitialspace)
+
+        # nothing else indicates a preference, pick the character that
+        # dominates(?)
+        items = [(v,k) for (k,v) in delims.items()]
+        items.sort()
+        delim = items[-1][1]
+
+        skipinitialspace = (data[0].count(delim) ==
+                            data[0].count("%c " % delim))
+        return (delim, skipinitialspace)
+
+
+    def has_header(self, sample):
+        # Creates a dictionary of types of data in each column. If any
+        # column is of a single type (say, integers), *except* for the first
+        # row, then the first row is presumed to be labels. If the type
+        # can't be determined, it is assumed to be a string in which case
+        # the length of the string is the determining factor: if all of the
+        # rows except for the first are the same length, it's a header.
+        # Finally, a 'vote' is taken at the end for each column, adding or
+        # subtracting from the likelihood of the first row being a header.
+
+        rdr = reader(StringIO(sample), self.sniff(sample))
+
+        header = next(rdr) # assume first row is header
+
+        columns = len(header)
+        columnTypes = {}
+        for i in range(columns): columnTypes[i] = None
+
+        checked = 0
+        for row in rdr:
+            # arbitrary number of rows to check, to keep it sane
+            if checked > 20:
+                break
+            checked += 1
+
+            if len(row) != columns:
+                continue # skip rows that have irregular number of columns
+
+            for col in list(columnTypes.keys()):
+
+                for thisType in [int, float, complex]:
+                    try:
+                        thisType(row[col])
+                        break
+                    except (ValueError, OverflowError):
+                        pass
+                else:
+                    # fallback to length of string
+                    thisType = len(row[col])
+
+                if thisType != columnTypes[col]:
+                    if columnTypes[col] is None: # add new column type
+                        columnTypes[col] = thisType
+                    else:
+                        # type is inconsistent, remove column from
+                        # consideration
+                        del columnTypes[col]
+
+        # finally, compare results against first row and "vote"
+        # on whether it's a header
+        hasHeader = 0
+        for col, colType in columnTypes.items():
+            if type(colType) == type(0): # it's a length
+                if len(header[col]) != colType:
+                    hasHeader += 1
+                else:
+                    hasHeader -= 1
+            else: # attempt typecast
+                try:
+                    colType(header[col])
+                except (ValueError, TypeError):
+                    hasHeader += 1
+                else:
+                    hasHeader -= 1
+
+        return hasHeader > 0

lib/ipaddr.py

@@ -22,9 +22,14 @@ and networks.
 
 """
 
-__version__ = '2.1.11'
+__version__ = '2.2.0'
 
 import struct
+import sys
+
+if sys.version_info > (3,):
+    long = int
+    xrange = range
 
 IPV4LENGTH = 32
 IPV6LENGTH = 128
@@ -156,16 +161,19 @@ def _find_address_range(addresses):
         addresses: a list of IPv4 or IPv6 addresses.
 
     Returns:
-        A tuple containing the first and last IP addresses in the sequence.
+        A tuple containing the first and last IP addresses in the sequence,
+        and the index of the last IP address in the sequence.
 
     """
     first = last = addresses[0]
+    last_index = 0
     for ip in addresses[1:]:
         if ip._ip == last._ip + 1:
             last = ip
+            last_index += 1
         else:
             break
-    return (first, last)
+    return (first, last, last_index)
 
 def _get_prefix_length(number1, number2, bits):
     """Get the number of leading bits that are same for two numbers.
@@ -358,8 +366,8 @@ def collapse_address_list(addresses):
     nets = sorted(set(nets))
 
     while i < len(ips):
-        (first, last) = _find_address_range(ips[i:])
-        i = ips.index(last) + 1
+        (first, last, last_index) = _find_address_range(ips[i:])
+        i += last_index + 1
         addrs.extend(summarize_address_range(first, last))
 
     return _collapse_address_list_recursive(sorted(
@@ -876,6 +884,26 @@ class _BaseNet(_IPAddrBase):
         else:
             raise NetmaskValueError('Bit pattern does not match /1*0*/')
 
+    def _prefix_from_prefix_int(self, prefixlen):
+        """Validate and return a prefix length integer.
+
+        Args:
+            prefixlen: An integer containing the prefix length.
+
+        Returns:
+            The input, possibly converted from long to int.
+
+        Raises:
+            NetmaskValueError: If the input is not an integer, or out of range.
+        """
+        if not isinstance(prefixlen, (int, long)):
+            raise NetmaskValueError('%r is not an integer' % prefixlen)
+        prefixlen = int(prefixlen)
+        if not (0 <= prefixlen <= self._max_prefixlen):
+            raise NetmaskValueError('%d is not a valid prefix length' %
+                                    prefixlen)
+        return prefixlen
+
     def _prefix_from_prefix_string(self, prefixlen_str):
         """Turn a prefix length string into an integer.
 
@@ -893,12 +921,10 @@ class _BaseNet(_IPAddrBase):
             if not _BaseV4._DECIMAL_DIGITS.issuperset(prefixlen_str):
                 raise ValueError
             prefixlen = int(prefixlen_str)
-            if not (0 <= prefixlen <= self._max_prefixlen):
-               raise ValueError
         except ValueError:
             raise NetmaskValueError('%s is not a valid prefix length' %
                                     prefixlen_str)
-        return prefixlen
+        return self._prefix_from_prefix_int(prefixlen)
 
     def _prefix_from_ip_string(self, ip_str):
         """Turn a netmask/hostmask string into a prefix length.
@@ -1239,6 +1265,11 @@ class IPv4Address(_BaseV4, _BaseIP):
         """
         _BaseV4.__init__(self, address)
 
+        # Efficient copy constructor.
+        if isinstance(address, IPv4Address):
+            self._ip = address._ip
+            return
+
         # Efficient constructor from integer.
         if isinstance(address, (int, long)):
             self._ip = address
@@ -1279,29 +1310,32 @@ class IPv4Network(_BaseV4, _BaseNet):
         """Instantiate a new IPv4 network object.
 
         Args:
-            address: A string or integer representing the IP [& network].
-              '192.168.1.1/24'
-              '192.168.1.1/255.255.255.0'
-              '192.168.1.1/0.0.0.255'
-              are all functionally the same in IPv4. Similarly,
-              '192.168.1.1'
-              '192.168.1.1/255.255.255.255'
-              '192.168.1.1/32'
-              are also functionaly equivalent. That is to say, failing to
-              provide a subnetmask will create an object with a mask of /32.
+            address: The IPv4 network as a string, 2-tuple, or any format
+              supported by the IPv4Address constructor.
 
-              If the mask (portion after the / in the argument) is given in
-              dotted quad form, it is treated as a netmask if it starts with a
-              non-zero field (e.g. /255.0.0.0 == /8) and as a hostmask if it
-              starts with a zero field (e.g. 0.255.255.255 == /8), with the
-              single exception of an all-zero mask which is treated as a
-              netmask == /0. If no mask is given, a default of /32 is used.
+              Strings typically use CIDR format, such as '192.0.2.0/24'.
+              If a dotted-quad is provided after the '/', it is treated as
+              a netmask if it starts with a nonzero bit (e.g. 255.0.0.0 == /8)
+              or a hostmask if it starts with a zero bit
+              (e.g. /0.0.0.255 == /8), with the single exception of an all-zero
+              mask which is treated as /0.
 
-              Additionally, an integer can be passed, so
-              IPv4Network('192.168.1.1') == IPv4Network(3232235777).
-              or, more generally
-              IPv4Network(int(IPv4Network('192.168.1.1'))) ==
-                IPv4Network('192.168.1.1')
+              The 2-tuple format consists of an (ip, prefixlen), where ip is any
+              format recognized by the IPv4Address constructor, and prefixlen is
+              an integer from 0 through 32.
+
+              A plain IPv4 address (in any format) will be forwarded to the
+              IPv4Address constructor, with an implied prefixlen of 32.
+
+              For example, the following inputs are equivalent:
+                IPv4Network('192.0.2.1/32')
+                IPv4Network('192.0.2.1/255.255.255.255')
+                IPv4Network('192.0.2.1')
+                IPv4Network(0xc0000201)
+                IPv4Network(IPv4Address('192.0.2.1'))
+                IPv4Network(('192.0.2.1', 32))
+                IPv4Network((0xc0000201, 32))
+                IPv4Network((IPv4Address('192.0.2.1'), 32))
 
             strict: A boolean. If true, ensure that we have been passed
               A true network address, eg, 192.168.1.0/24 and not an
@@ -1318,41 +1352,51 @@ class IPv4Network(_BaseV4, _BaseNet):
         _BaseNet.__init__(self, address)
         _BaseV4.__init__(self, address)
 
-        # Constructing from an integer or packed bytes.
-        if isinstance(address, (int, long, Bytes)):
+        # Constructing from a single IP address.
+        if isinstance(address, (int, long, Bytes, IPv4Address)):
             self.ip = IPv4Address(address)
             self._ip = self.ip._ip
             self._prefixlen = self._max_prefixlen
             self.netmask = IPv4Address(self._ALL_ONES)
             return
 
-        # Assume input argument to be string or any object representation
-        # which converts into a formatted IP prefix string.
-        addr = str(address).split('/')
-
-        if len(addr) > 2:
-            raise AddressValueError(address)
-
-        self._ip = self._ip_int_from_string(addr[0])
-        self.ip = IPv4Address(self._ip)
-
-        if len(addr) == 2:
+        # Constructing from an (ip, prefixlen) tuple.
+        if isinstance(address, tuple):
             try:
-                # Check for a netmask in prefix length form.
-                self._prefixlen = self._prefix_from_prefix_string(addr[1])
-            except NetmaskValueError:
-                # Check for a netmask or hostmask in dotted-quad form.
-                # This may raise NetmaskValueError.
-                self._prefixlen = self._prefix_from_ip_string(addr[1])
+                ip, prefixlen = address
+            except ValueError:
+                raise AddressValueError(address)
+            self.ip = IPv4Address(ip)
+            self._ip = self.ip._ip
+            self._prefixlen = self._prefix_from_prefix_int(prefixlen)
+
         else:
-            self._prefixlen = self._max_prefixlen
+            # Assume input argument to be string or any object representation
+            # which converts into a formatted IP prefix string.
+            addr = str(address).split('/')
+
+            if len(addr) > 2:
+                raise AddressValueError(address)
+
+            self._ip = self._ip_int_from_string(addr[0])
+            self.ip = IPv4Address(self._ip)
+
+            if len(addr) == 2:
+                try:
+                    # Check for a netmask in prefix length form.
+                    self._prefixlen = self._prefix_from_prefix_string(addr[1])
+                except NetmaskValueError:
+                    # Check for a netmask or hostmask in dotted-quad form.
+                    # This may raise NetmaskValueError.
+                    self._prefixlen = self._prefix_from_ip_string(addr[1])
+            else:
+                self._prefixlen = self._max_prefixlen
 
         self.netmask = IPv4Address(self._ip_int_from_prefix(self._prefixlen))
 
         if strict:
             if self.ip != self.network:
-                raise ValueError('%s has host bits set' %
-                                 self.ip)
+                raise ValueError('%s has host bits set' % self.ip)
         if self._prefixlen == (self._max_prefixlen - 1):
             self.iterhosts = self.__iter__
 
@@ -1447,7 +1491,7 @@ class _BaseV6(object):
 
         try:
             # Now, parse the hextets into a 128-bit integer.
-            ip_int = 0L
+            ip_int = long(0)
             for i in xrange(parts_hi):
                 ip_int <<= 16
                 ip_int |= self._parse_hextet(parts[i])
@@ -1752,6 +1796,11 @@ class IPv6Address(_BaseV6, _BaseIP):
         """
         _BaseV6.__init__(self, address)
 
+        # Efficient copy constructor.
+        if isinstance(address, IPv6Address):
+            self._ip = address._ip
+            return
+
         # Efficient constructor from integer.
         if isinstance(address, (int, long)):
             self._ip = address
@@ -1771,9 +1820,6 @@ class IPv6Address(_BaseV6, _BaseIP):
         # Assume input argument to be string or any object representation
         # which converts into a formatted IP string.
         addr_str = str(address)
-        if not addr_str:
-            raise AddressValueError('')
-
         self._ip = self._ip_int_from_string(addr_str)
 
 
@@ -1793,28 +1839,34 @@ class IPv6Network(_BaseV6, _BaseNet):
 
 
     def __init__(self, address, strict=False):
-        """Instantiate a new IPv6 Network object.
+        """Instantiate a new IPv6 network object.
 
         Args:
-            address: A string or integer representing the IPv6 network or the IP
-              and prefix/netmask.
-              '2001:4860::/128'
-              '2001:4860:0000:0000:0000:0000:0000:0000/128'
-              '2001:4860::'
-              are all functionally the same in IPv6.  That is to say,
-              failing to provide a subnetmask will create an object with
-              a mask of /128.
+            address: The IPv6 network as a string, 2-tuple, or any format
+              supported by the IPv6Address constructor.
 
-              Additionally, an integer can be passed, so
-              IPv6Network('2001:4860::') ==
-                IPv6Network(42541956101370907050197289607612071936L).
-              or, more generally
-              IPv6Network(IPv6Network('2001:4860::')._ip) ==
-                IPv6Network('2001:4860::')
+              Strings should be in CIDR format, such as '2001:db8::/32'.
+
+              The 2-tuple format consists of an (ip, prefixlen), where ip is any
+              format recognized by the IPv6Address constructor, and prefixlen is
+              an integer from 0 through 128.
+
+              A plain IPv6 address (in any format) will be forwarded to the
+              IPv6Address constructor, with an implied prefixlen of 128.
+
+              For example, the following inputs are equivalent:
+                IPv6Network('2001:db8::/128')
+                IPv6Network('2001:db8:0:0:0:0:0:0/128')
+                IPv6Network('2001:db8::')
+                IPv6Network(0x20010db8 << 96)
+                IPv6Network(IPv6Address('2001:db8::'))
+                IPv6Network(('2001:db8::', 128))
+                IPv6Network((0x20010db8 << 96, 128))
+                IPv6Network((IPv6Address('2001:db8::'), 128))
 
             strict: A boolean. If true, ensure that we have been passed
-              A true network address, eg, 192.168.1.0/24 and not an
-              IP address on a network, eg, 192.168.1.1/24.
+              A true network address, eg, 2001:db8::/32 and not an
+              IP address on a network, eg, 2001:db8::1/32.
 
         Raises:
             AddressValueError: If address isn't a valid IPv6 address.
@@ -1827,29 +1879,40 @@ class IPv6Network(_BaseV6, _BaseNet):
         _BaseNet.__init__(self, address)
         _BaseV6.__init__(self, address)
 
-        # Constructing from an integer or packed bytes.
-        if isinstance(address, (int, long, Bytes)):
+        # Constructing from a single IP address.
+        if isinstance(address, (int, long, Bytes, IPv6Address)):
             self.ip = IPv6Address(address)
             self._ip = self.ip._ip
             self._prefixlen = self._max_prefixlen
             self.netmask = IPv6Address(self._ALL_ONES)
             return
 
-        # Assume input argument to be string or any object representation
-        # which converts into a formatted IP prefix string.
-        addr = str(address).split('/')
+        # Constructing from an (ip, prefixlen) tuple.
+        if isinstance(address, tuple):
+            try:
+                ip, prefixlen = address
+            except ValueError:
+                raise AddressValueError(address)
+            self.ip = IPv6Address(ip)
+            self._ip = self.ip._ip
+            self._prefixlen = self._prefix_from_prefix_int(prefixlen)
 
-        if len(addr) > 2:
-            raise AddressValueError(address)
-
-        self._ip = self._ip_int_from_string(addr[0])
-        self.ip = IPv6Address(self._ip)
-
-        if len(addr) == 2:
-            # This may raise NetmaskValueError
-            self._prefixlen = self._prefix_from_prefix_string(addr[1])
         else:
-            self._prefixlen = self._max_prefixlen
+            # Assume input argument to be string or any object representation
+            # which converts into a formatted IP prefix string.
+            addr = str(address).split('/')
+
+            if len(addr) > 2:
+                raise AddressValueError(address)
+
+            self._ip = self._ip_int_from_string(addr[0])
+            self.ip = IPv6Address(self._ip)
+
+            if len(addr) == 2:
+                # This may raise NetmaskValueError
+                self._prefixlen = self._prefix_from_prefix_string(addr[1])
+            else:
+                self._prefixlen = self._max_prefixlen
 
         self.netmask = IPv6Address(self._ip_int_from_prefix(self._prefixlen))
 

lib/mock/__init__.py

@@ -1,4 +0,0 @@
-from __future__ import absolute_import
-import mock.mock as _mock
-from mock.mock import *
-__all__ = _mock.__all__

lib/osxnotify/registerapp.py

@@ -129,5 +129,5 @@ if __name__ == '__main__':
 
         return app_path, 'App registered'
 
-    except Exception, e:
+    except Exception as e:
         return None, 'Error creating App %s. %s' % (app_path, e)

lib/plexapi/__init__.py

@@ -3,9 +3,10 @@ import logging
 import os
 from logging.handlers import RotatingFileHandler
 from platform import uname
+from uuid import getnode
+
 from plexapi.config import PlexConfig, reset_base_headers
 from plexapi.utils import SecretsFilter
-from uuid import getnode
 
 # Load User Defined Config
 DEFAULT_CONFIG_PATH = os.path.expanduser('~/.config/plexapi/config.ini')
@@ -14,7 +15,7 @@ CONFIG = PlexConfig(CONFIG_PATH)
 
 # PlexAPI Settings
 PROJECT = 'PlexAPI'
-VERSION = '3.3.0'
+VERSION = '3.6.0'
 TIMEOUT = CONFIG.get('plexapi.timeout', 30, int)
 X_PLEX_CONTAINER_SIZE = CONFIG.get('plexapi.container_size', 100, int)
 X_PLEX_ENABLE_FAST_CONNECT = CONFIG.get('plexapi.enable_fast_connect', False, bool)

lib/plexapi/alert.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 import json
 import threading
-import websocket
+
 from plexapi import log
 
 
 class AlertListener(threading.Thread):
-    """ Creates a websocket connection to the PlexServer to optionally recieve alert notifications.
+    """ Creates a websocket connection to the PlexServer to optionally receive alert notifications.
         These often include messages from Plex about media scans as well as updates to currently running
-        Transcode Sessions. This class implements threading.Thread, therfore to start monitoring
+        Transcode Sessions. This class implements threading.Thread, therefore to start monitoring
         alerts you must call .start() on the object once it's created. When calling
         `PlexServer.startAlertListener()`, the thread will be started for you.
 
@@ -26,9 +26,9 @@ class AlertListener(threading.Thread):
 
         Parameters:
             server (:class:`~plexapi.server.PlexServer`): PlexServer this listener is connected to.
-            callback (func): Callback function to call on recieved messages. The callback function
+            callback (func): Callback function to call on received messages. The callback function
                 will be sent a single argument 'data' which will contain a dictionary of data
-                recieved from the server. :samp:`def my_callback(data): ...`
+                received from the server. :samp:`def my_callback(data): ...`
     """
     key = '/:/websockets/notifications'
 
@@ -40,6 +40,11 @@ class AlertListener(threading.Thread):
         self._ws = None
 
     def run(self):
+        try:
+            import websocket
+        except ImportError:
+            log.warning("Can't use the AlertListener without websocket")
+            return
         # create the websocket connection
         url = self._server.url(self.key, includeToken=True).replace('http', 'ws')
         log.info('Starting AlertListener: %s', url)
@@ -48,15 +53,21 @@ class AlertListener(threading.Thread):
         self._ws.run_forever()
 
     def stop(self):
-        """ Stop the AlertListener thread. Once the notifier is stopped, it cannot be diractly
+        """ Stop the AlertListener thread. Once the notifier is stopped, it cannot be directly
             started again. You must call :func:`plexapi.server.PlexServer.startAlertListener()`
             from a PlexServer instance.
         """
         log.info('Stopping AlertListener.')
         self._ws.close()
 
-    def _onMessage(self, ws, message):
-        """ Called when websocket message is recieved. """
+    def _onMessage(self, *args):
+        """ Called when websocket message is received.
+            In earlier releases, websocket-client returned a tuple of two parameters: a websocket.app.WebSocketApp
+            object and the message as a STR. Current releases appear to only return the message.
+            We are assuming the last argument in the tuple is the message.
+            This is to support compatibility with current and previous releases of websocket-client.
+        """
+        message = args[-1]
         try:
             data = json.loads(message)['NotificationContainer']
             log.debug('Alert: %s %s %s', *data)
@@ -65,6 +76,12 @@ class AlertListener(threading.Thread):
         except Exception as err:  # pragma: no cover
             log.error('AlertListener Msg Error: %s', err)
 
-    def _onError(self, ws, err):  # pragma: no cover
-        """ Called when websocket error is recieved. """
+    def _onError(self, *args):  # pragma: no cover
+        """ Called when websocket error is received.
+            In earlier releases, websocket-client returned a tuple of two parameters: a websocket.app.WebSocketApp
+            object and the error. Current releases appear to only return the error.
+            We are assuming the last argument in the tuple is the message.
+            This is to support compatibility with current and previous releases of websocket-client.
+        """
+        err = args[-1]
         log.error('AlertListener Error: %s' % err)

lib/plexapi/audio.py

@@ -36,6 +36,8 @@ class Audio(PlexPartialObject):
         self.key = data.attrib.get('key')
         self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
         self.librarySectionID = data.attrib.get('librarySectionID')
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
         self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
         self.summary = data.attrib.get('summary')
         self.thumb = data.attrib.get('thumb')
@@ -120,17 +122,26 @@ class Artist(Audio):
     TAG = 'Directory'
     TYPE = 'artist'
 
+    _include = ('?checkFiles=1&includeExtras=1&includeRelated=1'
+                '&includeOnDeck=1&includeChapters=1&includePopularLeaves=1'
+                '&includeMarkers=1&includeConcerts=1&includePreferences=1'
+                '&includeBandwidths=1&includeLoudnessRamps=1')
+                
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         Audio._loadData(self, data)
+        self.key = self.key.replace('/children', '')  # FIX_BUG_50
+        self._details_key = self.key + self._include
         self.art = data.attrib.get('art')
         self.guid = data.attrib.get('guid')
-        self.key = self.key.replace('/children', '')  # FIX_BUG_50
         self.locations = self.listAttrs(data, 'path', etag='Location')
         self.countries = self.findItems(data, media.Country)
+        self.fields = self.findItems(data, media.Field)
         self.genres = self.findItems(data, media.Genre)
         self.similar = self.findItems(data, media.Similar)
         self.collections = self.findItems(data, media.Collection)
+        self.moods = self.findItems(data, media.Mood)
+        self.styles = self.findItems(data, media.Style)
 
     def __iter__(self):
         for album in self.albums():
@@ -217,17 +228,26 @@ class Album(Audio):
         """ Load attribute values from Plex XML response. """
         Audio._loadData(self, data)
         self.art = data.attrib.get('art')
-        self.key = self.key.replace('/children', '')  # fixes bug #50
+        self.guid = data.attrib.get('guid')
+        self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
+        self.loudnessAnalysisVersion = utils.cast(int, data.attrib.get('loudnessAnalysisVersion'))
+        self.key = self.key.replace('/children', '')  # FIX_BUG_50
         self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
+        self.parentGuid = data.attrib.get('parentGuid')
         self.parentKey = data.attrib.get('parentKey')
         self.parentRatingKey = data.attrib.get('parentRatingKey')
         self.parentThumb = data.attrib.get('parentThumb')
         self.parentTitle = data.attrib.get('parentTitle')
+        self.rating = utils.cast(float, data.attrib.get('rating'))
         self.studio = data.attrib.get('studio')
+        self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
         self.year = utils.cast(int, data.attrib.get('year'))
-        self.genres = self.findItems(data, media.Genre)
         self.collections = self.findItems(data, media.Collection)
+        self.fields = self.findItems(data, media.Field)
+        self.genres = self.findItems(data, media.Genre)
         self.labels = self.findItems(data, media.Label)
+        self.moods = self.findItems(data, media.Mood)
+        self.styles = self.findItems(data, media.Style)
 
     def track(self, title):
         """ Returns the :class:`~plexapi.audio.Track` that matches the specified title.
@@ -284,15 +304,15 @@ class Track(Audio, Playable):
             art (str): Track artwork (/library/metadata/<ratingkey>/art/<artid>)
             chapterSource (TYPE): Unknown
             duration (int): Length of this album in seconds.
-            grandparentArt (str): Artist artowrk.
-            grandparentKey (str): Artist API URL.
-            grandparentRatingKey (str): Unique key identifying artist.
-            grandparentThumb (str): URL to artist thumbnail image.
-            grandparentTitle (str): Name of the artist for this track.
+            grandparentArt (str): Album artist artwork.
+            grandparentKey (str): Album artist API URL.
+            grandparentRatingKey (str): Unique key identifying album artist.
+            grandparentThumb (str): URL to album artist thumbnail image.
+            grandparentTitle (str): Name of the album artist for this track.
             guid (str): Unknown (unique ID).
             media (list): List of :class:`~plexapi.media.Media` objects for this track.
             moods (list): List of :class:`~plexapi.media.Mood` objects for this track.
-            originalTitle (str): Original track title (if translated).
+            originalTitle (str): Track artist.
             parentIndex (int): Album index.
             parentKey (str): Album API URL.
             parentRatingKey (int): Unique key identifying album.
@@ -312,20 +332,28 @@ class Track(Audio, Playable):
     TAG = 'Track'
     TYPE = 'track'
 
+    _include = ('?checkFiles=1&includeExtras=1&includeRelated=1'
+                '&includeOnDeck=1&includeChapters=1&includePopularLeaves=1'
+                '&includeMarkers=1&includeConcerts=1&includePreferences=1'
+                '&includeBandwidths=1&includeLoudnessRamps=1')
+
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         Audio._loadData(self, data)
         Playable._loadData(self, data)
+        self._details_key = self.key + self._include
         self.art = data.attrib.get('art')
         self.chapterSource = data.attrib.get('chapterSource')
         self.duration = utils.cast(int, data.attrib.get('duration'))
         self.grandparentArt = data.attrib.get('grandparentArt')
+        self.grandparentGuid = data.attrib.get('grandparentGuid')
         self.grandparentKey = data.attrib.get('grandparentKey')
         self.grandparentRatingKey = data.attrib.get('grandparentRatingKey')
         self.grandparentThumb = data.attrib.get('grandparentThumb')
         self.grandparentTitle = data.attrib.get('grandparentTitle')
         self.guid = data.attrib.get('guid')
         self.originalTitle = data.attrib.get('originalTitle')
+        self.parentGuid = data.attrib.get('parentGuid')
         self.parentIndex = data.attrib.get('parentIndex')
         self.parentKey = data.attrib.get('parentKey')
         self.parentRatingKey = data.attrib.get('parentRatingKey')
@@ -338,6 +366,7 @@ class Track(Audio, Playable):
         self.year = utils.cast(int, data.attrib.get('year'))
         self.media = self.findItems(data, media.Media)
         self.moods = self.findItems(data, media.Mood)
+        self.fields = self.findItems(data, media.Field)
 
     def _prettyfilename(self):
         """ Returns a filename for use in download. """
@@ -351,6 +380,13 @@ class Track(Audio, Playable):
         """ Return this track's :class:`~plexapi.audio.Artist`. """
         return self.fetchItem(self.grandparentKey)
 
+    @property
+    def locations(self):
+        """ This does not exist in plex xml response but is added to have a common
+            interface to get the location of the Track
+        """
+        return [part.file for part in self.iterParts() if part]
+        
     def _defaultSyncTitle(self):
         """ Returns str, default title for a new syncItem. """
         return '%s - %s - %s' % (self.grandparentTitle, self.parentTitle, self.title)

lib/plexapi/base.py

@@ -132,6 +132,8 @@ class PlexObject(object):
                     * __regex: Value matches the specified regular expression.
                     * __startswith: Value starts with specified arg.
         """
+        if ekey is None:
+            raise BadRequest('ekey was not provided')
         if isinstance(ekey, int):
             ekey = '/library/metadata/%s' % ekey
         for elem in self._server.query(ekey):
@@ -140,13 +142,27 @@ class PlexObject(object):
         clsname = cls.__name__ if cls else 'None'
         raise NotFound('Unable to find elem: cls=%s, attrs=%s' % (clsname, kwargs))
 
-    def fetchItems(self, ekey, cls=None, **kwargs):
+    def fetchItems(self, ekey, cls=None, container_start=None, container_size=None, **kwargs):
         """ Load the specified key to find and build all items with the specified tag
             and attrs. See :func:`~plexapi.base.PlexObject.fetchItem` for more details
             on how this is used.
+
+            Parameters:
+                container_start (None, int): offset to get a subset of the data
+                container_size (None, int): How many items in data
+
         """
-        data = self._server.query(ekey)
+        url_kw = {}
+        if container_start is not None:
+            url_kw["X-Plex-Container-Start"] = container_start
+        if container_size is not None:
+            url_kw["X-Plex-Container-Size"] = container_size
+
+        if ekey is None:
+            raise BadRequest('ekey was not provided')
+        data = self._server.query(ekey, params=url_kw)
         items = self.findItems(data, cls, ekey, **kwargs)
+
         librarySectionID = data.attrib.get('librarySectionID')
         if librarySectionID:
             for item in items:
@@ -318,7 +334,7 @@ class PlexPartialObject(PlexObject):
             search result for a movie often only contain a portion of the attributes a full
             object (main url) for that movie contain.
         """
-        return not self.key or self.key == self._initpath
+        return not self.key or (self._details_key or self.key) == self._initpath
 
     def isPartialObject(self):
         """ Returns True if this is not a full object. """
@@ -421,6 +437,141 @@ class PlexPartialObject(PlexObject):
                 'havnt allowed items to be deleted' % self.key)
             raise
 
+    def history(self, maxresults=9999999, mindate=None):
+        """ Get Play History for a media item.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        return self._server.history(maxresults=maxresults, mindate=mindate, ratingKey=self.ratingKey)
+
+    def posters(self):
+        """ Returns list of available poster objects. :class:`~plexapi.media.Poster`. """
+
+        return self.fetchItems('%s/posters' % self.key)
+
+    def uploadPoster(self, url=None, filepath=None):
+        """ Upload poster from url or filepath. :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video`. """
+        if url:
+            key = '%s/posters?url=%s' % (self.key, quote_plus(url))
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = '%s/posters?' % self.key
+            data = open(filepath, 'rb').read()
+            self._server.query(key, method=self._server._session.post, data=data)
+
+    def setPoster(self, poster):
+        """ Set . :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video` """
+        poster.select()
+
+    def arts(self):
+        """ Returns list of available art objects. :class:`~plexapi.media.Poster`. """
+
+        return self.fetchItems('%s/arts' % self.key)
+
+    def uploadArt(self, url=None, filepath=None):
+        """ Upload art from url or filepath. :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video`. """
+        if url:
+            key = '/library/metadata/%s/arts?url=%s' % (self.ratingKey, quote_plus(url))
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = '/library/metadata/%s/arts?' % self.ratingKey
+            data = open(filepath, 'rb').read()
+            self._server.query(key, method=self._server._session.post, data=data)
+
+    def setArt(self, art):
+        """ Set :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video` """
+        art.select()
+
+    def unmatch(self):
+        """ Unmatches metadata match from object. """
+        key = '/library/metadata/%s/unmatch' % self.ratingKey
+        self._server.query(key, method=self._server._session.put)
+
+    def matches(self, agent=None, title=None, year=None, language=None):
+        """ Return list of (:class:`~plexapi.media.SearchResult`) metadata matches.
+
+             Parameters:
+                agent (str): Agent name to be used (imdb, thetvdb, themoviedb, etc.)
+                title (str): Title of item to search for
+                year (str): Year of item to search in
+                language (str) : Language of item to search in
+
+            Examples:
+                1. video.matches()
+                2. video.matches(title="something", year=2020)
+                3. video.matches(title="something")
+                4. video.matches(year=2020)
+                5. video.matches(title="something", year="")
+                6. video.matches(title="", year=2020)
+                7. video.matches(title="", year="")
+
+                1. The default behaviour in Plex Web = no params in plexapi
+                2. Both title and year specified by user
+                3. Year automatically filled in
+                4. Title automatically filled in
+                5. Explicitly searches for title with blank year
+                6. Explicitly searches for blank title with year
+                7. I don't know what the user is thinking... return the same result as 1
+
+                For 2 to 7, the agent and language is automatically filled in
+        """
+        key = '/library/metadata/%s/matches' % self.ratingKey
+        params = {'manual': 1}
+
+        if agent and not any([title, year, language]):
+            params['language'] = self.section().language
+            params['agent'] = utils.getAgentIdentifier(self.section(), agent)
+        else:
+            if any(x is not None for x in [agent, title, year, language]):
+                if title is None:
+                    params['title'] = self.title
+                else:
+                    params['title'] = title
+
+                if year is None:
+                    params['year'] = self.year
+                else:
+                    params['year'] = year
+
+                params['language'] = language or self.section().language
+
+                if agent is None:
+                    params['agent'] = self.section().agent
+                else:
+                    params['agent'] = utils.getAgentIdentifier(self.section(), agent)
+
+        key = key + '?' + urlencode(params)
+        data = self._server.query(key, method=self._server._session.get)
+        return self.findItems(data, initpath=key)
+
+    def fixMatch(self, searchResult=None, auto=False, agent=None):
+        """ Use match result to update show metadata.
+
+            Parameters:
+                auto (bool): True uses first match from matches
+                    False allows user to provide the match
+                searchResult (:class:`~plexapi.media.SearchResult`): Search result from
+                    ~plexapi.base.matches()
+                agent (str): Agent name to be used (imdb, thetvdb, themoviedb, etc.)
+        """
+        key = '/library/metadata/%s/match' % self.ratingKey
+        if auto:
+            autoMatch = self.matches(agent=agent)
+            if autoMatch:
+                searchResult = autoMatch[0]
+            else:
+                raise NotFound('No matches found using this agent: (%s:%s)' % (agent, autoMatch))
+        elif not searchResult:
+            raise NotFound('fixMatch() requires either auto=True or '
+                           'searchResult=:class:`~plexapi.media.SearchResult`.')
+
+        params = {'guid': searchResult.guid,
+                  'name': searchResult.name}
+
+        data = key + '?' + urlencode(params)
+        self._server.query(data, method=self._server._session.put)
+
     # The photo tag cant be built atm. TODO
     # def arts(self):
     #     part = '%s/arts' % self.key
@@ -509,6 +660,14 @@ class Playable(object):
         key = '%s/split' % self.key
         return self._server.query(key, method=self._server._session.put)
 
+    def merge(self, ratingKeys):
+        """Merge duplicate items."""
+        if not isinstance(ratingKeys, list):
+            ratingKeys = str(ratingKeys).split(",")
+
+        key = '%s/merge?ids=%s' % (self.key, ','.join(ratingKeys))
+        return self._server.query(key, method=self._server._session.put)
+
     def unmatch(self):
         """Unmatch a media file."""
         key = '%s/unmatch' % self.key
@@ -573,7 +732,7 @@ class Playable(object):
                                                                                               time, state)
         self._server.query(key)
         self.reload()
-        
+
     def updateTimeline(self, time, state='stopped', duration=None):
         """ Set the timeline progress for this video.
 

lib/plexapi/client.py

@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 import time
-import requests
 
-from requests.status_codes import _codes as codes
-from plexapi import BASE_HEADERS, CONFIG, TIMEOUT
-from plexapi import log, logfilter, utils
+import requests
+from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, log, logfilter, utils
 from plexapi.base import PlexObject
 from plexapi.compat import ElementTree
-from plexapi.exceptions import BadRequest, Unsupported
+from plexapi.exceptions import BadRequest, NotFound, Unauthorized, Unsupported
 from plexapi.playqueue import PlayQueue
-
+from requests.status_codes import _codes as codes
 
 DEFAULT_MTYPE = 'video'
 
@@ -159,11 +157,16 @@ class PlexClient(PlexObject):
         log.debug('%s %s', method.__name__.upper(), url)
         headers = self._headers(**headers or {})
         response = method(url, headers=headers, timeout=timeout, **kwargs)
-        if response.status_code not in (200, 201):
+        if response.status_code not in (200, 201, 204):
             codename = codes.get(response.status_code)[0]
             errtext = response.text.replace('\n', ' ')
-            log.warning('BadRequest (%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
-            raise BadRequest('(%s) %s; %s %s' % (response.status_code, codename, response.url, errtext))
+            message = '(%s) %s; %s %s' % (response.status_code, codename, response.url, errtext)
+            if response.status_code == 401:
+                raise Unauthorized(message)
+            elif response.status_code == 404:
+                raise NotFound(message)
+            else:
+                raise BadRequest(message)
         data = response.text.encode('utf8')
         return ElementTree.fromstring(data) if data.strip() else None
 
@@ -204,10 +207,13 @@ class PlexClient(PlexObject):
             return query(key, headers=headers)
         except ElementTree.ParseError:
             # Workaround for players which don't return valid XML on successful commands
-            #   - Plexamp: `b'OK'`
+            #   - Plexamp, Plex for Android: `b'OK'`
+            #   - Plex for Samsung: `b'<?xml version="1.0"?><Response code="200" status="OK">'`
             if self.product in (
                 'Plexamp',
                 'Plex for Android (TV)',
+                'Plex for Android (Mobile)',
+                'Plex for Samsung',
             ):
                 return
             raise
@@ -300,6 +306,8 @@ class PlexClient(PlexObject):
             'address': server_url[1].strip('/'),
             'port': server_url[-1],
             'key': media.key,
+            'protocol': server_url[0],
+            'token': media._server.createToken()
         }, **params))
 
     # -------------------
@@ -465,6 +473,18 @@ class PlexClient(PlexObject):
         server_url = media._server._baseurl.split(':')
         server_port = server_url[-1].strip('/')
 
+        if hasattr(media, "playlistType"):
+            mediatype = media.playlistType
+        else:
+            if isinstance(media, PlayQueue):
+                mediatype = media.items[0].listType
+            else:
+                mediatype = media.listType
+
+        # mediatype must be in ["video", "music", "photo"]
+        if mediatype == "audio":
+            mediatype = "music"
+
         if self.product != 'OpenPHT':
             try:
                 self.sendCommand('timeline/subscribe', port=server_port, protocol='http')
@@ -481,7 +501,8 @@ class PlexClient(PlexObject):
             'port': server_port,
             'offset': offset,
             'key': media.key,
-            'token': media._server._token,
+            'token': media._server.createToken(),
+            'type': mediatype,
             'containerKey': '/playQueues/%s?window=100&own=1' % playqueue.playQueueID,
         }, **params))
 
@@ -527,9 +548,9 @@ class PlexClient(PlexObject):
 
     # -------------------
     # Timeline Commands
-    def timeline(self):
+    def timeline(self, wait=1):
         """ Poll the current timeline and return the XML response. """
-        return self.sendCommand('timeline/poll', wait=1)
+        return self.sendCommand('timeline/poll', wait=wait)
 
     def isPlayingMedia(self, includePaused=False):
         """ Returns True if any media is currently playing.
@@ -538,7 +559,7 @@ class PlexClient(PlexObject):
                 includePaused (bool): Set True to treat currently paused items
                     as playing (optional; default True).
         """
-        for mediatype in self.timeline():
+        for mediatype in self.timeline(wait=0):
             if mediatype.get('state') == 'playing':
                 return True
             if includePaused and mediatype.get('state') == 'paused':

lib/plexapi/compat.py

@@ -25,9 +25,9 @@ except ImportError:
     from urllib import quote
 
 try:
-    from urllib.parse import quote_plus
+    from urllib.parse import quote_plus, quote
 except ImportError:
-    from urllib import quote_plus
+    from urllib import quote_plus, quote
 
 try:
     from urllib.parse import unquote
@@ -44,11 +44,6 @@ try:
 except ImportError:
     from xml.etree import ElementTree
 
-try:
-    from unittest.mock import patch, MagicMock
-except ImportError:
-    from mock import patch, MagicMock
-
 
 def makedirs(name, mode=0o777, exist_ok=False):
     """ Mimicks os.makedirs() from Python 3. """

lib/plexapi/exceptions.py

@@ -26,6 +26,6 @@ class Unsupported(PlexApiException):
     pass
 
 
-class Unauthorized(PlexApiException):
-    """ Invalid username or password. """
+class Unauthorized(BadRequest):
+    """ Invalid username/password or token. """
     pass

lib/plexapi/gdm.py

@@ -0,0 +1,148 @@
+"""
+Support for discovery using GDM (Good Day Mate), multicast protocol by Plex.
+
+# Licensed Apache 2.0
+# From https://github.com/home-assistant/netdisco/netdisco/gdm.py
+
+Inspired by:
+  hippojay's plexGDM: https://github.com/hippojay/script.plexbmc.helper/resources/lib/plexgdm.py
+  iBaa's PlexConnect: https://github.com/iBaa/PlexConnect/PlexAPI.py
+"""
+import socket
+import struct
+
+
+class GDM:
+    """Base class to discover GDM services."""
+
+    def __init__(self):
+        self.entries = []
+        self.last_scan = None
+
+    def scan(self, scan_for_clients=False):
+        """Scan the network."""
+        self.update(scan_for_clients)
+
+    def all(self):
+        """Return all found entries.
+
+        Will scan for entries if not scanned recently.
+        """
+        self.scan()
+        return list(self.entries)
+
+    def find_by_content_type(self, value):
+        """Return a list of entries that match the content_type."""
+        self.scan()
+        return [entry for entry in self.entries
+                if value in entry['data']['Content_Type']]
+
+    def find_by_data(self, values):
+        """Return a list of entries that match the search parameters."""
+        self.scan()
+        return [entry for entry in self.entries
+                if all(item in entry['data'].items()
+                       for item in values.items())]
+
+    def update(self, scan_for_clients):
+        """Scan for new GDM services.
+
+        Examples of the dict list assigned to self.entries by this function:
+
+            Server:
+
+                [{'data': {
+                     'Content-Type': 'plex/media-server',
+                     'Host': '53f4b5b6023d41182fe88a99b0e714ba.plex.direct',
+                     'Name': 'myfirstplexserver',
+                     'Port': '32400',
+                     'Resource-Identifier': '646ab0aa8a01c543e94ba975f6fd6efadc36b7',
+                     'Updated-At': '1585769946',
+                     'Version': '1.18.8.2527-740d4c206',
+                },
+                 'from': ('10.10.10.100', 32414)}]
+
+            Clients:
+
+                [{'data': {'Content-Type': 'plex/media-player',
+                     'Device-Class': 'stb',
+                     'Name': 'plexamp',
+                     'Port': '36000',
+                     'Product': 'Plexamp',
+                     'Protocol': 'plex',
+                     'Protocol-Capabilities': 'timeline,playback,playqueues,playqueues-creation',
+                     'Protocol-Version': '1',
+                     'Resource-Identifier': 'b6e57a3f-e0f8-494f-8884-f4b58501467e',
+                     'Version': '1.1.0',
+                },
+                 'from': ('10.10.10.101', 32412)}]
+        """
+
+        gdm_msg = 'M-SEARCH * HTTP/1.0'.encode('ascii')
+        gdm_timeout = 1
+
+        self.entries = []
+        known_responses = []
+
+        # setup socket for discovery -> multicast message
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.settimeout(gdm_timeout)
+
+        # Set the time-to-live for messages for local network
+        sock.setsockopt(socket.IPPROTO_IP,
+                        socket.IP_MULTICAST_TTL,
+                        struct.pack("B", gdm_timeout))
+
+        if scan_for_clients:
+            # setup socket for broadcast to Plex clients
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+            gdm_ip = '255.255.255.255'
+            gdm_port = 32412
+        else:
+            # setup socket for multicast to Plex server(s)
+            gdm_ip = '239.0.0.250'
+            gdm_port = 32414
+
+        try:
+            # Send data to the multicast group
+            sock.sendto(gdm_msg, (gdm_ip, gdm_port))
+
+            # Look for responses from all recipients
+            while True:
+                try:
+                    bdata, host = sock.recvfrom(1024)
+                    data = bdata.decode('utf-8')
+                    if '200 OK' in data.splitlines()[0]:
+                        ddata = {k: v.strip() for (k, v) in (
+                            line.split(':') for line in
+                            data.splitlines() if ':' in line)}
+                        identifier = ddata.get('Resource-Identifier')
+                        if identifier and identifier in known_responses:
+                            continue
+                        known_responses.append(identifier)
+                        self.entries.append({'data': ddata,
+                                             'from': host})
+                except socket.timeout:
+                    break
+        finally:
+            sock.close()
+
+
+def main():
+    """Test GDM discovery."""
+    from pprint import pprint
+
+    gdm = GDM()
+
+    pprint("Scanning GDM for servers...")
+    gdm.scan()
+    pprint(gdm.entries)
+
+    pprint("Scanning GDM for clients...")
+    gdm.scan(scan_for_clients=True)
+    pprint(gdm.entries)
+
+
+if __name__ == "__main__":
+    main()

lib/plexapi/library.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-from plexapi import X_PLEX_CONTAINER_SIZE, log, utils
-from plexapi.base import PlexObject
-from plexapi.compat import unquote, urlencode, quote_plus
-from plexapi.media import MediaTag
+from plexapi import X_PLEX_CONTAINER_SIZE, log, utils, media
+from plexapi.base import PlexObject, PlexPartialObject
+from plexapi.compat import quote, quote_plus, unquote, urlencode
 from plexapi.exceptions import BadRequest, NotFound
+from plexapi.media import MediaTag
+from plexapi.settings import Setting
 
 
 class Library(PlexObject):
@@ -294,6 +295,17 @@ class Library(PlexObject):
             part += urlencode(kwargs)
         return self._server.query(part, method=self._server._session.post)
 
+    def history(self, maxresults=9999999, mindate=None):
+        """ Get Play History for all library Sections for the owner.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        hist = []
+        for section in self.sections():
+            hist.extend(section.history(maxresults=maxresults, mindate=mindate))
+        return hist
+
 
 class LibrarySection(PlexObject):
     """ Base class for a single library section.
@@ -320,6 +332,8 @@ class LibrarySection(PlexObject):
             type (str): Type of content section represents (movie, artist, photo, show).
             updatedAt (datetime): Datetime this library section was last updated.
             uuid (str): Unique id for this section (32258d7c-3e6c-4ac5-98ad-bad7a3b78c63)
+            totalSize (int): Total number of item in the library
+
     """
     ALLOWED_FILTERS = ()
     ALLOWED_SORT = ()
@@ -343,6 +357,51 @@ class LibrarySection(PlexObject):
         self.type = data.attrib.get('type')
         self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
         self.uuid = data.attrib.get('uuid')
+        # Private attrs as we dont want a reload.
+        self._total_size = None
+
+    def fetchItems(self, ekey, cls=None, container_start=None, container_size=None, **kwargs):
+        """ Load the specified key to find and build all items with the specified tag
+            and attrs. See :func:`~plexapi.base.PlexObject.fetchItem` for more details
+            on how this is used.
+
+            Parameters:
+                container_start (None, int): offset to get a subset of the data
+                container_size (None, int): How many items in data
+
+        """
+        url_kw = {}
+        if container_start is not None:
+            url_kw["X-Plex-Container-Start"] = container_start
+        if container_size is not None:
+            url_kw["X-Plex-Container-Size"] = container_size
+
+        if ekey is None:
+            raise BadRequest('ekey was not provided')
+        data = self._server.query(ekey, params=url_kw)
+
+        if '/all' in ekey:
+            # totalSize is only included in the xml response
+            # if container size is used.
+            total_size = data.attrib.get("totalSize") or data.attrib.get("size")
+            self._total_size = utils.cast(int, total_size)
+
+        items = self.findItems(data, cls, ekey, **kwargs)
+
+        librarySectionID = data.attrib.get('librarySectionID')
+        if librarySectionID:
+            for item in items:
+                item.librarySectionID = librarySectionID
+        return items
+
+    @property
+    def totalSize(self):
+        if self._total_size is None:
+            part = '/library/sections/%s/all?X-Plex-Container-Start=0&X-Plex-Container-Size=1' % self.key
+            data = self._server.query(part)
+            self._total_size = int(data.attrib.get("totalSize"))
+
+        return self._total_size
 
     def delete(self):
         """ Delete a library section. """
@@ -354,13 +413,18 @@ class LibrarySection(PlexObject):
             log.error(msg)
             raise
 
-    def edit(self, **kwargs):
+    def reload(self, key=None):
+        return self._server.library.section(self.title)
+
+    def edit(self, agent=None, **kwargs):
         """ Edit a library (Note: agent is required). See :class:`~plexapi.library.Library` for example usage.
 
             Parameters:
                 kwargs (dict): Dict of settings to edit.
         """
-        part = '/library/sections/%s?%s' % (self.key, urlencode(kwargs))
+        if not agent:
+            agent = self.agent
+        part = '/library/sections/%s?agent=%s&%s' % (self.key, agent, urlencode(kwargs))
         self._server.query(part, method=self._server._session.put)
 
         # Reload this way since the self.key dont have a full path, but is simply a id.
@@ -374,7 +438,7 @@ class LibrarySection(PlexObject):
             Parameters:
                 title (str): Title of the item to return.
         """
-        key = '/library/sections/%s/all' % self.key
+        key = '/library/sections/%s/all?title=%s' % (self.key, quote(title, safe=''))
         return self.fetchItem(key, title__iexact=title)
 
     def all(self, sort=None, **kwargs):
@@ -390,6 +454,17 @@ class LibrarySection(PlexObject):
         key = '/library/sections/%s/all%s' % (self.key, sortStr)
         return self.fetchItems(key, **kwargs)
 
+    def agents(self):
+        """ Returns a list of available `:class:`~plexapi.media.Agent` for this library section.
+        """
+        return self._server.agents(utils.searchType(self.type))
+
+    def settings(self):
+        """ Returns a list of all library settings. """
+        key = '/library/sections/%s/prefs' % self.key
+        data = self._server.query(key)
+        return self.findItems(data, cls=Setting)
+
     def onDeck(self):
         """ Returns a list of media items on deck from this library section. """
         key = '/library/sections/%s/onDeck' % self.key
@@ -464,9 +539,9 @@ class LibrarySection(PlexObject):
         key = '/library/sections/%s/%s%s' % (self.key, category, utils.joinArgs(args))
         return self.fetchItems(key, cls=FilterChoice)
 
-    def search(self, title=None, sort=None, maxresults=999999, libtype=None, **kwargs):
-        """ Search the library. If there are many results, they will be fetched from the server
-            in batches of X_PLEX_CONTAINER_SIZE amounts. If you're only looking for the first <num>
+    def search(self, title=None, sort=None, maxresults=None,
+               libtype=None, container_start=0, container_size=X_PLEX_CONTAINER_SIZE, **kwargs):
+        """ Search the library. The http requests will be batched in container_size. If you're only looking for the first <num>
             results, it would be wise to set the maxresults option to that amount so this functions
             doesn't iterate over all results on the server.
 
@@ -477,6 +552,8 @@ class LibrarySection(PlexObject):
                 maxresults (int): Only return the specified number of results (optional).
                 libtype (str): Filter results to a spcifiec libtype (movie, show, episode, artist,
                     album, track; optional).
+                container_start (int): default 0
+                container_size (int): default X_PLEX_CONTAINER_SIZE in your config file.
                 **kwargs (dict): Any of the available filters for the current library section. Partial string
                         matches allowed. Multiple matches OR together. Negative filtering also possible, just add an
                         exclamation mark to the end of filter name, e.g. `resolution!=1x1`.
@@ -508,15 +585,37 @@ class LibrarySection(PlexObject):
             args['sort'] = self._cleanSearchSort(sort)
         if libtype is not None:
             args['type'] = utils.searchType(libtype)
-        # iterate over the results
-        results, subresults = [], '_init'
-        args['X-Plex-Container-Start'] = 0
-        args['X-Plex-Container-Size'] = min(X_PLEX_CONTAINER_SIZE, maxresults)
-        while subresults and maxresults > len(results):
+
+        results = []
+        subresults = []
+        offset = container_start
+
+        if maxresults is not None:
+            container_size = min(container_size, maxresults)
+        while True:
             key = '/library/sections/%s/all%s' % (self.key, utils.joinArgs(args))
-            subresults = self.fetchItems(key)
-            results += subresults[:maxresults - len(results)]
-            args['X-Plex-Container-Start'] += args['X-Plex-Container-Size']
+            subresults = self.fetchItems(key, container_start=container_start,
+                                         container_size=container_size)
+            if not len(subresults):
+                if offset > self.totalSize:
+                    log.info("container_start is higher then the number of items in the library")
+                break
+
+            results.extend(subresults)
+
+            # self.totalSize is not used as a condition in the while loop as
+            # this require a additional http request.
+            # self.totalSize is updated from .fetchItems
+            wanted_number_of_items = self.totalSize - offset
+            if maxresults is not None:
+                wanted_number_of_items = min(maxresults, wanted_number_of_items)
+                container_size = min(container_size, maxresults - len(results))
+
+            if wanted_number_of_items <= len(results):
+                break
+
+            container_start += container_size
+
         return results
 
     def _cleanSearchFilter(self, category, value, libtype=None):
@@ -543,7 +642,7 @@ class LibrarySection(PlexObject):
             matches = [k for t, k in lookup.items() if item in t]
             if matches: map(result.add, matches); continue
             # nothing matched; use raw item value
-            log.warning('Filter value not listed, using raw item value: %s' % item)
+            log.debug('Filter value not listed, using raw item value: %s' % item)
             result.add(item)
         return ','.join(result)
 
@@ -633,6 +732,14 @@ class LibrarySection(PlexObject):
 
         return myplex.sync(client=client, clientId=clientId, sync_item=sync_item)
 
+    def history(self, maxresults=9999999, mindate=None):
+        """ Get Play History for this library Section for the owner.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        return self._server.history(maxresults=maxresults, mindate=mindate, librarySectionID=self.key, accountID=1)
+
 
 class MovieSection(LibrarySection):
     """ Represents a :class:`~plexapi.library.LibrarySection` section containing movies.
@@ -658,10 +765,23 @@ class MovieSection(LibrarySection):
     METADATA_TYPE = 'movie'
     CONTENT_TYPE = 'video'
 
+    def all(self, **kwargs):
+        """ Returns a list of all items from this library section.
+            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
+        return self.search(libtype='movie', **kwargs)
+
     def collection(self, **kwargs):
-        """ Returns a list of collections from this library section. """
+        """ Returns a list of collections from this library section.
+            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
         return self.search(libtype='collection', **kwargs)
 
+    def playlist(self, **kwargs):
+        """ Returns a list of playlists from this library section. """
+        key = '/playlists?type=15&playlistType=%s&sectionID=%s' % (self.CONTENT_TYPE, self.key)
+        return self.fetchItems(key, **kwargs)
+
     def sync(self, videoQuality, limit=None, unwatched=False, **kwargs):
         """ Add current Movie library section as sync item for specified device.
             See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting and
@@ -738,10 +858,23 @@ class ShowSection(LibrarySection):
         """
         return self.search(sort='addedAt:desc', libtype=libtype, maxresults=maxresults)
 
+    def all(self, libtype='show', **kwargs):
+        """ Returns a list of all items from this library section.
+            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
+        return self.search(libtype=libtype, **kwargs)
+
     def collection(self, **kwargs):
-        """ Returns a list of collections from this library section. """
+        """ Returns a list of collections from this library section.
+            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
         return self.search(libtype='collection', **kwargs)
 
+    def playlist(self, **kwargs):
+        """ Returns a list of playlists from this library section. """
+        key = '/playlists?type=15&playlistType=%s&sectionID=%s' % (self.CONTENT_TYPE, self.key)
+        return self.fetchItems(key, **kwargs)
+
     def sync(self, videoQuality, limit=None, unwatched=False, **kwargs):
         """ Add current Show library section as sync item for specified device.
             See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting and
@@ -819,10 +952,23 @@ class MusicSection(LibrarySection):
         """ Search for a track. See :func:`~plexapi.library.LibrarySection.search()` for usage. """
         return self.search(libtype='track', **kwargs)
 
+    def all(self, libtype='artist', **kwargs):
+        """ Returns a list of all items from this library section.
+            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
+        return self.search(libtype=libtype, **kwargs)
+
     def collection(self, **kwargs):
-        """ Returns a list of collections from this library section. """
+        """ Returns a list of collections from this library section.
+            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
         return self.search(libtype='collection', **kwargs)
 
+    def playlist(self, **kwargs):
+        """ Returns a list of playlists from this library section. """
+        key = '/playlists?type=15&playlistType=%s&sectionID=%s' % (self.CONTENT_TYPE, self.key)
+        return self.fetchItems(key, **kwargs)
+
     def sync(self, bitrate, limit=None, **kwargs):
         """ Add current Music library section as sync item for specified device.
             See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting and
@@ -869,7 +1015,7 @@ class PhotoSection(LibrarySection):
             TYPE (str): 'photo'
     """
     ALLOWED_FILTERS = ('all', 'iso', 'make', 'lens', 'aperture', 'exposure', 'device', 'resolution', 'place',
-                       'originallyAvailableAt', 'addedAt', 'title', 'userRating')
+                       'originallyAvailableAt', 'addedAt', 'title', 'userRating', 'tag', 'year')
     ALLOWED_SORT = ('addedAt',)
     TAG = 'Directory'
     TYPE = 'photo'
@@ -884,6 +1030,17 @@ class PhotoSection(LibrarySection):
         """ Search for a photo. See :func:`~plexapi.library.LibrarySection.search()` for usage. """
         return self.search(libtype='photo', title=title, **kwargs)
 
+    def all(self, libtype='photoalbum', **kwargs):
+        """ Returns a list of all items from this library section.
+            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
+        return self.search(libtype=libtype, **kwargs)
+
+    def playlist(self, **kwargs):
+        """ Returns a list of playlists from this library section. """
+        key = '/playlists?type=15&playlistType=%s&sectionID=%s' % (self.CONTENT_TYPE, self.key)
+        return self.fetchItems(key, **kwargs)
+
     def sync(self, resolution, limit=None, **kwargs):
         """ Add current Music library section as sync item for specified device.
             See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting and
@@ -968,6 +1125,7 @@ class Hub(PlexObject):
         self.size = utils.cast(int, data.attrib.get('size'))
         self.title = data.attrib.get('title')
         self.type = data.attrib.get('type')
+        self.key = data.attrib.get('key')
         self.items = self.findItems(data)
 
     def __len__(self):
@@ -975,32 +1133,81 @@ class Hub(PlexObject):
 
 
 @utils.registerPlexObject
-class Collections(PlexObject):
+class Collections(PlexPartialObject):
+    """ Represents a single Collection.
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'collection'
+            ratingKey (int): Unique key identifying this item.
+            addedAt (datetime): Datetime this item was added to the library.
+            childCount (int): Count of child object(s)
+            collectionMode (str): How the items in the collection are displayed.
+            collectionSort (str): How to sort the items in the collection.
+            contentRating (str) Content rating (PG-13; NR; TV-G).
+            fields (list): List of :class:`~plexapi.media.Field`.
+            guid (str): Plex GUID (collection://XXXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXX).
+            index (int): Unknown
+            key (str): API URL (/library/metadata/<ratingkey>).
+            labels (List<:class:`~plexapi.media.Label`>): List of field objects.
+            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
+            librarySectionKey (str): API URL (/library/sections/<sectionkey>).
+            librarySectionTitle (str): Section Title
+            maxYear (int): Year
+            minYear (int): Year
+            subtype (str): Media type
+            summary (str): Summary of the collection
+            thumb (str): URL to thumbnail image.
+            title (str): Collection Title
+            titleSort (str): Title to use when sorting (defaults to title).
+            type (str): Hardcoded 'collection'
+            updatedAt (datatime): Datetime this item was updated.
+    """
 
     TAG = 'Directory'
     TYPE = 'collection'
+    _include = "?includeExternalMedia=1&includePreferences=1"
 
     def _loadData(self, data):
         self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.key = data.attrib.get('key')
-        self.type = data.attrib.get('type')
-        self.title = data.attrib.get('title')
+        self.key = data.attrib.get('key').replace('/children', '')  # FIX_BUG_50
+        self._details_key = self.key + self._include
+        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
+        self.art = data.attrib.get('art')
+        self.childCount = utils.cast(int, data.attrib.get('childCount'))
+        self.collectionMode = utils.cast(int, data.attrib.get('collectionMode'))
+        self.collectionSort = utils.cast(int, data.attrib.get('collectionSort'))
+        self.contentRating = data.attrib.get('contentRating')
+        self.fields = self.findItems(data, media.Field)
+        self.guid = data.attrib.get('guid')
+        self.index = utils.cast(int, data.attrib.get('index'))
+        self.labels = self.findItems(data, media.Label)
+        self.librarySectionID = data.attrib.get('librarySectionID')
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.maxYear = utils.cast(int, data.attrib.get('maxYear'))
+        self.minYear = utils.cast(int, data.attrib.get('minYear'))
         self.subtype = data.attrib.get('subtype')
         self.summary = data.attrib.get('summary')
-        self.index = utils.cast(int, data.attrib.get('index'))
         self.thumb = data.attrib.get('thumb')
-        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
+        self.title = data.attrib.get('title')
+        self.titleSort = data.attrib.get('titleSort')
+        self.type = data.attrib.get('type')
         self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self.childCount = utils.cast(int, data.attrib.get('childCount'))
-        self.minYear = utils.cast(int, data.attrib.get('minYear'))
-        self.maxYear = utils.cast(int, data.attrib.get('maxYear'))
-        self.collectionMode = data.attrib.get('collectionMode')
-        self.collectionSort = data.attrib.get('collectionSort')
 
     @property
     def children(self):
         return self.fetchItems(self.key)
 
+    @property
+    def thumbUrl(self):
+        """ Return the thumbnail url for the collection."""
+        return self._server.url(self.thumb, includeToken=True) if self.thumb else None
+
+    @property
+    def artUrl(self):
+        """ Return the art url for the collection."""
+        return self._server.url(self.art, includeToken=True) if self.art else None
+
     def __len__(self):
         return self.childCount
 
@@ -1010,14 +1217,12 @@ class Collections(PlexObject):
 
     def modeUpdate(self, mode=None):
         """ Update Collection Mode
-
             Parameters:
                 mode: default     (Library default)
                       hide        (Hide Collection)
                       hideItems   (Hide Items in this Collection)
                       showItems   (Show this Collection and its Items)
             Example:
-
                 collection = 'plexapi.library.Collections'
                 collection.updateMode(mode="hide")
         """
@@ -1033,13 +1238,10 @@ class Collections(PlexObject):
 
     def sortUpdate(self, sort=None):
         """ Update Collection Sorting
-
             Parameters:
                 sort: realease     (Order Collection by realease dates)
                       alpha        (Order Collection Alphabetically)
-
             Example:
-
                 colleciton = 'plexapi.library.Collections'
                 collection.updateSort(mode="alpha")
         """
@@ -1051,5 +1253,43 @@ class Collections(PlexObject):
         part = '/library/metadata/%s/prefs?collectionSort=%s' % (self.ratingKey, key)
         return self._server.query(part, method=self._server._session.put)
 
+    def posters(self):
+        """ Returns list of available poster objects. :class:`~plexapi.media.Poster`. """
+
+        return self.fetchItems('/library/metadata/%s/posters' % self.ratingKey)
+
+    def uploadPoster(self, url=None, filepath=None):
+        """ Upload poster from url or filepath. :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video`. """
+        if url:
+            key = '/library/metadata/%s/posters?url=%s' % (self.ratingKey, quote_plus(url))
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = '/library/metadata/%s/posters?' % self.ratingKey
+            data = open(filepath, 'rb').read()
+            self._server.query(key, method=self._server._session.post, data=data)
+
+    def setPoster(self, poster):
+        """ Set . :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video` """
+        poster.select()
+
+    def arts(self):
+        """ Returns list of available art objects. :class:`~plexapi.media.Poster`. """
+
+        return self.fetchItems('/library/metadata/%s/arts' % self.ratingKey)
+
+    def uploadArt(self, url=None, filepath=None):
+        """ Upload art from url or filepath. :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video`. """
+        if url:
+            key = '/library/metadata/%s/arts?url=%s' % (self.ratingKey, quote_plus(url))
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = '/library/metadata/%s/arts?' % self.ratingKey
+            data = open(filepath, 'rb').read()
+            self._server.query(key, method=self._server._session.post, data=data)
+
+    def setArt(self, art):
+        """ Set :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video` """
+        art.select()
+
     # def edit(self, **kwargs):
     #    TODO

lib/plexapi/media.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
-from plexapi import log, utils
+
+import xml
+
+from plexapi import compat, log, settings, utils
 from plexapi.base import PlexObject
 from plexapi.exceptions import BadRequest
-from plexapi.utils import cast
+from plexapi.utils import cast, SEARCHTYPES
 
 
 @utils.registerPlexObject
@@ -42,6 +45,7 @@ class Media(PlexObject):
         self.aspectRatio = cast(float, data.attrib.get('aspectRatio'))
         self.audioChannels = cast(int, data.attrib.get('audioChannels'))
         self.audioCodec = data.attrib.get('audioCodec')
+        self.audioProfile = data.attrib.get('videoProfile')
         self.bitrate = cast(int, data.attrib.get('bitrate'))
         self.container = data.attrib.get('container')
         self.duration = cast(int, data.attrib.get('duration'))
@@ -57,6 +61,16 @@ class Media(PlexObject):
         self.videoResolution = data.attrib.get('videoResolution')
         self.width = cast(int, data.attrib.get('width'))
         self.parts = self.findItems(data, MediaPart)
+        self.proxyType = cast(int, data.attrib.get('proxyType'))
+        self.optimizedVersion = self.proxyType == SEARCHTYPES['optimizedVersion']
+        
+        # For Photo only
+        self.aperture = data.attrib.get('aperture')
+        self.exposure = data.attrib.get('exposure')
+        self.iso = cast(int, data.attrib.get('iso'))
+        self.lens = data.attrib.get('lens')
+        self.make = data.attrib.get('make')
+        self.model = data.attrib.get('model')
 
     def delete(self):
         part = self._initpath + '/media/%s' % self.id
@@ -93,26 +107,35 @@ class MediaPart(PlexObject):
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         self._data = data
+        self.audioProfile = data.attrib.get('audioProfile')
         self.container = data.attrib.get('container')
+        self.deepAnalysisVersion = cast(int, data.attrib.get('deepAnalysisVersion'))
         self.duration = cast(int, data.attrib.get('duration'))
         self.file = data.attrib.get('file')
+        self.has64bitOffsets = cast(bool, data.attrib.get('has64bitOffsets'))
+        self.hasThumbnail = cast(bool, data.attrib.get('hasThumbnail'))
         self.id = cast(int, data.attrib.get('id'))
         self.indexes = data.attrib.get('indexes')
         self.key = data.attrib.get('key')
         self.size = cast(int, data.attrib.get('size'))
         self.decision = data.attrib.get('decision')
         self.optimizedForStreaming = cast(bool, data.attrib.get('optimizedForStreaming'))
+        self.packetLength = cast(int, data.attrib.get('packetLength'))
+        self.requiredBandwidths = data.attrib.get('requiredBandwidths')
         self.syncItemId = cast(int, data.attrib.get('syncItemId'))
         self.syncState = data.attrib.get('syncState')
         self.videoProfile = data.attrib.get('videoProfile')
         self.streams = self._buildStreams(data)
         self.exists = cast(bool, data.attrib.get('exists'))
         self.accessible = cast(bool, data.attrib.get('accessible'))
+        
+        # For Photo only
+        self.orientation = cast(int, data.attrib.get('orientation'))
 
     def _buildStreams(self, data):
         streams = []
         for elem in data:
-            for cls in (VideoStream, AudioStream, SubtitleStream):
+            for cls in (VideoStream, AudioStream, SubtitleStream, LyricStream):
                 if elem.attrib.get('streamType') == str(cls.STREAMTYPE):
                     streams.append(cls(self._server, elem, self._initpath))
         return streams
@@ -129,6 +152,10 @@ class MediaPart(PlexObject):
         """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects in this MediaPart. """
         return [stream for stream in self.streams if stream.streamType == SubtitleStream.STREAMTYPE]
 
+    def lyricStreams(self):
+        """ Returns a list of :class:`~plexapi.media.LyricStream` objects in this MediaPart. """
+        return [stream for stream in self.streams if stream.streamType == LyricStream.STREAMTYPE]
+
     def setDefaultAudioStream(self, stream):
         """ Set the default :class:`~plexapi.media.AudioStream` for this MediaPart.
 
@@ -143,7 +170,7 @@ class MediaPart(PlexObject):
 
     def setDefaultSubtitleStream(self, stream):
         """ Set the default :class:`~plexapi.media.SubtitleStream` for this MediaPart.
-            
+
             Parameters:
                 stream (:class:`~plexapi.media.SubtitleStream`): SubtitleStream to set as default.
         """
@@ -174,7 +201,8 @@ class MediaPartStream(PlexObject):
             languageCode (str): Ascii code for language (ex: eng, tha).
             selected (bool): True if this stream is selected.
             streamType (int): Stream type (1=:class:`~plexapi.media.VideoStream`,
-                2=:class:`~plexapi.media.AudioStream`, 3=:class:`~plexapi.media.SubtitleStream`).
+                2=:class:`~plexapi.media.AudioStream`, 3=:class:`~plexapi.media.SubtitleStream`,
+                4=:class:`~plexapi.media.LyricStream`).
             type (int): Alias for streamType.
     """
 
@@ -183,18 +211,22 @@ class MediaPartStream(PlexObject):
         self._data = data
         self.codec = data.attrib.get('codec')
         self.codecID = data.attrib.get('codecID')
+        self.default = cast(bool, data.attrib.get('selected', '0'))
+        self.displayTitle = data.attrib.get('displayTitle')
+        self.extendedDisplayTitle = data.attrib.get('extendedDisplayTitle')
         self.id = cast(int, data.attrib.get('id'))
         self.index = cast(int, data.attrib.get('index', '-1'))
         self.language = data.attrib.get('language')
         self.languageCode = data.attrib.get('languageCode')
         self.selected = cast(bool, data.attrib.get('selected', '0'))
         self.streamType = cast(int, data.attrib.get('streamType'))
+        self.title = data.attrib.get('title')
         self.type = cast(int, data.attrib.get('streamType'))
 
     @staticmethod
     def parse(server, data, initpath):  # pragma: no cover seems to be dead code.
         """ Factory method returns a new MediaPartStream from xml data. """
-        STREAMCLS = {1: VideoStream, 2: AudioStream, 3: SubtitleStream}
+        STREAMCLS = {1: VideoStream, 2: AudioStream, 3: SubtitleStream, 4: LyricStream}
         stype = cast(int, data.attrib.get('streamType'))
         cls = STREAMCLS.get(stype, MediaPartStream)
         return cls(server, data, initpath)
@@ -230,21 +262,39 @@ class VideoStream(MediaPartStream):
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         super(VideoStream, self)._loadData(data)
+        self.anamorphic = data.attrib.get('anamorphic')
         self.bitDepth = cast(int, data.attrib.get('bitDepth'))
         self.bitrate = cast(int, data.attrib.get('bitrate'))
         self.cabac = cast(int, data.attrib.get('cabac'))
+        self.chromaLocation = data.attrib.get('chromaLocation')
         self.chromaSubsampling = data.attrib.get('chromaSubsampling')
+        self.codedHeight = data.attrib.get('codedHeight')
+        self.codedWidth = data.attrib.get('codedWidth')
+        self.colorPrimaries = data.attrib.get('colorPrimaries')
+        self.colorRange = data.attrib.get('colorRange')
         self.colorSpace = data.attrib.get('colorSpace')
+        self.colorTrc = data.attrib.get('colorTrc')
+        self.DOVIBLCompatID = cast(int, data.attrib.get('DOVIBLCompatID'))
+        self.DOVIBLPresent = cast(bool, data.attrib.get('DOVIBLPresent'))
+        self.DOVIELPresent = cast(bool, data.attrib.get('DOVIELPresent'))
+        self.DOVILevel = cast(int, data.attrib.get('DOVILevel'))
+        self.DOVIPresent = cast(bool, data.attrib.get('DOVIPresent'))
+        self.DOVIProfile = cast(int, data.attrib.get('DOVIProfile'))
+        self.DOVIRPUPresent = cast(bool, data.attrib.get('DOVIRPUPresent'))
+        self.DOVIVersion = cast(float, data.attrib.get('DOVIVersion'))
         self.duration = cast(int, data.attrib.get('duration'))
         self.frameRate = cast(float, data.attrib.get('frameRate'))
         self.frameRateMode = data.attrib.get('frameRateMode')
-        self.hasScallingMatrix = cast(bool, data.attrib.get('hasScallingMatrix'))
+        self.hasScalingMatrix = cast(bool, data.attrib.get('hasScalingMatrix'))
         self.height = cast(int, data.attrib.get('height'))
         self.level = cast(int, data.attrib.get('level'))
         self.profile = data.attrib.get('profile')
         self.refFrames = cast(int, data.attrib.get('refFrames'))
+        self.requiredBandwidths = data.attrib.get('requiredBandwidths')
+        self.pixelAspectRatio = data.attrib.get('pixelAspectRatio')
+        self.pixelFormat = data.attrib.get('pixelFormat')
         self.scanType = data.attrib.get('scanType')
-        self.title = data.attrib.get('title')
+        self.streamIdentifier = cast(int, data.attrib.get('streamIdentifier'))
         self.width = cast(int, data.attrib.get('width'))
 
 
@@ -278,8 +328,20 @@ class AudioStream(MediaPartStream):
         self.channels = cast(int, data.attrib.get('channels'))
         self.dialogNorm = cast(int, data.attrib.get('dialogNorm'))
         self.duration = cast(int, data.attrib.get('duration'))
+        self.profile = data.attrib.get('profile')
+        self.requiredBandwidths = data.attrib.get('requiredBandwidths')
         self.samplingRate = cast(int, data.attrib.get('samplingRate'))
-        self.title = data.attrib.get('title')
+
+        # For Track only
+        self.albumGain = cast(float, data.attrib.get('albumGain'))
+        self.albumPeak = cast(float, data.attrib.get('albumPeak'))
+        self.albumRange = cast(float, data.attrib.get('albumRange'))
+        self.endRamp = data.attrib.get('endRamp')
+        self.gain = cast(float, data.attrib.get('gain'))
+        self.loudness = cast(float, data.attrib.get('loudness'))
+        self.lra = cast(float, data.attrib.get('lra'))
+        self.peak = cast(float, data.attrib.get('peak'))
+        self.startRamp = data.attrib.get('startRamp')
 
 
 @utils.registerPlexObject
@@ -300,10 +362,36 @@ class SubtitleStream(MediaPartStream):
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         super(SubtitleStream, self)._loadData(data)
+        self.container = data.attrib.get('container')
         self.forced = cast(bool, data.attrib.get('forced', '0'))
         self.format = data.attrib.get('format')
+        self.headerCompression = data.attrib.get('headerCompression')
         self.key = data.attrib.get('key')
-        self.title = data.attrib.get('title')
+        self.requiredBandwidths = data.attrib.get('requiredBandwidths')
+
+
+@utils.registerPlexObject
+class LyricStream(MediaPartStream):
+    """ Respresents a lyric stream within a :class:`~plexapi.media.MediaPart`.
+
+        Attributes:
+            TAG (str): 'Stream'
+            STREAMTYPE (int): 4
+            format (str): Lyric format (ex: lrc).
+            key (str): Key of this subtitle stream (ex: /library/streams/212284).
+            title (str): Title of this lyric stream.
+    """
+    TAG = 'Stream'
+    STREAMTYPE = 4
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        super(LyricStream, self)._loadData(data)
+        self.format = data.attrib.get('format')
+        self.key = data.attrib.get('key')
+        self.minLines = cast(int, data.attrib.get('minLines'))
+        self.provider = data.attrib.get('provider')
+        self.timed = cast(bool, data.attrib.get('timed', '0'))
 
 
 @utils.registerPlexObject
@@ -349,6 +437,118 @@ class TranscodeSession(PlexObject):
         self.width = cast(int, data.attrib.get('width'))
 
 
+@utils.registerPlexObject
+class TranscodeJob(PlexObject):
+    """ Represents an Optimizing job.
+        TrancodeJobs are the process for optimizing conversions.
+        Active or paused optimization items. Usually one item as a time"""
+    TAG = 'TranscodeJob'
+
+    def _loadData(self, data):
+        self._data = data
+        self.generatorID = data.attrib.get('generatorID')
+        self.key = data.attrib.get('key')
+        self.progress = data.attrib.get('progress')
+        self.ratingKey = data.attrib.get('ratingKey')
+        self.size = data.attrib.get('size')
+        self.targetTagID = data.attrib.get('targetTagID')
+        self.thumb = data.attrib.get('thumb')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+
+
+@utils.registerPlexObject
+class Optimized(PlexObject):
+    """ Represents a Optimized item.
+        Optimized items are optimized and queued conversions items."""
+    TAG = 'Item'
+
+    def _loadData(self, data):
+        self._data = data
+        self.id = data.attrib.get('id')
+        self.composite = data.attrib.get('composite')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+        self.target = data.attrib.get('target')
+        self.targetTagID = data.attrib.get('targetTagID')
+
+    def remove(self):
+        """ Remove an Optimized item"""
+        key = '%s/%s' % (self._initpath, self.id)
+        self._server.query(key, method=self._server._session.delete)
+
+    def rename(self, title):
+        """ Rename an Optimized item"""
+        key = '%s/%s?Item[title]=%s' % (self._initpath, self.id, title)
+        self._server.query(key, method=self._server._session.put)
+
+    def reprocess(self, ratingKey):
+        """ Reprocess a removed Conversion item that is still a listed Optimize item"""
+        key = '%s/%s/%s/enable' % (self._initpath, self.id, ratingKey)
+        self._server.query(key, method=self._server._session.put)
+
+
+@utils.registerPlexObject
+class Conversion(PlexObject):
+    """ Represents a Conversion item.
+        Conversions are items queued for optimization or being actively optimized."""
+    TAG = 'Video'
+
+    def _loadData(self, data):
+        self._data = data
+        self.addedAt = data.attrib.get('addedAt')
+        self.art = data.attrib.get('art')
+        self.chapterSource = data.attrib.get('chapterSource')
+        self.contentRating = data.attrib.get('contentRating')
+        self.duration = data.attrib.get('duration')
+        self.generatorID = data.attrib.get('generatorID')
+        self.generatorType = data.attrib.get('generatorType')
+        self.guid = data.attrib.get('guid')
+        self.key = data.attrib.get('key')
+        self.lastViewedAt = data.attrib.get('lastViewedAt')
+        self.librarySectionID = data.attrib.get('librarySectionID')
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.originallyAvailableAt = data.attrib.get('originallyAvailableAt')
+        self.playQueueItemID = data.attrib.get('playQueueItemID')
+        self.playlistID = data.attrib.get('playlistID')
+        self.primaryExtraKey = data.attrib.get('primaryExtraKey')
+        self.rating = data.attrib.get('rating')
+        self.ratingKey = data.attrib.get('ratingKey')
+        self.studio = data.attrib.get('studio')
+        self.summary = data.attrib.get('summary')
+        self.tagline = data.attrib.get('tagline')
+        self.target = data.attrib.get('target')
+        self.thumb = data.attrib.get('thumb')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+        self.updatedAt = data.attrib.get('updatedAt')
+        self.userID = data.attrib.get('userID')
+        self.username = data.attrib.get('username')
+        self.viewOffset = data.attrib.get('viewOffset')
+        self.year = data.attrib.get('year')
+
+    def remove(self):
+        """ Remove Conversion from queue """
+        key = '/playlists/%s/items/%s/%s/disable' % (self.playlistID, self.generatorID, self.ratingKey)
+        self._server.query(key, method=self._server._session.put)
+
+    def move(self, after):
+        """ Move Conversion items position in queue
+            after (int): Place item after specified playQueueItemID. '-1' is the active conversion.
+
+                Example:
+                    Move 5th conversion Item to active conversion
+                        conversions[4].move('-1')
+
+                    Move 4th conversion Item to 3rd in conversion queue
+                        conversions[3].move(conversions[1].playQueueItemID)
+        """
+
+        key = '%s/items/%s/move?after=%s' % (self._initpath, self.playQueueItemID, after)
+        self._server.query(key, method=self._server._session.put)
+
+
 class MediaTag(PlexObject):
     """ Base class for media tags used for filtering and searching your library
         items or navigating the metadata of media items in your library. Tags are
@@ -395,6 +595,29 @@ class MediaTag(PlexObject):
         return self.fetchItems(self.key)
 
 
+class GuidTag(PlexObject):
+    """ Base class for guid tags used only for Guids, as they contain only a string identifier
+        Attributes:
+            server (:class:`~plexapi.server.PlexServer`): Server this client is connected to.
+            id (id): Tag ID (Used as a unique id, except for Guid's, used for external systems
+                to plex identifiers, like imdb and tmdb).
+    """
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        self._data = data
+        self.id = data.attrib.get('id')
+        self.tag = data.attrib.get('tag')
+
+    def items(self, *args, **kwargs):
+        """ Return the list of items within this tag. This function is only applicable
+            in search results from PlexServer :func:`~plexapi.server.PlexServer.search()`.
+        """
+        if not self.key:
+            raise BadRequest('Key is not defined for this tag: %s' % self.tag)
+        return self.fetchItems(self.key)
+
+
 @utils.registerPlexObject
 class Collection(MediaTag):
     """ Represents a single Collection media tag.
@@ -419,6 +642,25 @@ class Label(MediaTag):
     FILTER = 'label'
 
 
+@utils.registerPlexObject
+class Tag(MediaTag):
+    """ Represents a single tag media tag.
+
+        Attributes:
+            TAG (str): 'tag'
+            FILTER (str): 'tag'
+    """
+    TAG = 'Tag'
+    FILTER = 'tag'
+
+    def _loadData(self, data):
+        self._data = data
+        self.id = cast(int, data.attrib.get('id', 0))
+        self.filter = data.attrib.get('filter')
+        self.tag = data.attrib.get('tag')
+        self.title = self.tag
+
+
 @utils.registerPlexObject
 class Country(MediaTag):
     """ Represents a single Country media tag.
@@ -455,6 +697,12 @@ class Genre(MediaTag):
     FILTER = 'genre'
 
 
+@utils.registerPlexObject
+class Guid(GuidTag):
+    """ Represents a single Guid media tag. """
+    TAG = "Guid"
+
+
 @utils.registerPlexObject
 class Mood(MediaTag):
     """ Represents a single Mood media tag.
@@ -467,6 +715,18 @@ class Mood(MediaTag):
     FILTER = 'mood'
 
 
+@utils.registerPlexObject
+class Style(MediaTag):
+    """ Represents a single Style media tag.
+
+        Attributes:
+            TAG (str): 'Style'
+            FILTER (str): 'style'
+    """
+    TAG = 'Style'
+    FILTER = 'style'
+
+
 @utils.registerPlexObject
 class Poster(PlexObject):
     """ Represents a Poster.
@@ -480,9 +740,17 @@ class Poster(PlexObject):
         self._data = data
         self.key = data.attrib.get('key')
         self.ratingKey = data.attrib.get('ratingKey')
-        self.selected = data.attrib.get('selected')
+        self.selected = cast(bool, data.attrib.get('selected'))
         self.thumb = data.attrib.get('thumb')
 
+    def select(self):
+        key = self._initpath[:-1]
+        data = '%s?url=%s' % (key, compat.quote_plus(self.ratingKey))
+        try:
+            self._server.query(data, method=self._server._session.put)
+        except xml.etree.ElementTree.ParseError:
+            pass
+
 
 @utils.registerPlexObject
 class Producer(MediaTag):
@@ -547,11 +815,33 @@ class Chapter(PlexObject):
         self.filter = data.attrib.get('filter')  # I couldn't filter on it anyways
         self.tag = data.attrib.get('tag')
         self.title = self.tag
+        self.thumb = data.attrib.get('thumb')
         self.index = cast(int, data.attrib.get('index'))
         self.start = cast(int, data.attrib.get('startTimeOffset'))
         self.end = cast(int, data.attrib.get('endTimeOffset'))
 
 
+@utils.registerPlexObject
+class Marker(PlexObject):
+    """ Represents a single Marker media tag.
+        Attributes:
+            TAG (str): 'Marker'
+    """
+    TAG = 'Marker'
+
+    def __repr__(self):
+        name = self._clean(self.firstAttr('type'))
+        start = utils.millisecondToHumanstr(self._clean(self.firstAttr('start')))
+        end = utils.millisecondToHumanstr(self._clean(self.firstAttr('end')))
+        return '<%s:%s %s - %s>' % (self.__class__.__name__, name, start, end)
+
+    def _loadData(self, data):
+        self._data = data
+        self.type = data.attrib.get('type')
+        self.start = cast(int, data.attrib.get('startTimeOffset'))
+        self.end = cast(int, data.attrib.get('endTimeOffset'))
+
+
 @utils.registerPlexObject
 class Field(PlexObject):
     """ Represents a single Field.
@@ -565,3 +855,74 @@ class Field(PlexObject):
         self._data = data
         self.name = data.attrib.get('name')
         self.locked = cast(bool, data.attrib.get('locked'))
+
+
+@utils.registerPlexObject
+class SearchResult(PlexObject):
+    """ Represents a single SearchResult.
+
+        Attributes:
+            TAG (str): 'SearchResult'
+    """
+    TAG = 'SearchResult'
+
+    def __repr__(self):
+        name = self._clean(self.firstAttr('name'))
+        score = self._clean(self.firstAttr('score'))
+        return '<%s>' % ':'.join([p for p in [self.__class__.__name__, name, score] if p])
+
+    def _loadData(self, data):
+        self._data = data
+        self.guid = data.attrib.get('guid')
+        self.lifespanEnded = data.attrib.get('lifespanEnded')
+        self.name = data.attrib.get('name')
+        self.score = cast(int, data.attrib.get('score'))
+        self.year = data.attrib.get('year')
+
+
+@utils.registerPlexObject
+class Agent(PlexObject):
+    """ Represents a single Agent.
+
+        Attributes:
+            TAG (str): 'Agent'
+    """
+    TAG = 'Agent'
+
+    def __repr__(self):
+        uid = self._clean(self.firstAttr('shortIdentifier'))
+        return '<%s>' % ':'.join([p for p in [self.__class__.__name__, uid] if p])
+
+    def _loadData(self, data):
+        self._data = data
+        self.hasAttribution = data.attrib.get('hasAttribution')
+        self.hasPrefs = data.attrib.get('hasPrefs')
+        self.identifier = data.attrib.get('identifier')
+        self.primary = data.attrib.get('primary')
+        self.shortIdentifier = self.identifier.rsplit('.', 1)[1]
+        if 'mediaType' in self._initpath:
+            self.name = data.attrib.get('name')
+            self.languageCode = []
+            for code in data:
+                self.languageCode += [code.attrib.get('code')]
+        else:
+            self.mediaTypes = [AgentMediaType(server=self._server, data=d) for d in data]
+
+    def _settings(self):
+        key = '/:/plugins/%s/prefs' % self.identifier
+        data = self._server.query(key)
+        return self.findItems(data, cls=settings.Setting)
+
+
+class AgentMediaType(Agent):
+
+    def __repr__(self):
+        uid = self._clean(self.firstAttr('name'))
+        return '<%s>' % ':'.join([p for p in [self.__class__.__name__, uid] if p])
+
+    def _loadData(self, data):
+        self.mediaType = cast(int, data.attrib.get('mediaType'))
+        self.name = data.attrib.get('name')
+        self.languageCode = []
+        for code in data:
+            self.languageCode += [code.attrib.get('code')]

lib/plexapi/myplex.py

@@ -1,18 +1,21 @@
 # -*- coding: utf-8 -*-
 import copy
-import requests
+import threading
 import time
-from requests.status_codes import _codes as codes
-from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_IDENTIFIER, X_PLEX_ENABLE_FAST_CONNECT
-from plexapi import log, logfilter, utils
+
+import requests
+from plexapi import (BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_ENABLE_FAST_CONNECT,
+                     X_PLEX_IDENTIFIER, log, logfilter, utils)
 from plexapi.base import PlexObject
-from plexapi.exceptions import BadRequest, NotFound
+from plexapi.exceptions import BadRequest, NotFound, Unauthorized
 from plexapi.client import PlexClient
 from plexapi.compat import ElementTree
 from plexapi.library import LibrarySection
 from plexapi.server import PlexServer
-from plexapi.sync import SyncList, SyncItem
+from plexapi.sonos import PlexSonosClient
+from plexapi.sync import SyncItem, SyncList
 from plexapi.utils import joinArgs
+from requests.status_codes import _codes as codes
 
 
 class MyPlexAccount(PlexObject):
@@ -73,6 +76,12 @@ class MyPlexAccount(PlexObject):
     REQUESTS = 'https://plex.tv/api/invites/requests'                                           # get
     SIGNIN = 'https://plex.tv/users/sign_in.xml'                                                # get with auth
     WEBHOOKS = 'https://plex.tv/api/v2/user/webhooks'                                           # get, post with data
+    # Hub sections
+    VOD = 'https://vod.provider.plex.tv/'                                                       # get
+    WEBSHOWS = 'https://webshows.provider.plex.tv/'                                             # get
+    NEWS = 'https://news.provider.plex.tv/'                                                     # get
+    PODCASTS = 'https://podcasts.provider.plex.tv/'                                             # get
+    MUSIC = 'https://music.provider.plex.tv/'                                                   # get
     # Key may someday switch to the following url. For now the current value works.
     # https://plex.tv/api/v2/user?X-Plex-Token={token}&X-Plex-Client-Identifier={clientId}
     key = 'https://plex.tv/users/account'
@@ -80,6 +89,8 @@ class MyPlexAccount(PlexObject):
     def __init__(self, username=None, password=None, token=None, session=None, timeout=None):
         self._token = token
         self._session = session or requests.Session()
+        self._sonos_cache = []
+        self._sonos_cache_timestamp = 0
         data, initpath = self._signin(username, password, timeout)
         super(MyPlexAccount, self).__init__(self, data, initpath)
 
@@ -175,7 +186,13 @@ class MyPlexAccount(PlexObject):
         if response.status_code not in (200, 201, 204):  # pragma: no cover
             codename = codes.get(response.status_code)[0]
             errtext = response.text.replace('\n', ' ')
-            raise BadRequest('(%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
+            message = '(%s) %s; %s %s' % (response.status_code, codename, response.url, errtext)
+            if response.status_code == 401:
+                raise Unauthorized(message)
+            elif response.status_code == 404:
+                raise NotFound(message)
+            else:
+                raise BadRequest(message)
         data = response.text.encode('utf8')
         return ElementTree.fromstring(data) if data.strip() else None
 
@@ -195,6 +212,24 @@ class MyPlexAccount(PlexObject):
         data = self.query(MyPlexResource.key)
         return [MyPlexResource(self, elem) for elem in data]
 
+    def sonos_speakers(self):
+        if 'companions_sonos' not in self.subscriptionFeatures:
+            return []
+
+        t = time.time()
+        if t - self._sonos_cache_timestamp > 60:
+            self._sonos_cache_timestamp = t
+            data = self.query('https://sonos.plex.tv/resources')
+            self._sonos_cache = [PlexSonosClient(self, elem) for elem in data]
+
+        return self._sonos_cache
+
+    def sonos_speaker(self, name):
+        return [x for x in self.sonos_speakers() if x.title == name][0]
+
+    def sonos_speaker_by_id(self, identifier):
+        return [x for x in self.sonos_speakers() if x.machineIdentifier == identifier][0]
+
     def inviteFriend(self, user, server, sections=None, allowSync=False, allowCameraUpload=False,
                      allowChannels=False, filterMovies=None, filterTelevision=None, filterMusic=None):
         """ Share library content with the specified user.
@@ -384,8 +419,8 @@ class MyPlexAccount(PlexObject):
             params = {'server_id': machineId, 'shared_server': {'library_section_ids': sectionIds}}
             url = self.FRIENDSERVERS.format(machineId=machineId, serverId=serverId)
         else:
-            params = {'server_id': machineId, 'shared_server': {'library_section_ids': sectionIds,
-                      'invited_id': user.id}}
+            params = {'server_id': machineId,
+                      'shared_server': {'library_section_ids': sectionIds, 'invited_id': user.id}}
             url = self.FRIENDINVITE.format(machineId=machineId)
         # Remove share sections, add shares to user without shares, or update shares
         if not user_servers or sectionIds:
@@ -429,7 +464,7 @@ class MyPlexAccount(PlexObject):
                 return user
 
             elif (user.username and user.email and user.id and username.lower() in
-                 (user.username.lower(), user.email.lower(), str(user.id))):
+                  (user.username.lower(), user.email.lower(), str(user.id))):
                 return user
 
         raise NotFound('Unable to find user %s' % username)
@@ -600,6 +635,54 @@ class MyPlexAccount(PlexObject):
             raise BadRequest('(%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
         return response.json()['token']
 
+    def history(self, maxresults=9999999, mindate=None):
+        """ Get Play History for all library sections on all servers for the owner.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        servers = [x for x in self.resources() if x.provides == 'server' and x.owned]
+        hist = []
+        for server in servers:
+            conn = server.connect()
+            hist.extend(conn.history(maxresults=maxresults, mindate=mindate, accountID=1))
+        return hist
+
+    def videoOnDemand(self):
+        """ Returns a list of VOD Hub items :class:`~plexapi.library.Hub`
+        """
+        req = requests.get(self.VOD + 'hubs/', headers={'X-Plex-Token': self._token})
+        elem = ElementTree.fromstring(req.text)
+        return self.findItems(elem)
+
+    def webShows(self):
+        """ Returns a list of Webshow Hub items :class:`~plexapi.library.Hub`
+        """
+        req = requests.get(self.WEBSHOWS + 'hubs/', headers={'X-Plex-Token': self._token})
+        elem = ElementTree.fromstring(req.text)
+        return self.findItems(elem)
+
+    def news(self):
+        """ Returns a list of News Hub items :class:`~plexapi.library.Hub`
+        """
+        req = requests.get(self.NEWS + 'hubs/sections/all', headers={'X-Plex-Token': self._token})
+        elem = ElementTree.fromstring(req.text)
+        return self.findItems(elem)
+
+    def podcasts(self):
+        """ Returns a list of Podcasts Hub items :class:`~plexapi.library.Hub`
+        """
+        req = requests.get(self.PODCASTS + 'hubs/', headers={'X-Plex-Token': self._token})
+        elem = ElementTree.fromstring(req.text)
+        return self.findItems(elem)
+
+    def tidal(self):
+        """ Returns a list of tidal Hub items :class:`~plexapi.library.Hub`
+        """
+        req = requests.get(self.MUSIC + 'hubs/', headers={'X-Plex-Token': self._token})
+        elem = ElementTree.fromstring(req.text)
+        return self.findItems(elem)
+
 
 class MyPlexUser(PlexObject):
     """ This object represents non-signed in users such as friends and linked
@@ -654,6 +737,8 @@ class MyPlexUser(PlexObject):
         self.title = data.attrib.get('title', '')
         self.username = data.attrib.get('username', '')
         self.servers = self.findItems(data, MyPlexServerShare)
+        for server in self.servers:
+            server.accountID = self.id
 
     def get_token(self, machineIdentifier):
         try:
@@ -663,6 +748,29 @@ class MyPlexUser(PlexObject):
         except Exception:
             log.exception('Failed to get access token for %s' % self.title)
 
+    def server(self, name):
+        """ Returns the :class:`~plexapi.myplex.MyPlexServerShare` that matches the name specified.
+
+            Parameters:
+                name (str): Name of the server to return.
+        """
+        for server in self.servers:
+            if name.lower() == server.name.lower():
+                return server
+
+        raise NotFound('Unable to find server %s' % name)
+
+    def history(self, maxresults=9999999, mindate=None):
+        """ Get all Play History for a user in all shared servers.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        hist = []
+        for server in self.servers:
+            hist.extend(server.history(maxresults=maxresults, mindate=mindate))
+        return hist
+
 
 class Section(PlexObject):
     """ This refers to a shared section. The raw xml for the data presented here
@@ -689,6 +797,16 @@ class Section(PlexObject):
         self.type = data.attrib.get('type')
         self.shared = utils.cast(bool, data.attrib.get('shared'))
 
+    def history(self, maxresults=9999999, mindate=None):
+        """ Get all Play History for a user for this section in this shared server.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        server = self._server._server.resource(self._server.name).connect()
+        return server.history(maxresults=maxresults, mindate=mindate,
+                              accountID=self._server.accountID, librarySectionID=self.sectionKey)
+
 
 class MyPlexServerShare(PlexObject):
     """ Represents a single user's server reference. Used for library sharing.
@@ -711,6 +829,7 @@ class MyPlexServerShare(PlexObject):
         """ Load attribute values from Plex XML response. """
         self._data = data
         self.id = utils.cast(int, data.attrib.get('id'))
+        self.accountID = utils.cast(int, data.attrib.get('accountID'))
         self.serverId = utils.cast(int, data.attrib.get('serverId'))
         self.machineIdentifier = data.attrib.get('machineIdentifier')
         self.name = data.attrib.get('name')
@@ -720,7 +839,21 @@ class MyPlexServerShare(PlexObject):
         self.owned = utils.cast(bool, data.attrib.get('owned'))
         self.pending = utils.cast(bool, data.attrib.get('pending'))
 
+    def section(self, name):
+        """ Returns the :class:`~plexapi.myplex.Section` that matches the name specified.
+
+            Parameters:
+                name (str): Name of the section to return.
+        """
+        for section in self.sections():
+            if name.lower() == section.title.lower():
+                return section
+
+        raise NotFound('Unable to find section %s' % name)
+
     def sections(self):
+        """ Returns a list of all :class:`~plexapi.myplex.Section` objects shared with this user.
+        """
         url = MyPlexAccount.FRIENDSERVERS.format(machineId=self.machineIdentifier, serverId=self.id)
         data = self._server.query(url)
         sections = []
@@ -731,6 +864,15 @@ class MyPlexServerShare(PlexObject):
 
         return sections
 
+    def history(self, maxresults=9999999, mindate=None):
+        """ Get all Play History for a user in this shared server.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        server = self._server.resource(self.name).connect()
+        return server.history(maxresults=maxresults, mindate=mindate, accountID=self.accountID)
+
 
 class MyPlexResource(PlexObject):
     """ This object represents resources connected to your Plex server that can provide
@@ -932,6 +1074,186 @@ class MyPlexDevice(PlexObject):
         return self._server.syncItems(client=self)
 
 
+class MyPlexPinLogin(object):
+    """
+        MyPlex PIN login class which supports getting the four character PIN which the user must
+        enter on https://plex.tv/link to authenticate the client and provide an access token to
+        create a :class:`~plexapi.myplex.MyPlexAccount` instance.
+        This helper class supports a polling, threaded and callback approach.
+
+        - The polling approach expects the developer to periodically check if the PIN login was
+          successful using :func:`plexapi.myplex.MyPlexPinLogin.checkLogin`.
+        - The threaded approach expects the developer to call
+          :func:`plexapi.myplex.MyPlexPinLogin.run` and then at a later time call
+          :func:`plexapi.myplex.MyPlexPinLogin.waitForLogin` to wait for and check the result.
+        - The callback approach is an extension of the threaded approach and expects the developer
+          to pass the `callback` parameter to the call to :func:`plexapi.myplex.MyPlexPinLogin.run`.
+          The callback will be called when the thread waiting for the PIN login to succeed either
+          finishes or expires. The parameter passed to the callback is the received authentication
+          token or `None` if the login expired.
+
+        Parameters:
+            session (requests.Session, optional): Use your own session object if you want to
+                cache the http responses from PMS
+            requestTimeout (int): timeout in seconds on initial connect to plex.tv (default config.TIMEOUT).
+
+        Attributes:
+            PINS (str): 'https://plex.tv/pins.xml'
+            CHECKPINS (str): 'https://plex.tv/pins/{pinid}.xml'
+            POLLINTERVAL (int): 1
+            finished (bool): Whether the pin login has finished or not.
+            expired (bool): Whether the pin login has expired or not.
+            token (str): Token retrieved through the pin login.
+            pin (str): Pin to use for the login on https://plex.tv/link.
+    """
+    PINS = 'https://plex.tv/pins.xml'               # get
+    CHECKPINS = 'https://plex.tv/pins/{pinid}.xml'  # get
+    POLLINTERVAL = 1
+
+    def __init__(self, session=None, requestTimeout=None):
+        super(MyPlexPinLogin, self).__init__()
+        self._session = session or requests.Session()
+        self._requestTimeout = requestTimeout or TIMEOUT
+
+        self._loginTimeout = None
+        self._callback = None
+        self._thread = None
+        self._abort = False
+        self._id = None
+
+        self.finished = False
+        self.expired = False
+        self.token = None
+        self.pin = self._getPin()
+
+    def run(self, callback=None, timeout=None):
+        """ Starts the thread which monitors the PIN login state.
+            Parameters:
+                callback (Callable[str]): Callback called with the received authentication token (optional).
+                timeout (int): Timeout in seconds waiting for the PIN login to succeed (optional).
+
+            Raises:
+                :class:`RuntimeError`: if the thread is already running.
+                :class:`RuntimeError`: if the PIN login for the current PIN has expired.
+        """
+        if self._thread and not self._abort:
+            raise RuntimeError('MyPlexPinLogin thread is already running')
+        if self.expired:
+            raise RuntimeError('MyPlexPinLogin has expired')
+
+        self._loginTimeout = timeout
+        self._callback = callback
+        self._abort = False
+        self.finished = False
+        self._thread = threading.Thread(target=self._pollLogin, name='plexapi.myplex.MyPlexPinLogin')
+        self._thread.start()
+
+    def waitForLogin(self):
+        """ Waits for the PIN login to succeed or expire.
+            Parameters:
+                callback (Callable[str]): Callback called with the received authentication token (optional).
+                timeout (int): Timeout in seconds waiting for the PIN login to succeed (optional).
+
+            Returns:
+                `True` if the PIN login succeeded or `False` otherwise.
+        """
+        if not self._thread or self._abort:
+            return False
+
+        self._thread.join()
+        if self.expired or not self.token:
+            return False
+
+        return True
+
+    def stop(self):
+        """ Stops the thread monitoring the PIN login state. """
+        if not self._thread or self._abort:
+            return
+
+        self._abort = True
+        self._thread.join()
+
+    def checkLogin(self):
+        """ Returns `True` if the PIN login has succeeded. """
+        if self._thread:
+            return False
+
+        try:
+            return self._checkLogin()
+        except Exception:
+            self.expired = True
+            self.finished = True
+
+        return False
+
+    def _getPin(self):
+        if self.pin:
+            return self.pin
+
+        url = self.PINS
+        response = self._query(url, self._session.post)
+        if not response:
+            return None
+
+        self._id = response.find('id').text
+        self.pin = response.find('code').text
+
+        return self.pin
+
+    def _checkLogin(self):
+        if not self._id:
+            return False
+
+        if self.token:
+            return True
+
+        url = self.CHECKPINS.format(pinid=self._id)
+        response = self._query(url)
+        if not response:
+            return False
+
+        token = response.find('auth_token').text
+        if not token:
+            return False
+
+        self.token = token
+        self.finished = True
+        return True
+
+    def _pollLogin(self):
+        try:
+            start = time.time()
+            while not self._abort and (not self._loginTimeout or (time.time() - start) < self._loginTimeout):
+                try:
+                    result = self._checkLogin()
+                except Exception:
+                    self.expired = True
+                    break
+
+                if result:
+                    break
+
+                time.sleep(self.POLLINTERVAL)
+
+            if self.token and self._callback:
+                self._callback(self.token)
+        finally:
+            self.finished = True
+
+    def _query(self, url, method=None):
+        method = method or self._session.get
+        log.debug('%s %s', method.__name__.upper(), url)
+        headers = BASE_HEADERS.copy()
+        response = method(url, headers=headers, timeout=self._requestTimeout)
+        if not response.ok:  # pragma: no cover
+            codename = codes.get(response.status_code)[0]
+            errtext = response.text.replace('\n', ' ')
+            raise BadRequest('(%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
+        data = response.text.encode('utf8')
+        return ElementTree.fromstring(data) if data.strip() else None
+
+
 def _connect(cls, url, token, timeout, results, i, job_is_done_event=None):
     """ Connects to the specified cls with url and token. Stores the connection
         information to results[i] in a threadsafe way.

lib/plexapi/photo.py

@@ -38,14 +38,18 @@ class Photoalbum(PlexPartialObject):
         self.composite = data.attrib.get('composite')
         self.guid = data.attrib.get('guid')
         self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = data.attrib.get('key')
+        self.key = data.attrib.get('key', '').replace('/children', '')  # FIX_BUG_50
         self.librarySectionID = data.attrib.get('librarySectionID')
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
         self.ratingKey = data.attrib.get('ratingKey')
         self.summary = data.attrib.get('summary')
         self.thumb = data.attrib.get('thumb')
         self.title = data.attrib.get('title')
+        self.titleSort = data.attrib.get('titleSort')
         self.type = data.attrib.get('type')
         self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
+        self.fields = self.findItems(data, media.Field)
 
     def albums(self, **kwargs):
         """ Returns a list of :class:`~plexapi.photo.Photoalbum` objects in this album. """
@@ -71,6 +75,11 @@ class Photoalbum(PlexPartialObject):
                 return photo
         raise NotFound('Unable to find photo: %s' % title)
 
+    def clips(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.video.Clip` objects in this album. """
+        key = '/library/metadata/%s/children' % self.ratingKey
+        return self.fetchItems(key, etag='Video', **kwargs)
+
 
 @utils.registerPlexObject
 class Photo(PlexPartialObject):
@@ -99,24 +108,43 @@ class Photo(PlexPartialObject):
     TYPE = 'photo'
     METADATA_TYPE = 'photo'
 
+    _include = ('?checkFiles=1&includeExtras=1&includeRelated=1'
+                '&includeOnDeck=1&includeChapters=1&includePopularLeaves=1'
+                '&includeMarkers=1&includeConcerts=1&includePreferences=1'
+                '&includeBandwidths=1&includeLoudnessRamps=1')
+
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
+        self.key = data.attrib.get('key')
+        self._details_key = self.key + self._include
         self.listType = 'photo'
         self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
+        self.createdAtAccuracy = data.attrib.get('createdAtAccuracy')
+        self.createdAtTZOffset = utils.cast(int, data.attrib.get('createdAtTZOffset'))
+        self.guid = data.attrib.get('guid')
         self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = data.attrib.get('key')
+        self.librarySectionID = data.attrib.get('librarySectionID')
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
         self.originallyAvailableAt = utils.toDatetime(
             data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
+        self.parentGuid = data.attrib.get('parentGuid')
+        self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
         self.parentKey = data.attrib.get('parentKey')
         self.parentRatingKey = data.attrib.get('parentRatingKey')
+        self.parentThumb = data.attrib.get('parentThumb')
+        self.parentTitle = data.attrib.get('parentTitle')
         self.ratingKey = data.attrib.get('ratingKey')
         self.summary = data.attrib.get('summary')
         self.thumb = data.attrib.get('thumb')
         self.title = data.attrib.get('title')
+        self.titleSort = data.attrib.get('titleSort')
         self.type = data.attrib.get('type')
         self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
         self.year = utils.cast(int, data.attrib.get('year'))
         self.media = self.findItems(data, media.Media)
+        self.tag = self.findItems(data, media.Tag)
+        self.fields = self.findItems(data, media.Field)
 
     def photoalbum(self):
         """ Return this photo's :class:`~plexapi.photo.Photoalbum`. """
@@ -131,6 +159,13 @@ class Photo(PlexPartialObject):
         else:
             raise BadRequest('Unable to get section for photo, can`t find librarySectionID')
 
+    @property
+    def locations(self):
+        """ This does not exist in plex xml response but is added to have a common
+            interface to get the location of the Photo
+        """
+        return [part.file for item in self.media for part in item.parts if part]
+        
     def sync(self, resolution, client=None, clientId=None, limit=None, title=None):
         """ Add current photo as sync item for specified device.
             See :func:`plexapi.myplex.MyPlexAccount.sync()` for possible exceptions.

lib/plexapi/playlist.py

@@ -268,3 +268,41 @@ class Playlist(PlexPartialObject, Playable):
             raise Unsupported('Unsupported playlist content')
 
         return myplex.sync(sync_item, client=client, clientId=clientId)
+
+    def posters(self):
+        """ Returns list of available poster objects. :class:`~plexapi.media.Poster`. """
+
+        return self.fetchItems('/library/metadata/%s/posters' % self.ratingKey)
+
+    def uploadPoster(self, url=None, filepath=None):
+        """ Upload poster from url or filepath. :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video`. """
+        if url:
+            key = '/library/metadata/%s/posters?url=%s' % (self.ratingKey, quote_plus(url))
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = '/library/metadata/%s/posters?' % self.ratingKey
+            data = open(filepath, 'rb').read()
+            self._server.query(key, method=self._server._session.post, data=data)
+
+    def setPoster(self, poster):
+        """ Set . :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video` """
+        poster.select()
+
+    def arts(self):
+        """ Returns list of available art objects. :class:`~plexapi.media.Poster`. """
+
+        return self.fetchItems('/library/metadata/%s/arts' % self.ratingKey)
+
+    def uploadArt(self, url=None, filepath=None):
+        """ Upload art from url or filepath. :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video`. """
+        if url:
+            key = '/library/metadata/%s/arts?url=%s' % (self.ratingKey, quote_plus(url))
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = '/library/metadata/%s/arts?' % self.ratingKey
+            data = open(filepath, 'rb').read()
+            self._server.query(key, method=self._server._session.post, data=data)
+
+    def setArt(self, art):
+        """ Set :class:`~plexapi.media.Poster` to :class:`~plexapi.video.Video` """
+        art.select()

lib/plexapi/server.py

@@ -7,12 +7,13 @@ from plexapi.alert import AlertListener
 from plexapi.base import PlexObject
 from plexapi.client import PlexClient
 from plexapi.compat import ElementTree, urlencode
-from plexapi.exceptions import BadRequest, NotFound
+from plexapi.exceptions import BadRequest, NotFound, Unauthorized
 from plexapi.library import Library, Hub
 from plexapi.settings import Settings
 from plexapi.playlist import Playlist
 from plexapi.playqueue import PlayQueue
 from plexapi.utils import cast
+from plexapi.media import Optimized, Conversion
 
 # Need these imports to populate utils.PLEXOBJECTS
 from plexapi import (audio as _audio, video as _video,        # noqa: F401
@@ -183,8 +184,18 @@ class PlexServer(PlexObject):
         data = self.query(Account.key)
         return Account(self, data)
 
+    def agents(self, mediaType=None):
+        """ Returns the `:class:`~plexapi.media.Agent` objects this server has available. """
+        key = '/system/agents'
+        if mediaType:
+            key += '?mediaType=%s' % mediaType
+        return self.fetchItems(key)
+
     def createToken(self, type='delegation', scope='all'):
         """Create a temp access token for the server."""
+        if not self._token:
+            # Handle unclaimed servers
+            return None
         q = self.query('/security/token?type=%s&scope=%s' % (type, scope))
         return q.attrib.get('token')
 
@@ -322,7 +333,7 @@ class PlexServer(PlexObject):
             # figure out what method this is..
             return self.query(part, method=self._session.put)
 
-    def history(self, maxresults=9999999, mindate=None):
+    def history(self, maxresults=9999999, mindate=None, ratingKey=None, accountID=None, librarySectionID=None):
         """ Returns a list of media items from watched history. If there are many results, they will
             be fetched from the server in batches of X_PLEX_CONTAINER_SIZE amounts. If you're only
             looking for the first <num> results, it would be wise to set the maxresults option to that
@@ -332,9 +343,18 @@ class PlexServer(PlexObject):
                 maxresults (int): Only return the specified number of results (optional).
                 mindate (datetime): Min datetime to return results from. This really helps speed
                     up the result listing. For example: datetime.now() - timedelta(days=7)
+                ratingKey (int/str) Request history for a specific ratingKey item.
+                accountID (int/str) Request history for a specific account ID.
+                librarySectionID (int/str) Request history for a specific library section ID.
         """
         results, subresults = [], '_init'
         args = {'sort': 'viewedAt:desc'}
+        if ratingKey:
+            args['metadataItemID'] = ratingKey
+        if accountID:
+            args['accountID'] = accountID
+        if librarySectionID:
+            args['librarySectionID'] = librarySectionID
         if mindate:
             args['viewedAt>'] = int(mindate.timestamp())
         args['X-Plex-Container-Start'] = 0
@@ -346,11 +366,11 @@ class PlexServer(PlexObject):
             args['X-Plex-Container-Start'] += args['X-Plex-Container-Size']
         return results
 
-    def playlists(self):
+    def playlists(self, **kwargs):
         """ Returns a list of all :class:`~plexapi.playlist.Playlist` objects saved on the server. """
         # TODO: Add sort and type options?
         # /playlists/all?type=15&sort=titleSort%3Aasc&playlistType=video&smart=0
-        return self.fetchItems('/playlists')
+        return self.fetchItems('/playlists', **kwargs)
 
     def playlist(self, title):
         """ Returns the :class:`~plexapi.client.Playlist` that matches the specified title.
@@ -363,6 +383,36 @@ class PlexServer(PlexObject):
         """
         return self.fetchItem('/playlists', title=title)
 
+    def optimizedItems(self, removeAll=None):
+        """ Returns list of all :class:`~plexapi.media.Optimized` objects connected to server. """
+        if removeAll is True:
+            key = '/playlists/generators?type=42'
+            self.query(key, method=self._server._session.delete)
+        else:
+            backgroundProcessing = self.fetchItem('/playlists?type=42')
+            return self.fetchItems('%s/items' % backgroundProcessing.key, cls=Optimized)
+
+    def optimizedItem(self, optimizedID):
+        """ Returns single queued optimized item :class:`~plexapi.media.Video` object.
+            Allows for using optimized item ID to connect back to source item.
+        """
+
+        backgroundProcessing = self.fetchItem('/playlists?type=42')
+        return self.fetchItem('%s/items/%s/items' % (backgroundProcessing.key, optimizedID))
+
+    def conversions(self, pause=None):
+        """ Returns list of all :class:`~plexapi.media.Conversion` objects connected to server. """
+        if pause is True:
+            self.query('/:/prefs?BackgroundQueueIdlePaused=1', method=self._server._session.put)
+        elif pause is False:
+            self.query('/:/prefs?BackgroundQueueIdlePaused=0', method=self._server._session.put)
+        else:
+            return self.fetchItems('/playQueues/1', cls=Conversion)
+
+    def currentBackgroundProcess(self):
+        """ Returns list of all :class:`~plexapi.media.TranscodeJob` objects running or paused on server. """
+        return self.fetchItems('/status/sessions/background')
+
     def query(self, key, method=None, headers=None, timeout=None, **kwargs):
         """ Main method used to handle HTTPS requests to the Plex server. This method helps
             by encoding the response to utf-8 and parsing the returned XML into and
@@ -377,8 +427,13 @@ class PlexServer(PlexObject):
         if response.status_code not in (200, 201):
             codename = codes.get(response.status_code)[0]
             errtext = response.text.replace('\n', ' ')
-            log.warning('BadRequest (%s) %s %s; %s' % (response.status_code, codename, response.url, errtext))
-            raise BadRequest('(%s) %s; %s %s' % (response.status_code, codename, response.url, errtext))
+            message = '(%s) %s; %s %s' % (response.status_code, codename, response.url, errtext)
+            if response.status_code == 401:
+                raise Unauthorized(message)
+            elif response.status_code == 404:
+                raise NotFound(message)
+            else:
+                raise BadRequest(message)
         data = response.text.encode('utf8')
         return ElementTree.fromstring(data) if data.strip() else None
 
@@ -472,6 +527,25 @@ class PlexServer(PlexObject):
         self.refreshSynclist()
         self.refreshContent()
 
+    def _allowMediaDeletion(self, toggle=False):
+        """ Toggle allowMediaDeletion.
+            Parameters:
+                toggle (bool): True enables Media Deletion
+                               False or None disable Media Deletion (Default)
+        """
+        if self.allowMediaDeletion and toggle is False:
+            log.debug('Plex is currently allowed to delete media. Toggling off.')
+        elif self.allowMediaDeletion and toggle is True:
+            log.debug('Plex is currently allowed to delete media. Toggle set to allow, exiting.')
+            raise BadRequest('Plex is currently allowed to delete media. Toggle set to allow, exiting.')
+        elif self.allowMediaDeletion is None and toggle is True:
+            log.debug('Plex is currently not allowed to delete media. Toggle set to allow.')
+        else:
+            log.debug('Plex is currently not allowed to delete media. Toggle set to not allow, exiting.')
+            raise BadRequest('Plex is currently not allowed to delete media. Toggle set to not allow, exiting.')
+        value = 1 if toggle is True else 0
+        return self.query('/:/prefs?allowMediaDeletion=%s' % value, self._session.put)
+
 
 class Account(PlexObject):
     """ Contains the locally cached MyPlex account information. The properties provided don't

lib/plexapi/settings.py

@@ -124,8 +124,8 @@ class Setting(PlexObject):
         self.enumValues = self._getEnumValues(data)
 
     def _cast(self, value):
-        """ Cast the specifief value to the type of this setting. """
-        if self.type != 'text':
+        """ Cast the specific value to the type of this setting. """
+        if self.type != 'enum':
             value = utils.cast(self.TYPES.get(self.type)['cast'], value)
         return value
 

lib/plexapi/sonos.py

@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+import requests
+from plexapi import CONFIG, X_PLEX_IDENTIFIER
+from plexapi.client import PlexClient
+from plexapi.exceptions import BadRequest
+from plexapi.playqueue import PlayQueue
+
+
+class PlexSonosClient(PlexClient):
+    """ Class for interacting with a Sonos speaker via the Plex API. This class
+        makes requests to an external Plex API which then forwards the
+        Sonos-specific commands back to your Plex server & Sonos speakers. Use
+        of this feature requires an active Plex Pass subscription and Sonos
+        speakers linked to your Plex account. It also requires remote access to
+        be working properly.
+
+        More details on the Sonos integration are avaialble here:
+        https://support.plex.tv/articles/218237558-requirements-for-using-plex-for-sonos/
+
+        The Sonos API emulates the Plex player control API closely:
+        https://github.com/plexinc/plex-media-player/wiki/Remote-control-API
+
+        Parameters:
+            account (:class:`~plexapi.myplex.PlexAccount`): PlexAccount instance this
+                Sonos speaker is associated with.
+            data (ElementTree): Response from Plex Sonos API used to build this client.
+
+        Attributes:
+            deviceClass (str): "speaker"
+            lanIP (str): Local IP address of speaker.
+            machineIdentifier (str): Unique ID for this device.
+            platform (str): "Sonos"
+            platformVersion (str): Build version of Sonos speaker firmware.
+            product (str): "Sonos"
+            protocol (str): "plex"
+            protocolCapabilities (list<str>): List of client capabilities (timeline, playback,
+                playqueues, provider-playback)
+            server (:class:`~plexapi.server.PlexServer`): Server this client is connected to.
+            session (:class:`~requests.Session`): Session object used for connection.
+            title (str): Name of this Sonos speaker.
+            token (str): X-Plex-Token used for authenication
+            _baseurl (str): Address of public Plex Sonos API endpoint.
+            _commandId (int): Counter for commands sent to Plex API.
+            _token (str): Token associated with linked Plex account.
+            _session (obj): Requests session object used to access this client.
+    """
+
+    def __init__(self, account, data):
+        self._data = data
+        self.deviceClass = data.attrib.get("deviceClass")
+        self.machineIdentifier = data.attrib.get("machineIdentifier")
+        self.product = data.attrib.get("product")
+        self.platform = data.attrib.get("platform")
+        self.platformVersion = data.attrib.get("platformVersion")
+        self.protocol = data.attrib.get("protocol")
+        self.protocolCapabilities = data.attrib.get("protocolCapabilities")
+        self.lanIP = data.attrib.get("lanIP")
+        self.title = data.attrib.get("title")
+        self._baseurl = "https://sonos.plex.tv"
+        self._commandId = 0
+        self._token = account._token
+        self._session = account._session or requests.Session()
+
+        # Dummy values for PlexClient inheritance
+        self._last_call = 0
+        self._proxyThroughServer = False
+        self._showSecrets = CONFIG.get("log.show_secrets", "").lower() == "true"
+
+    def playMedia(self, media, offset=0, **params):
+
+        if hasattr(media, "playlistType"):
+            mediatype = media.playlistType
+        else:
+            if isinstance(media, PlayQueue):
+                mediatype = media.items[0].listType
+            else:
+                mediatype = media.listType
+
+        if mediatype == "audio":
+            mediatype = "music"
+        else:
+            raise BadRequest("Sonos currently only supports music for playback")
+
+        server_protocol, server_address, server_port = media._server._baseurl.split(":")
+        server_address = server_address.strip("/")
+        server_port = server_port.strip("/")
+
+        playqueue = (
+            media
+            if isinstance(media, PlayQueue)
+            else media._server.createPlayQueue(media)
+        )
+        self.sendCommand(
+            "playback/playMedia",
+            **dict(
+                {
+                    "type": "music",
+                    "providerIdentifier": "com.plexapp.plugins.library",
+                    "containerKey": "/playQueues/{}?own=1".format(
+                        playqueue.playQueueID
+                    ),
+                    "key": media.key,
+                    "offset": offset,
+                    "machineIdentifier": media._server.machineIdentifier,
+                    "protocol": server_protocol,
+                    "address": server_address,
+                    "port": server_port,
+                    "token": media._server.createToken(),
+                    "commandID": self._nextCommandId(),
+                    "X-Plex-Client-Identifier": X_PLEX_IDENTIFIER,
+                    "X-Plex-Token": media._server._token,
+                    "X-Plex-Target-Client-Identifier": self.machineIdentifier,
+                },
+                **params
+            )
+        )

lib/plexapi/utils.py

@@ -2,23 +2,29 @@
 import logging
 import os
 import re
-import requests
 import time
 import zipfile
 from datetime import datetime
 from getpass import getpass
-from threading import Thread, Event
-from tqdm import tqdm
+from threading import Event, Thread
+
+import requests
 from plexapi import compat
 from plexapi.exceptions import NotFound
 
+try:
+    from tqdm import tqdm
+except ImportError:
+    tqdm = None
+
 log = logging.getLogger('plexapi')
 
 # Search Types - Plex uses these to filter specific media types when searching.
 # Library Types - Populated at runtime
 SEARCHTYPES = {'movie': 1, 'show': 2, 'season': 3, 'episode': 4, 'trailer': 5, 'comic': 6, 'person': 7,
                'artist': 8, 'album': 9, 'track': 10, 'picture': 11, 'clip': 12, 'photo': 13, 'photoalbum': 14,
-               'playlist': 15, 'playlistFolder': 16, 'collection': 18, 'userPlaylistItem': 1001}
+               'playlist': 15, 'playlistFolder': 16, 'collection': 18,
+               'optimizedVersion': 42, 'userPlaylistItem': 1001}
 PLEXOBJECTS = {}
 
 
@@ -59,7 +65,7 @@ def registerPlexObject(cls):
 
 def cast(func, value):
     """ Cast the specified value to the specified type (returned by func). Currently this
-        only support int, float, bool. Should be extended if needed.
+        only support str, int, float, bool. Should be extended if needed.
 
         Parameters:
             func (func): Calback function to used cast to type (int, bool, float).
@@ -67,7 +73,13 @@ def cast(func, value):
     """
     if value is not None:
         if func == bool:
-            return bool(int(value))
+            if value in (1, True, "1", "true"):
+                return True
+            elif value in (0, False, "0", "false"):
+                return False
+            else:
+                raise ValueError(value)
+
         elif func in (int, float):
             try:
                 return func(value)
@@ -89,7 +101,7 @@ def joinArgs(args):
     arglist = []
     for key in sorted(args, key=lambda x: x.lower()):
         value = compat.ustr(args[key])
-        arglist.append('%s=%s' % (key, compat.quote(value)))
+        arglist.append('%s=%s' % (key, compat.quote(value, safe='')))
     return '?%s' % '&'.join(arglist)
 
 
@@ -287,17 +299,17 @@ def download(url, token, filename=None, savepath=None, session=None, chunksize=4
 
     # save the file to disk
     log.info('Downloading: %s', fullpath)
-    if showstatus:  # pragma: no cover
+    if showstatus and tqdm:  # pragma: no cover
         total = int(response.headers.get('content-length', 0))
         bar = tqdm(unit='B', unit_scale=True, total=total, desc=filename)
 
     with open(fullpath, 'wb') as handle:
         for chunk in response.iter_content(chunk_size=chunksize):
             handle.write(chunk)
-            if showstatus:
+            if showstatus and tqdm:
                 bar.update(len(chunk))
 
-    if showstatus:  # pragma: no cover
+    if showstatus and tqdm:  # pragma: no cover
         bar.close()
     # check we want to unzip the contents
     if fullpath.endswith('zip') and unpack:
@@ -375,3 +387,15 @@ def choose(msg, items, attr):  # pragma: no cover
 
         except (ValueError, IndexError):
             pass
+
+
+def getAgentIdentifier(section, agent):
+    """ Return the full agent identifier from a short identifier, name, or confirm full identifier. """
+    agents = []
+    for ag in section.agents():
+        identifiers = [ag.identifier, ag.shortIdentifier, ag.name]
+        if agent in identifiers:
+            return ag.identifier
+        agents += identifiers
+    raise NotFound('Couldnt find "%s" in agents list (%s)' %
+                   (agent, ', '.join(agents)))

lib/plexapi/video.py

@@ -2,7 +2,8 @@
 from plexapi import media, utils
 from plexapi.exceptions import BadRequest, NotFound
 from plexapi.base import Playable, PlexPartialObject
-from plexapi.compat import quote_plus
+from plexapi.compat import quote_plus, urlencode
+import os
 
 
 class Video(PlexPartialObject):
@@ -34,6 +35,8 @@ class Video(PlexPartialObject):
         self.key = data.attrib.get('key', '')
         self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
         self.librarySectionID = data.attrib.get('librarySectionID')
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
         self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
         self.summary = data.attrib.get('summary')
         self.thumb = data.attrib.get('thumb')
@@ -89,10 +92,112 @@ class Video(PlexPartialObject):
         """ Returns str, default title for a new syncItem. """
         return self.title
 
-    def posters(self):
-        """ Returns list of available poster objects. :class:`~plexapi.media.Poster`:"""
+    def subtitleStreams(self):
+        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
+        streams = []
 
-        return self.fetchItems('%s/posters' % self.key, cls=media.Poster)
+        parts = self.iterParts()
+        for part in parts:
+            streams += part.subtitleStreams()
+        return streams
+
+    def uploadSubtitles(self, filepath):
+        """ Upload Subtitle file for video. """
+        url = '%s/subtitles' % self.key
+        filename = os.path.basename(filepath)
+        subFormat = os.path.splitext(filepath)[1][1:]
+        with open(filepath, 'rb') as subfile:
+            params = {'title': filename,
+                      'format': subFormat
+                      }
+            headers = {'Accept': 'text/plain, */*'}
+            self._server.query(url, self._server._session.post, data=subfile, params=params, headers=headers)
+
+    def removeSubtitles(self, streamID=None, streamTitle=None):
+        """ Remove Subtitle from movie's subtitles listing.
+
+            Note: If subtitle file is located inside video directory it will bbe deleted.
+            Files outside of video directory are not effected.
+        """
+        for stream in self.subtitleStreams():
+            if streamID == stream.id or streamTitle == stream.title:
+                self._server.query(stream.key, self._server._session.delete)
+
+    def optimize(self, title=None, target="", targetTagID=None, locationID=-1, policyScope='all',
+                 policyValue="", policyUnwatched=0, videoQuality=None, deviceProfile=None):
+        """ Optimize item
+
+            locationID (int): -1 in folder with orginal items
+                               2 library path
+
+            target (str): custom quality name.
+                          if none provided use "Custom: {deviceProfile}"
+
+            targetTagID (int):  Default quality settings
+                                1 Mobile
+                                2 TV
+                                3 Original Quality
+
+            deviceProfile (str): Android, IOS, Universal TV, Universal Mobile, Windows Phone,
+                                    Windows, Xbox One
+
+            Example:
+                Optimize for Mobile
+                   item.optimize(targetTagID="Mobile") or item.optimize(targetTagID=1")
+                Optimize for Android 10 MBPS 1080p
+                   item.optimize(deviceProfile="Android", videoQuality=10)
+                Optimize for IOS Original Quality
+                   item.optimize(deviceProfile="IOS", videoQuality=-1)
+
+            * see sync.py VIDEO_QUALITIES for additional information for using videoQuality
+        """
+        tagValues = [1, 2, 3]
+        tagKeys = ["Mobile", "TV", "Original Quality"]
+        tagIDs = tagKeys + tagValues
+
+        if targetTagID not in tagIDs and (deviceProfile is None or videoQuality is None):
+            raise BadRequest('Unexpected or missing quality profile.')
+
+        if isinstance(targetTagID, str):
+            tagIndex = tagKeys.index(targetTagID)
+            targetTagID = tagValues[tagIndex]
+
+        if title is None:
+            title = self.title
+
+        backgroundProcessing = self.fetchItem('/playlists?type=42')
+        key = '%s/items?' % backgroundProcessing.key
+        params = {
+            'Item[type]': 42,
+            'Item[target]': target,
+            'Item[targetTagID]': targetTagID if targetTagID else '',
+            'Item[locationID]': locationID,
+            'Item[Policy][scope]': policyScope,
+            'Item[Policy][value]': policyValue,
+            'Item[Policy][unwatched]': policyUnwatched
+        }
+
+        if deviceProfile:
+            params['Item[Device][profile]'] = deviceProfile
+
+        if videoQuality:
+            from plexapi.sync import MediaSettings
+            mediaSettings = MediaSettings.createVideo(videoQuality)
+            params['Item[MediaSettings][videoQuality]'] = mediaSettings.videoQuality
+            params['Item[MediaSettings][videoResolution]'] = mediaSettings.videoResolution
+            params['Item[MediaSettings][maxVideoBitrate]'] = mediaSettings.maxVideoBitrate
+            params['Item[MediaSettings][audioBoost]'] = ''
+            params['Item[MediaSettings][subtitleSize]'] = ''
+            params['Item[MediaSettings][musicBitrate]'] = ''
+            params['Item[MediaSettings][photoQuality]'] = ''
+
+        titleParam = {'Item[title]': title}
+        section = self._server.library.sectionByID(self.librarySectionID)
+        params['Item[Location][uri]'] = 'library://' + section.uuid + '/item/' + \
+                                        quote_plus(self.key + '?includeExternalMedia=1')
+
+        data = key + urlencode(params) + '&' + urlencode(titleParam)
+        return self._server.query(data, method=self._server._session.put)
 
     def sync(self, videoQuality, client=None, clientId=None, limit=None, unwatched=False, title=None):
         """ Add current video (movie, tv-show, season or episode) as sync item for specified device.
@@ -161,6 +266,7 @@ class Movie(Playable, Video):
             directors (List<:class:`~plexapi.media.Director`>): List of director objects.
             fields (List<:class:`~plexapi.media.Field`>): List of field objects.
             genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
             media (List<:class:`~plexapi.media.Media`>): List of media objects.
             producers (List<:class:`~plexapi.media.Producer`>): List of producers objects.
             roles (List<:class:`~plexapi.media.Role`>): List of role objects.
@@ -173,7 +279,8 @@ class Movie(Playable, Video):
     METADATA_TYPE = 'movie'
     _include = ('?checkFiles=1&includeExtras=1&includeRelated=1'
                 '&includeOnDeck=1&includeChapters=1&includePopularLeaves=1'
-                '&includeConcerts=1&includePreferences=1')
+                '&includeConcerts=1&includePreferences=1'
+                '&includeBandwidths=1')
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
@@ -204,6 +311,7 @@ class Movie(Playable, Video):
         self.directors = self.findItems(data, media.Director)
         self.fields = self.findItems(data, media.Field)
         self.genres = self.findItems(data, media.Genre)
+        self.guids = self.findItems(data, media.Guid)
         self.media = self.findItems(data, media.Media)
         self.producers = self.findItems(data, media.Producer)
         self.roles = self.findItems(data, media.Role)
@@ -220,18 +328,10 @@ class Movie(Playable, Video):
     @property
     def locations(self):
         """ This does not exist in plex xml response but is added to have a common
-            interface to get the location of the Movie/Show/Episode
+            interface to get the location of the Movie
         """
         return [part.file for part in self.iterParts() if part]
 
-    def subtitleStreams(self):
-        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
-        streams = []
-        for elem in self.media:
-            for part in elem.parts:
-                streams += part.subtitleStreams()
-        return streams
-
     def _prettyfilename(self):
         # This is just for compat.
         return self.title
@@ -257,7 +357,7 @@ class Movie(Playable, Video):
             else:
                 self._server.url('%s?download=1' % location.key)
             filepath = utils.download(url, self._server._token, filename=name,
-                savepath=savepath, session=self._server._session)
+                                      savepath=savepath, session=self._server._session)
             if filepath:
                 filepaths.append(filepath)
         return filepaths
@@ -302,7 +402,7 @@ class Show(Video):
         """ Load attribute values from Plex XML response. """
         Video._loadData(self, data)
         # fix key if loaded from search
-        self.key = self.key.replace('/children', '')
+        self.key = self.key.replace('/children', '')  # FIX_BUG_50
         self.art = data.attrib.get('art')
         self.banner = data.attrib.get('banner')
         self.childCount = utils.cast(int, data.attrib.get('childCount'))
@@ -320,6 +420,7 @@ class Show(Video):
         self.theme = data.attrib.get('theme')
         self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
         self.year = utils.cast(int, data.attrib.get('year'))
+        self.fields = self.findItems(data, media.Field)
         self.genres = self.findItems(data, media.Genre)
         self.roles = self.findItems(data, media.Role)
         self.labels = self.findItems(data, media.Label)
@@ -432,12 +533,20 @@ class Season(Video):
         Video._loadData(self, data)
         # fix key if loaded from search
         self.key = self.key.replace('/children', '')
+        art = data.attrib.get('art')
+        self.art = art if art and str(self.ratingKey) in art else None
+        self.guid = data.attrib.get('guid')
         self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
         self.index = utils.cast(int, data.attrib.get('index'))
+        self.parentGuid = data.attrib.get('parentGuid')
+        self.parentIndex = data.attrib.get('parentIndex')
         self.parentKey = data.attrib.get('parentKey')
         self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
+        self.parentTheme = data.attrib.get('parentTheme')
+        self.parentThumb = data.attrib.get('parentThumb')
         self.parentTitle = data.attrib.get('parentTitle')
         self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
+        self.fields = self.findItems(data, media.Field)
 
     def __repr__(self):
         return '<%s>' % ':'.join([p for p in [
@@ -481,7 +590,7 @@ class Season(Video):
 
     def show(self):
         """ Return this seasons :func:`~plexapi.video.Show`.. """
-        return self.fetchItem(self.parentKey)
+        return self.fetchItem(int(self.parentRatingKey))
 
     def watched(self):
         """ Returns list of watched :class:`~plexapi.video.Episode` objects. """
@@ -549,7 +658,8 @@ class Episode(Playable, Video):
 
     _include = ('?checkFiles=1&includeExtras=1&includeRelated=1'
                 '&includeOnDeck=1&includeChapters=1&includePopularLeaves=1'
-                '&includeConcerts=1&includePreferences=1')
+                '&includeMarkers=1&includeConcerts=1&includePreferences=1'
+                '&includeBandwidths=1')
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
@@ -557,11 +667,13 @@ class Episode(Playable, Video):
         Playable._loadData(self, data)
         self._details_key = self.key + self._include
         self._seasonNumber = None  # cached season number
-        self.art = data.attrib.get('art')
+        art = data.attrib.get('art')
+        self.art = art if art and str(self.ratingKey) in art else None
         self.chapterSource = data.attrib.get('chapterSource')
         self.contentRating = data.attrib.get('contentRating')
         self.duration = utils.cast(int, data.attrib.get('duration'))
         self.grandparentArt = data.attrib.get('grandparentArt')
+        self.grandparentGuid = data.attrib.get('grandparentGuid')
         self.grandparentKey = data.attrib.get('grandparentKey')
         self.grandparentRatingKey = utils.cast(int, data.attrib.get('grandparentRatingKey'))
         self.grandparentTheme = data.attrib.get('grandparentTheme')
@@ -570,6 +682,7 @@ class Episode(Playable, Video):
         self.guid = data.attrib.get('guid')
         self.index = utils.cast(int, data.attrib.get('index'))
         self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
+        self.parentGuid = data.attrib.get('parentGuid')
         self.parentIndex = data.attrib.get('parentIndex')
         self.parentKey = data.attrib.get('parentKey')
         self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
@@ -580,11 +693,13 @@ class Episode(Playable, Video):
         self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
         self.year = utils.cast(int, data.attrib.get('year'))
         self.directors = self.findItems(data, media.Director)
+        self.fields = self.findItems(data, media.Field)
         self.media = self.findItems(data, media.Media)
         self.writers = self.findItems(data, media.Writer)
         self.labels = self.findItems(data, media.Label)
         self.collections = self.findItems(data, media.Collection)
         self.chapters = self.findItems(data, media.Chapter)
+        self.markers = self.findItems(data, media.Marker)
 
     def __repr__(self):
         return '<%s>' % ':'.join([p for p in [
@@ -600,7 +715,7 @@ class Episode(Playable, Video):
     @property
     def locations(self):
         """ This does not exist in plex xml response but is added to have a common
-            interface to get the location of the Movie/Show
+            interface to get the location of the Episode
         """
         return [part.file for part in self.iterParts() if part]
 
@@ -616,14 +731,57 @@ class Episode(Playable, Video):
         """ Returns the s00e00 string containing the season and episode. """
         return 's%se%s' % (str(self.seasonNumber).zfill(2), str(self.index).zfill(2))
 
+    @property
+    def hasIntroMarker(self):
+        """ Returns True if this episode has an intro marker in the xml. """
+        if not self.isFullObject():
+            self.reload()
+        return any(marker.type == 'intro' for marker in self.markers)
+
     def season(self):
         """" Return this episodes :func:`~plexapi.video.Season`.. """
         return self.fetchItem(self.parentKey)
 
     def show(self):
         """" Return this episodes :func:`~plexapi.video.Show`.. """
-        return self.fetchItem(self.grandparentKey)
+        return self.fetchItem(int(self.grandparentRatingKey))
 
     def _defaultSyncTitle(self):
         """ Returns str, default title for a new syncItem. """
         return '%s - %s - (%s) %s' % (self.grandparentTitle, self.parentTitle, self.seasonEpisode, self.title)
+
+
+@utils.registerPlexObject
+class Clip(Playable, Video):
+    """ Represents a single Clip."""
+
+    TAG = 'Video'
+    TYPE = 'clip'
+    METADATA_TYPE = 'clip'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Video._loadData(self, data)
+        Playable._loadData(self, data)
+        self._data = data
+        self.addedAt = data.attrib.get('addedAt')
+        self.duration = utils.cast(int, data.attrib.get('duration'))
+        self.guid = data.attrib.get('guid')
+        self.key = data.attrib.get('key')
+        self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
+        self.ratingKey = data.attrib.get('ratingKey')
+        self.skipDetails = utils.cast(int, data.attrib.get('skipDetails'))
+        self.subtype = data.attrib.get('subtype')
+        self.thumb = data.attrib.get('thumb')
+        self.thumbAspectRatio = data.attrib.get('thumbAspectRatio')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+        self.year = utils.cast(int, data.attrib.get('year'))
+        self.media = self.findItems(data, media.Media)
+
+    @property
+    def locations(self):
+        """ This does not exist in plex xml response but is added to have a common
+            interface to get the location of the Clip
+        """
+        return [part.file for part in self.iterParts() if part]

lib/profilehooks.py

@@ -7,7 +7,7 @@ coverage reports.  There's a third convenient decorator (`timecall`) that
 measures the duration of function execution without the extra profiling
 overhead.
 
-Usage example (Python 2.4 or newer)::
+Usage example::
 
     from profilehooks import profile, coverage
 
@@ -16,20 +16,18 @@ Usage example (Python 2.4 or newer)::
         if n < 2: return 1
         else: return n * fn(n-1)
 
-    print fn(42)
+    print(fn(42))
 
-Usage example (Python 2.3 or older)::
+Or without imports, with some hack
 
-    from profilehooks import profile, coverage
+    $ python -m profilehooks yourmodule
 
+    @profile    # or @coverage
     def fn(n):
         if n < 2: return 1
         else: return n * fn(n-1)
 
-    # Now wrap that function in a decorator
-    fn = profile(fn) # or coverage(fn)
-
-    print fn(42)
+    print(fn(42))
 
 Reports for all thusly decorated functions will be printed to sys.stdout
 on program termination.  You can alternatively request for immediate
@@ -42,7 +40,7 @@ instead of a detailed (but costly) profile.
 Caveats
 
   A thread on python-dev convinced me that hotshot produces bogus numbers.
-  See http://mail.python.org/pipermail/python-dev/2005-November/058264.html
+  See https://mail.python.org/pipermail/python-dev/2005-November/058264.html
 
   I don't know what will happen if a decorated function will try to call
   another decorated function.  All decorators probably need to explicitly
@@ -62,7 +60,7 @@ Caveats
   executed.  For this reason coverage analysis now uses trace.py which is
   slower, but more accurate.
 
-Copyright (c) 2004--2008 Marius Gedminas <marius@pov.lt>
+Copyright (c) 2004--2020 Marius Gedminas <marius@gedmin.as>
 Copyright (c) 2007 Hanno Schlichting
 Copyright (c) 2008 Florian Schulze
 
@@ -88,24 +86,30 @@ Released under the MIT licence since December 2006:
 
 (Previously it was distributed under the GNU General Public Licence.)
 """
-# $Id: profilehooks.py 29 2010-08-13 16:29:20Z mg $
+from __future__ import print_function
 
-__author__ = "Marius Gedminas (marius@gedmin.as)"
-__copyright__ = "Copyright 2004-2009 Marius Gedminas"
+__author__ = "Marius Gedminas <marius@gedmin.as>"
+__copyright__ = "Copyright 2004-2020 Marius Gedminas and contributors"
 __license__ = "MIT"
-__version__ = "1.4"
-__date__ = "2009-03-31"
-
+__version__ = '1.12.0'
+__date__ = "2020-08-20"
 
 import atexit
+
+import functools
 import inspect
-import sys
+import logging
+import os
 import re
+import sys
 
 # For profiling
 from profile import Profile
 import pstats
 
+# For timecall
+import timeit
+
 # For hotshot profiling (inaccurate!)
 try:
     import hotshot
@@ -115,6 +119,9 @@ except ImportError:
 
 # For trace.py coverage
 import trace
+import dis
+import token
+import tokenize
 
 # For hotshot coverage (inaccurate!; uses undocumented APIs; might break)
 if hotshot is not None:
@@ -127,24 +134,55 @@ try:
 except ImportError:
     cProfile = None
 
-# For timecall
-import time
-
-
 # registry of available profilers
 AVAILABLE_PROFILERS = {}
 
+__all__ = ['coverage', 'coverage_with_hotshot', 'profile', 'timecall']
+
+
+# Use tokenize.open() on Python >= 3.2, fall back to open() on Python 2
+tokenize_open = getattr(tokenize, 'open', open)
+
+
+def _unwrap(fn):
+    # inspect.unwrap() doesn't exist on Python 2
+    if not hasattr(fn, '__wrapped__'):
+        return fn
+    else:
+        # intentionally using recursion here instead of a while loop to
+        # make cycles fail with a recursion error instead of looping forever.
+        return _unwrap(fn.__wrapped__)
+
+
+def _identify(fn):
+    fn = _unwrap(fn)
+    funcname = fn.__name__
+    filename = fn.__code__.co_filename
+    lineno = fn.__code__.co_firstlineno
+    return (funcname, filename, lineno)
+
+
+def _is_file_like(o):
+    return hasattr(o, 'write')
+
 
 def profile(fn=None, skip=0, filename=None, immediate=False, dirs=False,
             sort=None, entries=40,
-            profiler=('cProfile', 'profile', 'hotshot')):
+            profiler=('cProfile', 'profile', 'hotshot'),
+            stdout=True):
     """Mark `fn` for profiling.
 
     If `skip` is > 0, first `skip` calls to `fn` will not be profiled.
 
+    If `stdout` is not file-like and truthy, output will be printed to
+    sys.stdout. If it is a file-like object, output will be printed to it
+    instead. `stdout` must be writable in text mode (as opposed to binary)
+    if it is file-like.
+
     If `immediate` is False, profiling results will be printed to
-    sys.stdout on program termination.  Otherwise results will be printed
-    after each call.
+    self.stdout on program termination.  Otherwise results will be printed
+    after each call.  (If you don't want this, set stdout=False and specify a
+    `filename` to store profile data.)
 
     If `dirs` is False only the name of the file will be printed.
     Otherwise the full path is used.
@@ -170,7 +208,8 @@ def profile(fn=None, skip=0, filename=None, immediate=False, dirs=False,
     'profile', 'hotshot').
 
     If `filename` is specified, the profile stats will be stored in the
-    named file.  You can load them pstats.Stats(filename).
+    named file.  You can load them with pstats.Stats(filename) or use a
+    visualization tool like RunSnakeRun.
 
     Usage::
 
@@ -192,12 +231,12 @@ def profile(fn=None, skip=0, filename=None, immediate=False, dirs=False,
             ...
 
     """
-    if fn is None: # @profile() syntax -- we are a decorator maker
+    if fn is None:  # @profile() syntax -- we are a decorator maker
         def decorator(fn):
             return profile(fn, skip=skip, filename=filename,
                            immediate=immediate, dirs=dirs,
                            sort=sort, entries=entries,
-                           profiler=profiler)
+                           profiler=profiler, stdout=stdout)
         return decorator
     # @profile syntax -- we are a decorator.
     if isinstance(profiler, str):
@@ -208,20 +247,16 @@ def profile(fn=None, skip=0, filename=None, immediate=False, dirs=False,
             break
     else:
         raise ValueError('only these profilers are available: %s'
-                             % ', '.join(AVAILABLE_PROFILERS))
+                         % ', '.join(sorted(AVAILABLE_PROFILERS)))
     fp = profiler_class(fn, skip=skip, filename=filename,
                         immediate=immediate, dirs=dirs,
-                        sort=sort, entries=entries)
-    # fp = HotShotFuncProfile(fn, skip=skip, filename=filename, ...)
-         # or HotShotFuncProfile
+                        sort=sort, entries=entries, stdout=stdout)
     # We cannot return fp or fp.__call__ directly as that would break method
     # definitions, instead we need to return a plain function.
+
+    @functools.wraps(fn)
     def new_fn(*args, **kw):
         return fp(*args, **kw)
-    new_fn.__doc__ = fn.__doc__
-    new_fn.__name__ = fn.__name__
-    new_fn.__dict__ = fn.__dict__
-    new_fn.__module__ = fn.__module__
     return new_fn
 
 
@@ -244,15 +279,13 @@ def coverage(fn):
             ...
 
     """
-    fp = TraceFuncCoverage(fn) # or HotShotFuncCoverage
+    fp = TraceFuncCoverage(fn)  # or HotShotFuncCoverage
     # We cannot return fp or fp.__call__ directly as that would break method
     # definitions, instead we need to return a plain function.
+
+    @functools.wraps(fn)
     def new_fn(*args, **kw):
         return fp(*args, **kw)
-    new_fn.__doc__ = fn.__doc__
-    new_fn.__name__ = fn.__name__
-    new_fn.__dict__ = fn.__dict__
-    new_fn.__module__ = fn.__module__
     return new_fn
 
 
@@ -268,12 +301,10 @@ def coverage_with_hotshot(fn):
     fp = HotShotFuncCoverage(fn)
     # We cannot return fp or fp.__call__ directly as that would break method
     # definitions, instead we need to return a plain function.
+
+    @functools.wraps(fn)
     def new_fn(*args, **kw):
         return fp(*args, **kw)
-    new_fn.__doc__ = fn.__doc__
-    new_fn.__name__ = fn.__name__
-    new_fn.__dict__ = fn.__dict__
-    new_fn.__module__ = fn.__module__
     return new_fn
 
 
@@ -286,7 +317,7 @@ class FuncProfile(object):
     Profile = Profile
 
     def __init__(self, fn, skip=0, filename=None, immediate=False, dirs=False,
-                 sort=None, entries=40):
+                 sort=None, entries=40, stdout=True):
         """Creates a profiler for a function.
 
         Every profiler has its own log file (the name of which is derived
@@ -298,14 +329,21 @@ class FuncProfile(object):
         self.fn = fn
         self.skip = skip
         self.filename = filename
-        self.immediate = immediate
+        self._immediate = immediate
+        self.stdout = stdout
+        self._stdout_is_fp = self.stdout and _is_file_like(self.stdout)
         self.dirs = dirs
         self.sort = sort or ('cumulative', 'time', 'calls')
         if isinstance(self.sort, str):
             self.sort = (self.sort, )
         self.entries = entries
         self.reset_stats()
-        atexit.register(self.atexit)
+        if not self.immediate:
+            atexit.register(self.atexit)
+
+    @property
+    def immediate(self):
+        return self._immediate
 
     def __call__(self, *args, **kw):
         """Profile a singe call to the function."""
@@ -332,40 +370,45 @@ class FuncProfile(object):
 
     def print_stats(self):
         """Print profile information to sys.stdout."""
-        funcname = self.fn.__name__
-        filename = self.fn.func_code.co_filename
-        lineno = self.fn.func_code.co_firstlineno
-        print
-        print "*** PROFILER RESULTS ***"
-        print "%s (%s:%s)" % (funcname, filename, lineno)
-        print "function called %d times" % self.ncalls,
-        if self.skipped:
-            print "(%d calls not profiled)" % self.skipped
-        else:
-            print
-        print
         stats = self.stats
         if self.filename:
             stats.dump_stats(self.filename)
-        if not self.dirs:
-            stats.strip_dirs()
-        stats.sort_stats(*self.sort)
-        stats.print_stats(self.entries)
+        if self.stdout:
+            funcname, filename, lineno = _identify(self.fn)
+            print_f = print
+            if self._stdout_is_fp:
+                print_f = functools.partial(print, file=self.stdout)
+
+            print_f("")
+            print_f("*** PROFILER RESULTS ***")
+            print_f("%s (%s:%s)" % (funcname, filename, lineno))
+            if self.skipped:
+                skipped = " (%d calls not profiled)" % self.skipped
+            else:
+                skipped = ""
+            print_f("function called %d times%s" % (self.ncalls, skipped))
+            print_f("")
+            if not self.dirs:
+                stats.strip_dirs()
+            stats.sort_stats(*self.sort)
+            stats.print_stats(self.entries)
 
     def reset_stats(self):
         """Reset accumulated profiler statistics."""
+        # send stats printing to specified stdout if it's file-like
+        stream = self.stdout if self._stdout_is_fp else sys.stdout
+
         # Note: not using self.Profile, since pstats.Stats() fails then
-        self.stats = pstats.Stats(Profile())
+        self.stats = pstats.Stats(Profile(), stream=stream)
         self.ncalls = 0
         self.skipped = 0
 
     def atexit(self):
-        """Stop profiling and print profile information to sys.stdout.
+        """Stop profiling and print profile information to sys.stdout or self.stdout.
 
         This function is registered as an atexit hook.
         """
-        if not self.immediate:
-            self.print_stats()
+        self.print_stats()
 
 
 AVAILABLE_PROFILERS['profile'] = FuncProfile
@@ -383,13 +426,14 @@ if cProfile is not None:
 
 if hotshot is not None:
 
-    class HotShotFuncProfile(object):
+    class HotShotFuncProfile(FuncProfile):
         """Profiler for a function (uses hotshot)."""
 
         # This flag is shared between all instances
         in_profiler = False
 
-        def __init__(self, fn, skip=0, filename=None):
+        def __init__(self, fn, skip=0, filename=None, immediate=False,
+                     dirs=False, sort=None, entries=40, stdout=True):
             """Creates a profiler for a function.
 
             Every profiler has its own log file (the name of which is derived
@@ -401,17 +445,13 @@ if hotshot is not None:
             The log file is not removed and remains there to clutter the
             current working directory.
             """
-            self.fn = fn
-            self.filename = filename
-            if self.filename:
+            if filename:
                 self.logfilename = filename + ".raw"
             else:
-                self.logfilename = fn.__name__ + ".prof"
-            self.profiler = hotshot.Profile(self.logfilename)
-            self.ncalls = 0
-            self.skip = skip
-            self.skipped = 0
-            atexit.register(self.atexit)
+                self.logfilename = "%s.%d.prof" % (fn.__name__, os.getpid())
+            super(HotShotFuncProfile, self).__init__(
+                fn, skip=skip, filename=filename, immediate=immediate,
+                dirs=dirs, sort=sort, entries=entries, stdout=stdout)
 
         def __call__(self, *args, **kw):
             """Profile a singe call to the function."""
@@ -423,43 +463,32 @@ if hotshot is not None:
             if HotShotFuncProfile.in_profiler:
                 # handle recursive calls
                 return self.fn(*args, **kw)
+            if self.profiler is None:
+                self.profiler = hotshot.Profile(self.logfilename)
             try:
                 HotShotFuncProfile.in_profiler = True
                 return self.profiler.runcall(self.fn, *args, **kw)
             finally:
                 HotShotFuncProfile.in_profiler = False
+                if self.immediate:
+                    self.print_stats()
+                    self.reset_stats()
 
-        def atexit(self):
-            """Stop profiling and print profile information to sys.stderr.
-
-            This function is registered as an atexit hook.
-            """
-            self.profiler.close()
-            funcname = self.fn.__name__
-            filename = self.fn.func_code.co_filename
-            lineno = self.fn.func_code.co_firstlineno
-            print
-            print "*** PROFILER RESULTS ***"
-            print "%s (%s:%s)" % (funcname, filename, lineno)
-            print "function called %d times" % self.ncalls,
-            if self.skipped:
-                print "(%d calls not profiled)" % self.skipped
+        def print_stats(self):
+            if self.profiler is None:
+                self.stats = pstats.Stats(Profile())
             else:
-                print
-            print
-            stats = hotshot.stats.load(self.logfilename)
-            # hotshot.stats.load takes ages, and the .prof file eats megabytes, but
-            # a saved stats object is small and fast
-            if self.filename:
-                stats.dump_stats(self.filename)
-            # it is best to save before strip_dirs
-            stats.strip_dirs()
-            stats.sort_stats('cumulative', 'time', 'calls')
-            stats.print_stats(40)
+                self.profiler.close()
+                self.stats = hotshot.stats.load(self.logfilename)
+            super(HotShotFuncProfile, self).print_stats()
+
+        def reset_stats(self):
+            self.profiler = None
+            self.ncalls = 0
+            self.skipped = 0
 
     AVAILABLE_PROFILERS['hotshot'] = HotShotFuncProfile
 
-
     class HotShotFuncCoverage:
         """Coverage analysis for a function (uses _hotshot).
 
@@ -482,7 +511,7 @@ if hotshot is not None:
             current working directory.
             """
             self.fn = fn
-            self.logfilename = fn.__name__ + ".cprof"
+            self.logfilename = "%s.%d.cprof" % (fn.__name__, os.getpid())
             self.profiler = _hotshot.coverage(self.logfilename)
             self.ncalls = 0
             atexit.register(self.atexit)
@@ -490,7 +519,11 @@ if hotshot is not None:
         def __call__(self, *args, **kw):
             """Profile a singe call to the function."""
             self.ncalls += 1
-            return self.profiler.runcall(self.fn, args, kw)
+            old_trace = sys.gettrace()
+            try:
+                return self.profiler.runcall(self.fn, args, kw)
+            finally:  # pragma: nocover
+                sys.settrace(old_trace)
 
         def atexit(self):
             """Stop profiling and print profile information to sys.stderr.
@@ -498,14 +531,12 @@ if hotshot is not None:
             This function is registered as an atexit hook.
             """
             self.profiler.close()
-            funcname = self.fn.__name__
-            filename = self.fn.func_code.co_filename
-            lineno = self.fn.func_code.co_firstlineno
-            print
-            print "*** COVERAGE RESULTS ***"
-            print "%s (%s:%s)" % (funcname, filename, lineno)
-            print "function called %d times" % self.ncalls
-            print
+            funcname, filename, lineno = _identify(self.fn)
+            print("")
+            print("*** COVERAGE RESULTS ***")
+            print("%s (%s:%s)" % (funcname, filename, lineno))
+            print("function called %d times" % self.ncalls)
+            print("")
             fs = FuncSource(self.fn)
             reader = hotshot.log.LogReader(self.logfilename)
             for what, (filename, lineno, funcname), tdelta in reader:
@@ -514,15 +545,19 @@ if hotshot is not None:
                 if what == hotshot.log.LINE:
                     fs.mark(lineno)
                 if what == hotshot.log.ENTER:
-                    # hotshot gives us the line number of the function definition
-                    # and never gives us a LINE event for the first statement in
-                    # a function, so if we didn't perform this mapping, the first
-                    # statement would be marked as never executed
+                    # hotshot gives us the line number of the function
+                    # definition and never gives us a LINE event for the first
+                    # statement in a function, so if we didn't perform this
+                    # mapping, the first statement would be marked as never
+                    # executed
                     if lineno == fs.firstlineno:
                         lineno = fs.firstcodelineno
                     fs.mark(lineno)
             reader.close()
-            print fs
+            print(fs)
+            never_executed = fs.count_never_executed()
+            if never_executed:
+                print("%d lines were not executed." % never_executed)
 
 
 class TraceFuncCoverage:
@@ -552,19 +587,21 @@ class TraceFuncCoverage:
         current working directory.
         """
         self.fn = fn
-        self.logfilename = fn.__name__ + ".cprof"
+        self.logfilename = "%s.%d.cprof" % (fn.__name__, os.getpid())
         self.ncalls = 0
         atexit.register(self.atexit)
 
     def __call__(self, *args, **kw):
         """Profile a singe call to the function."""
         self.ncalls += 1
-        if TraceFuncCoverage.tracing:
+        if TraceFuncCoverage.tracing:  # pragma: nocover
             return self.fn(*args, **kw)
+        old_trace = sys.gettrace()
         try:
             TraceFuncCoverage.tracing = True
             return self.tracer.runfunc(self.fn, *args, **kw)
-        finally:
+        finally:  # pragma: nocover
+            sys.settrace(old_trace)
             TraceFuncCoverage.tracing = False
 
     def atexit(self):
@@ -572,23 +609,21 @@ class TraceFuncCoverage:
 
         This function is registered as an atexit hook.
         """
-        funcname = self.fn.__name__
-        filename = self.fn.func_code.co_filename
-        lineno = self.fn.func_code.co_firstlineno
-        print
-        print "*** COVERAGE RESULTS ***"
-        print "%s (%s:%s)" % (funcname, filename, lineno)
-        print "function called %d times" % self.ncalls
-        print
+        funcname, filename, lineno = _identify(self.fn)
+        print("")
+        print("*** COVERAGE RESULTS ***")
+        print("%s (%s:%s)" % (funcname, filename, lineno))
+        print("function called %d times" % self.ncalls)
+        print("")
         fs = FuncSource(self.fn)
         for (filename, lineno), count in self.tracer.counts.items():
             if filename != fs.filename:
                 continue
             fs.mark(lineno, count)
-        print fs
+        print(fs)
         never_executed = fs.count_never_executed()
         if never_executed:
-            print "%d lines were not executed." % never_executed
+            print("%d lines were not executed." % never_executed)
 
 
 class FuncSource:
@@ -599,22 +634,47 @@ class FuncSource:
     def __init__(self, fn):
         self.fn = fn
         self.filename = inspect.getsourcefile(fn)
-        self.source, self.firstlineno = inspect.getsourcelines(fn)
         self.sourcelines = {}
-        self.firstcodelineno = self.firstlineno
-        self.find_source_lines()
+        self.source = []
+        self.firstlineno = self.firstcodelineno = 0
+        try:
+            self.source, self.firstlineno = inspect.getsourcelines(fn)
+            self.firstcodelineno = self.firstlineno
+            self.find_source_lines()
+        except IOError:
+            self.filename = None
 
     def find_source_lines(self):
         """Mark all executable source lines in fn as executed 0 times."""
-        strs = trace.find_strings(self.filename)
-        lines = trace.find_lines_from_code(self.fn.func_code, strs)
-        self.firstcodelineno = sys.maxint
+        if self.filename is None:
+            return
+        strs = self._find_docstrings(self.filename)
+        lines = {
+            ln
+            for off, ln in dis.findlinestarts(_unwrap(self.fn).__code__)
+            if ln not in strs
+        }
         for lineno in lines:
-            self.firstcodelineno = min(self.firstcodelineno, lineno)
             self.sourcelines.setdefault(lineno, 0)
-        if self.firstcodelineno == sys.maxint:
+        if lines:
+            self.firstcodelineno = min(lines)
+        else:  # pragma: nocover
+            # This branch cannot be reached, I'm just being paranoid.
             self.firstcodelineno = self.firstlineno
 
+    def _find_docstrings(self, filename):
+        # A replacement for trace.find_strings() which was deprecated in
+        # Python 3.2 and removed in 3.6.
+        strs = set()
+        prev = token.INDENT  # so module docstring is detected as docstring
+        with tokenize_open(filename) as f:
+            tokens = tokenize.generate_tokens(f.readline)
+            for ttype, tstr, start, end, line in tokens:
+                if ttype == token.STRING and prev == token.INDENT:
+                    strs.update(range(start[0], end[0] + 1))
+                prev = ttype
+        return strs
+
     def mark(self, lineno, count=1):
         """Mark a given source line as executed count times.
 
@@ -635,6 +695,8 @@ class FuncSource:
 
     def __str__(self):
         """Return annotated source code for the function."""
+        if self.filename is None:
+            return "cannot show coverage data since co_filename is None"
         lines = []
         lineno = self.firstlineno
         for line in self.source:
@@ -642,7 +704,10 @@ class FuncSource:
             if counter is None:
                 prefix = ' ' * 7
             elif counter == 0:
-                if self.blank_rx.match(line):
+                if self.blank_rx.match(line):  # pragma: nocover
+                    # This is an workaround for an ancient bug I can't
+                    # reproduce, perhaps because it was fixed, or perhaps
+                    # because I can't remember all the details.
                     prefix = ' ' * 7
                 else:
                     prefix = '>' * 6 + ' '
@@ -653,7 +718,10 @@ class FuncSource:
         return ''.join(lines)
 
 
-def timecall(fn=None, immediate=True, timer=time.time):
+def timecall(
+        fn=None, immediate=True, timer=None,
+        log_name=None, log_level=logging.DEBUG,
+):
     """Wrap `fn` and print its execution time.
 
     Example::
@@ -665,36 +733,56 @@ def timecall(fn=None, immediate=True, timer=time.time):
         somefunc(2, 3)
 
     will print the time taken by somefunc on every call.  If you want just
-    a summary at program termination, use
+    a summary at program termination, use ::
 
         @timecall(immediate=False)
 
-    You can also choose a timing method other than the default ``time.time()``,
-    e.g.:
+    You can also choose a timing method other than the default
+    ``timeit.default_timer()``, e.g.::
 
         @timecall(timer=time.clock)
 
+    You can also log the output to a logger by specifying the name and level
+    of the logger to use, eg:
+
+        @timecall(immediate=True,
+                  log_name='profile_log',
+                  log_level=logging.DEBUG)
+
     """
-    if fn is None: # @timecall() syntax -- we are a decorator maker
+    if fn is None:  # @timecall() syntax -- we are a decorator maker
         def decorator(fn):
-            return timecall(fn, immediate=immediate, timer=timer)
+            return timecall(
+                fn, immediate=immediate, timer=timer,
+                log_name=log_name, log_level=log_level,
+            )
         return decorator
     # @timecall syntax -- we are a decorator.
-    fp = FuncTimer(fn, immediate=immediate, timer=timer)
+    if timer is None:
+        timer = timeit.default_timer
+    fp = FuncTimer(
+        fn, immediate=immediate, timer=timer,
+        log_name=log_name, log_level=log_level,
+    )
     # We cannot return fp or fp.__call__ directly as that would break method
     # definitions, instead we need to return a plain function.
+
+    @functools.wraps(fn)
     def new_fn(*args, **kw):
         return fp(*args, **kw)
-    new_fn.__doc__ = fn.__doc__
-    new_fn.__name__ = fn.__name__
-    new_fn.__dict__ = fn.__dict__
-    new_fn.__module__ = fn.__module__
     return new_fn
 
 
 class FuncTimer(object):
 
-    def __init__(self, fn, immediate, timer):
+    def __init__(
+            self, fn, immediate, timer,
+            log_name=None, log_level=logging.DEBUG,
+    ):
+        self.logger = None
+        if log_name:
+            self.logger = logging.getLogger(log_name)
+        self.log_level = log_level
         self.fn = fn
         self.ncalls = 0
         self.totaltime = 0
@@ -708,25 +796,57 @@ class FuncTimer(object):
         fn = self.fn
         timer = self.timer
         self.ncalls += 1
+        start = timer()
         try:
-            start = timer()
             return fn(*args, **kw)
         finally:
             duration = timer() - start
             self.totaltime += duration
             if self.immediate:
-                funcname = fn.__name__
-                filename = fn.func_code.co_filename
-                lineno = fn.func_code.co_firstlineno
-                print >> sys.stderr, "\n  %s (%s:%s):\n    %.3f seconds\n" % (
-                                        funcname, filename, lineno, duration)
+                funcname, filename, lineno = _identify(fn)
+                message = "%s (%s:%s):\n    %.3f seconds\n\n" % (
+                    funcname, filename, lineno, duration,
+                )
+                if self.logger:
+                    self.logger.log(self.log_level, message)
+                else:
+                    sys.stderr.write("\n  " + message)
+                    sys.stderr.flush()
+
     def atexit(self):
         if not self.ncalls:
             return
-        funcname = self.fn.__name__
-        filename = self.fn.func_code.co_filename
-        lineno = self.fn.func_code.co_firstlineno
-        print ("\n  %s (%s:%s):\n"
-               "    %d calls, %.3f seconds (%.3f seconds per call)\n" % (
-                                funcname, filename, lineno, self.ncalls,
-                                self.totaltime, self.totaltime / self.ncalls))
+        funcname, filename, lineno = _identify(self.fn)
+        message = "\n  %s (%s:%s):\n"\
+            "    %d calls, %.3f seconds (%.3f seconds per call)\n" % (
+                funcname, filename, lineno, self.ncalls,
+                self.totaltime, self.totaltime / self.ncalls)
+        if self.logger:
+            self.logger.log(self.log_level, message)
+        else:
+            print(message)
+
+
+if __name__ == '__main__':
+
+    local = dict((name, globals()[name]) for name in __all__)
+    message = """********
+Injected `profilehooks`
+--------
+{}
+********
+""".format("\n".join(local.keys()))
+
+    def interact_():
+        from code import interact
+        interact(message, local=local)
+
+    def run_():
+        from runpy import run_module
+        print(message)
+        run_module(sys.argv[1], init_globals=local)
+
+    if len(sys.argv) == 1:
+        interact_()
+    else:
+        run_()

lib/tqdm/__init__.py

@@ -1,34 +0,0 @@
-from ._tqdm import tqdm
-from ._tqdm import trange
-from ._tqdm_gui import tqdm_gui
-from ._tqdm_gui import tgrange
-from ._tqdm_pandas import tqdm_pandas
-from ._main import main
-from ._monitor import TMonitor, TqdmSynchronisationWarning
-from ._version import __version__  # NOQA
-from ._tqdm import TqdmTypeError, TqdmKeyError, TqdmWarning, \
-    TqdmDeprecationWarning, TqdmExperimentalWarning, \
-    TqdmMonitorWarning
-
-__all__ = ['tqdm', 'tqdm_gui', 'trange', 'tgrange', 'tqdm_pandas',
-           'tqdm_notebook', 'tnrange', 'main', 'TMonitor',
-           'TqdmTypeError', 'TqdmKeyError',
-           'TqdmWarning', 'TqdmDeprecationWarning',
-           'TqdmExperimentalWarning',
-           'TqdmMonitorWarning', 'TqdmSynchronisationWarning',
-           '__version__']
-
-
-def tqdm_notebook(*args, **kwargs):  # pragma: no cover
-    """See tqdm._tqdm_notebook.tqdm_notebook for full documentation"""
-    from ._tqdm_notebook import tqdm_notebook as _tqdm_notebook
-    return _tqdm_notebook(*args, **kwargs)
-
-
-def tnrange(*args, **kwargs):  # pragma: no cover
-    """
-    A shortcut for tqdm_notebook(xrange(*args), **kwargs).
-    On Python3+ range is used instead of xrange.
-    """
-    from ._tqdm_notebook import tnrange as _tnrange
-    return _tnrange(*args, **kwargs)