Bitmessage/PyBitmessage-2024-12-25
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Add functions for sqlqueries

Browse Source
This commit is contained in:
shekhar-cis 2022-05-12 18:16:59 +05:30
parent 9a4c85d4da
commit df712511da
Signed by untrusted user: shekhar-cis
GPG Key ID: F4F00AB04E83F9A7
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitmessagekivy/baseclass/draft.py
View File

@ -206,7 +206,7 @@ class Draft(Screen, HelperDraft):
# state.msg_counter_objs = src_object.children[2].children[0].ids # state.msg_counter_objs = src_object.children[2].children[0].ids
Draft().kivy_state.draft_count = str(int(Draft().kivy_state.draft_count) + 1) \ Draft().kivy_state.draft_count = str(int(Draft().kivy_state.draft_count) + 1) \
if state.association == fromAddress else Draft().kivy_state.draft_count if Draft().kivy_state.association == fromAddress else Draft().kivy_state.draft_count
src_object.ids.sc16.clear_widgets() src_object.ids.sc16.clear_widgets()
src_object.ids.sc16.add_widget(Draft()) src_object.ids.sc16.add_widget(Draft())
toast('Save draft') toast('Save draft')

40
src/bitmessagekivy/baseclass/maildetail.py
View File

@ -28,6 +28,7 @@ from bitmessagekivy.baseclass.common import (
from bitmessagekivy.baseclass.popup import SenderDetailPopup from bitmessagekivy.baseclass.popup import SenderDetailPopup
import helper_sent import helper_sent
class OneLineListTitle(OneLineListItem): class OneLineListTitle(OneLineListItem):
"""OneLineListTitle class for kivy Ui""" """OneLineListTitle class for kivy Ui"""
__events__ = ('on_long_press', ) __events__ = ('on_long_press', )
@ -89,6 +90,7 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes
page_type = StringProperty() page_type = StringProperty()
time_tag = StringProperty() time_tag = StringProperty()
avatarImg = StringProperty() avatarImg = StringProperty()
no_subject = '(no subject)'
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
"""Mail Details method""" """Mail Details method"""
@ -99,21 +101,20 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes
def init_ui(self, dt=0): def init_ui(self, dt=0):
"""Clock Schdule for method MailDetail mails""" """Clock Schdule for method MailDetail mails"""
self.page_type = state.detailPageType if state.detailPageType else '' self.page_type = self.kivy_state.detailPageType if self.kivy_state.detailPageType else ''
# import pdb; pdb.set_trace() # import pdb; pdb.set_trace()
try: try:
if state.detailPageType == 'sent' or self.kivy_state.detailPageType == 'draft': if state.detailPageType == 'sent' or self.kivy_state.detailPageType == 'draft':
data = sqlQuery( # data = sqlQuery(
"select toaddress, fromaddress, subject, message, status," # "select toaddress, fromaddress, subject, message, status,"
" ackdata, senttime from sent where ackdata = ?;", self.kivy_state.mail_id) # " ackdata, senttime from sent where ackdata = ?;", self.kivy_state.mail_id)
data = helper_sent.retrieve_message_details(self.kivy_state.mail_id)
state.status = self state.status = self
state.ackdata = data[0][5] state.ackdata = data[0][5]
self.assign_mail_details(data) self.assign_mail_details(data)
state.kivyapp.set_mail_detail_header() state.kivyapp.set_mail_detail_header()
elif state.detailPageType == 'inbox': elif state.detailPageType == 'inbox':
data = sqlQuery( data = helper_sent.retrieve_message_details(state.mail_id)
"select toaddress, fromaddress, subject, message, received from inbox"
" where msgid = ?;", state.mail_id)
self.assign_mail_details(data) self.assign_mail_details(data)
state.kivyapp.set_mail_detail_header() state.kivyapp.set_mail_detail_header()
except Exception as e: except Exception as e:
@ -127,7 +128,7 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes
self.from_addr = data[0][1] self.from_addr = data[0][1]
self.subject = subject.capitalize( self.subject = subject.capitalize(
) if subject.capitalize() else '(no subject)' ) if subject.capitalize() else self.no_subject
self.message = body self.message = body
if len(data[0]) == 7: if len(data[0]) == 7:
self.status = data[0][4] self.status = data[0][4]
@ -143,18 +144,14 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes
self.children[0].children[0].active = True self.children[0].children[0].active = True
if state.detailPageType == 'sent': if state.detailPageType == 'sent':
state.kivyapp.root.ids.sc4.ids.sent_search.ids.search_field.text = '' state.kivyapp.root.ids.sc4.ids.sent_search.ids.search_field.text = ''
sqlExecute( helper_sent.delete(state.mail_id)
"UPDATE sent SET folder = 'trash' WHERE"
" ackdata = ?;", state.mail_id)
msg_count_objs.send_cnt.ids.badge_txt.text = str(int(state.sent_count) - 1) msg_count_objs.send_cnt.ids.badge_txt.text = str(int(state.sent_count) - 1)
state.sent_count = str(int(state.sent_count) - 1) state.sent_count = str(int(state.sent_count) - 1)
self.parent.screens[2].ids.ml.clear_widgets() self.parent.screens[2].ids.ml.clear_widgets()
self.parent.screens[2].loadSent(state.association) self.parent.screens[2].loadSent(state.association)
elif state.detailPageType == 'inbox': elif state.detailPageType == 'inbox':
state.kivyapp.root.ids.sc1.ids.inbox_search.ids.search_field.text = '' state.kivyapp.root.ids.sc1.ids.inbox_search.ids.search_field.text = ''
sqlExecute( helper_sent.delete(state.mail_id)
"UPDATE inbox SET folder = 'trash' WHERE"
" msgid = ?;", state.mail_id)
msg_count_objs.inbox_cnt.ids.badge_txt.text = str( msg_count_objs.inbox_cnt.ids.badge_txt.text = str(
int(state.inbox_count) - 1) int(state.inbox_count) - 1)
state.inbox_count = str(int(state.inbox_count) - 1) state.inbox_count = str(int(state.inbox_count) - 1)
@ -163,7 +160,7 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes
elif state.detailPageType == 'draft': elif state.detailPageType == 'draft':
helper_sent.delete(state.mail_id) helper_sent.delete(state.mail_id)
sqlExecute("DELETE FROM sent WHERE ackdata = ?;", state.mail_id) # sqlExecute("DELETE FROM sent WHERE ackdata = ?;", state.mail_id)
msg_count_objs.draft_cnt.ids.badge_txt.text = str( msg_count_objs.draft_cnt.ids.badge_txt.text = str(
int(state.draft_count) - 1) int(state.draft_count) - 1)
state.draft_count = str(int(state.draft_count) - 1) state.draft_count = str(int(state.draft_count) - 1)
@ -198,9 +195,10 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes
state.in_composer = True state.in_composer = True
from_address = ' wrote:--------------\n' from_address = ' wrote:--------------\n'
time_str = '\n\n --------------On ' time_str = '\n\n --------------On '
data = sqlQuery( # data = sqlQuery(
"select toaddress, fromaddress, subject, message, received from inbox where" # "select toaddress, fromaddress, subject, message, received from inbox where"
" msgid = ?;", state.mail_id) # " msgid = ?;", state.mail_id)
data = helper_sent.retrieve_message_details(state.mail_id)
composer_obj = self.parent.screens[1].children[1].ids composer_obj = self.parent.screens[1].children[1].ids
composer_obj.ti.text = data[0][0] composer_obj.ti.text = data[0][0]
composer_obj.btn.text = data[0][0] composer_obj.btn.text = data[0][0]
@ -222,15 +220,13 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes
def write_msg(self, navApp): def write_msg(self, navApp):
"""Write on draft mail""" """Write on draft mail"""
state.send_draft_mail = self.kivy_state.mail_id state.send_draft_mail = self.kivy_state.mail_id
data = sqlQuery( data = helper_sent.retrieve_message_details(state.mail_id)
"select toaddress, fromaddress, subject, message from sent where"
" ackdata = ?;", self.kivy_state.mail_id)
composer_ids = ( composer_ids = (
self.parent.parent.ids.sc3.children[1].ids) self.parent.parent.ids.sc3.children[1].ids)
composer_ids.ti.text = data[0][1] composer_ids.ti.text = data[0][1]
composer_ids.btn.text = data[0][1] composer_ids.btn.text = data[0][1]
composer_ids.txt_input.text = data[0][0] composer_ids.txt_input.text = data[0][0]
composer_ids.subject.text = data[0][2] if data[0][2] != '(no subject)' else '' composer_ids.subject.text = data[0][2] if data[0][2] != self.no_subject else ''
composer_ids.body.text = data[0][3] composer_ids.body.text = data[0][3]
self.parent.current = 'create' self.parent.current = 'create'
navApp.set_navbar_for_composer() navApp.set_navbar_for_composer()

10
src/helper_sent.py
View File

@ -1,7 +1,7 @@
""" """
Insert values into sent table Insert values into sent table
""" """
from helper_sql import sqlExecute from helper_sql import sqlExecute, sqlQuery
def insert(t): def insert(t):
@ -11,3 +11,11 @@ def insert(t):
def delete(ack_data): def delete(ack_data):
"""Perform delete ack data""" """Perform delete ack data"""
sqlExecute("DELETE FROM sent WHERE ackdata = ?", ack_data) sqlExecute("DELETE FROM sent WHERE ackdata = ?", ack_data)
def retrieve_message_details(ack_data):
"""Retriving Message details"""
data = sqlQuery(
"select toaddress, fromaddress, subject, message, received from inbox where"
" msgid = ?;", ack_data
)
return data