Tvheadend

Handling of Freesat channel numbering/bouquets seems to have regressed recently. After scanning I have a large number of channels numbered as 0. I think most of them are channels that aren't present in Freesat's SDT, so that's understandable, but there are some that definitely should be mapped, such as 'ITV' and 'ITV HD'. I've attached a screenshot of how these appear in tvheadend's Configuration -> Channels/EPG -> Channels list. FWIW I've enabled just the one bouquet/region, "England HD: South/Meridian S".

ITV has many regional variations but they all have the same name in Freesat, so that's probably confused it. Also, I've written my own scanner, and looked at Freesat's LCN descriptors. Many channels have multiple possible LCNs depending on region etc. Most/all ITV (SD) variants can either be 103 or 111 and some ITV HD variants can also be 1965. I guess this is to allow HD and SD numbers to be swapped depending on whether you select a SD or HD bouquet, but I'm not sure what the 1965 is for.

I've found a good strategy for dealing with this is to iterate over LCNs and find the most appropriate service for each, instead of iterating through channels and trying to find the most appropriate LCN.

If nobody is available to look into this I could probably try to fix it myself, but some hints on which parts of the source I need to look at would be helpful.