Skip to content

Commit 7fc37e6

Browse files
committed
add progress dialog for internal epg grab
1 parent c4c3139 commit 7fc37e6

File tree

1 file changed

+43
-2
lines changed

1 file changed

+43
-2
lines changed

default.py

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -918,10 +918,10 @@ def adapt_param_load(adapter_uuid_sel):
918918
adapt_init = find_param(adapt_load, 'initscan')
919919
adapt_idle = find_param(adapt_load, 'idlescan')
920920
adapt_network = find_param(adapt_load, 'networks')
921+
adapt_network_uuid_list = find_list(adapt_load, 'networks', 'value')
921922
if adapt_network == []:
922923
adapt_network = ""
923924
else:
924-
adapt_network_uuid_list = find_list(adapt_load, 'networks', 'value')
925925
adapt_network_name = []
926926
for net_u in adapt_network_uuid_list:
927927
adapt_network_url = 'http://' + tvh_url + ':' + tvh_port + '/api/idnode/load?uuid=' + str(net_u)
@@ -1511,10 +1511,51 @@ def epg():
15111511
if epg_run_ota == {}:
15121512
dialog.ok("OTA EPG grabber triggered", "You have initiated the OTA EPG grabber. Your epg should update once completed. Sometimes Kodi needs a restart in order to update the EPG display.")
15131513
if sel_epg == 2:
1514+
comet_poll_box_url = 'http://' + tvh_url + ':' + tvh_port + '/comet/poll'
1515+
comet_poll_box = requests.get(comet_poll_box_url).json()
1516+
comet_poll_box_id = comet_poll_box['boxid']
15141517
epg_run_int_url = 'http://' + tvh_url + ':' + tvh_port + '/api/epggrab/internal/rerun?rerun=1'
15151518
epg_run_int = requests.get(epg_run_int_url).json()
15161519
if epg_run_int == {}:
1517-
dialog.ok("Internal EPG grabber triggered", "You have initiated the internal EPG grabber. Your epg should update once completed. Sometimes Kodi needs a restart in order to update the EPG display.")
1520+
pDialog = xbmcgui.DialogProgress()
1521+
pDialog.create('Internal EPG grabber triggered')
1522+
comet_poll_url = 'http://' + tvh_url + ':' + tvh_port + '/comet/poll?boxid=' + comet_poll_box_id + '&immediate=0'
1523+
comet_poll = requests.get(comet_poll_url).json()
1524+
comet_poll_logtxt_list = []
1525+
for t in comet_poll['messages']:
1526+
comet_poll_logtxt_list.insert(0,t['logtxt'])
1527+
comet_poll_logtxt = '\n'.join(comet_poll_logtxt_list)
1528+
pDialog.update(10, comet_poll_logtxt)
1529+
time.sleep(1)
1530+
if (pDialog.iscanceled()):
1531+
pDialog.close()
1532+
comet_update = False
1533+
comet_poll = requests.get(comet_poll_url).json()
1534+
if comet_poll['messages'] == []:
1535+
comet_poll_logtxt = '\n'.join(comet_poll_logtxt_list)
1536+
pDialog.update(25, comet_poll_logtxt)
1537+
time.sleep(1)
1538+
if (pDialog.iscanceled()):
1539+
pDialog.close()
1540+
perc_update = 30
1541+
while comet_update == False:
1542+
if (pDialog.iscanceled()):
1543+
pDialog.close()
1544+
pDialog.update(perc_update, comet_poll_logtxt)
1545+
comet_poll = requests.get(comet_poll_url).json()
1546+
perc_update = perc_update + 5
1547+
if comet_poll['messages'] == []:
1548+
comet_update = True
1549+
time.sleep(1)
1550+
# comet_poll = requests.get(comet_poll_url).json()
1551+
for t in comet_poll['messages']:
1552+
comet_poll_logtxt_list.insert(0,t['logtxt'])
1553+
comet_poll_logtxt = '\n'.join(comet_poll_logtxt_list)
1554+
pDialog.update(100, comet_poll_logtxt)
1555+
time.sleep(2)
1556+
pDialog.close()
1557+
if dialog.yesno("Internal EPG grabber finished", "Your EPG has been updated.", "Sometimes Kodi needs a restart in order to update the EPG display. Or you can clear the data in the PVR & Live TV settings.", "Would you like to open the PVR & Live TV settings?"):
1558+
xbmc.executebuiltin('ActivateWindow(pvrsettings)')
15181559
if sel_epg > 2 :
15191560
epg_param(sel_epg, epg_rename, epg_renumber, epg_reicon, epg_dbsave, epg_intcron, epg_otainit, epg_otacron, epg_otatime)
15201561

0 commit comments

Comments
 (0)