pjht/buku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -D with -d. Now -D is -d 0.

Browse Source
This commit is contained in:
Arun Prakash Jana 2016-04-20 21:23:12 +05:30
parent b3675594e1
commit a051cdc8be
No known key found for this signature in database
GPG Key ID: C0A712ED95043DCB
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
buku
View File

@ -566,7 +566,7 @@ def cleardb(conn, cur, index):
Params: connection, cursor, index to delete Params: connection, cursor, index to delete
""" """
if index == None: # Remove the table if int(index) == 0: # Remove the table
resp = input("ALL bookmarks will be removed. Enter \x1b[1my\x1b[21m to confirm: ") resp = input("ALL bookmarks will be removed. Enter \x1b[1my\x1b[21m to confirm: ")
if resp != 'y': if resp != 'y':
print("No bookmarks deleted") print("No bookmarks deleted")
@ -961,7 +961,7 @@ def usage():
"General options\n" "General options\n"
" -a URL [tags] add URL as bookmark with comma separated tags\n" " -a URL [tags] add URL as bookmark with comma separated tags\n"
" -d N delete entry at DB index N (from -p 0)\n" " -d N delete entry at DB index N (from -p 0), N=0 deletes all\n"
" -g list all tags alphabetically\n" " -g list all tags alphabetically\n"
" -m title manually specify the title, for -a, -i, -u\n" " -m title manually specify the title, for -a, -i, -u\n"
" -s keyword(s) search bookmarks for any keyword\n" " -s keyword(s) search bookmarks for any keyword\n"
@ -970,7 +970,6 @@ def usage():
" -w fetch title from web, for -a, -i, -u\n\n" " -w fetch title from web, for -a, -i, -u\n\n"
"Power toys\n" "Power toys\n"
" -D delete ALL bookmarks\n"
" -e show bookmarks with empty titles or no tags\n" " -e show bookmarks with empty titles or no tags\n"
" -i N insert new bookmark at free DB index N\n" " -i N insert new bookmark at free DB index N\n"
" -j show results in Json format\n" " -j show results in Json format\n"
@ -1020,9 +1019,9 @@ if len(sys.argv) < 2:
try: try:
if len(pipeargs) > 0: if len(pipeargs) > 0:
optlist, keywords = getopt(pipeargs[1:], "d:i:m:o:p:t:u:x:aDegjklRrsSwz") optlist, keywords = getopt(pipeargs[1:], "d:i:m:o:p:t:u:x:aegjklRrsSwz")
else: else:
optlist, keywords = getopt(sys.argv[1:], "d:i:m:o:p:t:u:x:aDegjklRrsSwz") optlist, keywords = getopt(sys.argv[1:], "d:i:m:o:p:t:u:x:aegjklRrsSwz")
if len(optlist) < 1: if len(optlist) < 1:
usage() usage()
@ -1042,13 +1041,7 @@ try:
usage() usage()
entry = opt[1] entry = opt[1]
if int(entry) <= 0: if int(entry) < 0:
usage()
delete = True
elif opt[0] == "-D":
if addurl == True or update == True:
print("You can either add or update or delete in one instance\n")
usage() usage()
delete = True delete = True