From c15ff64deff8d08414251a10035d729121fae356 Mon Sep 17 00:00:00 2001 From: Dmitriy Yefremov Date: Mon, 9 Oct 2017 00:15:27 +0300 Subject: [PATCH] added service type --- main/data/lamedb_example | 1588 ++++++++++++++++++++++++++++++++++++-- main/editor_ui.glade | 119 ++- main/eparser/lamedb.py | 20 +- main/ui.py | 16 +- 4 files changed, 1621 insertions(+), 122 deletions(-) diff --git a/main/data/lamedb_example b/main/data/lamedb_example index 028baaef..2a896014 100644 --- a/main/data/lamedb_example +++ b/main/data/lamedb_example @@ -48,6 +48,78 @@ transponders 01680000:0016:0070 s 12015180:27500000:3:3:360:2:0:1:2:0:2:-1:1:0 / +01680000:0001:00fd + s 11727000:27500000:0:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0002:00fd + s 11747000:27500000:3:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0005:00fd + s 11804000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0007:00fd + s 11842000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0009:00fd + s 11880000:27500000:2:3:360:2:0 +/ +01680000:000b:00fd + s 11920000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:000f:00fd + s 11996000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0011:00fd + s 12034000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0012:00fd + s 12054000:27500000:3:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0013:00fd + s 12073000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0015:00fd + s 12111000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0017:00fd + s 12149000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0019:00fd + s 12190000:22500000:2:3:360:2:0 +/ +01680000:001b:00fd + s 12226000:27500000:2:3:360:2:0 +/ +01680000:001f:00fd + s 12303000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0022:00fd + s 12360000:27500000:3:4:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0027:00fd + s 12456000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0028:00fd + s 12475000:27500000:3:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:00cb:00fd + s 11766000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:00d5:00fd + s 11957000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:00ed:00fd + s 12418000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:014f:00fd + s 12380000:27500000:2:3:360:2:0:1:2:0:2:-1:1:0 +/ +01680000:0960:036e + s 12169000:27500000:1:3:360:2:0:1:2:0:2:-1:1:0 +/ +01682f8e:0001:0001 + s 12174000:4340000:0:3:360:2:0 +/ 0168affb:0008:0070 s 12283000:27500000:3:3:360:2:0:1:2:0:2:-1:1:0 / @@ -56,21 +128,1020 @@ transponders / end services +5a00:01680000:0017:00fd:1:0 +Наш Детектив +p:TricolorTV +0001:01682f8e:0001:0001:1:0 +TNV +p:TNV +0003:01680000:001f:00fd:1:0 +Союз +p:TricolorTV +5208:01680000:000b:00fd:1:0 +Дом Кино Премиум HD +p:TricolorTV,C:0000 +5209:01680000:000b:00fd:1:0 +Nickelodeon HD +p:TricolorTV,C:0000 +520a:01680000:000b:00fd:1:0 +Мультик HD +p:TricolorTV,C:0000 +5a0a:01680000:0017:00fd:1:0 +Travel+Adventure +p:TricolorTV +520b:01680000:0015:00fd:1:0 +Раз ТВ +p:TricolorTV +520c:01680000:000b:00fd:1:0 +Первый канал HD +p:TricolorTV +520d:01680000:000b:00fd:1:0 +МАТЧ! ИГРА HD +p:TricolorTV +520e:01680000:000b:00fd:1:0 +Телемастер +p:TricolorTV +5210:01680000:000b:00fd:1:0 +МАТЧ! АРЕНА HD +p:TricolorTV +6914:01680000:0007:00fd:1:0 +ТВ Поиск +p:TricolorTV +6915:01680000:0007:00fd:1:0 +Экран 1. Кинозалы +p:TricolorTV +6916:01680000:0007:00fd:1:0 +Экран 2. Кинозалы +p:TricolorTV +6217:01680000:0019:00fd:1:0 +Ювелирочка +p:TricolorTV +6917:01680000:0007:00fd:1:0 +Экран 3. Кинозалы +p:TricolorTV +6918:01680000:0007:00fd:1:0 +Экран 4. Кинозалы +p:TricolorTV +6919:01680000:0007:00fd:1:0 +Экран 5. Кинозалы +p:TricolorTV +7919:01680000:001f:00fd:1:0 +2x2 +p:TricolorTV +691a:01680000:0007:00fd:1:0 +Экран 6. Кинозалы +p:TricolorTV +791a:01680000:001f:00fd:1:0 +Mezzo +p:TricolorTV +691b:01680000:0007:00fd:1:0 +Экран 7. Кинозалы +p:TricolorTV +791b:01680000:001f:00fd:1:0 +RU TV +p:TricolorTV +691c:01680000:0007:00fd:1:0 +Экран 8. Кинозалы +p:TricolorTV +791c:01680000:001f:00fd:1:0 +Бобёр +p:TricolorTV +691d:01680000:0007:00fd:1:0 +Экран 9. Кинозалы +p:TricolorTV +791d:01680000:001f:00fd:1:0 +Дом Кино +p:TricolorTV +5a1e:01680000:0017:00fd:1:0 +Рыжий +p:TricolorTV +691e:01680000:0007:00fd:1:0 +Экран 10. Кинозалы +p:TricolorTV +791e:01680000:001f:00fd:1:0 +Малыш +p:TricolorTV +691f:01680000:0007:00fd:1:0 +Экран 11. Кинозалы +p:TricolorTV +791f:01680000:001f:00fd:1:0 +МАТЧ! БОЕЦ +p:TricolorTV +6920:01680000:0007:00fd:1:0 +Экран 12. Кинозалы +p:TricolorTV +7920:01680000:001f:00fd:1:0 +Наш Футбол +p:TricolorTV +7921:01680000:001f:00fd:1:0 +Наше Любимое +p:TricolorTV +4e22:01680000:0002:00fd:1:0 +Ника ТВ +p:TricolorTV +4e23:01680000:0002:00fd:1:0 +Ямал-Регион +p:TricolorTV +7923:01680000:001f:00fd:1:0 +ТНТ4 +p:TricolorTV +7924:01680000:001f:00fd:1:0 +Че +p:TricolorTV +4e25:01680000:0002:00fd:1:0 +Кубань 24 ОРБИТА +p:TricolorTV +7925:01680000:001f:00fd:1:0 +Ю +p:TricolorTV +7926:01680000:001f:00fd:1:0 +Телеканал "Радио Страна FM" +p:TricolorTV +4e27:01680000:0002:00fd:1:0 +Чаваш Ен +p:TricolorTV +4e28:01680000:0002:00fd:1:0 +Shop & Show +p:TricolorTV +5a28:01680000:0017:00fd:1:0 +Кинопоказ +p:TricolorTV +2329:01680000:0009:00fd:1:0 +LEOMAX +p:TricolorTV +7929:01680000:001f:00fd:1:0 +7 tv +p:TricolorTV +232a:01680000:0009:00fd:1:0 +ТВ2ТВ +p:TricolorTV +0a2b:01680000:0001:00fd:1:0 +НАШЕ НОВОЕ КИНО +p:TricolorTV +232b:01680000:0009:00fd:1:0 +ТВ-ТВ +p:TricolorTV +232c:01680000:0009:00fd:1:0 +Искушение +p:TricolorTV +792c:01680000:001f:00fd:1:0 +Архыз 24 +p:TricolorTV +012d:01680000:0005:00fd:1:0 +Моя Планета +p:TricolorTV,C:0000 +232d:01680000:0009:00fd:1:0 +Ночной Клуб +p:TricolorTV +792d:01680000:001f:00fd:1:0 +Грозный +p:TricolorTV +0a2e:01680000:0001:00fd:1:0 +Авто Плюс +p:TricolorTV +792e:01680000:001f:00fd:1:0 +Дагестан +p:TricolorTV +012f:01680000:0005:00fd:1:0 +Мама +p:TricolorTV +792f:01680000:001f:00fd:1:0 +ИНГУШЕТИЯ +p:TricolorTV +0a30:01680000:0001:00fd:1:0 +Наука +p:TricolorTV +7930:01680000:001f:00fd:1:0 +ACB TV +p:TricolorTV +0a31:01680000:0001:00fd:1:0 +Страна +p:TricolorTV +4e31:01680000:0002:00fd:1:0 +Мир Белогорья +p:TricolorTV +0a32:01680000:0001:00fd:1:0 +Сарафан +p:TricolorTV +4e32:01680000:0002:00fd:1:0 +ДОН 24 +p:TricolorTV +5a32:01680000:0017:00fd:1:0 +Загородный ТВ +p:TricolorTV +0133:01680000:0005:00fd:1:0 +Русский бестселлер +p:TricolorTV +0a33:01680000:0001:00fd:1:0 +AMEDIA HIT +p:TricolorTV +4e33:01680000:0002:00fd:1:0 +Свердловское ТВ +p:TricolorTV +0134:01680000:0005:00fd:1:0 +TV Губерния +p:TricolorTV +0a34:01680000:0001:00fd:1:0 +Санкт-Петербург +p:TricolorTV +0135:01680000:0005:00fd:1:0 +КИНОСВИДАНИЕ +p:TricolorTV +0835:01680000:0015:00fd:1:0 +Телеканал Известия +p:TricolorTV,C:0000 +0a37:01680000:0001:00fd:1:0 +РОДНОЕ КИНО +p:TricolorTV +0838:01680000:0015:00fd:1:0 +TR!CK HD +p:TricolorTV +0a38:01680000:0001:00fd:1:0 +MTV Rocks +p:TricolorTV +4a38:01680000:0013:00fd:1:0 +Морской HD +p:TricolorTV,C:0000 +0a39:01680000:0001:00fd:1:0 +СТС Love +p:TricolorTV +4a39:01680000:0013:00fd:1:0 +НТВ HD +p:TricolorTV +4a3a:01680000:0013:00fd:1:0 +1HD Music Television +p:TricolorTV +0a3b:01680000:0001:00fd:1:0 +MTV Hits +p:TricolorTV +4a3b:01680000:0013:00fd:1:0 +Bollywood HD +p:TricolorTV +083c:01680000:0015:00fd:1:0 +Первый Вегетарианский +p:TricolorTV +4a3c:01680000:0013:00fd:1:0 +Планета HD +p:TricolorTV +5a3c:01680000:0017:00fd:1:0 +Телепутешествия +p:TricolorTV +083d:01680000:0015:00fd:1:0 +Nick Jr. +p:TricolorTV +0a3d:01680000:0001:00fd:1:0 +VH1 +p:TricolorTV +013e:01680000:0005:00fd:1:0 +КХЛ +p:TricolorTV +083e:01680000:0015:00fd:1:0 +Nickelodeon +p:TricolorTV +013f:01680000:0005:00fd:1:0 +НСТ +p:TricolorTV +0a3f:01680000:0001:00fd:1:0 +ТНТ MUSIC +p:TricolorTV +0a40:01680000:0001:00fd:1:0 +Europa Plus TV +p:TricolorTV +5b40:01680000:0017:00fd:1:0 +Шансон ТВ +p:TricolorTV +0141:01680000:0005:00fd:1:0 +МУЖСКОЕ КИНО +p:TricolorTV +0841:01680000:0015:00fd:1:0 +LEOMAX +p:TricolorTV +9c41:01680000:0028:00fd:1:0 +Russian Extreme Ultra +p:TricolorTV,C:0000 +0142:01680000:0005:00fd:1:0 +ЖАРА +p:TricolorTV +0842:01680000:0015:00fd:1:0 +365 дней +p:TricolorTV +0143:01680000:0005:00fd:1:0 +Ля-минор ТВ +p:TricolorTV +0a43:01680000:0001:00fd:1:0 +Время +p:TricolorTV +9c43:01680000:0028:00fd:1:0 +CNN International +p:TricolorTV,C:0000 +0144:01680000:0005:00fd:1:0 +Кухня ТВ +p:TricolorTV +0844:01680000:0015:00fd:1:0 +Доктор +p:TricolorTV +9c44:01680000:0028:00fd:1:0 +Deutsche Welle +p:TricolorTV,C:0000 +0845:01680000:0015:00fd:1:0 +Мультимания +p:TricolorTV +0a45:01680000:0001:00fd:1:0 +Русский роман +p:TricolorTV +9c45:01680000:0028:00fd:1:0 +France 24 +p:TricolorTV,C:0000 +0846:01680000:0015:00fd:1:0 +Еда +p:TricolorTV +0a46:01680000:0001:00fd:1:0 +TV5Monde +p:TricolorTV +5a46:01680000:0017:00fd:1:0 +Охотник и рыболов +p:TricolorTV +9c46:01680000:0028:00fd:1:0 +RT +p:TricolorTV,C:0000 +0847:01680000:0015:00fd:1:0 +В гостях у сказки +p:TricolorTV +0a47:01680000:0001:00fd:1:0 +МАТЧ! НАШ СПОРТ +p:TricolorTV +9c47:01680000:0028:00fd:1:0 +RTД +p:TricolorTV,C:0000 +0148:01680000:0005:00fd:1:0 +Музыка Первого +p:TricolorTV +0848:01680000:0015:00fd:1:0 +Пёс и Ко +p:TricolorTV +0a48:01680000:0001:00fd:1:0 +КИНОМИКС +p:TricolorTV +9c48:01680000:0028:00fd:1:0 +Калейдоскоп ТВ +p:TricolorTV,C:0000 +5b4a:01680000:0017:00fd:1:0 +National Geographic +p:TricolorTV +9c4a:01680000:0028:00fd:1:0 +РБК +p:TricolorTV,C:0000 +9c4b:01680000:0028:00fd:1:0 +8 канал +p:TricolorTV,C:0000 +9c4c:01680000:0028:00fd:1:0 +NHK WORLD TV +p:TricolorTV,C:0000 +014d:01680000:0005:00fd:1:0 +BRIDGE TV CLASSIC +p:TricolorTV +9c4d:01680000:0028:00fd:1:0 +Живи! +p:TricolorTV,C:0000 +014e:01680000:0005:00fd:1:0 +Телекафе +p:TricolorTV +9c4e:01680000:0028:00fd:1:0 +ТДК +p:TricolorTV,C:0000 +014f:01680000:0005:00fd:1:0 +МАТЧ! ФУТБОЛ 1 +p:TricolorTV +0150:01680000:0005:00fd:1:0 +МАТЧ! ФУТБОЛ 2 +p:TricolorTV +4650:01680000:0012:00fd:1:0 +СЕРИАЛ UHD +p:TricolorTV +5a50:01680000:0017:00fd:1:0 +Тонус ТВ +p:TricolorTV +c350:01680000:0015:00fd:1:0 +Посмотрите инструкцию +p:TricolorTV +0151:01680000:0005:00fd:1:0 +МАТЧ! ФУТБОЛ 3 +p:TricolorTV +4651:01680000:0012:00fd:1:0 +C4K360 +p:TricolorTV +6151:01680000:0007:00fd:1:0 +Мульт +p:TricolorTV +c351:01680000:0015:00fd:1:0 +Сохраните данный канал +p:TricolorTV +6152:01680000:0007:00fd:1:0 +Zee TV +p:TricolorTV +6153:01680000:0007:00fd:1:0 +Game Show +p:TricolorTV +4654:01680000:0012:00fd:1:0 +Test 10bit +p:TricolorTV +6154:01680000:0007:00fd:1:0 +СвоёТВ.Ставропольский край +p:TricolorTV +4655:01680000:0012:00fd:1:0 +Test 8bit +p:TricolorTV +6155:01680000:0007:00fd:1:0 +O! +p:TricolorTV +6156:01680000:0007:00fd:1:0 +ПОЕХАЛИ! +p:TricolorTV +6157:01680000:0007:00fd:1:0 +ШАЛУН +p:TricolorTV +9859:01680000:0027:00fd:1:0 +AMEDIA HIT HD +p:TricolorTV,C:0000 +0d5a:01680000:0001:00fd:1:0 +BRIDGE TV DANCE +p:TricolorTV +5a5a:01680000:0017:00fd:1:0 +Zoo TV +p:TricolorTV +985a:01680000:0027:00fd:1:0 +КХЛ HD +p:TricolorTV +985b:01680000:0027:00fd:1:0 +Mezzo Live HD +p:TricolorTV +5b5e:01680000:0017:00fd:1:0 +Наш Кинороман +p:TricolorTV +9862:01680000:0027:00fd:1:0 +English Club TV +p:TricolorTV +9863:01680000:0027:00fd:1:0 +КИНОКОМЕДИЯ +p:TricolorTV +0064:01680000:0960:036e:1:0 +Int Table +p:EUTELSAT +5a64:01680000:0017:00fd:1:0 +Рыжий (сурд.) +p:TricolorTV +9864:01680000:0027:00fd:1:0 +КИНОСЕРИЯ +p:TricolorTV +9865:01680000:0027:00fd:1:0 +КВН ТВ +p:TricolorTV +9867:01680000:0027:00fd:1:0 +ИНДИЙСКОЕ КИНО +p:TricolorTV +9869:01680000:0027:00fd:1:0 +БОКС ТВ +p:TricolorTV +986a:01680000:0027:00fd:1:0 +Ювелирочка Мода +p:TricolorTV +986d:01680000:0027:00fd:1:0 +Ani +p:TricolorTV +5a6e:01680000:0017:00fd:1:0 +Евроновости +p:TricolorTV +4273:01680000:0011:00fd:1:0 +КиноПремиум HD +p:TricolorTV +9873:01680000:0027:00fd:1:0 +TR!CK +p:TricolorTV +4274:01680000:0011:00fd:1:0 +Остросюжетное HD +p:TricolorTV +4275:01680000:0011:00fd:1:0 +Наш Детектив HD +p:TricolorTV +4276:01680000:0011:00fd:1:0 +МАТЧ! HD +p:TricolorTV +4277:01680000:0011:00fd:1:0 +Наш Кинороман HD +p:TricolorTV +4278:01680000:0011:00fd:1:0 +Travel+Adventure HD +p:TricolorTV +5a78:01680000:0017:00fd:1:0 +FOX +p:TricolorTV +6978:01680000:001b:00fd:1:0 +Инфоканал +p:TricolorTV +9878:01680000:0027:00fd:1:0 +Конный Мир +p:TricolorTV +9879:01680000:0027:00fd:1:0 +Анекдот ТВ +p:TricolorTV +697d:01680000:001b:00fd:1:0 +Первый канал +p:TricolorTV,C:0000 +6982:01680000:001b:00fd:1:0 +Россия 1 +p:TricolorTV,C:0000 +0385:01680000:0009:00fd:1:0 +ОТР +p:TricolorTV,C:0000 +6987:01680000:001b:00fd:1:0 +НТВ +p:TricolorTV,C:0000 +1389:01680000:0005:00fd:1:0 +CANDY +p:TricolorTV +9089:01680000:00ed:00fd:1:0 +Animal Family HD +p:TricolorTV,C:0000 +138a:01680000:0005:00fd:1:0 +CANDYMAN +p:TricolorTV +908a:01680000:00ed:00fd:1:0 +Охотник и рыболов HD +p:TricolorTV +138b:01680000:0005:00fd:1:0 +Живая Планета +p:TricolorTV +908b:01680000:00ed:00fd:1:0 +Ginger HD +p:TricolorTV +038c:01680000:0009:00fd:1:0 +Русская ночь +p:TricolorTV,C:0000 +5a8c:01680000:0017:00fd:1:0 +ВМЕСТЕ-РФ +p:TricolorTV +698c:01680000:001b:00fd:1:0 +Россия К +p:TricolorTV,C:0000 +908c:01680000:00ed:00fd:1:0 +Teletravel HD +p:TricolorTV +138d:01680000:0005:00fd:1:0 +Техно 24 +p:TricolorTV +908d:01680000:00ed:00fd:1:0 +Eureka HD +p:TricolorTV +138e:01680000:0005:00fd:1:0 +Русский детектив +p:TricolorTV +908e:01680000:00ed:00fd:1:0 +Наш Футбол HD +p:TricolorTV +038f:01680000:0009:00fd:1:0 +Телеинструктор +p:TricolorTV +0391:01680000:0009:00fd:1:0 +O-la-la +p:TricolorTV +6991:01680000:001b:00fd:1:0 +SHOP24 +p:TricolorTV,C:0000 +0395:01680000:0009:00fd:1:0 +Промо ТВ +p:TricolorTV +0396:01680000:0009:00fd:1:0 +Shopping Live +p:TricolorTV +6996:01680000:001b:00fd:1:0 +МАТЧ! +p:TricolorTV,C:0000 +0398:01680000:0009:00fd:1:0 +ТНТ +p:TricolorTV +039a:01680000:0009:00fd:1:0 +Brazzers TV +p:TricolorTV +039b:01680000:0009:00fd:1:0 +Нано +p:TricolorTV +039c:01680000:0009:00fd:1:0 +Top Shop +p:TricolorTV +69a0:01680000:001b:00fd:1:0 +Россия 24 +p:TricolorTV,C:0000 +61a9:01680000:0019:00fd:1:0 +Домашний +p:TricolorTV +61aa:01680000:0019:00fd:1:0 +МИР +p:TricolorTV +69aa:01680000:001b:00fd:1:0 +Пятый канал +p:TricolorTV,C:0000 +61ab:01680000:0019:00fd:1:0 +ПЯТНИЦА! +p:TricolorTV +61ac:01680000:0019:00fd:1:0 +РЕН ТВ +p:TricolorTV +61ad:01680000:0019:00fd:1:0 +СТС +p:TricolorTV +61ae:01680000:0019:00fd:1:0 +ТВ-3 +p:TricolorTV +88b8:01680000:014f:00fd:1:0 +МАТЧ! ФУТБОЛ 1 HD +p:TricolorTV,C:0000 +0bb9:01680000:00cb:00fd:1:0 +Russian Extreme HD +p:TricolorTV,C:0000 +88b9:01680000:014f:00fd:1:0 +МАТЧ! ФУТБОЛ 2 HD +p:TricolorTV,C:0000 +0bba:01680000:00cb:00fd:1:0 +Кинопоказ HD1 +p:TricolorTV +88ba:01680000:014f:00fd:1:0 +МАТЧ! ФУТБОЛ 3 HD +p:TricolorTV +0bbb:01680000:00cb:00fd:1:0 +Кинопоказ HD2 +p:TricolorTV +88bb:01680000:014f:00fd:1:0 +BRIDGE HD +p:TricolorTV +0bbc:01680000:00cb:00fd:1:0 +Еда Премиум +p:TricolorTV +88bc:01680000:014f:00fd:1:0 +LUXURY HD +p:TricolorTV +0bbd:01680000:00cb:00fd:1:0 +Искушение HD +p:TricolorTV +88bd:01680000:014f:00fd:1:0 +RUSSIAN MUSICBOX HD +p:TricolorTV +88be:01680000:014f:00fd:1:0 +НТВ Стиль +p:TricolorTV +0bbf:01680000:00cb:00fd:1:0 +Наше Любимое HD +p:TricolorTV +88c0:01680000:014f:00fd:1:0 +A1 HD +p:TricolorTV +88c2:01680000:014f:00fd:1:0 +ТНТ HD +p:TricolorTV +3ac3:01680000:000f:00fd:1:0 +Россия 1 (+2) +p:TricolorTV +88c3:01680000:014f:00fd:1:0 +Spike HD +p:TricolorTV +3ac5:01680000:000f:00fd:1:0 +Карусель (+3) +p:TricolorTV +88c5:01680000:014f:00fd:1:0 +Совершенно секретно +p:TricolorTV +3ac6:01680000:000f:00fd:1:0 +Пятый канал (+2) +p:TricolorTV +61c6:01680000:0019:00fd:1:0 +ЗВЕЗДА +p:TricolorTV +88c6:01680000:014f:00fd:1:0 +НТВ Сериал +p:TricolorTV +3ac7:01680000:000f:00fd:1:0 +Россия К (+2) +p:TricolorTV +88c7:01680000:014f:00fd:1:0 +НТВ Право +p:TricolorTV +3ac8:01680000:000f:00fd:1:0 +НТВ (+2) +p:TricolorTV +88c8:01680000:014f:00fd:1:0 +СТС +p:TricolorTV 00c9:01680000:0002:0070:1:0 Fashion One (4K) -p:HTB+,c:0000ce,c:010132,c:0300ce,c:050001,C:0500 -4e8b:01680000:0014:0070:25:0 -1HD p:HTB+,C:0500 +32c9:01680000:00d5:00fd:1:0 +Россия 1 HD +p:TricolorTV,C:0000 +3ac9:01680000:000f:00fd:1:0 +ТНТ (+2) +p:TricolorTV +88c9:01680000:014f:00fd:1:0 +Пятый канал +p:TricolorTV 00ca:01680000:0002:0070:1:0 HOME 4K (TECT) p:HTB+,C:0500 +32ca:01680000:00d5:00fd:1:0 +FOX Life HD +p:TricolorTV +3aca:01680000:000f:00fd:1:0 +СТС (+2) +p:TricolorTV +32cb:01680000:00d5:00fd:1:0 +Nat Geo Wild HD +p:TricolorTV +3acb:01680000:000f:00fd:1:0 +Радость моя +p:TricolorTV +32cc:01680000:00d5:00fd:1:0 +National Geographic HD +p:TricolorTV +3acc:01680000:000f:00fd:1:0 +Канал Disney +p:TricolorTV +32cd:01680000:00d5:00fd:1:0 +FOX HD +p:TricolorTV +3acd:01680000:000f:00fd:1:0 +Детский Мир +p:TricolorTV +3ace:01680000:000f:00fd:1:0 +Cartoon Network +p:TricolorTV +32cf:01680000:00d5:00fd:1:0 +Fashion One HD +p:TricolorTV +3acf:01680000:000f:00fd:1:0 +Boomerang +p:TricolorTV +3ad0:01680000:000f:00fd:1:0 +Детский +p:TricolorTV +84d0:01680000:0022:00fd:1:0 +INSIGHT UHD +p:TricolorTV,C:0000 +07d1:01680000:0002:00fd:1:0 +Первый Ярославский +p:TricolorTV,C:0000 +3ad1:01680000:000f:00fd:1:0 +TiJi +p:TricolorTV +84d1:01680000:0022:00fd:1:0 +КИНО UHD +p:TricolorTV +07d2:01680000:0002:00fd:1:0 +Феникс плюс Кино +p:TricolorTV,C:0000 +3ad2:01680000:000f:00fd:1:0 +Gulli Girl +p:TricolorTV +69d2:01680000:001b:00fd:1:0 +Карусель +p:TricolorTV +84d2:01680000:0022:00fd:1:0 +FASHION ONE 4K +p:TricolorTV +07d3:01680000:0002:00fd:1:0 +Оружие +p:TricolorTV +3ad3:01680000:000f:00fd:1:0 +JimJam +p:TricolorTV +07d4:01680000:0002:00fd:1:0 +ТНВ-Планета +p:TricolorTV +3ad4:01680000:000f:00fd:1:0 +Baby TV +p:TricolorTV +07d5:01680000:0002:00fd:1:0 +ТРО +p:TricolorTV +07d6:01680000:0002:00fd:1:0 +Липецкое время +p:TricolorTV +3ad6:01680000:000f:00fd:1:0 +Первый канал (+2) +p:TricolorTV +07d7:01680000:0002:00fd:1:0 +Север +p:TricolorTV +07d8:01680000:0002:00fd:1:0 +Царьград +p:TricolorTV +07d9:01680000:0002:00fd:1:0 +МИР 24 +p:TricolorTV +07da:01680000:0002:00fd:1:0 +Москва 24 +p:TricolorTV +61da:01680000:0019:00fd:1:0 +Дисконт +p:TricolorTV +07db:01680000:0002:00fd:1:0 +Телеканал 360 +p:TricolorTV +5adc:01680000:0017:00fd:1:0 +РУССКИЙ ХИТ +p:TricolorTV +69dc:01680000:001b:00fd:1:0 +ТВ Центр +p:TricolorTV +07dd:01680000:0002:00fd:1:0 +БСТ +p:TricolorTV +59e2:01680000:0017:00fd:1:0 +Nat Geo Wild +p:TricolorTV,C:0000 +61e4:01680000:0019:00fd:1:0 +Спас +p:TricolorTV +5ae6:01680000:0017:00fd:1:0 +КиноПремиум +p:TricolorTV +03e9:01680000:0001:00fd:1:0 +A2 +p:TricolorTV,C:0000 +03ea:01680000:0001:00fd:1:0 +НАШЕ ТВ +p:TricolorTV +03eb:01680000:0001:00fd:1:0 +Paramount Comedy +p: +59ec:01680000:0017:00fd:1:0 +FOX Life +p:TricolorTV,C:0000 +61ee:01680000:0019:00fd:1:0 +МУЗ-ТВ +p:TricolorTV +5af0:01680000:0017:00fd:1:0 +BRIDGE TV +p:TricolorTV +59f6:01680000:0017:00fd:1:0 +Остросюжетное +p:TricolorTV,C:0000 03f7:01680000:000a:0070:1:0 ТВОЙ ДОМ p:HTB+,C:0500 +5afa:01680000:0017:00fd:1:0 +История +p:TricolorTV +0004:01680000:001f:00fd:2:0 +Воскресение +p:TricolorTV +001e:01680000:0019:00fd:2:0 +Energy +p:Connecto +0020:01680000:0019:00fd:2:0 +Avtoradio +p:Connecto +002d:01680000:0019:00fd:2:0 +Romantika +p:Connecto +0837:01680000:0015:00fd:2:0 +Маруся ФМ +p:TricolorTV,C:0000 +0039:01680000:0019:00fd:2:0 +Humor FM +p:Connecto +4269:01680000:0011:00fd:2:0 +Радио Монте-Карло +p:TricolorTV,C:0000 +426a:01680000:0011:00fd:2:0 +МАКС-FM +p:TricolorTV +6979:01680000:001b:00fd:2:0 +Радио России +p:TricolorTV,C:0000 +697a:01680000:001b:00fd:2:0 +Маяк +p:TricolorTV,C:0000 +697b:01680000:001b:00fd:2:0 +Вести FM +p:TricolorTV,C:0000 0480:01680000:000b:0070:2:0 Детское радио p:HTB+ +3a99:01680000:000f:00fd:2:0 +Град Петров +p:TricolorTV,C:0000 +3a9a:01680000:000f:00fd:2:0 +Хит FM +p:TricolorTV,C:0000 +3a9b:01680000:000f:00fd:2:0 +Чаваш Ен +p:TricolorTV,C:0000 +3a9c:01680000:000f:00fd:2:0 +Русское радио +p:TricolorTV,C:0000 +3a9d:01680000:000f:00fd:2:0 +KAVKAZ MUSIC +p:TricolorTV,C:0000 +3a9e:01680000:000f:00fd:2:0 +Радио Ваня +p:TricolorTV +3a9f:01680000:000f:00fd:2:0 +Comedy Radio +p:TricolorTV +3aa0:01680000:000f:00fd:2:0 +Радио Шансон +p:TricolorTV +3aa1:01680000:000f:00fd:2:0 +Детское радио +p:TricolorTV +3aa2:01680000:000f:00fd:2:0 +DFM +p:TricolorTV +3aa3:01680000:000f:00fd:2:0 +MAXIMUM +p:TricolorTV +3aa4:01680000:000f:00fd:2:0 +Радио Русь +p:TricolorTV +3aa6:01680000:000f:00fd:2:0 +Радио Родных Дорог +p:TricolorTV +3aa8:01680000:000f:00fd:2:0 +Страна FM +p:TricolorTV +3aa9:01680000:000f:00fd:2:0 +Культура +p:TricolorTV +3aaa:01680000:000f:00fd:2:0 +Радио ИСКАТЕЛЬ +p:TricolorTV +3aab:01680000:000f:00fd:2:0 +Радио Дача +p:TricolorTV +3aac:01680000:000f:00fd:2:0 +Радонеж +p:TricolorTV +3aae:01680000:000f:00fd:2:0 +Новое Радио +p:TricolorTV +3aaf:01680000:000f:00fd:2:0 +Спорт FM +p:TricolorTV +3ab0:01680000:000f:00fd:2:0 +Такси FM +p:TricolorTV +3ab1:01680000:000f:00fd:2:0 +Дорожное радио +p:TricolorTV +3ab2:01680000:000f:00fd:2:0 +Ретро FM +p:TricolorTV +3ab3:01680000:000f:00fd:2:0 +Европа Плюс +p:TricolorTV +3ab4:01680000:000f:00fd:2:0 +Радио для Двоих +p:TricolorTV +3ab5:01680000:000f:00fd:2:0 +Радио 7 на семи холмах +p:TricolorTV +3ab6:01680000:000f:00fd:2:0 +Модное радио +p:TricolorTV +3ab7:01680000:000f:00fd:2:0 +Радио МИР +p:TricolorTV +3ab8:01680000:000f:00fd:2:0 +Радио Комсомольская правда +p:TricolorTV +3ab9:01680000:000f:00fd:2:0 +Радио Рокс +p:TricolorTV +3aba:01680000:000f:00fd:2:0 +Радио Рекорд +p:TricolorTV +3abb:01680000:000f:00fd:2:0 +Радио 107 (Краснодар) +p:TricolorTV +3abc:01680000:000f:00fd:2:0 +Орфей +p:TricolorTV +3abd:01680000:000f:00fd:2:0 +Love Radio +p:TricolorTV +3abe:01680000:000f:00fd:2:0 +Радио ЗВЕЗДА +p:TricolorTV +3abf:01680000:000f:00fd:2:0 +Юмор FM +p:TricolorTV +3ac0:01680000:000f:00fd:2:0 +Радио ENERGY +p:TricolorTV +3ac1:01680000:000f:00fd:2:0 +Радио Romantika +p:TricolorTV +3ac2:01680000:000f:00fd:2:0 +Авторадио +p:TricolorTV 02e5:01680000:0007:0070:2:0 Юмор FM p:HTB+ @@ -104,6 +1175,12 @@ p:HTB+ 02ef:01680000:0007:0070:2:0 Business FM p:HTB+ +02f0:01680000:0007:0070:2:0 +Милицейская волна +p:HTB+ +02f1:01680000:0007:0070:2:0 +Comedy Radio +p:HTB+ 02f2:01680000:0007:0070:2:0 Комсомольская правда p:HTB+ @@ -125,48 +1202,246 @@ p:HTB+ 02f8:01680000:0007:0070:2:0 Детское радио p:HTB+ +6a0d:01680000:001b:00fd:12:0 +magazine_service +p:TricolorTV +6a0e:01680000:001b:00fd:12:0 +publisher_service +p:TricolorTV +6a0f:01680000:001b:00fd:12:0 +Banner_27 +p:TricolorTV +5212:01680000:000b:00fd:12:0 +Neotion Update Service +p:TricolorTV +5213:01680000:000b:00fd:12:0 +publisher_service +p:TricolorTV +5214:01680000:000b:00fd:12:0 +DRE2 +p:TricolorTV +0015:01680000:0960:036e:12:0 +OTT +p:EUTELSAT +5215:01680000:000b:00fd:12:0 +U510 +p:TricolorTV +6a18:01680000:001b:00fd:12:0 +DRE +p:TricolorTV +9920:01680000:0027:00fd:12:0 +publisher_service +p:TricolorTV +9921:01680000:0027:00fd:12:0 +Banner_39 +p:TricolorTV +5225:01680000:000b:00fd:12:0 +B520 +p:TricolorTV +5226:01680000:000b:00fd:12:0 +U210CI +p:TricolorTV +5227:01680000:000b:00fd:12:0 +Banner_11 +p:TricolorTV +5227:01680000:0015:00fd:12:0 +publisher_service +p:TricolorTV +5228:01680000:000b:00fd:12:0 +Collections +p:TricolorTV +5228:01680000:0015:00fd:12:0 +Banner_21 +p:TricolorTV +692d:01680000:0007:00fd:12:0 +k_rai +p:TricolorTV +692e:01680000:0007:00fd:12:0 +k-rai-icon +p:TricolorTV +692f:01680000:0007:00fd:12:0 +PushVoD +p:TricolorTV +6932:01680000:0007:00fd:12:0 +publisher_service +p:TricolorTV +6933:01680000:0007:00fd:12:0 +Banner_7 +p:TricolorTV +4e34:01680000:0002:00fd:12:0 +publisher_service +p:TricolorTV +4e35:01680000:0002:00fd:12:0 +Banner_2 +p:TricolorTV +623e:01680000:0019:00fd:12:0 +publisher_service +p:TricolorTV +623f:01680000:0019:00fd:12:0 +Banner_25 +p:TricolorTV +6a40:01680000:001b:00fd:12:0 +Icons_Channels +p:TricolorTV +4a43:01680000:0013:00fd:12:0 +publisher_service +p:TricolorTV +4a44:01680000:0013:00fd:12:0 +Banner_19 +p:TricolorTV +7952:01680000:001f:00fd:12:0 +Neotion Update Service +p:TricolorTV 1f53:01680000:000a:0070:12:0 VAHD3100S DOWNLOAD SVC -p:HTB+,f:40 +p:HTB+ +0154:01680000:0005:00fd:12:0 +publisher_service +p:TricolorTV +7954:01680000:001f:00fd:12:0 +publisher_service +p:TricolorTV +0155:01680000:0005:00fd:12:0 +Banner_5 +p:TricolorTV +7955:01680000:001f:00fd:12:0 +Banner_31 +p:TricolorTV 1b58:01680000:000a:0070:12:0 OPENTEL 1740V OTA p:HTB+ +0d5c:01680000:0001:00fd:12:0 +publisher_service +p:TricolorTV 025d:01680000:0015:0070:12:0 Neotion Update Service -p:HTB+,f:40 +p:HTB+ +0d5d:01680000:0001:00fd:12:0 +Banner_1 +p:TricolorTV 1f5e:01680000:0015:0070:12:0 KMedia p:HTB+ +9c5f:01680000:0028:00fd:12:0 +Banner 40 +p:TricolorTV +9c60:01680000:0028:00fd:12:0 +publisher_service +p:TricolorTV +1b62:01680000:0001:0070:12:0 +SSU7010 +p:HTB+ +0263:01680000:0001:0070:12:0 +Neotion CAM PRO +p:HTB+ 0265:01680000:0015:0070:12:0 Neotion CAM PRO -p:HTB+,f:40 +p:HTB+ 1f68:01680000:000a:0070:12:0 Jiuzhou 1HD SSU p:HTB+ +1f69:01680000:0001:0070:12:0 +SSU8041 +p:HTB+ +466f:01680000:0012:00fd:12:0 +Banner_18 +p:TricolorTV +4670:01680000:0012:00fd:12:0 +publisher_service +p:TricolorTV +1f72:01680000:0001:0070:12:0 +DSI87 +p:HTB+ +1f73:01680000:0001:0070:12:0 +SAGEM DSI74 HD +p:HTB+ +1f7c:01680000:0001:0070:12:0 +Sphere1 +p:HTB+ +427c:01680000:0011:00fd:12:0 +publisher_service +p:TricolorTV +427d:01680000:0011:00fd:12:0 +Banner_17 +p:TricolorTV 1f7f:01680000:000a:0070:12:0 SMiT -p:HTB+,f:40 +p:HTB+ 1f80:01680000:000a:0070:12:0 SMiT+ -p:HTB+,f:40 +p:HTB+ 0884:01680000:0015:0070:12:0 TEST2180 -p:HTB+,f:40 +p:HTB+ +028b:01680000:0001:0070:12:0 +SPro16 +p:HTB+ 028c:01680000:0015:0070:12:0 SPro16 -p:HTB+,f:40 +p:HTB+ 028d:0168affb:0008:0070:12:0 SPro16 -p:HTB+,f:40 +p:HTB+ 028d:0168affc:0008:0070:12:0 SPro16 -p:HTB+,f:40 +p:HTB+ +0291:01680000:0011:0070:12:0 +SPro Test +p:HTB+ +9092:01680000:00ed:00fd:12:0 +publisher_service +p:TricolorTV +9093:01680000:00ed:00fd:12:0 +Banner_37 +p:TricolorTV 0296:01680000:000b:0070:12:0 SPro16 -p:HTB+,f:40 +p:HTB+ 0297:01680000:000d:0070:12:0 SPro16 -p:HTB+,f:40 +p:HTB+ +0299:01680000:0012:0070:12:0 +SPro16 +p:HTB+ +03a2:01680000:0009:00fd:12:0 +publisher_service +p:TricolorTV +03a3:01680000:0009:00fd:12:0 +Banner_9 +p:TricolorTV +0bc2:01680000:00cb:00fd:12:0 +publisher_service +p:TricolorTV +0bc3:01680000:00cb:00fd:12:0 +Banner_3 +p:TricolorTV +5bcc:01680000:0017:00fd:12:0 +publisher_service +p:TricolorTV +5bcd:01680000:0017:00fd:12:0 +Banner_23 +p:TricolorTV +32d2:01680000:00d5:00fd:12:0 +publisher_service +p:TricolorTV +32d3:01680000:00d5:00fd:12:0 +Banner_13 +p:TricolorTV +88d8:01680000:014f:00fd:12:0 +Banner_35 +p:TricolorTV +84da:01680000:0022:00fd:12:0 +publisher_service +p:TricolorTV +84db:01680000:0022:00fd:12:0 +Banner_34 +p:TricolorTV +3ade:01680000:000f:00fd:12:0 +publisher_service +p:TricolorTV +3adf:01680000:000f:00fd:12:0 +Banner_15 +p:TricolorTV 0709:01680000:0012:0070:22:0 Первый канал +2 p:HTB+,C:0500 @@ -179,6 +1454,12 @@ p:HTB+,C:0500 070c:01680000:0012:0070:22:0 ТНТ +2 p:HTB+,C:0500 +070d:01680000:0012:0070:22:0 +Моя Планета +p:HTB+,C:0500 +070e:01680000:0012:0070:22:0 +Наука 2.0 +p:HTB+,C:0500 070f:01680000:0012:0070:22:0 ТРО p:HTB+,C:0500 @@ -199,40 +1480,49 @@ RU.TV p:HTB+,C:0500 0515:01680000:000d:0070:22:0 МАТЧ! АРЕНА -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0715:01680000:0012:0070:22:0 Travel Channel p:HTB+,C:0500 0516:01680000:000d:0070:22:0 МАТЧ! БОЕЦ -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0716:01680000:0012:0070:22:0 RTД (русск.) p:HTB+,C:0500 0517:01680000:000d:0070:22:0 МАТЧ! ИГРА -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 +0717:01680000:0012:0070:22:0 +RT (английский) +p:HTB+,C:0500 0518:01680000:000d:0070:22:0 МАТЧ! НАШ СПОРТ -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0718:01680000:0012:0070:22:0 RTG TV p:HTB+,C:0500 0519:01680000:000d:0070:22:0 МАТЧ! ФУТБОЛ 1 -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 +0719:01680000:0012:0070:22:0 +Ювелирочка +p:,C:0500 051a:01680000:000d:0070:22:0 МАТЧ! ФУТБОЛ 2 -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 071a:01680000:0012:0070:22:0 BRIDGE TV DANCE p:HTB+,C:0500 051b:01680000:000d:0070:22:0 МАТЧ! ФУТБОЛ 3 -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 +071b:01680000:0012:0070:22:0 +CNN International +p:HTB+,C:0500 051c:01680000:000d:0070:22:0 ОТР -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 071c:01680000:0012:0070:22:0 THT4 p:HTB+,C:0500 @@ -256,7 +1546,7 @@ p:HTB+,C:0500 p:HTB+,C:0500 0520:01680000:000d:0070:22:0 Канал Disney -p:HTB+,c:0000d4,c:010138,c:0300d4,c:050001,C:0500 +p:HTB+,C:0500 0720:01680000:0012:0070:22:0 Царьград p:HTB+,C:0500 @@ -268,19 +1558,19 @@ Animal Planet p:HTB+,C:0500 0521:01680000:000d:0070:22:0 МУЗ -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0721:01680000:0012:0070:22:0 Санкт-Петербург p:HTB+,C:0500 0322:0168affb:0008:0070:22:0 Cartoon Network -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0322:0168affc:0008:0070:22:0 Cartoon Network p:HTB+,C:0500 0522:01680000:000d:0070:22:0 НАШ ФУТБОЛ -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0323:0168affb:0008:0070:22:0 Discovery Channel p:HTB+,C:0500 @@ -310,7 +1600,7 @@ p:HTB+,C:0500 p:HTB+,C:0500 0326:0168affb:0008:0070:22:0 Fox Life -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0326:0168affc:0008:0070:22:0 Fox Life p:HTB+,C:0500 @@ -319,7 +1609,7 @@ p:HTB+,C:0500 p:HTB+,C:0500 0327:0168affb:0008:0070:22:0 ID Xtra -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0327:0168affc:0008:0070:22:0 ID Xtra p:HTB+,C:0500 @@ -328,10 +1618,10 @@ p:HTB+,C:0500 p:HTB+,C:0500 0328:0168affb:0008:0070:22:0 O! -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0328:0168affc:0008:0070:22:0 O! -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0528:01680000:000d:0070:22:0 Ю-ТВ p:HTB+,C:0500 @@ -340,7 +1630,7 @@ MTV p:HTB+,C:0500 0329:0168affc:0008:0070:22:0 MTV -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 032a:0168affb:0008:0070:22:0 MTV Dance p:HTB+,C:0500 @@ -349,7 +1639,7 @@ MTV Dance p:HTB+,C:0500 052a:01680000:000d:0070:22:0 World Fashion -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 032b:0168affb:0008:0070:22:0 MTV Hits p:HTB+,C:0500 @@ -358,7 +1648,7 @@ MTV Hits p:HTB+,C:0500 052b:01680000:000d:0070:22:0 Shop&Show -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 032c:0168affb:0008:0070:22:0 MTV Rocks p:HTB+,C:0500 @@ -370,28 +1660,28 @@ THT MUSIC p:HTB+,C:0500 032d:0168affb:0008:0070:22:0 National Geographic -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 032d:0168affc:0008:0070:22:0 National Geographic p:HTB+,C:0500 032e:0168affb:0008:0070:22:0 Nick Jr. -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 032e:0168affc:0008:0070:22:0 Nick Jr. p:HTB+,C:0500 032f:0168affb:0008:0070:22:0 TLC -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 032f:0168affc:0008:0070:22:0 TLC -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0330:0168affb:0008:0070:22:0 VH1 Classic -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0330:0168affc:0008:0070:22:0 VH1 Classic -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0331:0168affb:0008:0070:22:0 VH1 European p:HTB+,C:0500 @@ -415,19 +1705,19 @@ p:HTB+,C:0500 p:HTB+,C:0500 0334:0168affc:0008:0070:22:0 Дом Кино -p:HTB+,c:0000dc,c:010140,c:0300dc,c:050001,C:0500 +p:HTB+,C:0500 0335:0168affb:0008:0070:22:0 Boomerang p:HTB+,C:0500 0335:0168affc:0008:0070:22:0 Boomerang -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0835:01680000:0015:0070:22:0 2X2 p:HTB+,C:0500 0336:0168affb:0008:0070:22:0 Карусель -p:HTB+,c:0000de,c:010142,c:02020a,c:0300de,c:050001,C:0500 +p:HTB+,C:0500 0336:0168affc:0008:0070:22:0 Карусель p:HTB+,C:0500 @@ -436,19 +1726,19 @@ A1 p:HTB+,C:0500 0337:0168affb:0008:0070:22:0 Музыка Первого -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0337:0168affc:0008:0070:22:0 Музыка Первого -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0837:01680000:0015:0070:22:0 AMEDIA HIT p:HTB+,C:0500 0338:0168affb:0008:0070:22:0 ТЕЛЕКАФЕ -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0338:0168affc:0008:0070:22:0 ТЕЛЕКАФЕ -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0838:01680000:0015:0070:22:0 Amedia Premium p:HTB+,C:0500 @@ -475,10 +1765,10 @@ AMC p:HTB+,C:0500 0841:01680000:0015:0070:22:0 ТВЦ -p:HTB+,c:0000d5,c:010139,c:020201,c:0300d5,c:050001,C:0500 +p:HTB+,C:0500 0842:01680000:0015:0070:22:0 Москва 24 -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0843:01680000:0015:0070:22:0 Совершенно секретно p:HTB+,C:0500 @@ -487,7 +1777,7 @@ TВ-21М p:HTB+,C:0500 0845:01680000:0015:0070:22:0 A2 -p:HTB+,c:0000d9,c:01013d,c:020205,c:0300d9,c:050001,C:0500 +p:HTB+,C:0500 0846:01680000:0015:0070:22:0 BRIDGE TV p:HTB+,C:0500 @@ -496,16 +1786,16 @@ BRIDGE TV Русский Хит p:HTB+,C:0500 0848:01680000:0015:0070:22:0 Playboy TV -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0849:01680000:0015:0070:22:0 TiJi -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 084a:01680000:0015:0070:22:0 Gulli Girl p:HTB+,C:0500 054b:01680000:000d:0070:22:0 ПП Тест2 -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 084b:01680000:0015:0070:22:0 BBC World News p:HTB+,C:0500 @@ -517,7 +1807,7 @@ p:HTB+,C:0500 p:HTB+,C:0500 084d:01680000:0015:0070:22:0 КРИК-Тв -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 044e:01680000:000b:0070:22:0 Домашний p:HTB+,C:0500 @@ -535,7 +1825,7 @@ p:HTB+,C:0500 p:HTB+,C:0500 0451:01680000:000b:0070:22:0 СТС -p:HTB+,c:0000cd,c:010131,c:0300cd,c:050001,C:0500 +p:HTB+,C:0500 0452:01680000:000b:0070:22:0 CTC Love p:HTB+,C:0500 @@ -547,19 +1837,19 @@ p:HTB+,C:0500 p:HTB+,C:0500 0455:01680000:000b:0070:22:0 Че -p:HTB+,c:0000d1,c:010135,c:0300d1,c:050001,C:0500 +p:HTB+,C:0500 0555:01680000:000d:0070:22:0 TEST VIRTUAL -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0456:01680000:000b:0070:22:0 Discovery Science p:HTB+,C:0500 0457:01680000:000b:0070:22:0 NHK WORLD TV -p:HTB+,f:40 +p:HTB+ 0458:01680000:000b:0070:22:0 Детский -p:HTB+,c:0000d4,c:010138,c:0300d4,c:050001,C:0500 +p:HTB+,C:0500 0459:01680000:000b:0070:22:0 Зоопарк p:HTB+,C:0500 @@ -605,24 +1895,45 @@ p:HTB+,C:0500 006f:01680000:0001:0070:22:0 Ля-минор ТВ p:HTB+,C:0500 +0070:01680000:0001:0070:22:0 +МАТЧ! ПЛАНЕТА +p:HTB+,C:0500 0071:01680000:0001:0070:22:0 КИНОСЕРИЯ p:HTB+,C:0500 +0072:01680000:0001:0070:22:0 +МУЖСКОЕ КИНО +p:HTB+,C:0500 0073:01680000:0001:0070:22:0 РОДНОЕ КИНО p:HTB+,C:0500 +0074:01680000:0001:0070:22:0 +НАШЕ НОВОЕ КИНО +p:HTB+,C:0500 0075:01680000:0001:0070:22:0 Ностальгия p:HTB+,C:0500 +0076:01680000:0001:0070:22:0 +НЮ АРТ ТВ +p:HTB+,C:0500 +0077:01680000:0001:0070:22:0 +КИНОСЕМЬЯ +p:HTB+,C:0500 0078:01680000:0001:0070:22:0 Русская ночь p:HTB+,C:0500 +0079:01680000:0001:0070:22:0 +Эгоист ТВ +p:HTB+,C:0500 007a:01680000:0001:0070:22:0 Hustler TV p:HTB+,C:0500 007b:01680000:0001:0070:22:0 ЖАРА p:HTB+,C:0500 +007c:01680000:0001:0070:22:0 +КВН ТВ +p:HTB+,C:0500 0191:01680000:0004:0070:22:0 Detektiv.tv p:HTB+,C:0500 @@ -641,6 +1952,9 @@ p:HTB+,C:0500 0196:01680000:0004:0070:22:0 НТВ Право p:HTB+,C:0500 +0197:01680000:0004:0070:22:0 +Мульт +p:HTB+,C:0500 0198:01680000:0004:0070:22:0 НТВ Сериал p:HTB+,C:0500 @@ -662,12 +1976,27 @@ p:HTB+,C:0500 4a9d:01680000:0013:0070:22:0 Телеканал Да Винчи p:HTB+,C:0500 +019e:01680000:0004:0070:22:0 +Морской +p:HTB+,C:0500 +4a9e:01680000:0013:0070:22:0 +TV 1000 +p:HTB+,C:0500 019f:01680000:0004:0070:22:0 НТВ Стиль p:HTB+,C:0500 +4a9f:01680000:0013:0070:22:0 +TV 1000 Action +p:HTB+,C:0500 01a0:01680000:0004:0070:22:0 Food Network p:HTB+,C:0500 +4aa0:01680000:0013:0070:22:0 +TB 1000 Русское кино +p:HTB+,C:0500 +01a1:01680000:0004:0070:22:0 +Москва Доверие +p:HTB+,C:0500 4aa1:01680000:0013:0070:22:0 Viasat Explore p:HTB+,C:0500 @@ -686,6 +2015,9 @@ p:HTB+,C:0500 01a4:01680000:0004:0070:22:0 Страна p:HTB+,C:0500 +4aa4:01680000:0013:0070:22:0 +Viasat Sport +p:HTB+,C:0500 01a5:01680000:0004:0070:22:0 Русский бестселлер p:HTB+,C:0500 @@ -695,6 +2027,12 @@ p:HTB+,C:0500 01a6:01680000:0004:0070:22:0 БОКС ТВ p:HTB+,C:0500 +4aa6:01680000:0013:0070:22:0 +Охота и рыбалка +p:HTB+,C:0500 +00a7:01680000:0001:0070:22:0 +ПП Тест1 +p:HTB+,C:0500 01a7:01680000:0004:0070:22:0 Game Show p:HTB+,C:0500 @@ -715,6 +2053,9 @@ p:HTB+,C:0500 p:HTB+,C:0500 01aa:01680000:0004:0070:22:0 +p:HTB+,C:0500 +4aaa:01680000:0013:0070:22:0 +Euronews p:HTB+,C:0500 01ab:01680000:0004:0070:22:0 Duck @@ -722,18 +2063,42 @@ p:HTB+,C:0500 4aab:01680000:0013:0070:22:0 FOX p:HTB+,C:0500 +01ac:01680000:0004:0070:22:0 +Мультимания +p:HTB+,C:0500 4aac:01680000:0013:0070:22:0 Nat Geo Wild p:HTB+,C:0500 +01ad:01680000:0004:0070:22:0 +Barely legal +p:HTB+,C:0500 4aad:01680000:0013:0070:22:0 АРМЕНИЯ ТВ p:HTB+,C:0500 +4aae:01680000:0013:0070:22:0 +Paramount Comedy +p:HTB+,C:0500 +4aaf:01680000:0013:0070:22:0 +Viasat Golf +p:HTB+,C:0500 4ab0:01680000:0013:0070:22:0 Мама p:HTB+,C:0500 4ab1:01680000:0013:0070:22:0 Paramount Channel p:HTB+,C:0500 +4ab2:01680000:0013:0070:22:0 +OCEAN-TV +p:HTB+,C:0500 +4ab3:01680000:0013:0070:22:0 +CCTV4 +p:HTB+,C:0500 +4ab4:01680000:0013:0070:22:0 +CGTN +p:HTB+,C:0500 +4ab5:01680000:0013:0070:22:0 +CGTN-Русский +p:HTB+,C:0500 4ab6:01680000:0013:0070:22:0 Mezzo p:HTB+,C:0500 @@ -758,6 +2123,9 @@ p:HTB+,C:0500 02c1:01680000:0007:0070:22:0 Bloomberg Television p:HTB+,C:0500 +02c2:01680000:0007:0070:22:0 +Spike +p:HTB+,C:0500 02c3:01680000:0007:0070:22:0 FRANCE 24 p:HTB+,C:0500 @@ -773,6 +2141,9 @@ p:HTB+,C:0500 02c7:01680000:0007:0070:22:0 Sony Sci-Fi p:HTB+,C:0500 +02c8:01680000:0007:0070:22:0 +Sony Turbo +p:HTB+,C:0500 02c9:01680000:0007:0070:22:0 Travel+Adventure p:HTB+,C:0500 @@ -814,19 +2185,19 @@ p:HTB+,C:0500 p:HTB+,C:0500 03ea:01680000:000a:0070:22:0 МАТЧ! -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 03eb:01680000:000a:0070:22:0 Пятый канал -p:HTB+,c:0000cb,c:01012f,c:0201f7,c:0300cb,c:050001,C:0500 +p:HTB+,C:0500 03ec:01680000:000a:0070:22:0 РЕН ТВ -p:HTB+,c:0000cc,c:010130,c:0300cc,c:050001,C:0500 +p:HTB+,C:0500 03ed:01680000:000a:0070:22:0 Россия К p:HTB+,C:0500 03ee:01680000:000a:0070:22:0 Россия 24 -p:HTB+,c:0000ce,c:010132,c:0300ce,c:050001,C:0500 +p:HTB+,C:0500 03ef:01680000:000a:0070:22:0 СПАС p:HTB+,C:0500 @@ -835,31 +2206,61 @@ p:HTB+,C:0500 p:HTB+,C:0500 03f1:01680000:000a:0070:22:0 ПЯТНИЦА -p:HTB+,c:0000d1,c:010135,c:0300d1,c:050001,C:0500 +p:HTB+,C:0500 03f2:01680000:000a:0070:22:0 МИР p:HTB+,C:0500 03f3:01680000:000a:0070:22:0 Shopping Live -p:HTB+,f:40 +p:HTB+ 03f4:01680000:000a:0070:22:0 Shop24 -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 03f5:01680000:000a:0070:22:0 RT (арабский) -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 03f6:01680000:000a:0070:22:0 RT (испанский) -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 +3719:01680000:000e:0070:25:0 +МАТЧ! ФУТБОЛ 1 HD +p:HTB+,C:0500 +371a:01680000:000e:0070:25:0 +Nickelodeon HD +p:HTB+,C:0500 +2f45:01680000:000c:0070:25:0 +КИНОПРЕМЬЕРА HD +p:HTB+,C:0500 +2f46:01680000:000c:0070:25:0 +МАТЧ! ИГРА HD +p:HTB+,C:0500 2f47:01680000:000c:0070:25:0 HD Life p:HTB+,C:0500 +2f48:01680000:000c:0070:25:0 +МАТЧ! АРЕНА HD +p:HTB+,C:0500 2f49:01680000:000c:0070:25:0 Discovery Channel HD p:HTB+,C:0500 2f4a:01680000:000c:0070:25:0 Телеканал КХЛ HD p:HTB+,C:0500 +2f4b:01680000:000c:0070:25:0 +Тлум HD +p:HTB+,C:0500 +374b:01680000:000e:0070:25:0 +ПП Тест3 +p:HTB+,C:0500 +0579:01680000:000e:0070:25:0 +МАТЧ! ФУТБОЛ 2 HD +p:HTB+,C:0500 +057a:01680000:000e:0070:25:0 +МАТЧ! ФУТБОЛ 3 HD +p:HTB+,C:0500 +057b:01680000:000e:0070:25:0 +НАШ ФУТБОЛ HD +p:HTB+,C:0500 057c:01680000:000e:0070:25:0 MTV Live HD p:HTB+,C:0500 @@ -880,10 +2281,16 @@ MGM HD p:HTB+,C:0500 4e89:01680000:0014:0070:25:0 Первый канал HD -p:HTB+,c:0000cd,c:010131,c:0201f9,c:0300cd,c:050001,C:0500 +p:HTB+,C:0500 4e8a:01680000:0014:0070:25:0 Россия 1 HD -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 +4e8b:01680000:0014:0070:25:0 +1HD +p:HTB+,C:0500 +6591:01680000:0009:0070:25:0 +EUROSPORT 1 HD +p:HTB+,C:0500 6592:01680000:0009:0070:25:0 National Geographic HD p:HTB+,C:0500 @@ -899,18 +2306,21 @@ p:HTB+,C:0500 6596:01680000:0009:0070:25:0 Travel Channel HD p:HTB+,C:0500 +6597:01680000:0009:0070:25:0 +Bollywood HD +p:HTB+,C:0500 0899:01680000:0016:0070:25:0 HTB HD -p:HTB+,c:0000c9,c:01012d,c:0300c9,c:050001,C:0500 +p:HTB+,C:0500 089a:01680000:0016:0070:25:0 Animal Planet HD -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 089b:01680000:0016:0070:25:0 КОННЫЙ МИР HD p:HTB+,C:0500 089c:01680000:0016:0070:25:0 МАТЧ! HD -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 089d:01680000:0016:0070:25:0 Дом Кино Премиум HD p:HTB+,C:0500 @@ -919,26 +2329,46 @@ BRIDGE HD p:HTB+,C:0500 089f:01680000:0016:0070:25:0 THT HD -p:HTB+,c:0000cf,c:010133,c:0300cf,c:050001,C:0500 +p:HTB+,C:0500 42cd:01680000:0011:0070:25:0 FOX HD p:HTB+,C:0500 +42ce:01680000:0011:0070:25:0 +TV 1000 Comedy HD +p:HTB+,C:0500 +42cf:01680000:0011:0070:25:0 +TV 1000 Megahit HD +p:HTB+,C:0500 +42d0:01680000:0011:0070:25:0 +TV 1000 Premium HD +p:HTB+,C:0500 42d1:01680000:0011:0070:25:0 Viasat Nature/History HD p:HTB+,C:0500 +42d2:01680000:0011:0070:25:0 +Viasat Sport HD +p:HTB+,C:0500 +42d3:01680000:0011:0070:25:0 +EUROSPORT 2 HD +p:HTB+,C:0500 +00cb:01680000:0002:0070:31:0 +TECT +p:HTB+,C:0500 1f51:01680000:000a:0070:100:0 12264V SID 0x1f51 -p:DVB-S QPSK 12264V 36.0°E,f:40 +p:DVB-S QPSK 12264V 36.0°E 0003:01680000:000a:0070:135:0 EPG TECT -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0002:01680000:000a:0070:136:0 Имена групп каналов -p:HTB+,C:0500,f:40 +p:HTB+,C:0500 0032:01680000:000a:0070:139:0 010D011320 -p:HTB+,f:40 +p:HTB+ 003c:01680000:000a:0070:139:0 010E01130F -p:HTB+,f:40 -end \ No newline at end of file +p:HTB+ +end +sdfkdfkdlkfdslkf +ghgh diff --git a/main/editor_ui.glade b/main/editor_ui.glade index 7af4c6d3..3a8e96dc 100644 --- a/main/editor_ui.glade +++ b/main/editor_ui.glade @@ -2,6 +2,7 @@ + @@ -9,6 +10,16 @@ False gtk-edit + + True + False + go-bottom + + + True + False + go-top + True autosize @@ -25,6 +36,8 @@ + + @@ -81,22 +94,26 @@ - - gtk-connect + + Download True False + Download data from receiver True - True + image2 + False - - gtk-disconnect + + Upload True False + Upload data into receiver True - True + image3 + False @@ -242,13 +259,38 @@ True False + + + True + False + Open + True + gtk-open + + + + False + True + + + + + True + False + + + False + False + + True False + Download data from receiver Download True - gtk-connect + gtk-goto-bottom @@ -256,6 +298,20 @@ True + + + True + False + Upload data into receiver + True + gtk-goto-top + + + + False + True + + True @@ -315,16 +371,6 @@ True - - - True - False - - - False - False - - True @@ -464,7 +510,7 @@ autosize Service - + 0 @@ -477,22 +523,33 @@ autosize Package - + 1 + + + Type + + + + 2 + + + + True autosize Ssid - + - 2 + 3 @@ -503,9 +560,9 @@ autosize Freq - + - 3 + 4 @@ -516,9 +573,9 @@ autosize Rate - + - 4 + 5 @@ -529,9 +586,9 @@ autosize Pol - + - 5 + 6 @@ -542,9 +599,9 @@ autosize FEC - + - 6 + 7 @@ -555,9 +612,9 @@ autosize System - + - 7 + 8 diff --git a/main/eparser/lamedb.py b/main/eparser/lamedb.py index 28d2fc44..b14ee5b0 100644 --- a/main/eparser/lamedb.py +++ b/main/eparser/lamedb.py @@ -1,13 +1,12 @@ -""" - This module used for parsing lamedb file +""" This module used for parsing lamedb file - Currently implemented only for satellite channels!!! - Description of format taken from here: http://www.satsupreme.com/showthread.php/194074-Lamedb-format-explained + Currently implemented only for satellite channels!!! + Description of format taken from here: http://www.satsupreme.com/showthread.php/194074-Lamedb-format-explained """ from collections import namedtuple from enum import Enum -Channel = namedtuple("Channel", ["service", "package", "ssid", "freq", "rate", "pol", "fec", "system"]) +Channel = namedtuple("Channel", ["service", "package", "service_type", "ssid", "freq", "rate", "pol", "fec", "system"]) _HEADER = "eDVB services /4/" _FILE_PATH = "../data/lamedb_example" @@ -34,7 +33,11 @@ FEC = {0: "None", 1: "Auto", 2: "1/2", 6: "7/8", 7: "3/5", 8: "4/5", 9: "8/9", 10: "9/10"} -System = {0: "DVB-S", 1: "DVB_S2"} +SYSTEM = {0: "DVB-S", 1: "DVB_S2"} + +SERVICE_TYPE = {-2: "Unknown", 1: "TV", 2: "Radio", 3: "Data", + 10: "Radio", 12: "Data", 22: "TV", 25: "HD TV", + 136: "Data", 139: "Data"} def parse(path): @@ -43,6 +46,7 @@ def parse(path): data = str(file.read()) transponders, sep, services = data.partition("transponders") # 1 step transponders, sep, services = services.partition("services") # 2 step + services, sep, _ = services.partition("end") # 3 step return get_channels(services.split("\n"), transponders.split("/")) @@ -74,9 +78,9 @@ def get_channels(*args): if transponder is not None: tr = str(transponder)[2:].split(_SEP) # Removing type of DVB transponders (s , t, c) and split pack = pack[2:pack.find(",")] - channels.append(Channel(ch[1], pack, data[0], tr[0], + channels.append(Channel(ch[1], pack, SERVICE_TYPE.get(int(data[4]), SERVICE_TYPE[-2]), data[0], tr[0], tr[1], Polarization(int(tr[2])).name, - FEC[int(tr[3])], System[int(tr[6])])) + FEC[int(tr[3])], SYSTEM[int(tr[6])])) return channels diff --git a/main/ui.py b/main/ui.py index 8e9f6376..76afaba2 100644 --- a/main/ui.py +++ b/main/ui.py @@ -26,6 +26,7 @@ def get_handlers(): "on_about_app": on_about_app, "on_preferences": on_preferences, "on_download": on_download, + "on_upload": on_upload, "on_data_dir_field_icon_press": on_path_open, "on_data_open": on_data_open, "on_tree_view_key_release": on_tree_view_key_release @@ -99,18 +100,25 @@ def on_tree_view_key_release(widget, event): print(widget.get_name()) +def on_upload(item): + connect(__options, False) + + def on_download(item): connect(__options) -def connect(properties): +def connect(properties, download=True): assert isinstance(properties, dict) try: with FTP(properties["host"]) as ftp: ftp.login(user=properties["user"], passwd=properties["password"]) - __status_bar.push(1, ftp.voidcmd("NOOP")) - ftp.cwd(properties["services_path"]) - ftp.retrlines("LIST") + if download: + __status_bar.push(1, ftp.voidcmd("NOOP")) + ftp.cwd(properties["services_path"]) + ftp.retrlines("LIST") + else: + pass except Exception as e: __status_bar.remove_all(1) __status_bar.push(1, getattr(e, "message", repr(e))) # Or maybe so: getattr(e, 'message', str(e))