One commit sufficient for multiple updates.

ASC is the default.
Revert timeout to 30 secs.
This commit is contained in:
Arun Prakash Jana 2016-06-01 08:18:39 +05:30
parent fef2775941
commit 7957a29e31
No known key found for this signature in database
GPG Key ID: C0A712ED95043DCB

10
buku
View File

@ -352,16 +352,16 @@ class BukuDb:
print('Title: [%s]' % title)
self.cur.execute('UPDATE bookmarks SET metadata = ? WHERE id = ?', (title, row[0],))
self.conn.commit()
print('Index %d updated\n' % row[0])
else:
title = title_manual
for row in resultset:
self.cur.execute('UPDATE bookmarks SET metadata = ? WHERE id = ?', (title, row[0],))
self.conn.commit()
print('Index %d updated\n' % row[0])
self.conn.commit()
def searchdb(self, keywords, all_keywords=False, json=False):
"""Search the database for an entries with tags or URL
or title info matching keywords and list those.
@ -527,7 +527,7 @@ class BukuDb:
count = 1
Tags = []
uniqueTags = []
for row in self.cur.execute('SELECT DISTINCT tags FROM bookmarks ORDER BY tags ASC'):
for row in self.cur.execute('SELECT DISTINCT tags FROM bookmarks ORDER BY tags'):
tagset = row[0].strip(DELIMITER).split(DELIMITER)
for tag in tagset:
if tag not in Tags:
@ -705,7 +705,7 @@ def connect_server(url, fullurl=False, forced=False):
server = server[:marker]
elif not forced: # Handle domain name without trailing /
url = '/'
urlconn = HTTPSConnection(server, timeout=45)
urlconn = HTTPSConnection(server, timeout=30)
elif url.find('http://') >= 0: # Insecure connection
server = url[7:]
marker = server.find('/')
@ -715,7 +715,7 @@ def connect_server(url, fullurl=False, forced=False):
server = server[:marker]
elif not forced:
url = '/'
urlconn = HTTPConnection(server, timeout=45)
urlconn = HTTPConnection(server, timeout=30)
else:
printmsg('Not a valid HTTP(S) url', 'WARNING')
if url.find(':') == -1: