From ebb16925ca529e8832c51f86a8f9df9ebb5216ca Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:15:43 -0500 Subject: [PATCH 1/9] Update core.py updating to reflect python > v3.12 --- lib/gntp/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gntp/core.py b/lib/gntp/core.py index 978055929..0c28db72b 100644 --- a/lib/gntp/core.py +++ b/lib/gntp/core.py @@ -30,7 +30,7 @@ re.IGNORECASE ) -GNTP_HEADER = re.compile('([\w-]+):(.+)') +GNTP_HEADER = re.compile('([\\w-]+):(.+)') GNTP_EOL = gntp.shim.b('\r\n') GNTP_SEP = gntp.shim.b(': ') From a4aa6bb1456284bc4d3412fa139277127af9ecf2 Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:51:07 -0500 Subject: [PATCH 2/9] Update core.py --- lib/gntp/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gntp/core.py b/lib/gntp/core.py index 0c28db72b..bd80adc78 100644 --- a/lib/gntp/core.py +++ b/lib/gntp/core.py @@ -19,14 +19,14 @@ #GNTP/ [:][ :.] GNTP_INFO_LINE = re.compile( - 'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + + 'GNTP/(?P\\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + ' (?P[A-Z0-9]+(:(?P[A-F0-9]+))?) ?' + '((?P[A-Z0-9]+):(?P[A-F0-9]+).(?P[A-F0-9]+))?\r\n', re.IGNORECASE ) GNTP_INFO_LINE_SHORT = re.compile( - 'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', + 'GNTP/(?P\\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', re.IGNORECASE ) From 545105b28317960d4dab42a3d67b3af29633baf3 Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:51:56 -0500 Subject: [PATCH 3/9] Rename README.md to README-ORG.md --- README.md => README-ORG.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.md => README-ORG.md (100%) diff --git a/README.md b/README-ORG.md similarity index 100% rename from README.md rename to README-ORG.md From f50277bb4b8c48b63bfb98b0961b0b154179c182 Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:52:20 -0500 Subject: [PATCH 4/9] Create README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..c0b689e78 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +Anyway, for those seeing this I'm just doing this as I regularly use this product and I find it useful and wanted the latest version of the Headphones application avaialble in a docker image again so I can deploy it to my TrueNAS server. + +I simply renamed the original README.md as README-ORG.md so please DON'T believe anything contained in it reflects to this project! + +For now the only way to get the updated version is to clone this repository, do a docker build on the code and then create a custom yaml file to reference the new image. I'm currently testing this on my TrueNAS system and have it working well with a few minor issues that need sorting out. From 33ef434ceb093e5e088210f3863249fde5b2de71 Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:57:17 -0500 Subject: [PATCH 5/9] Update core.py --- lib/gntp/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gntp/core.py b/lib/gntp/core.py index bd80adc78..96544caa6 100644 --- a/lib/gntp/core.py +++ b/lib/gntp/core.py @@ -19,14 +19,14 @@ #GNTP/ [:][ :.] GNTP_INFO_LINE = re.compile( - 'GNTP/(?P\\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + + 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + ' (?P[A-Z0-9]+(:(?P[A-F0-9]+))?) ?' + '((?P[A-Z0-9]+):(?P[A-F0-9]+).(?P[A-F0-9]+))?\r\n', re.IGNORECASE ) GNTP_INFO_LINE_SHORT = re.compile( - 'GNTP/(?P\\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', + 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', re.IGNORECASE ) From 9efccb56fa647e7b6999c49b258ce9d0f417ed84 Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:59:04 -0500 Subject: [PATCH 6/9] Update core.py --- lib/gntp/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gntp/core.py b/lib/gntp/core.py index 96544caa6..b2b844b10 100644 --- a/lib/gntp/core.py +++ b/lib/gntp/core.py @@ -19,14 +19,14 @@ #GNTP/ [:][ :.] GNTP_INFO_LINE = re.compile( - 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + + 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\\-OK|\\-ERROR)' + ' (?P[A-Z0-9]+(:(?P[A-F0-9]+))?) ?' + '((?P[A-Z0-9]+):(?P[A-F0-9]+).(?P[A-F0-9]+))?\r\n', re.IGNORECASE ) GNTP_INFO_LINE_SHORT = re.compile( - 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', + 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\\-OK|\\-ERROR)', re.IGNORECASE ) From f0d6253ecd2fbe3ca7af88053d41d28e0d9090b4 Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Thu, 13 Feb 2025 12:02:57 -0500 Subject: [PATCH 7/9] Update core.py added additional escape characters "\" so that it will work with newer versions of python (>3.12) From 1b8cfa072f2499dd991bb96e299360e59cf03a97 Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Fri, 14 Feb 2025 09:49:37 -0500 Subject: [PATCH 8/9] Update core.py changing how to correct python issues related to alpine 3.21 by using raw string instead of additional escape characters. --- lib/gntp/core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gntp/core.py b/lib/gntp/core.py index b2b844b10..30bcbd27a 100644 --- a/lib/gntp/core.py +++ b/lib/gntp/core.py @@ -19,18 +19,18 @@ #GNTP/ [:][ :.] GNTP_INFO_LINE = re.compile( - 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\\-OK|\\-ERROR)' + + r'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + ' (?P[A-Z0-9]+(:(?P[A-F0-9]+))?) ?' + '((?P[A-Z0-9]+):(?P[A-F0-9]+).(?P[A-F0-9]+))?\r\n', re.IGNORECASE ) GNTP_INFO_LINE_SHORT = re.compile( - 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\\-OK|\\-ERROR)', + r'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', re.IGNORECASE ) -GNTP_HEADER = re.compile('([\\w-]+):(.+)') +r'GNTP_HEADER = re.compile('([\w-]+):(.+)')' GNTP_EOL = gntp.shim.b('\r\n') GNTP_SEP = gntp.shim.b(': ') From 632485e89dbd8b9ae51a444665b2f650deb6dd5f Mon Sep 17 00:00:00 2001 From: Spunky <69635300+Spunky17@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:16:55 -0500 Subject: [PATCH 9/9] Update core.py --- lib/gntp/core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gntp/core.py b/lib/gntp/core.py index 30bcbd27a..b2b844b10 100644 --- a/lib/gntp/core.py +++ b/lib/gntp/core.py @@ -19,18 +19,18 @@ #GNTP/ [:][ :.] GNTP_INFO_LINE = re.compile( - r'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' + + 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\\-OK|\\-ERROR)' + ' (?P[A-Z0-9]+(:(?P[A-F0-9]+))?) ?' + '((?P[A-Z0-9]+):(?P[A-F0-9]+).(?P[A-F0-9]+))?\r\n', re.IGNORECASE ) GNTP_INFO_LINE_SHORT = re.compile( - r'GNTP/(?P\d+\.\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)', + 'GNTP/(?P\\d+\\.\\d+) (?PREGISTER|NOTIFY|SUBSCRIBE|\\-OK|\\-ERROR)', re.IGNORECASE ) -r'GNTP_HEADER = re.compile('([\w-]+):(.+)')' +GNTP_HEADER = re.compile('([\\w-]+):(.+)') GNTP_EOL = gntp.shim.b('\r\n') GNTP_SEP = gntp.shim.b(': ')