From e72f0f2274b34a11a6862f763ffd9c5ee406fdc6 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 15 Oct 2020 11:01:46 -0400 Subject: [PATCH 1/2] Ensure Channel Order --- fHDHR/originservice/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fHDHR/originservice/__init__.py b/fHDHR/originservice/__init__.py index 07a69af..d80b765 100644 --- a/fHDHR/originservice/__init__.py +++ b/fHDHR/originservice/__init__.py @@ -1,6 +1,7 @@ import datetime +from collections import OrderedDict -from . import nextpvr as serviceorigin +from . import plutotv as serviceorigin from fHDHR.tools import hours_between_datetime from fHDHR.fHDHRerrors import LoginError @@ -24,6 +25,10 @@ class OriginService(): self.channels["list"][chan["number"]] = {} for chankey in list(chan.keys()): self.channels["list"][chan["number"]][chankey] = chan[chankey] + self.channel_order() + + def channel_order(self): + self.channels["list"] = OrderedDict(sorted(self.channels["list"].items())) def get_channels(self, forceupdate=False): From 641bb2890f08ac440e8f93d709b4fe35bbea77ad Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 15 Oct 2020 11:12:17 -0400 Subject: [PATCH 2/2] Fix Bonehead mistake --- fHDHR/originservice/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fHDHR/originservice/__init__.py b/fHDHR/originservice/__init__.py index d80b765..d9a4dfb 100644 --- a/fHDHR/originservice/__init__.py +++ b/fHDHR/originservice/__init__.py @@ -1,7 +1,7 @@ import datetime from collections import OrderedDict -from . import plutotv as serviceorigin +from . import nextpvr as serviceorigin from fHDHR.tools import hours_between_datetime from fHDHR.fHDHRerrors import LoginError