Daily concurrent stream count by stream type Last 30 days
@@ -372,6 +372,10 @@
break
}
+ if (window.location.hash === '#concurrent-graph') {
+ current_tab = '#tabs-stream';
+ }
+
$('#yaxis-' + yaxis).prop('checked', true);
$('#yaxis-' + yaxis).closest('label').addClass('active');
$('#graph-days').val(current_day_range);
@@ -639,7 +643,7 @@
}
});
- $('#nav-tabs-2').tab('show');
+ $('#nav-tabs-stream').tab('show');
}
function loadGraphsTab3(time_range, yaxis) {
diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html
index d66dd1d4..3e1e118c 100644
--- a/data/interfaces/default/home_stats.html
+++ b/data/interfaces/default/home_stats.html
@@ -177,7 +177,9 @@ DOCUMENTATION :: END
% elif stat_id == 'top_platforms':
${row['platform']}
% elif stat_id == 'most_concurrent':
- ${row['title']}
+
+ ${row['title']}
+
% endif
From 98583d139ac4207604fd728f3d591c2a79cb4636 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:05:47 -0700
Subject: [PATCH 3/7] Add config override for PMS_LANGUAGE
---
plexpy/config.py | 1 +
plexpy/http_handler.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/plexpy/config.py b/plexpy/config.py
index 6f2926d9..dbcd294d 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -55,6 +55,7 @@ _CONFIG_DEFINITIONS = {
'PMS_IP': (str, 'PMS', '127.0.0.1'),
'PMS_IS_CLOUD': (int, 'PMS', 0),
'PMS_IS_REMOTE': (int, 'PMS', 0),
+ 'PMS_LANGUAGE': (str, 'PMS', ''),
'PMS_LOGS_FOLDER': (str, 'PMS', ''),
'PMS_LOGS_LINE_CAP': (int, 'PMS', 1000),
'PMS_NAME': (str, 'PMS', ''),
diff --git a/plexpy/http_handler.py b/plexpy/http_handler.py
index 87c4cff5..79bb3562 100644
--- a/plexpy/http_handler.py
+++ b/plexpy/http_handler.py
@@ -62,7 +62,7 @@ class HTTPHandler(object):
plexpy.common.PLATFORM_RELEASE),
'X-Plex-Device-Name': '{} ({})'.format(plexpy.common.PLATFORM_DEVICE_NAME,
plexpy.common.PRODUCT),
- 'Accept-Language': plexpy.SYS_LANGUAGE
+ 'X-Plex-Language': plexpy.CONFIG.PMS_LANGUAGE or plexpy.SYS_LANGUAGE
}
self.token = token
From d63c0cb469375537ddb713368a1e89dde41072ad Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:24:48 -0700
Subject: [PATCH 4/7] Guard against None transcode_key
---
plexpy/activity_handler.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py
index 7bfbe8fb..32f835c3 100644
--- a/plexpy/activity_handler.py
+++ b/plexpy/activity_handler.py
@@ -310,7 +310,9 @@ class ActivityHandler(object):
last_state = self.db_session['state']
last_rating_key = str(self.db_session['rating_key'])
last_live_uuid = self.db_session['live_uuid']
- last_transcode_key = self.db_session['transcode_key'].split('/')[-1]
+ last_transcode_key = self.db_session['transcode_key']
+ if isinstance(last_transcode_key, str):
+ last_transcode_key = last_transcode_key.split('/')[-1]
last_paused = self.db_session['last_paused']
last_rating_key_websocket = self.db_session['rating_key_websocket']
last_guid = self.db_session['guid']
From c215afbf84baafb1a2020c2dc6e36944a6de1504 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:27:31 -0700
Subject: [PATCH 5/7] v2.13.2
---
CHANGELOG.md | 14 ++++++++++++++
plexpy/version.py | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1266e43f..d5eb4c5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+## v2.13.2 (2023-10-26)
+* History:
+ * New: Added quarter values icons for history watch status. (#2179, #2156) (Thanks @herby2212)
+* Graphs:
+ * New: Added concurrent streams per day graph. (#2046) (Thanks @herby2212)
+* Exporter:
+ * New: Added metadata directory to exporter fields.
+ * Removed: Banner exporter fields for tv shows.
+* UI:
+ * New: Added last triggered time to notification agents and newsletter agent lists.
+* Other:
+ * New: Added X-Plex-Language header override to config file.
+
+
## v2.13.1 (2023-08-25)
* Notes:
* Support for Python 3.7 has been dropped. The minimum Python version is now 3.8.
diff --git a/plexpy/version.py b/plexpy/version.py
index c5ee1521..5ca70297 100644
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -18,4 +18,4 @@
from __future__ import unicode_literals
PLEXPY_BRANCH = "master"
-PLEXPY_RELEASE_VERSION = "v2.13.1"
\ No newline at end of file
+PLEXPY_RELEASE_VERSION = "v2.13.2"
\ No newline at end of file
From dd380b583f67ad112f99057da4518a3df9c7ff74 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 26 Oct 2023 11:05:34 -0700
Subject: [PATCH 6/7] Add system language to startup logs
---
plexpy/__init__.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index eb1f73c2..2590c867 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -239,6 +239,9 @@ def initialize(config_file):
logger.info("{} (UTC{})".format(
str(SYS_TIMEZONE), SYS_UTC_OFFSET
))
+ logger.info("Language {}{} / Encoding {}".format(
+ SYS_LANGUAGE, f' (override {CONFIG.PMS_LANGUAGE})' if CONFIG.PMS_LANGUAGE else '', SYS_ENCODING
+ ))
logger.info("Python {}".format(
sys.version.replace('\n', '')
))
From 32cf26884b4dcc7fa1aa26260d99689b922deedd Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 26 Oct 2023 11:05:51 -0700
Subject: [PATCH 7/7] Add system language and sqlite version to configuration
table
---
data/interfaces/default/configuration_table.html | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/data/interfaces/default/configuration_table.html b/data/interfaces/default/configuration_table.html
index 676876d6..66d8ef40 100644
--- a/data/interfaces/default/configuration_table.html
+++ b/data/interfaces/default/configuration_table.html
@@ -11,6 +11,7 @@ DOCUMENTATION :: END
<%!
import os
+ import sqlite3
import sys
import plexpy
from plexpy import common, logger
@@ -71,10 +72,18 @@ DOCUMENTATION :: END
System Timezone: |
${str(plexpy.SYS_TIMEZONE)} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)})
+ |
+ | System Language: |
+ ${plexpy.SYS_LANGUAGE + (' (override {})'.format(plexpy.CONFIG.PMS_LANGUAGE) if plexpy.CONFIG.PMS_LANGUAGE else '')} |
+
| Python Version: |
${sys.version} |
+
+ | SQLite Version: |
+ ${sqlite3.sqlite_version} |
+
| Resources: |
|