diff --git a/.github/workflows/publishrelease-beta.yml b/.github/workflows/publishrelease-beta.yml deleted file mode 100644 index 28183600..00000000 --- a/.github/workflows/publishrelease-beta.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Create Pre-Release -on: - push: - tags: - - 'v*-beta' -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@master - - name: Get Release Version - run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//} - - name: Get Changelog - run: echo ::set-env name=CHANGELOG::"$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md | sed '$d' | sed '$d' | sed '$d' | sed ':a;N;$!ba;s/\n/%0A/g' )" - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ env.RELEASE_VERSION }} - release_name: Tautulli ${{ env.RELEASE_VERSION }} - body: | - ## Changelog - - ##${{ env.CHANGELOG }} - draft: false - prerelease: true diff --git a/.github/workflows/publishrelease-master.yml b/.github/workflows/publishrelease.yml similarity index 92% rename from .github/workflows/publishrelease-master.yml rename to .github/workflows/publishrelease.yml index e7795681..f5e0b5d9 100644 --- a/.github/workflows/publishrelease-master.yml +++ b/.github/workflows/publishrelease.yml @@ -3,7 +3,6 @@ on: push: tags: - 'v*' - - '!v*-beta' jobs: build: runs-on: ubuntu-latest @@ -27,4 +26,4 @@ jobs: ##${{ env.CHANGELOG }} draft: false - prerelease: false + prerelease: ${{ endsWith(env.RELEASE_VERSION, '-beta') }} diff --git a/API.md b/API.md index 09e471e0..799f4dee 100644 --- a/API.md +++ b/API.md @@ -173,10 +173,13 @@ Delete the 3rd party API lookup info. ``` Required parameters: + None + +Optional parameters: rating_key (int): 1234 (Note: Must be the movie, show, artist, album, or track rating key) -Optional parameters: - None + service (str): 'themoviedb' or 'tvmaze' or 'musicbrainz' + delete_all (bool): 'true' to delete all images form the service Returns: json: @@ -327,6 +330,7 @@ Required parameters: Optional parameters: custom_thumb (str): The URL for the custom library thumbnail + custom_art (str): The URL for the custom library background art keep_history (int): 0 or 1 Returns: diff --git a/CHANGELOG.md b/CHANGELOG.md index 831d94e8..67090ca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # Changelog -## v2.2.0-beta (2020-02-27) +## v2.2.0 (2020-03-08) * Important Note! * All Live TV changes requires Plex Media Server 1.18.7 or higher. * Monitoring: + * Fix: Improved IPv6 display on the activity cards. (Thanks @felixbuenemann) * New: Added Live TV metadata and posters to the activity cards. * Change: Show bandwidth in Gbps when greater than 1000 Mbps. * History: @@ -18,8 +19,17 @@ * Notifications: * Fix: Race condition causing stream count to be incorrect for playback stop notifications. * New: Added Live TV channel notification parameters. + * New: Added Plex background art notification parameter. + * Note: This is the Plex API endpoint to retrieve the background art, not the actual image. + * New: Added poster images for clip notifications. + * Change: Default Webhook notification method to POST. +* UI: + * Fix: Windows platform showing up twice on the Most Active Platforms statistics card. + * New: Added option to change the background art for library sections when editing a library. + * New: Added button to reset Tautulli git installation in settings to fix failed git updates. * API: * New: Added ability to filter history using a "live" media type and by guid for the get_history API command. + * New: Added cutsom_art parameter to the edit_library API command. * Other: * Change: Add crossorigin use-credentials attribute to manifest tags. (Thanks @pkoenig10) * Change: Disable automatic updates for Docker containers. Updates are now handled by updating the Docker container. diff --git a/Tautulli.py b/Tautulli.py index d6e290a9..36af255a 100755 --- a/Tautulli.py +++ b/Tautulli.py @@ -261,6 +261,8 @@ def main(): plexpy.shutdown(restart=True) elif plexpy.SIGNAL == 'checkout': plexpy.shutdown(restart=True, checkout=True) + elif plexpy.SIGNAL == 'reset': + plexpy.shutdown(restart=True, reset=True) else: plexpy.shutdown(restart=True, update=True) diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index c32dcd08..1642af09 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -291,6 +291,7 @@ ${next.modalIncludes()} + % if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS: diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css index 94469b7a..a3865497 100644 --- a/data/interfaces/default/css/tautulli.css +++ b/data/interfaces/default/css/tautulli.css @@ -1921,6 +1921,16 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span { margin-left: 2px; color: #999; } +.critic-rating { + display: inline-block; + font-size: 14px; + overflow: hidden; + white-space: nowrap; + margin-top: 2px; + height: 20px; + line-height: 20px; + float: right; +} .children-list, .search-results-list { position: relative; @@ -3153,7 +3163,7 @@ div.dataTables_info { .channel-thumbnail { background-color: #868b8b; background-position: center; - background-size: cover; + background-size: contain; background-origin: content-box; background-repeat: no-repeat; height: 50px; @@ -4021,7 +4031,33 @@ a:hover .overlay-refresh-image:hover { .stats-most_concurrent { background-image: url(../images/icons/most-concurrent-streams.svg); } - +.rating-image { + width: 51px; + height: 20px; + margin-left: 10px; + display: inline-block; + background-origin: content-box !important; + background-size: contain !important; + background-repeat: no-repeat !important; + background-position: left !important; + text-align: right; +} +.rating-imdb { + width: 62px !important; + background-image: url(../images/rating/imdb.svg); +} +.rating-rottentomatos-ripe { + background-image: url(../images/rating/tomato-ripe.svg); +} +.rating-rottentomatos-rotten { + background-image: url(../images/rating/tomato-rotten.svg); +} +.rating-rottentomatos-upright { + background-image: url(../images/rating/popcorn-upright.svg); +} +.rating-rottentomatos-spilled { + background-image: url(../images/rating/popcorn-spilled.svg); +} .transparent { background-color: transparent !important; } diff --git a/data/interfaces/default/edit_library.html b/data/interfaces/default/edit_library.html index f8c3863a..8b36a332 100644 --- a/data/interfaces/default/edit_library.html +++ b/data/interfaces/default/edit_library.html @@ -40,13 +40,22 @@ DOCUMENTATION :: END