Skip to content

add support for listing subscriptions #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afarris wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add support for listing subscriptions #16

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33f5b12
add support for listing subscriptions
afarris Feb 28, 2014
94ee4a2
minor error handling change
afarris Feb 28, 2014
c6e54f1
slightly rename channel commands and resolve conflicts
afarris Feb 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 27 additions & 22 deletions daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,24 +447,28 @@ def unsubscribe():

def listSubscriptions():
global usrPrompt
#jsonAddresses = json.loads(api.listSubscriptions())
#numAddresses = len(jsonAddresses['addresses']) #Number of addresses
print '\nLabel, Address, Enabled\n'
try:
print api.listSubscriptions()
response = api.listSubscriptions()
if "API Error" in response:
return getAPIErrorCode(response)
subs = json.loads(response)
print
print '--------------------------------------------------------------------------------'
print '| Label | Address | On? |'
print '|--------------------------------|---------------------------------------|-----|'
for entry in subs['subscriptions']:
label = entry['label'].decode('base64')
address = entry['address']
enabled = "Yes" if entry['enabled'] else "No"
if (len(label) > 30): label = label[:27] + '...'
print '| ' + label.ljust(30) + ' | ' + address.ljust(37) + ' | ' + enabled.ljust(3) + ' |'
print '--------------------------------------------------------------------------------'
print

except:
print '\n Connection Error\n'
usrPrompt = 0
main()

'''for addNum in range (0, numAddresses): #processes all of the addresses and lists them out
label = jsonAddresses['addresses'][addNum]['label']
address = jsonAddresses['addresses'][addNum]['address']
enabled = jsonAddresses['addresses'][addNum]['enabled']

print label, address, enabled
'''
print ' '

def createChan():
global usrPrompt
Expand Down Expand Up @@ -1277,12 +1281,12 @@ def UI(usrInput): #Main user menu
print ' |------------------------|----------------------------------------------|'
print ' | subscribe | Subscribes to an address |'
print ' | unsubscribe | Unsubscribes from an address |'
#print ' | listSubscriptions | Lists all of the subscriptions. |'
print ' | listSubscriptions | Lists all of the subscriptions. |'
print ' |------------------------|----------------------------------------------|'
print ' | createChannel | Creates a channel |'
print ' | joinChannel | Joins a channel |'
print ' | leaveChannel | Leaves a channel |'
print ' |------------------------|----------------------------------------------|'
print ' | create | Creates a channel |'
print ' | join | Joins a channel |'
print ' | leave | Leaves a channel |'
print ' |------------------------|----------------------------------------------|'
print ' | inbox | Lists the message information for the inbox |'
print ' | outbox | Lists the message information for the outbox |'
print ' | send | Send a new message or broadcast |'
Expand Down Expand Up @@ -1397,21 +1401,22 @@ def UI(usrInput): #Main user menu
usrPrompt = 1
main()
elif usrInput == "listsubscriptions": #Unsubscribe from an address
listSubscriptions()
res = listSubscriptions()
if res == 20: print '\n Error: API function not supported.\n'
usrPrompt = 1
main()

elif usrInput == "create":
elif usrInput == "createchan" or usrInput == "createchannel":
createChan()
userPrompt = 1
main()

elif usrInput == "join":
elif usrInput == "joinchan" or usrInput == "joinchannel":
joinChan()
userPrompt = 1
main()

elif usrInput == "leave":
elif usrInput == "leavechan" or usrInput == "leavechannel":
leaveChan()
userPrompt = 1
main()
Expand Down