Автор Тема: Плагин m3u2bouquet (Мод от Dorik1972)  (Прочитано 4643 раз)

nike v и 1 Гость просматривают эту тему.

Vicont

  • Помощник
  • Старожил
  • ****
  • Спасибо
  • -> Вы поблагодарили: 2895
  • -> Вас поблагодарили: 3120
  • Сообщений: 670
  • Респект: +365/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« : 09 Июль 2022, 14:35:04 »
Плагин m3u2bouquet  (Мод от Dorik1972)

UPDATE
1.0.65


Restored the functionality of customizing the generation of bouquets based on the override.xml template file
« Последнее редактирование: 19 Август 2022, 12:45:39 от astraA4 »

astraA4

  • Модератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 6668
  • -> Вас поблагодарили: 7399
  • Сообщений: 1579
  • Респект: +867/-0
Плагины для enigma 2
« Ответ #1 : 02 Август 2022, 16:46:32 »
Плагин m3u2bouquet (Мод от Dorik1972)

UPDATE
1.0.69


1) The logic of working with "downloadable" files has been completely redesigned. There is no binding to the file name or its extension. Uploaded files are parsed based on a "magic number" and then the content is determined to be a valid XML structure. This solution allows using any links for XMLTV, for example,

http://example.com:8087/xmltv.php?username=USER&password=PASS
http://example.com/api/xmltv.xml.7.2
http://example.com/epg.xml.gz?token=123456789
http://example.com/provider.epg
http://example.com/epg.xmltv.gz
http://example.com/epg.xmltv.xz
http://example.com/epg.xmltv.zip
http://example.com/EPG

2) Playing around with the epg.db wrapper code for a more stable import (for DreamOS images only!). Now you can even turn off the power "on the go" (during import) and no data will be lost or "corrupted"
3) Minor optimization of the m3u parser code
4) Minor logging changes

The configuration files generated by this version for EPGImport are not compatible with the original EPGImport code. In case of shared use, it is necessary to install my EPGImport MOD -

https://tvfaq.net/index.php/topic,2063.msg46502.html#msg46502

astraA4

  • Модератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 6668
  • -> Вас поблагодарили: 7399
  • Сообщений: 1579
  • Респект: +867/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #2 : 19 Август 2022, 12:52:08 »
e2m3u2bouquet 1.0.70 (Mod Dorik1972)

1) Bouquet filenames generated by this plugin have been changed
2) Reorganized the structure of folders and files in the plugin data folder
3) Updated all libraries used by this plugin to the latest versions available for shared use in Python 2/3
4) Added support for the JTV format (PDT and NDX files) for the EPG. This EPG format is used by some local IPTV providers. It is also quite popular in Poland. Tested on the following sources:

Teleguideinfo__http://www.teleguide.info/download/new3/jtv.zip
Iformula_______http://iformula.ru/IPTV/tvprogramm/jtv.zip
Triolan________http://triolan.tv/App_Files/jtv.zip
Matrixhome_____http://iptv.matrixhome.net/jtv/dn/epg_jtv.zip
2kom___________http://2kom.tv/jtv.zip
Idcmd__________http://iptv.idc.md/files/jtv.zip
Spark__________http://spark-tv.ru/jtv.zip
Avianetwork____http://avianetwork.ru/tv_list/jtv.zip
ProgramTV______http://programtv.ru/jtv.zip

p.s. To upgrade to this version:

1) Backup config.xml from plugin data storage folder
2) Menu - Reset Bouquets - Yes
3) Install a new version of the plugin
4) Restore config.xml from backup
5) Create bouquets
6) Enjoy!

Thanks Dorik1972

Mika

  • Модератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 16644
  • -> Вас поблагодарили: 27933
  • Сообщений: 6018
  • Респект: +3744/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #3 : 24 Август 2022, 21:48:14 »
UPDATE
1.0.71


1) Fixed remembering links in the "file://" scheme when entering from the virtual keyboard in the provider's card
2) Fixed/added the ability to "recognize" XML files in 'UTF-8-BOM' encoding. For example:

https://raw.githubusercontent.com/bebawy6/EPG/master/allEPG.xml
3) Fixed handling of XMLTVs packed in ZIP.
Added a branding module to the installation packages, due to which the version did not work
"Вы никогда не достигнете своей цели, если каждый раз будете останавливаться, чтобы бросить палку в лающую на вас собаку"

kolllya

  • Друзья
  • Аксакал
  • ***
  • Спасибо
  • -> Вы поблагодарили: 4067
  • -> Вас поблагодарили: 5633
  • Сообщений: 1171
  • Респект: +637/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #4 : 29 Август 2022, 16:53:42 »
m3u2bouquet
UPDATE
1.0.72


1) Fixed "database malformed" for DreamOS-based images. This error almost always occurred if you set "Start import EPG after loading bouquets" in the plugin settings. No more problems
2) Small reorganization of the code + added logging of what is happening =)

Vicont

  • Помощник
  • Старожил
  • ****
  • Спасибо
  • -> Вы поблагодарили: 2895
  • -> Вас поблагодарили: 3120
  • Сообщений: 670
  • Респект: +365/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #5 : 02 Сентябрь 2022, 21:39:32 »
UPDATE
1.0.73

(DreamOS special edition)

1) The ability to select "eServiceStream" (8739:0:) player in the provider card has been fixed. Now this type of player is only available on images based on DreamOS versions >=4.4
2) Completely rewritten SQL-wrapper to interact with epg.db when updating EPG.  Now everything works as it should   ::)
3) Updated Italian locale (special thanks for @mapi)

Дигидон

  • Супермодератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 17253
  • -> Вас поблагодарили: 29703
  • Сообщений: 6497
  • Респект: +4855/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #6 : 05 Сентябрь 2022, 19:15:20 »
UPDATE
1.0.73.1

(DreamOS special edition part 2)

Скрытый текстСкрытый текст (вы должны войти под своим логином или зарегистрироваться ).
У вас нет прав чтобы видеть скрытый текст, содержащейся здесь.


1) Changed SQLite server parameters on opening epg.db, thanks to which the speed of importing EPG events in new (fresh) epg.db has increased by 100% compared to the previous version (1.0.73)
2) Now only new events are added to the existing database, i.е. only those that are NOT in the existing EPG. Thanks to this logic, we have a 150-200% increase in the speed of importing events on the existing database compared to the previous version (1.0.73)
3) When "closing" the database after adding events, we do "VACUUM" which allows us to significantly reduce the size of the epg.db file, especially noticeable when the EPG file is > 100Mb
4) Fixed a theoretically possible error when adding an event with a short description (title) longer than 240 characters. Under certain circumstances, such events might not fall into the EPG database.

p.s. At the moment, the speed of importing XMLTV events on my DM900HD is almost comparable to the speed of importing the same events of the same XMLTV on VU + Ultimo4K

Дигидон

  • Супермодератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 17253
  • -> Вас поблагодарили: 29703
  • Сообщений: 6497
  • Респект: +4855/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #7 : 14 Сентябрь 2022, 23:10:47 »
UPDATE
1.0.74


1) A bunch of little things have been fixed due to which some of the events from XMLTV could not get into the EPG.
2) Added "analysis" of the validity of received events from XMLTV. Now any "garbage" that occurs due to errors in the formation of XMLTV by the provider does not get into the EPG.
3) The logic of the XMLTV parser has been completely changed... now we analyze one event ahead... which makes it possible to form the correct event tuples for a group of channels.
Previously, events were parsed into the following "structure":
([service, service, ***], ((event)))
Now so
([service, service, ***], ((event), (event), (event), ***))
This allows the full use of the enigma.eEPGCache (epgcache.cpp) C code if it supports the ImportEvents method. For a group of channels, a group of events is now transmitted, and not just one event as before... As a result, on the nodes "programme" ordered by "channel" in XMLTV, we get an increase in the speed of importing events.
4) Parsing the values of all tags of the "programme" node in XMLTV is now done in "one pass".
5) Added support for "multi-language" XMLTV ... and not only in the XMLTV parser, but also in import to epg.db for DreamOS...
Judging by the structure of the database (epg.db), this is clearly supported there (an analogy can be drawn with different audio tracks for the same broadcast). In OE versions<2.5 multilingual EPG is not supported and priority is given to events whose language matches the locale of your Enigma2
6) In SQL-wrapper (only for DreamOS) added "UPDATE" of event descriptions imported earlier ...
For example:
On Mon morning you imported EPG 3 days in advance and in it, for some channels, there were no descriptions, and on Mon evening - the provider updated its XMLTV and added descriptions ... so... now if you update the EPG again after that, for example on Tuesday morning, then the descriptions for existing events will be updated.
7) Returned back journal_mode = "DELETE" for SQLite. Now working with the SQL database is exactly the same as in the C code on DreamOS.
8 ) I changed the code so that I removed two files altogether... They turned out to be superfluous "crutches" ... Due to this, there is one less "intermediate" generator.
9) Added "pop-up" notifications... cool little stuff... will pop up in the upper right corner of the screen...
10) Fixed a bug with the appearance of channels marked as enabled="0" in the ***-diff-override.xml file in the "custom" sorting mode.
11) The logic of working with "hidden markers" has been completely removed. Now in userbouquets the strings "519:1" or "832:d" that are incomprehensible to many users will be removed.

nicoll

  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 6011
  • -> Вас поблагодарили: 11003
  • Сообщений: 2186
  • Респект: +1106/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #8 : 20 Сентябрь 2022, 22:52:52 »
E2m3u2bouquet
UPDATE 1.0.75



    1) Fixed an annoying typo in the code that caused a crash when trying to save the log file
    2) Minor changes to the XML iterator, giving a gain of 1-2 seconds for every 100,000 records processed
    3) Slightly updated the design of the regular skin. More strict and concise.
    4) The algorithm for auto-selection of EPG events by channel name has been redesigned. Now, if after preliminary analysis no exact match is found among the candidates, the Damerau-Levenshtein algorithm for finding the greatest match based on an iterative version of the Wagner-Fischer algorithm is applied (this works if and only if the EPGurl link is set in the provider settings.) - Theory - Optimal Wagner-Fischer Algorithm For Approximate Strings Matching
Излишняя скромность - кратчайший путь в неизвестность !

Vicont

  • Помощник
  • Старожил
  • ****
  • Спасибо
  • -> Вы поблагодарили: 2895
  • -> Вас поблагодарили: 3120
  • Сообщений: 670
  • Респект: +365/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #9 : 23 Сентябрь 2022, 17:57:06 »
UPDATE
1.0.76


Fixed "segmentation fault" error that occurred on DreamTWO (OE2.6) after importing EPG events ...
Theoretically, it could also occur on other versions of OE ... but so far it has not manifested itself
« Последнее редактирование: 23 Сентябрь 2022, 22:27:54 от Марат »

nicoll

  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 6011
  • -> Вас поблагодарили: 11003
  • Сообщений: 2186
  • Респект: +1106/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #10 : 02 Октябрь 2022, 21:03:35 »
UPDATE
1.0.77


1) Fixed m3u playlist parsing error when using an automatic selection of EPG events by channel name, which sporadically occurred on some variants of m3u playlists​
2) "Playing" with EPGImport code... Now the code is as compact as possible, as understandable as possible, and more "twisted"ly =)  and works with the same import
performance regardless of the logic used ... be it twisted.reactor.doRead or twisted.internet.threads.deferToThread . The speed of importing EPG events depends
only on the performance of the processor of your SAT-box and the speed of reading / writing to the storage device (HDD / USB / Internal Flash)
3) Slightly supplemented and reorganized the output of logs for greater informational content of what is happening
4) Refreshed Italian locale
Излишняя скромность - кратчайший путь в неизвестность !

Дигидон

  • Супермодератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 17253
  • -> Вас поблагодарили: 29703
  • Сообщений: 6497
  • Респект: +4855/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #11 : 11 Октябрь 2022, 18:16:25 »
UPDATE
1.0.78


​1) Fixed the appearance of the "names.client" error for images with the old or truncated twisted library (Merlin, Pure2, e.t.c.)
2) The functionality of xml_escape and xml_unescape for XML files has been completely rewritten. Instead of the previously used xml.sax.saxutils module, precompiled rules for regexp, and the name2codepoint module are now used. This increased both the speed and quality of processing. Often, the descriptions of programs in XMLTV contained HTML tags that got there due to poor parsing by the provider of HTML resources with descriptions of programs ... Now, thanks to name2codepoint, unescape of program descriptions is much cleaner and more accurate ... taking into account the unescape of all possible XML and HTML tags
3) For images with threads.deferToThread support (90% of existing images​), no temporary files are almost ever created now. All operations for downloading and processing any data occur in the RAM-"pipe". Temporary files will be created automatically if and only if there is not enough free RAM to store and process data... moreover, they will be created on the media with the largest available free space. Information about available RAM and the amount of cached data is displayed in the log. Storage and processing in RAM - eliminates slow read/write operations on any media. Operations in RAM are a priori the fastest!
4) Any operations of parsing m3u or XML files are done on the basis of "generators". Generators in python are the fastest and least "gluttonous" functions both in terms of CPU and RAM resources

Mika

  • Модератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 16644
  • -> Вас поблагодарили: 27933
  • Сообщений: 6018
  • Респект: +3744/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #12 : 12 Октябрь 2022, 22:43:15 »
​UPDATE
1.0.79


1) Fixed a memory leak when using the EPG event auto-detection algorithm by the channel name from the playlist (if the EPGurl link is set in the provider's card). This resulted in the overloading of some "weak" SAT-boxes on some providers
2) ​A part of the Damerau-Levenshtein algorithm code has been slightly optimized... Now the "difference" of strings is searched much faster
"Вы никогда не достигнете своей цели, если каждый раз будете останавливаться, чтобы бросить палку в лающую на вас собаку"

Mika

  • Модератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 16644
  • -> Вас поблагодарили: 27933
  • Сообщений: 6018
  • Респект: +3744/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #13 : 29 Октябрь 2022, 10:09:04 »
​UPDATE
1.0.80


1) Fixed crash log for VTi images
2) Slightly reworked the EPG auto-selection algorithm by channel name to improve the accuracy of its work
3) htmlentitydefs is included as a module and the plugin no longer requires this dependency to be installed
4) Once again, the algorithm for importing EPG events has been slightly redesigned. Fixed python bugs to work correctly with ZIP archived EPGs.
"Вы никогда не достигнете своей цели, если каждый раз будете останавливаться, чтобы бросить палку в лающую на вас собаку"

Дигидон

  • Супермодератор
  • Аксакал
  • *****
  • Спасибо
  • -> Вы поблагодарили: 17253
  • -> Вас поблагодарили: 29703
  • Сообщений: 6497
  • Респект: +4855/-0
Плагин m3u2bouquet (Мод от Dorik1972)
« Ответ #14 : 30 Октябрь 2022, 13:32:55 »
[30/10/22 04:30GMT] Fixed parsing of EPG given in plain (not zipped) XML...
redownload ... --force-reinstall