From 410a991ae6be818905f62f1f127468598b76d8c0 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Fri, 9 Aug 2019 17:48:55 -0500 Subject: [PATCH 01/13] to-develop switch --- varken/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/varken/__init__.py b/varken/__init__.py index 754c281d..eb55f87f 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ -VERSION = "1.7.3" -BRANCH = 'master' +VERSION = "1.7.4" +BRANCH = 'develop' From ca2c9aa6e6a210b3b009930c8727397c03e9e68e Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Fri, 9 Aug 2019 17:49:50 -0500 Subject: [PATCH 02/13] add release to gitlab-ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb8e73f9..a845616b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,7 +119,7 @@ latest: "$CI_PROJECT_PATH":"$TAG-arm" - docker manifest push -p "$CI_PROJECT_PATH":latest -.github: +github: <<: *common_release stage: release script: From 37dc8d5c844932d9122c5051b27d7320d61a40be Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Fri, 9 Aug 2019 18:10:57 -0500 Subject: [PATCH 03/13] change release to point to most recent release --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 484d218b..bd88fb9f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Discord](https://img.shields.io/discord/518970285773422592.svg?colorB=7289DA&label=Discord&logo=Discord&logoColor=7289DA&style=flat-square)](https://discord.gg/VjZ6qSM) [![ko-fi](https://img.shields.io/badge/Buy%20Us%20A%20Coffee-Donate-ff813f.svg?logo=CoffeeScript&style=flat-square)](https://ko-fi.com/varken) [![Docker-Layers](https://images.microbadger.com/badges/image/boerderij/varken.svg)](https://microbadger.com/images/boerderij/varken) -[![Release](https://img.shields.io/github/release/boerderij/varken.svg?style=flat-square)](https://microbadger.com/images/boerderij/varken) +[![Release](https://img.shields.io/github/release/boerderij/varken.svg?style=flat-square)](https://github.com/Boerderij/Varken/releases/latest) [![Docker Pulls](https://img.shields.io/docker/pulls/boerderij/varken.svg)](https://hub.docker.com/r/boerderij/varken/) Dutch for PIG. PIG is an Acronym for Plex/InfluxDB/Grafana From ecbb0406ce1ec37a93dbe17685e6efd87007d63b Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Thu, 19 Sep 2019 23:37:01 -0400 Subject: [PATCH 04/13] Update tautulli scructure to refelct recent changes --- varken/structures.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/varken/structures.py b/varken/structures.py index 9781067a..2cfb8591 100644 --- a/varken/structures.py +++ b/varken/structures.py @@ -398,11 +398,13 @@ class TautulliStream(NamedTuple): stream_video_codec_level: str = None stream_video_decision: str = None stream_video_framerate: str = None + stream_video_full_resolution: str = None stream_video_height: str = None stream_video_language: str = None stream_video_language_code: str = None stream_video_ref_frames: str = None stream_video_resolution: str = None + stream_video_scan_type: str = None stream_video_width: str = None studio: str = None sub_type: str = None @@ -456,12 +458,14 @@ class TautulliStream(NamedTuple): video_decision: str = None video_frame_rate: str = None video_framerate: str = None + video_full_resolution: str = None video_height: str = None video_language: str = None video_language_code: str = None video_profile: str = None video_ref_frames: str = None video_resolution: str = None + video_scan_type: str = None video_width: str = None view_offset: str = None watched_status: int = None From 1dd6e494cc0112e65d182f4d69759ab8cd61ff69 Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Thu, 19 Sep 2019 23:37:54 -0400 Subject: [PATCH 05/13] Use full resolution when applicable in tautulli --- varken/tautulli.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/varken/tautulli.py b/varken/tautulli.py index 8a60ae48..2b527715 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -101,6 +101,8 @@ def get_activity(self): quality = session.container.upper() elif quality in ('SD', 'sd', '4k'): quality = session.stream_video_resolution.upper() + elif session.stream_video_full_resolution: + quality = session.stream_video_full_resolution else: quality = session.stream_video_resolution + 'p' From e4bcc0d90337b4701db28162d49baca03cb90cfb Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Fri, 20 Sep 2019 13:13:16 -0400 Subject: [PATCH 06/13] Enhance platform overrides --- varken/tautulli.py | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/varken/tautulli.py b/varken/tautulli.py index 2b527715..8cc3c732 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -114,10 +114,18 @@ def get_activity(self): elif player_state == 'buffering': player_state = 3 + # Platform Version Overrides product_version = session.product_version - if session.platform == 'Roku': + if session.platform in ('Roku', 'osx', 'windows'): product_version = session.product_version.split('-')[0] + # Platform Overrides + platform_name = session.platform + if platform_name in 'osx': + platform_name = 'Plex Mac OS' + if platform_name in 'windows': + platform_name = 'Plex Windows' + hash_id = hashit(f'{session.session_id}{session.session_key}{session.username}{session.full_title}') influx_payload.append( { @@ -128,7 +136,7 @@ def get_activity(self): "friendly_name": session.friendly_name, "username": session.username, "title": session.full_title, - "platform": session.platform, + "platform": platform_name, "product_version": product_version, "quality": quality, "video_decision": video_decision.title(), @@ -147,7 +155,7 @@ def get_activity(self): "latitude": latitude, "longitude": longitude, "player_state": player_state, - "device_type": session.platform, + "device_type": platform_name, "relayed": session.relayed, "secure": session.secure, "server": self.server.id @@ -300,9 +308,23 @@ def get_historical(self, days=30): quality = session.container.upper() elif quality in ('SD', 'sd', '4k'): quality = session.stream_video_resolution.upper() + elif session.stream_video_full_resolution: + quality = session.stream_video_full_resolution else: quality = session.stream_video_resolution + 'p' + # Platform Version Overrides + product_version = session.product_version + if session.platform in ('Roku', 'osx', 'windows'): + product_version = session.product_version.split('-')[0] + + # Platform Overrides + platform_name = session.platform + if platform_name in 'osx': + platform_name = 'Plex Mac OS' + if platform_name in 'windows': + platform_name = 'Plex Windows' + player_state = 100 hash_id = hashit(f'{session.id}{session.session_key}{session.user}{session.full_title}') @@ -315,7 +337,7 @@ def get_historical(self, days=30): "friendly_name": session.friendly_name, "username": session.user, "title": session.full_title, - "platform": session.platform, + "platform": platform_name, "quality": quality, "video_decision": video_decision.title(), "transcode_decision": decision.title(), @@ -332,7 +354,7 @@ def get_historical(self, days=30): "latitude": latitude, "longitude": longitude, "player_state": player_state, - "device_type": session.platform, + "device_type": platform_name, "relayed": session.relayed, "secure": session.secure, "server": self.server.id From 404b8bc25f75cdd5d57c1525f6b453b93a4b79d7 Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Fri, 20 Sep 2019 13:18:08 -0400 Subject: [PATCH 07/13] Remove product version from historical import --- varken/tautulli.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/varken/tautulli.py b/varken/tautulli.py index 8cc3c732..733ba2ab 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -313,11 +313,6 @@ def get_historical(self, days=30): else: quality = session.stream_video_resolution + 'p' - # Platform Version Overrides - product_version = session.product_version - if session.platform in ('Roku', 'osx', 'windows'): - product_version = session.product_version.split('-')[0] - # Platform Overrides platform_name = session.platform if platform_name in 'osx': From 2e3cfcde81fac3e3eed201707478cf12a5bc5a9f Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Fri, 20 Sep 2019 13:33:26 -0400 Subject: [PATCH 08/13] Add product to data sent to influx --- varken/tautulli.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/varken/tautulli.py b/varken/tautulli.py index 733ba2ab..5f1c4d55 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -136,6 +136,7 @@ def get_activity(self): "friendly_name": session.friendly_name, "username": session.username, "title": session.full_title, + "product": session.product, "platform": platform_name, "product_version": product_version, "quality": quality, @@ -332,6 +333,7 @@ def get_historical(self, days=30): "friendly_name": session.friendly_name, "username": session.user, "title": session.full_title, + "product": session.product, "platform": platform_name, "quality": quality, "video_decision": video_decision.title(), From 9eb58a7b0220cac6784384e576de2e7bc430cf2d Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Sun, 22 Sep 2019 13:50:57 -0400 Subject: [PATCH 09/13] Make platform overrides more in line with what plex should have made them --- varken/tautulli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/varken/tautulli.py b/varken/tautulli.py index 5f1c4d55..209d7f5f 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -122,9 +122,9 @@ def get_activity(self): # Platform Overrides platform_name = session.platform if platform_name in 'osx': - platform_name = 'Plex Mac OS' + platform_name = 'MacOS' if platform_name in 'windows': - platform_name = 'Plex Windows' + platform_name = 'Windows' hash_id = hashit(f'{session.session_id}{session.session_key}{session.username}{session.full_title}') influx_payload.append( From 89a51e944a2b54b5a2ff2bf55b80be1b2dd850d0 Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Sun, 22 Sep 2019 13:51:58 -0400 Subject: [PATCH 10/13] Apple... --- varken/tautulli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/varken/tautulli.py b/varken/tautulli.py index 209d7f5f..c0d11a29 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -122,7 +122,7 @@ def get_activity(self): # Platform Overrides platform_name = session.platform if platform_name in 'osx': - platform_name = 'MacOS' + platform_name = 'macOS' if platform_name in 'windows': platform_name = 'Windows' From fdc165ae309fbb6e2c77c1f8f0f09a49f535d20c Mon Sep 17 00:00:00 2001 From: samwiseg00 Date: Mon, 7 Oct 2019 09:22:46 -0400 Subject: [PATCH 11/13] Add grandparent_guid and parent_guid to Tautulli structures. Closes #154 --- varken/structures.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/varken/structures.py b/varken/structures.py index 2cfb8591..cb359446 100644 --- a/varken/structures.py +++ b/varken/structures.py @@ -306,6 +306,7 @@ class TautulliStream(NamedTuple): friendly_name: str = None full_title: str = None genres: list = None + grandparent_guid: str = None grandparent_rating_key: str = None grandparent_thumb: str = None grandparent_title: str = None @@ -337,6 +338,7 @@ class TautulliStream(NamedTuple): optimized_version_title: str = None original_title: str = None originally_available_at: str = None + parent_guid: str = None parent_media_index: str = None parent_rating_key: str = None parent_thumb: str = None From 90106d75c40dd138bba3124c99647de65bcc0178 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Mon, 7 Oct 2019 11:34:35 -0500 Subject: [PATCH 12/13] 1.7.4 to master --- varken/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/varken/__init__.py b/varken/__init__.py index eb55f87f..72b3f7d1 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ VERSION = "1.7.4" -BRANCH = 'develop' +BRANCH = 'master' From e8ef70b4d5b8e9151aef43a1f890a628233b87f7 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Mon, 7 Oct 2019 11:39:28 -0500 Subject: [PATCH 13/13] 1.7.4 changelog --- CHANGELOG.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e7c6442..4db6a942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,19 @@ # Change Log -## [v1.7.3](https://github.com/Boerderij/Varken/tree/v1.7.3) (2019-08-09) -[Full Changelog](https://github.com/Boerderij/Varken/compare/1.7.2...v1.7.3) +## [v1.7.4](https://github.com/Boerderij/Varken/tree/v1.7.4) (2019-10-07) +[Full Changelog](https://github.com/Boerderij/Varken/compare/1.7.3...v1.7.4) + +**Implemented enhancements:** + +- \[Enhancement\] Update Tautulli structures to include grandparent\_guid and parent\_guid [\#154](https://github.com/Boerderij/Varken/issues/154) +- \[Enhancement\] Update Tautulli structures to reflect recent changes [\#153](https://github.com/Boerderij/Varken/issues/153) + +**Merged pull requests:** + +- v1.7.4 Merge [\#155](https://github.com/Boerderij/Varken/pull/155) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) + +## [1.7.3](https://github.com/Boerderij/Varken/tree/1.7.3) (2019-08-09) +[Full Changelog](https://github.com/Boerderij/Varken/compare/1.7.2...1.7.3) **Implemented enhancements:** @@ -311,4 +323,4 @@ - Create crontabs [\#6](https://github.com/Boerderij/Varken/pull/6) ([ghost](https://github.com/ghost)) - update plex\_dashboard.json [\#5](https://github.com/Boerderij/Varken/pull/5) ([ghost](https://github.com/ghost)) - Update README.md [\#4](https://github.com/Boerderij/Varken/pull/4) ([ghost](https://github.com/ghost)) -- added sickrage portion [\#3](https://github.com/Boerderij/Varken/pull/3) ([ghost](https://github.com/ghost)) \ No newline at end of file +- added sickrage portion [\#3](https://github.com/Boerderij/Varken/pull/3) ([ghost](https://github.com/ghost))