Bitmessage/PyBitmessage-2024-08-21
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Updated if conditions in clean format in bitmessagecli.py

Browse Source
This commit is contained in:
kuldeep.k@cisinlabs.com 2021-08-11 22:20:56 +05:30
parent 0640703409
commit 7ce0180eed
No known key found for this signature in database
GPG Key ID: AF4FB299BF7C7C2A
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/bitmessagecli.py
View File

@ -214,12 +214,12 @@ def apiData():
uInput = userInput("Would you like to create a keys.dat in the local directory, (Y)es or (N)o?").lower() uInput = userInput("Would you like to create a keys.dat in the local directory, (Y)es or (N)o?").lower()
if (uInput == "y" or uInput == "yes"): if uInput in ("y", "yes"):
configInit() configInit()
keysPath = keysName keysPath = keysName
usrPrompt = 0 usrPrompt = 0
main() main()
elif (uInput == "n" or uInput == "no"): elif uInput in ("n", "no"):
print('\n Trying Again.\n') print('\n Trying Again.\n')
usrPrompt = 0 usrPrompt = 0
main() main()
@ -737,9 +737,9 @@ Encoding:base64
uInput = userInput('Would you like to add another attachment, (Y)es or (N)o?').lower() uInput = userInput('Would you like to add another attachment, (Y)es or (N)o?').lower()
if uInput == 'y' or uInput == 'yes': # Allows multiple attachments to be added to one message if uInput in ('y', 'yes'): # Allows multiple attachments to be added to one message
theAttachmentS = str(theAttachmentS) + str(theAttachment) + '\n\n' theAttachmentS = str(theAttachmentS) + str(theAttachment) + '\n\n'
elif uInput == 'n' or uInput == 'no': elif uInput in ('n', 'no'):
break break
theAttachmentS = theAttachmentS + theAttachment theAttachmentS = theAttachmentS + theAttachment
@ -814,10 +814,10 @@ def sendMsg(toAddress, fromAddress, subject, message):
print('\n Using the only address in the addressbook to send from.\n') print('\n Using the only address in the addressbook to send from.\n')
fromAddress = jsonAddresses['addresses'][0]['address'] fromAddress = jsonAddresses['addresses'][0]['address']
if subject == '': if not subject:
subject = userInput("Enter your Subject.") subject = userInput("Enter your Subject.")
subject = subject.encode('base64') subject = subject.encode('base64')
if message == '': if not message:
message = userInput("Enter your Message.") message = userInput("Enter your Message.")
uInput = userInput('Would you like to add an attachment, (Y)es or (N)o?').lower() uInput = userInput('Would you like to add an attachment, (Y)es or (N)o?').lower()
@ -839,7 +839,7 @@ def sendBrd(fromAddress, subject, message):
"""Send a broadcast""" """Send a broadcast"""
global usrPrompt global usrPrompt
if fromAddress == '': if not fromAddress:
try: try:
jsonAddresses = json.loads(api.listAddresses()) jsonAddresses = json.loads(api.listAddresses())
@ -887,10 +887,10 @@ def sendBrd(fromAddress, subject, message):
print('\n Using the only address in the addressbook to send from.\n') print('\n Using the only address in the addressbook to send from.\n')
fromAddress = jsonAddresses['addresses'][0]['address'] fromAddress = jsonAddresses['addresses'][0]['address']
if subject == '': if not subject:
subject = userInput("Enter your Subject.") subject = userInput("Enter your Subject.")
subject = subject.encode('base64') subject = subject.encode('base64')
if message == '': if not message:
message = userInput("Enter your Message.") message = userInput("Enter your Message.")
uInput = userInput('Would you like to add an attachment, (Y)es or (N)o?').lower() uInput = userInput('Would you like to add an attachment, (Y)es or (N)o?').lower()
@ -1030,7 +1030,7 @@ def readSentMsg(msgNum):
uInput = userInput( uInput = userInput(
'\n Attachment Detected. Would you like to save the attachment, (Y)es or (N)o?').lower() '\n Attachment Detected. Would you like to save the attachment, (Y)es or (N)o?').lower()
if uInput == "y" or uInput == 'yes': if uInput in ("y", 'yes'):
this_attachment = message[attPos + 9:attEndPos] this_attachment = message[attPos + 9:attEndPos]
saveFile(fileName, this_attachment) saveFile(fileName, this_attachment)
@ -1093,7 +1093,7 @@ def readMsg(msgNum):
uInput = userInput( uInput = userInput(
'\n Attachment Detected. Would you like to save the attachment, (Y)es or (N)o?').lower() '\n Attachment Detected. Would you like to save the attachment, (Y)es or (N)o?').lower()
if uInput == "y" or uInput == 'yes': if uInput in ("y", 'yes'):
this_attachment = message[attPos + 9:attEndPos] this_attachment = message[attPos + 9:attEndPos]
saveFile(fileName, this_attachment) saveFile(fileName, this_attachment)
@ -1421,7 +1421,7 @@ def UI(usrInput):
global usrPrompt global usrPrompt
if usrInput == "help" or usrInput == "h" or usrInput == "?": if usrInput in ("help", "h", "?"):
print(' ') print(' ')
print(' -------------------------------------------------------------------------') print(' -------------------------------------------------------------------------')
print(' | https://github.com/Dokument/PyBitmessage-Daemon |') print(' | https://github.com/Dokument/PyBitmessage-Daemon |')
@ -1500,7 +1500,7 @@ def UI(usrInput):
elif usrInput == "generateaddress": # Generates a new address elif usrInput == "generateaddress": # Generates a new address
uInput = userInput('\nWould you like to create a (D)eterministic or (R)andom address?').lower() uInput = userInput('\nWould you like to create a (D)eterministic or (R)andom address?').lower()
if uInput in ["d", "deterministic"]: # Creates a deterministic address if uInput in ("d", "deterministic"): # Creates a deterministic address
deterministic = True deterministic = True
lbl = '' lbl = ''
@ -1593,11 +1593,11 @@ def UI(usrInput):
elif usrInput == 'send': # Sends a message or broadcast elif usrInput == 'send': # Sends a message or broadcast
uInput = userInput('Would you like to send a (M)essage or (B)roadcast?').lower() uInput = userInput('Would you like to send a (M)essage or (B)roadcast?').lower()
if (uInput == 'm' or uInput == 'message'): if uInput in ('m', 'message'):
null = '' null = ''
sendMsg(null, null, null, null) sendMsg(null, null, null, null)
main() main()
elif (uInput == 'b' or uInput == 'broadcast'): elif uInput in ('b', 'broadcast'):
null = '' null = ''
sendBrd(null, null, null) sendBrd(null, null, null)
main() main()
@ -1606,38 +1606,38 @@ def UI(usrInput):
uInput = userInput("Would you like to read a message from the (I)nbox or (O)utbox?").lower() uInput = userInput("Would you like to read a message from the (I)nbox or (O)utbox?").lower()
if (uInput != 'i' and uInput != 'inbox' and uInput != 'o' and uInput != 'outbox'): if uInput not in ('i', 'inbox', 'o', 'outbox'):
print('\n Invalid Input.\n') print('\n Invalid Input.\n')
usrPrompt = 1 usrPrompt = 1
main() main()
msgNum = int(userInput("What is the number of the message you wish to open?")) msgNum = int(userInput("What is the number of the message you wish to open?"))
if (uInput == 'i' or uInput == 'inbox'): if uInput in ('i', 'inbox'):
print('\n Loading...\n') print('\n Loading...\n')
messageID = readMsg(msgNum) messageID = readMsg(msgNum)
uInput = userInput("\nWould you like to keep this message unread, (Y)es or (N)o?").lower() uInput = userInput("\nWould you like to keep this message unread, (Y)es or (N)o?").lower()
if not (uInput == 'y' or uInput == 'yes'): if uInput not in ('y', 'yes'):
markMessageRead(messageID) markMessageRead(messageID)
usrPrompt = 1 usrPrompt = 1
uInput = userInput("\nWould you like to (D)elete, (F)orward, (R)eply to, or (Exit) this message?").lower() uInput = userInput("\nWould you like to (D)elete, (F)orward, (R)eply to, or (Exit) this message?").lower()
if uInput in ['r', 'reply']: if uInput in ('r', 'reply'):
print('\n Loading...\n') print('\n Loading...\n')
print(' ') print(' ')
replyMsg(msgNum, 'reply') replyMsg(msgNum, 'reply')
usrPrompt = 1 usrPrompt = 1
elif uInput == 'f' or uInput == 'forward': elif uInput in ('f', 'forward'):
print('\n Loading...\n') print('\n Loading...\n')
print(' ') print(' ')
replyMsg(msgNum, 'forward') replyMsg(msgNum, 'forward')
usrPrompt = 1 usrPrompt = 1
elif uInput in ["d", 'delete']: elif uInput in ("d", 'delete'):
uInput = userInput("Are you sure, (Y)es or (N)o?").lower() # Prevent accidental deletion uInput = userInput("Are you sure, (Y)es or (N)o?").lower() # Prevent accidental deletion
if uInput == "y": if uInput == "y":
@ -1650,13 +1650,13 @@ def UI(usrInput):
print('\n Invalid entry\n') print('\n Invalid entry\n')
usrPrompt = 1 usrPrompt = 1
elif (uInput == 'o' or uInput == 'outbox'): elif uInput in ('o', 'outbox'):
readSentMsg(msgNum) readSentMsg(msgNum)
# Gives the user the option to delete the message # Gives the user the option to delete the message
uInput = userInput("Would you like to (D)elete, or (Exit) this message?").lower() uInput = userInput("Would you like to (D)elete, or (Exit) this message?").lower()
if (uInput == "d" or uInput == 'delete'): if uInput in ("d", 'delete'):
uInput = userInput('Are you sure, (Y)es or (N)o?').lower() # Prevent accidental deletion uInput = userInput('Are you sure, (Y)es or (N)o?').lower() # Prevent accidental deletion
if uInput == "y": if uInput == "y":
@ -1675,12 +1675,12 @@ def UI(usrInput):
uInput = userInput("Would you like to save a message from the (I)nbox or (O)utbox?").lower() uInput = userInput("Would you like to save a message from the (I)nbox or (O)utbox?").lower()
if uInput not in ['i', 'inbox', 'o', 'outbox']: if uInput not in ('i', 'inbox', 'o', 'outbox'):
print('\n Invalid Input.\n') print('\n Invalid Input.\n')
usrPrompt = 1 usrPrompt = 1
main() main()
if uInput in ['i', 'inbox']: if uInput in ('i', 'inbox'):
inboxMessages = json.loads(api.getAllInboxMessages()) inboxMessages = json.loads(api.getAllInboxMessages())
numMessages = len(inboxMessages['inboxMessages']) numMessages = len(inboxMessages['inboxMessages'])
@ -1722,7 +1722,7 @@ def UI(usrInput):
uInput = userInput("Would you like to delete a message from the (I)nbox or (O)utbox?").lower() uInput = userInput("Would you like to delete a message from the (I)nbox or (O)utbox?").lower()
if uInput in ['i', 'inbox']: if uInput in ('i', 'inbox'):
inboxMessages = json.loads(api.getAllInboxMessages()) inboxMessages = json.loads(api.getAllInboxMessages())
numMessages = len(inboxMessages['inboxMessages']) numMessages = len(inboxMessages['inboxMessages'])
@ -1740,7 +1740,7 @@ def UI(usrInput):
uInput = userInput("Are you sure, (Y)es or (N)o?").lower() # Prevent accidental deletion uInput = userInput("Are you sure, (Y)es or (N)o?").lower() # Prevent accidental deletion
if uInput == "y": if uInput == "y":
if msgNum in ['a', 'all']: if msgNum in ('a', 'all'):
print(' ') print(' ')
for msgNum in range(0, numMessages): # processes all of the messages in the inbox for msgNum in range(0, numMessages): # processes all of the messages in the inbox
print(' Deleting message ', msgNum + 1, ' of ', numMessages) print(' Deleting message ', msgNum + 1, ' of ', numMessages)
@ -1756,7 +1756,7 @@ def UI(usrInput):
else: else:
usrPrompt = 1 usrPrompt = 1
elif uInput in ['o', 'outbox']: elif uInput in ('o', 'outbox'):
outboxMessages = json.loads(api.getAllSentMessages()) outboxMessages = json.loads(api.getAllSentMessages())
numMessages = len(outboxMessages['sentMessages']) numMessages = len(outboxMessages['sentMessages'])
@ -1764,7 +1764,7 @@ def UI(usrInput):
msgNum = userInput( msgNum = userInput(
'Enter the number of the message you wish to delete or (A)ll to empty the inbox.').lower() 'Enter the number of the message you wish to delete or (A)ll to empty the inbox.').lower()
if msgNum in ['a', 'all']: if msgNum in ('a', 'all'):
break break
elif int(msgNum) >= numMessages: elif int(msgNum) >= numMessages:
print('\n Invalid Message Number.\n') print('\n Invalid Message Number.\n')
@ -1774,7 +1774,7 @@ def UI(usrInput):
uInput = userInput("Are you sure, (Y)es or (N)o?").lower() # Prevent accidental deletion uInput = userInput("Are you sure, (Y)es or (N)o?").lower() # Prevent accidental deletion
if uInput == "y": if uInput == "y":
if msgNum in ['a', 'all']: if msgNum in ('a', 'all'):
print(' ') print(' ')
for msgNum in range(0, numMessages): # processes all of the messages in the outbox for msgNum in range(0, numMessages): # processes all of the messages in the outbox
print(' Deleting message ', msgNum + 1, ' of ', numMessages) print(' Deleting message ', msgNum + 1, ' of ', numMessages)