clean
This commit is contained in:
parent
e02adb7e9c
commit
9bac67cf0c
31
buku
31
buku
@ -512,14 +512,7 @@ def searchdb(cur, keywords):
|
||||
results = []
|
||||
resultset = cur.execute(query, arguments)
|
||||
|
||||
if jsonOutput == True:
|
||||
results = cur.fetchall();
|
||||
if len(results) > 0:
|
||||
print(formatJson(results))
|
||||
else:
|
||||
return
|
||||
|
||||
else:
|
||||
if jsonOutput == False:
|
||||
for row in resultset:
|
||||
results.append(row[1])
|
||||
count += 1
|
||||
@ -550,6 +543,13 @@ def searchdb(cur, keywords):
|
||||
else:
|
||||
break
|
||||
|
||||
else:
|
||||
results = cur.fetchall();
|
||||
if len(results) > 0:
|
||||
print(formatJson(results))
|
||||
else:
|
||||
return
|
||||
|
||||
|
||||
|
||||
def compactDB(conn, cur, index):
|
||||
@ -613,22 +613,7 @@ def printdb(cur, index, empty=False):
|
||||
global showOpt
|
||||
global jsonOutput
|
||||
|
||||
# if index == None: # Show all entries
|
||||
#resultset = cur.execute('SELECT * FROM bookmarks')
|
||||
#if jsonOutput == False:
|
||||
#for row in resultset:
|
||||
#if showOpt == 1:
|
||||
#print("%s %s" % (row[0], row[1]))
|
||||
#elif showOpt == 2:
|
||||
#print("%s %s %s" % (row[0], row[1], row[3][1:-1]))
|
||||
#else:
|
||||
#print("\x1B[1m\x1B[93m%s. \x1B[0m\x1B[92m%s\x1B[0m\n\t%s\n\t\x1B[91m[TAGS]\x1B[0m %s" % (row[0], row[1], row[2], row[3][1:-1]))
|
||||
#else:
|
||||
#print(formatJson(resultset))
|
||||
|
||||
#=======
|
||||
resultset = None
|
||||
|
||||
if index == None: # Show all entries
|
||||
if empty == False:
|
||||
cur.execute('SELECT * FROM bookmarks')
|
||||
|
Loading…
Reference in New Issue
Block a user