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

Porting bitmessageqt to Qt5 #1389

Open
g1itch wants to merge 34 commits from g1itch/qt5-wip into v0.6
pull from: g1itch/qt5-wip
merge into: Bitmessage:v0.6
Conversation 30 Commits 34 Files Changed 48 +29 -31
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6fd07a079d - Show all commits

58
src/bitmessageqt/account.py
View File

@ -23,8 +23,8 @@ def getSortedAccounts():
configSections = BMConfigParser().addresses()
configSections.sort(
cmp=lambda x, y: cmp(
unicode(BMConfigParser().get(x, 'label'), 'utf-8').lower(),
unicode(BMConfigParser().get(y, 'label'), 'utf-8').lower())
BMConfigParser().get(x, 'label').decode('utf-8').lower(),
BMConfigParser().get(y, 'label').decode('utf-8').lower())
)
return configSections
@ -38,22 +38,21 @@ def getSortedSubscriptions(count=False):
:retuns: dict keys are addresses, values are dicts containing settings
:rtype: dict, default {}
"""
queryreturn = sqlQuery('SELECT label, address, enabled FROM subscriptions ORDER BY label COLLATE NOCASE ASC')
queryreturn = sqlQuery(
'SELECT label, address, enabled FROM subscriptions'
' ORDER BY label COLLATE NOCASE ASC')
ret = {}
for row in queryreturn:
label, address, enabled = row
ret[address] = {}
ret[address]["inbox"] = {}
ret[address]["inbox"]['label'] = label
ret[address]["inbox"]['enabled'] = enabled
ret[address]["inbox"]['count'] = 0
for label, address, enabled in queryreturn:
ret[address] = {'inbox': {}}
ret[address]['inbox'].update(label=label, enabled=enabled, count=0)
if count:
queryreturn = sqlQuery('''SELECT fromaddress, folder, count(msgid) as cnt
FROM inbox, subscriptions ON subscriptions.address = inbox.fromaddress
WHERE read = 0 AND toaddress = ?
GROUP BY inbox.fromaddress, folder''', str_broadcast_subscribers)
for row in queryreturn:
address, folder, cnt = row
queryreturn = sqlQuery(
'SELECT fromaddress, folder, count(msgid) AS cnt'
' FROM inbox, subscriptions'
' ON subscriptions.address = inbox.fromaddress WHERE read = 0'
' AND toaddress = ? GROUP BY inbox.fromaddress, folder',
str_broadcast_subscribers)
for address, folder, cnt in queryreturn:
if folder not in ret[address]:
ret[address][folder] = {
'label': ret[address]['inbox']['label'],
@ -105,7 +104,9 @@ class AccountColor(AccountMixin):
elif BMConfigParser().safeGetBoolean(self.address, 'chan'):
self.type = AccountMixin.CHAN
elif sqlQuery(
'''select label from subscriptions where address=?''', self.address):
'SELECT label FROM subscriptions WHERE address=?',
self.address
):
self.type = AccountMixin.SUBSCRIPTION
else:
self.type = AccountMixin.NORMAL
@ -149,10 +150,9 @@ class BMAccount(NoAccount):
self.type = AccountMixin.MAILINGLIST
elif self.address == str_broadcast_subscribers:
self.type = AccountMixin.BROADCAST
else:
queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', self.address)
if queryreturn:
elif sqlQuery(
'SELECT label FROM subscriptions WHERE address=?', self.address
):
self.type = AccountMixin.SUBSCRIPTION
def getLabel(self, address=None):
@ -160,17 +160,15 @@ class BMAccount(NoAccount):
address = super(BMAccount, self).getLabel(address)
label = BMConfigParser().safeGet(address, 'label', address)
queryreturn = sqlQuery(
'''select label from addressbook where address=?''', address)
if queryreturn != []:
for row in queryreturn:
label, = row
'SELECT label FROM addressbook WHERE address=?', address)
if queryreturn:
label = queryreturn[-1][0]
else:
queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', address)
if queryreturn != []:
for row in queryreturn:
label, = row
return unicode(label, 'utf-8')
'SELECT label FROM subscriptions WHERE address=?', address)
if queryreturn:
label = queryreturn[-1][0]
return label.decode('utf-8')
class SubscriptionAccount(BMAccount):