Skip to content

Commit

Permalink
[LCD4Linux]
Browse files Browse the repository at this point in the history 
* partly revert d494024
  • Loading branch information
@jbleyel
jbleyel committed Jul 30, 2024
1 parent 4697e9b commit bfb5a5f
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions LCD4linux/src/plugin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2989,8 +2989,8 @@ def getpiconres(x, y, full, picon, channelname, channelname2, P2, P2A, P2C):
name3 = "%s.png" % channelname2.replace('\xc2\x87', '').replace('\xc2\x86', '').decode("utf-8").encode("utf-8")
name = normalize('NFKD', unicode(str("" + channelname), 'utf-8', errors='ignore')).encode('ASCII', 'ignore')
else:
name2 = "%s.png" % channelname.encode("latin-1", "ignore").decode("utf-8")
name4 = "%s.png" % channelname.encode("utf-8", "ignore").decode("utf-8")
name2 = "%s.png" % channelname
name4 = "%s.png" % channelname
name3 = "%s.png" % channelname2.replace('\x87', '').replace('\x86', '')
name = normalize('NFKD', str("" + channelname))
name = "%s.png" % sub(r'[^a-z0-9]', '', str(name).replace('&', 'and').replace('+', 'plus').replace('*', 'star').lower())
Expand Down Expand Up @@ -10840,8 +10840,8 @@ def getShowCover(BildFile):
name3 = "%s.png" % self.Lchannel_name2.replace('\xc2\x87', '').replace('\xc2\x86', '').decode("utf-8").encode("utf-8")
name = normalize('NFKD', unicode(str("" + self.Lchannel_name), 'utf-8', errors='ignore')).encode('ASCII', 'ignore')
else:
name2 = "%s.png" % self.Lchannel_name.encode("latin-1", "ignore").decode("utf-8")
name4 = "%s.png" % self.Lchannel_name.encode("utf-8", "ignore").decode("utf-8")
name2 = "%s.png" % self.Lchannel_name
name4 = "%s.png" % self.Lchannel_name
name3 = "%s.png" % self.Lchannel_name2.replace('\x87', '').replace('\x86', '')
name = normalize('NFKD', str("" + self.Lchannel_name))
name = "%s.png" % sub(r'[^a-z0-9]', '', str(name).replace('&', 'and').replace('+', 'plus').replace('*', 'star').lower())
Expand Down Expand Up @@ -12047,12 +12047,12 @@ def putPicon(workaround, draw, im):
PIC.append(join(P2, picon))
if not PY3:
name2 = "%s.png" % self.Lchannel_name.decode("utf-8").encode("latin-1", "ignore")
name4 = "%s.png" % self.Lchannel_name.decode("utf-8").encode("latin-1", "ignore")
name4 = "%s.png" % self.Lchannel_name.decode("utf-8").encode("utf-8", "ignore")
name3 = "%s.png" % self.Lchannel_name2.replace('\xc2\x87', '').replace('\xc2\x86', '').decode("utf-8").encode("utf-8")
name = normalize('NFKD', self.Lchannel_name.decode('unicode-escape'))
else:
name2 = "%s.png" % self.Lchannel_name.encode("latin-1", "ignore").decode("utf-8")
name4 = "%s.png" % self.Lchannel_name.encode("utf-8", "ignore").decode("utf-8")
name2 = "%s.png" % self.Lchannel_name
name4 = "%s.png" % self.Lchannel_name
name3 = "%s.png" % self.Lchannel_name2.replace('\x87', '').replace('\x86', '')
name = normalize('NFKD', self.Lchannel_name)
name = "%s.png" % sub(r'[^a-z0-9]', '', str(name).replace('&', 'and').replace('+', 'plus').replace('*', 'star').lower())
Expand Down

23 comments on commit bfb5a5f

@gintarasarm
Copy link

@gintarasarm gintarasarm commented on bfb5a5f Aug 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lcd4linux "V5.0-r22 (Modus: Py3)"
Sorry but picons doesn't show up on LCD on my IPTV channels

@MrServo
Copy link
Contributor

@MrServo MrServo commented on bfb5a5f Aug 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No picons at all? Or are you talking only about IPTV-Olympia Picons?

@gintarasarm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not displayed all picons on LCD IPTV channels

@AbuBaniaz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The plugin should really import the picon names from enigma2

@Hains
Copy link

@Hains Hains commented on bfb5a5f Aug 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Be aware, this might be a OpenPLi issue only?

OpenPLi users using this
https://github.com/OpenPLi/enigma2-binary-plugins/commits/python3/lcd4linux

Just to be clear.

@MrServo
Isn't het result of:

name = normalize('NFKD', channelname)
name = sub(r'[^a-z0-9]', '', "%s.png" % str(name).replace('&', 'and').replace('+', 'plus').replace('*', 'star').lower())

different than:

name = normalize('NFKD', str("" + channelname))
name = "%s.png" % sub(r'[^a-z0-9]', '', str(name).replace('&', 'and').replace('+', 'plus').replace('*', 'star').lower())

See:
OpenPLi/enigma2-binary-plugins@267b0a9#diff-7ee2a891a00f095233d0c0042bebb10cc26ee5f74ad122f93fb561857e7dd731L2988

The first code has no dot in the name variable, the second code has.

@Marchella1983
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I don't know much about this, but maybe we should come to a single consensus and make it work on all images without any different codes.

@AbuBaniaz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need to re-invent/duplicate the wheel with regards to picon names. Enigma2 already deals with the picon names, so just use those instead of redoing the work.

Previously on Vix, the picn names were calculated twice, one for the OSD and second for teh LCD/front panels. @SimonCapewell consolidated them here: OpenViX/enigma2@512dbc2
Maybe you can use similar and just get the name. Otherwise you will have issues where the names are calculated differently.

@MrServo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for a better understanding: Most of the more than 15000 lines of code of the (already very old) plugin 'LCD4linux' were written by the author @joergm6@IHAD and we only edited the plugin where it was necessary (e.g. to adapt it to PY3 and when functions didn't work anymore). LCD4linux was originally written for the Dreamboxes and was later not always adapted to the latest E2 by the author.
This is why there are still passages in the code that may need to be adapted today. LCD4linux has always worked with its own solutions in many places, which make the plugin somewhat more independent. It is a question of philosophy whether LCD4linux can/should/must remain independent. Every change to this huge plugin must be tested. That's why only small modifications have ever been made.
It is not a problem for me to make changes! So if anyone has a tested suggestion for a code improvement, please let me know ;)

@Hains: Have you tested that code? Does it solve the problem? If yes,, I will replace the old code by your new code...

@gintarasarm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MrServo,
If you manage to solve this problem on IPTV channels, I mean with picons, so many people will only be grateful to you and only you can do this!
Thank you very much for your job!
With great respect to you!

@Hains
Copy link

@Hains Hains commented on bfb5a5f Aug 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MrServo

I cant' test it myself. I'm depending on the test results of @gintarasarm.
And it seems the problem lies somewhere else.
And his webif doesn't work.
For me webif works, on all 3 boxes and no one else has complained about it so far.
Better that he fixes that first.

So leave it as it is now.

@gintarasarm
Copy link

@gintarasarm gintarasarm commented on bfb5a5f Aug 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MrServo,
OpenWebif stopped working for me after several tests,
when I want to access from OpenWebix to the LCD4linux plugin, this is what it write to me: Processing Failed

@MrServo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gintarasarm: Same situation for me: When I call 'myBoxIP/lcd4linux/config' everything works fine on two boxes (OpenATV 7.4 and OpenATV 7.5). I never had troubles the last two years and I allways use L4L-WebIF.
Please perform a GUI-restart, reproduce the error and forward an cutout of debuglog, showing the last 30 lines before the error-message appears in debuglog. Thats the only way to analyse this.

@MrServo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Hains: Your proposal seems to make sense ;)
I will try out by tomorrow. THX

@gintarasarm
Copy link

@gintarasarm gintarasarm commented on bfb5a5f Aug 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MrServo,
I have now completely removed the LCD4linux plugin and I’m thinking about which plugin to install again, that is, which version, I don’t even know what to do. Can you give me some advice on what to install?
Now we have the 22 version of plugin LCD4linux on our feed

@MrServo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Current version LCD4linux V5.0-r22 and older versions are OK regardign L4l-WebIF, no problems the past two years...

@gintarasarm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mr.Servo,
After several plugin.py tests, when I had a problem with OpenWebif, I tried to reinstall the LCD4linux plugin, but the problem of OpenWebif did not disappear for me, I’ll try the 22 version from the feed, now I don’t know how it will work

@MrServo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you really shure that you have to focus on LCD4linux? Try to install a clean image (e.g. on another multibott slot) and try again. I never had heard about problems you describe so I estimate: Your current image (which one???) is not working properly?

@gintarasarm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OpenPli Develop 9.0

@gintarasarm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really like this plugin, it’s a very good and beautiful plugin created, but it’s a pity that by today’s standards it hasn’t been finalized. And it’s impeccable, even very good, and I really don’t want to give it up, because with LCD you can create a very beautiful image in which it helps

@MrServo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please mind: Nobody have troubles with L4l-WebIF on several images. Please try with a clean flashed image in order to rule out that it is not due to the image itself.

@gintarasarm
Copy link

@gintarasarm gintarasarm commented on bfb5a5f Aug 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll try to do everything on the new image and write to you tomorrow
THX

@gintarasarm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MrServo,
On a clean image OpenPli Develop 9.0 LCD4linux plugin works through OpenWebif. So you can configure IPTV channel picons to be shown on the LCD display
Best regards to you

@MrServo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With regards to streams (IPTV / Internetradio) and picons, try this testversion: https://www.opena.tv/plugins/73-lcd4linux-post569143.html#post569143

Please sign in to comment.