mirror of
https://github.com/raspiblitz/raspiblitz.git
synced 2025-11-23 04:17:32 +01:00
detect no subscriptions
This commit is contained in:
@@ -47,47 +47,45 @@ You have no active or inactive subscriptions at the moment.
|
|||||||
''',title="Info")
|
''',title="Info")
|
||||||
return
|
return
|
||||||
|
|
||||||
while True:
|
# load subscriptions and make dialog choices out of it
|
||||||
|
choices = []
|
||||||
# load subscriptions and make dialog choices out of it
|
lookup = {}
|
||||||
choices = []
|
lookupIndex=0
|
||||||
lookup = {}
|
subs = toml.load(SUBSCRIPTIONS_FILE)
|
||||||
lookupIndex=0
|
|
||||||
subs = toml.load(SUBSCRIPTIONS_FILE)
|
|
||||||
|
|
||||||
# list ip2tor subscriptions
|
# list ip2tor subscriptions
|
||||||
for sub in subs['subscriptions_ip2tor']:
|
for sub in subs['subscriptions_ip2tor']:
|
||||||
# remember subscription under lookupindex
|
# remember subscription under lookupindex
|
||||||
lookupIndex += 1
|
lookupIndex += 1
|
||||||
lookup[str(lookupIndex)]=sub
|
lookup[str(lookupIndex)]=sub
|
||||||
# add to dialog choices
|
# add to dialog choices
|
||||||
if sub['active']:
|
if sub['active']:
|
||||||
activeState="on"
|
activeState="on"
|
||||||
else:
|
else:
|
||||||
activeState="off"
|
activeState="off"
|
||||||
name="IP2TOR brigde for {0}".format(sub['blitz_service'])
|
name="IP2TOR brigde for {0}".format(sub['blitz_service'])
|
||||||
choices.append( ("{0}".format(lookupIndex), "{0} ({1})".format(name.ljust(20), activeState)) )
|
choices.append( ("{0}".format(lookupIndex), "{0} ({1})".format(name.ljust(20), activeState)) )
|
||||||
|
|
||||||
# show menu with options
|
# show menu with options
|
||||||
d = Dialog(dialog="dialog",autowidgetsize=True)
|
d = Dialog(dialog="dialog",autowidgetsize=True)
|
||||||
d.set_background_title("RaspiBlitz Subscriptions")
|
d.set_background_title("RaspiBlitz Subscriptions")
|
||||||
code, tag = d.menu(
|
code, tag = d.menu(
|
||||||
"You have the following subscriptions (active & inactive). Select for details:",
|
"You have the following subscriptions (active & inactive). Select for details:",
|
||||||
choices=choices, title="My Subscriptions")
|
choices=choices, title="My Subscriptions")
|
||||||
|
|
||||||
# if user cancels
|
# if user chosses CANCEL
|
||||||
if code != d.OK: return
|
if code != d.OK: return
|
||||||
|
|
||||||
# get data of selected subscrption
|
# get data of selected subscrption
|
||||||
selectedSub = lookup[str(tag)]
|
selectedSub = lookup[str(tag)]
|
||||||
|
|
||||||
# show details of selected
|
# show details of selected
|
||||||
d = Dialog(dialog="dialog",autowidgetsize=True)
|
d = Dialog(dialog="dialog",autowidgetsize=True)
|
||||||
d.set_background_title("My Subscriptions")
|
d.set_background_title("My Subscriptions")
|
||||||
if selectedSub['type'] == "ip2tor-v1":
|
if selectedSub['type'] == "ip2tor-v1":
|
||||||
if len(selectedSub['warning']) > 0:
|
if len(selectedSub['warning']) > 0:
|
||||||
selectedSub['warning'] = "\n{0}".formart(selectedSub['warning'])
|
selectedSub['warning'] = "\n{0}".formart(selectedSub['warning'])
|
||||||
text='''
|
text='''
|
||||||
This is a IP2TOR subscription bought on {initdate} at
|
This is a IP2TOR subscription bought on {initdate} at
|
||||||
{shop}
|
{shop}
|
||||||
|
|
||||||
@@ -113,19 +111,22 @@ The following additional information is available:
|
|||||||
warning=selectedSub['warning'],
|
warning=selectedSub['warning'],
|
||||||
description=selectedSub['description'],
|
description=selectedSub['description'],
|
||||||
service=selectedSub['blitz_service']
|
service=selectedSub['blitz_service']
|
||||||
)
|
)
|
||||||
|
|
||||||
if selectedSub['active']:
|
if selectedSub['active']:
|
||||||
extraLable = "CANCEL"
|
extraLable = "CANCEL"
|
||||||
else:
|
else:
|
||||||
extraLable = "DELETE"
|
extraLable = "DELETE"
|
||||||
code = d.msgbox(text, title="Subscription Detail", ok_label="Back", extra_button=True, extra_label=extraLable ,width=70, height=30)
|
code = d.msgbox(text, title="Subscription Detail", ok_label="Back", extra_button=True, extra_label=extraLable ,width=70, height=30)
|
||||||
|
|
||||||
# user wants to delete this subscription
|
# user wants to delete this subscription
|
||||||
if code == "extra":
|
if code == "extra":
|
||||||
if selectedSub['type'] == "ip2tor-v1":
|
if selectedSub['type'] == "ip2tor-v1":
|
||||||
# TODO: make call to blitz.ip2tor to cancel/delete subscription
|
# TODO: make call to blitz.ip2tor to cancel/delete subscription
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
# loop until no more subscriptions or user chooses CANCEL on subscription list
|
||||||
|
mySubscriptions()
|
||||||
|
|
||||||
####### SSH MENU #########
|
####### SSH MENU #########
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user