[non-official] X-streamity - modifications

msatter · Sep 21st 2023

I am using since a while X-streamity and modified thing to be more to my liking and extend the capabilities of it.

Thanks to Kiddac for creating X-streamity and it very structured to finding stuff is not that difficult.

My latest modification is able to keep watching live while having started a instant recording of same live channel. Even if you have chosen for .m3u8 instead of .ts as output extension. What it does, when a instant recording is started while you watch the same channel, the current stream is terminated on start of the recording and new stream is started matching the way a recording is made.

This way you keep watching live while the recording is made in background. You can change/stop the recording through the menu button and go to timers.

Also what is added is the actual end time of the transmission so the recording will stop when the transmission is over. If no end time is found the the default recording duration will be one hour.

Python: streamplayer.py

instantRecordActive = False #### allows to instant record a channel

Python: streamplayer.py

    def IPTVstartInstantRecording(self, limitEvent=True):
        from . import record
        begin = int(time.time())
        end = begin + 3600
        
        # if now-next is available, take the starttime of next as endtime for current
        if (glob.currentepglist[glob.currentchannellistindex][5]): ####
            endstring = (glob.currentepglist[glob.currentchannellistindex][5])
            shortend_dt = datetime.strptime(endstring, "%H:%M")
            end = int(time.mktime(shortend_dt.timetuple())) ####
            
            #self.session.open(MessageBox, _("Switched live view, to streaming type 1 to match the recording being made!"), MessageBox.TYPE_INFO, timeout=5)

        if glob.currentepglist[glob.currentchannellistindex][3]:
            name = glob.currentepglist[glob.currentchannellistindex][3]
        else:
            name = glob.currentchannellist[glob.currentchannellistindex][0]

        self.name = NoSave(ConfigText(default=name, fixed_size=False))
        self.date = time.time()
        self.starttime = NoSave(ConfigClock(default=begin))
        self.endtime = NoSave(ConfigClock(default=end))
        self.session.openWithCallback(self.RecordDateInputClosed, record.RecordDateInput, self.name, self.date, self.starttime, self.endtime, True)
              
    def RecordDateInputClosed(self, ret=None):
        if ret:
            begin = ret[1]
            end = ret[2]
            name = ret[3]
            
            #### for instant recording .m3u8 extension should to be .ts
            streamurl = self.streamurl.replace(".m3u8", ".ts") #### create a local non class variable

            description = glob.currentepglist[glob.currentchannellistindex][4]
            eventid = int(self.streamurl.rpartition("/")[-1].partition(".")[0])
            #serviceref = eServiceReference(1, 0, self.streamurl)
            serviceref = eServiceReference(1, 0, streamurl)
            
            #### keep playing live when the livestream is not streamtype 1
            if self.servicetype != "1":
                self.session.nav.stopService()
                self.playStream("1", streamurl, self.direct_source)

            self.session.open(MessageBox, _("Live view is probably stopped, allowing it to be recorded. \r\n Please do not change channel or use reconnect! \r\n Pressing menu allows to change or stop the started recording."), MessageBox.TYPE_INFO, timeout=9)
                   
            if isinstance(serviceref, eServiceReference):
                serviceref = ServiceReference(serviceref)
                                
            recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname=str(cfg.downloadlocation.getValue()))
            recording.dontSave = True
            instantRecordActive = True #### allows to instant record without interupption

            simulTimerList = self.session.nav.RecordTimer.record(recording)

            if simulTimerList is None:  # no conflict
                recording.autoincrease = False
                self.session.open(MessageBox, _("Recording Timer Set."), MessageBox.TYPE_INFO, timeout=5)
            else:
                self.session.open(MessageBox, _("Recording Failed."), MessageBox.TYPE_WARNING)
                return
        else:
            return

Display More

The toggle and I shorted it now so that it won't change the servicetype

Python: streamplayer.py

    def streamTypeFailed(self, data=None):
        if instantRecordActive == False: #### allow instant recording run uninterupted
            if str(self.servicetype) == "1":
                self.servicetype = "4097"
            elif str(self.servicetype) == "4097":
                self.servicetype = "1"

            self.streamcheck = 2
            self.playStream(self.servicetype, self.streamurl, self.direct_source)
        instantRecordActive = False

IPTVstartInstantRecording proposed changes have been implemented in X-streamity 4.16 adding the actual end time of a recording instead of default one hour if EPG data is available.

msatter · Sep 22nd 2023

The next one is a adaptation to the download manager screen. When a Catch-up can be marked as to be recorded but the recording is in fact not present.

This can happen because EPG and the actual recording have separate sources.

Default this will be displayed as the recording being "0B" and changed that "File N/A". If the recording is restored with your provider then then this should be detected and then you can still get the recording.

Python: downloadmanager.py

def convert_size(size_bytes):
    if size_bytes == 0:
        return "File N/A"
        #return "0B" #### replaced by "File N/A" in the downloadmanager screen
    size_name = ("B", "KB", "MB", "GB", "TB")
    i = int(math.floor(math.log(size_bytes, 1024)))
    p = math.pow(1024, i)
    s = round(size_bytes / p, 2)
    return "%s %s" % (s, size_name[i])

msatter · Sep 22nd 2023

This is the first step to enable EIT (Extended Information Table) file support also for Catch-up recordings.

The first step is to put the short description taken form the EPG into the download2.json file so that it can be read by the download manager code.

I have marked the changes as always with ####

Python: channels.py

def downloadVideo(self):
        # print("*** downloadVideo ***")
        # load x-downloadlist.json file

        if self.categoryname == "series" and self.level != 4:
            return

        if self.categoryname == "catchup" and self.selectedlist != self["epg_short_list"]:
            return

        if self["main_list"].getCurrent():

            if self.categoryname == "catchup":
                next_url = self["main_list"].getCurrent()[3]
                stream = next_url.rpartition("/")[-1]
                date = str(self["epg_short_list"].getCurrent()[4])
                duration = str(self["epg_short_list"].getCurrent()[5])
                playurl = "%s/timeshift/%s/%s/%s/%s/%s" % (self.host, self.username, self.password, duration, date, stream)

                date_all = str(self["epg_short_list"].getCurrent()[1]).strip()
                time_all = str(self["epg_short_list"].getCurrent()[2]).strip()
                time_start = time_all.partition(" - ")[0].strip()
                current_year = int(datetime.now().year)
                date = str(datetime.strptime(str(current_year) + str(date_all) + str(time_start), "%Y%a %d/%m%H:%M")).replace("-", "").replace(":", "")[:-2]

                otitle = str(self["epg_short_list"].getCurrent()[0])
                channel = str(self["main_list"].getCurrent()[0])
                title = str(date) + " - " + str(channel) + " - " + str(otitle)
                # define and set description with the text for the EIT file
                description = str(self["epg_short_list"].getCurrent()[3]) ####

            else:
                title = self["main_list"].getCurrent()[0]
                stream_url = self["main_list"].getCurrent()[3]

            downloads_all = []
            if os.path.isfile(downloads_json):
                with open(downloads_json, "r") as f:
                    try:
                        downloads_all = json.load(f)
                    except:
                        pass

            exists = False
            for video in downloads_all:
                url = video[2]

                if self.categoryname == "vod" or self.categoryname == "series":
                    if stream_url == url:
                        exists = True

                if self.categoryname == "catchup":
                    if playurl == url:
                        exists = True

            if exists is False:
                if self.categoryname == "vod":
                    downloads_all.append([_("Movie"), title, stream_url, "Not Started", 0, 0])
                elif self.categoryname == "series":
                    downloads_all.append([_("Series"), title, stream_url, "Not Started", 0, 0])
                elif self.categoryname == "catchup":
                    downloads_all.append([_("Catch-up"), title, playurl, "Not Started", 0, 0, description]) #### adding description to download2.json

                with open(downloads_json, "w") as f:
                    json.dump(downloads_all, f)

                self.session.openWithCallback(self.opendownloader, MessageBox, _(title) + "\n\n" + _("Added to download manager") + "\n\n" + _("Note recording acts as an open connection.") + "\n" + _("Do not record and play streams at the same time.") + "\n\n" + _("Open download manager?"))

            else:
                self.session.open(MessageBox, _(title) + "\n\n" + _("Already added to download manager"), MessageBox.TYPE_ERROR, timeout=5)

Display More

msatter · Sep 22nd 2023

Next step for the EIT file is to read it in downloadmanager.py and store it with the help of an external script named "EvenInformationTable.py" written by cmikula.

This file is attached and has be copied to the X-streamity directory and after a restart of the box it should be active.

This is a new code part and you can place it above "def createMetaFile(self, filename, filmtitle):" at the bottom of the downloadmanager.py code.

The shown line numbers are indicative because in my files there also other changes that I will post at a later moment.

Python: downloadmanager.py

from Components.ActionMap import ActionMap
from Components.Sources.List import List
from Screens.MessageBox import MessageBox
from Screens.Screen import Screen
from enigma import eTimer, eServiceReference
from requests.adapters import HTTPAdapter, Retry
#### for writing the EIT file after downloading a Catch-up item
from EvenInformationTable import writeEIT

Python: downloadmanager.py

    def createEitFile(self, filename, filmtitle): ####
        if os.path.isfile(downloads_json):
            with open(downloads_json, "r") as f:
                try:
                    self.downloads_all = json.load(f)
                except Exception as e:
                    print(e)

        for video in self.downloads_all:
            if str(video[1]) == str(filmtitle):
                urlParts = re.split("/", video[2])
                startDateTime = urlParts[-2]
                duration = urlParts[-3] # duration here in minutes
                description = str(video[6])
                eitMJD = str(datetime.datetime.strptime(startDateTime, "%Y-%m-%d:%H-%M").strftime("%Y-%m-%d"))
                filename = filename.replace(".m3u8", ".ts")
                eit_file = filename.replace(".ts", ".eit") # includes the whole path
                overview = filmtitle[14:16]+" - "+duration+" "+"minutes"
                break
         
        try:
            #self.session.open(MessageBox, _("WriteEIT: "+"\r\n"+str(filename)+"\r\n"+str(filmtitle)+"\r\n"+str(eit_file)+"\r\n"+str(description)), type=MessageBox.TYPE_INFO)           
            writeEIT(filename, eit_file, (filmtitle[17:]), filmtitle[17:], "Catch-up", description, eitMJD, duration, (filmtitle[14:16]+" "))
        except Exception as e:
            print(e)
        return

Display More

Python: downloadmanger.py

    def download_finished(self, filename, filmtitle):
        self.createEitFile(filename, self.filmtitle)  ####
        global ui
        if os.path.isfile(downloads_json):
            with open(downloads_json, "r") as f:
                try:
                    self.downloads_all = json.load(f)
                except Exception as e:
                    print(e)

        x = 0
        for video in self.downloads_all:
            if str(video[1]) == str(filmtitle):
                break
            x += 1
        del self.downloads_all[x]
        if ui:
            self.sortlist()
            self.buildList()
        self.createMetaFile(filename, self.filmtitle)
        #self.createEitFile(filename, self.filmtitle)
        self.saveJson()

Display More

The needed file: EvenInformationTable.py

msatter · Sep 27th 2023

When using the download manager and having more than one recording the marking the the recording is a bit tricky. When marking, and at the same time a screen update is being made, the selected recording is deselected and the just updated is being selected.

This can lead to unexpected outcomes when wanting to apply changes by the user.

So I changed the order of the lines in the download manager screen.

Python: downloadmanager.py

 def buildList(self):
        self.drawList = []
        self.drawList = [self.buildListEntry(x[0], x[1], x[2], str(x[3]), x[4], x[5]) for x in self.downloads_all]
        self["downloadlist"].setList(self.drawList)

    def updatescreen(self):
        self.diskspace()
        self.getprogress()
        
    #### here the change of position of the list can be archieved
    def sortlist(self):
        ####order = {"In progress": 0, "Waiting": 1, "Not Started": 2, "Downloaded": 3}
        order = {"In progress": 2, "Waiting": 1, "Not Started": 0, "Downloaded": 3}
        self.downloads_all.sort(key=lambda x: order[x[3]])
        # self.buildList()

Display More

The changed order is: note started / waiting / progress / last downloaded

So the not stared are always at the top of the list and can so be started more easy without that it gets tricky. The downloaded lines are default automatically removed after successful download.

disclaimer: the shown line number is an estimate because my code has more modifications than I already have written here. So more to come.

msatter · Sep 28th 2023

This a small one and when selecting recording to be placed local so I can watch those in a time I want.

The change is in the flow and it makes it easier to select more than one recording.

Python: channels.py

            if exists is False:
                if self.categoryname == "vod":
                    downloads_all.append([_("Movie"), title, stream_url, "Not Started", 0, 0])
                elif self.categoryname == "series":
                    downloads_all.append([_("Series"), title, stream_url, "Not Started", 0, 0])
                elif self.categoryname == "catchup":
                    downloads_all.append([_("Catch-up"), title, playurl, "Not Started", 0, 0, description]) #### adding description to download2.json

                with open(downloads_json, "w") as f:
                    json.dump(downloads_all, f)

                ####self.session.openWithCallback(self.opendownloader, MessageBox, _(title) + "\n\n" + _("Added to download manager") + "\n\n" + _("Note recording acts as an open connection.") + "\n" + _("Do not record and play streams at the same time.") + "\n\n" + _("Open download manager?"))
                self.session.openWithCallback(self.opendownloader, MessageBox, _(title) + "\n\n" + _("Added to download manager") + "\n\n" + _("Note recording acts as an open connection.") + "\n" + _("Do not record and play streams at the same time.") + "\n\n" + _("Select more recordings?"))
            else:
                self.session.open(MessageBox, _(title) + "\n\n" + _("Already added to download manager"), MessageBox.TYPE_ERROR, timeout=5)

    def opendownloader(self, answer=None):
        ####if not answer:
        if answer:
            return
        else:
            from . import downloadmanager
            self.session.openWithCallback(self.createSetup, downloadmanager.XStreamity_DownloadManager)

Display More

I have marked the lines that are marked out now with #### and added the changed line underneath.

If you by accident still want go to the download manager screen then you can select a other recording and the then select no, showing then the screen or you go the main menu where you can enter the download manager screen also.

[non-official] X-streamity - modifications

IPTVstartInstantRecording proposed changes have been implemented in X-streamity 4.16 adding the actual end time of a recording instead of default one hour if EPG data is available.

KiddaC Skins and Plugins

Participate now!

Share

Tags