From e94046370934cec855802e06aa40a85215a7ca34 Mon Sep 17 00:00:00 2001 From: lakshyacis Date: Sat, 3 Aug 2019 17:19:28 +0530 Subject: [PATCH 1/4] flake8 fixes part1 --- src/bitmessagekivy/mpybit.py | 133 ++++++++++++++++++++++------------- 1 file changed, 83 insertions(+), 50 deletions(-) diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index 067eb4e5..b7d15bd9 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -1,22 +1,17 @@ -# -*- coding: utf-8 -*- +"""Coding: utf-8.""" from kivy.app import App from kivy.lang import Builder from kivy.metrics import dp from kivy.properties import ObjectProperty from kivy.uix.image import Image -from kivy.uix.screenmanager import Screen, NoTransition -from kivymd.bottomsheet import MDListBottomSheet, MDGridBottomSheet +from kivy.uix.screenmanager import Screen from kivymd.button import MDIconButton -from kivymd.date_picker import MDDatePicker from kivymd.dialog import MDDialog from kivymd.label import MDLabel -from kivymd.list import ILeftBody, ILeftBodyTouch, IRightBodyTouch, BaseListItem -from kivymd.material_resources import DEVICE_TYPE +from kivymd.list import ILeftBody, ILeftBodyTouch, IRightBodyTouch from kivymd.navigationdrawer import MDNavigationDrawer, NavigationDrawerHeaderBase from kivymd.selectioncontrols import MDCheckbox -from kivymd.snackbar import Snackbar from kivymd.theming import ThemeManager -from kivymd.time_picker import MDTimePicker from kivymd.list import ThreeLineAvatarIconListItem, TwoLineAvatarIconListItem, TwoLineListItem from kivy.properties import ListProperty, StringProperty, BooleanProperty from kivy.clock import Clock @@ -24,16 +19,12 @@ from bmconfigparser import BMConfigParser import state import queues from kivy.uix.popup import Popup -from helper_sql import * -from kivy.uix.gridlayout import GridLayout -from kivy.app import App +from helper_sql import sqlQuery, sqlExecute from kivy.uix.textinput import TextInput -from kivy.lang import Builder from kivy.uix.boxlayout import BoxLayout from kivy.uix.floatlayout import FloatLayout -from kivy.properties import NumericProperty, ListProperty, BooleanProperty, ObjectProperty +from kivy.properties import NumericProperty from kivy.uix.recycleview import RecycleView -from kivy.uix.recyclegridlayout import RecycleGridLayout from kivy.uix.recycleview.views import RecycleDataViewBehavior from kivy.uix.label import Label from kivy.uix.recycleboxlayout import RecycleBoxLayout @@ -50,7 +41,10 @@ from kivy.uix.carousel import Carousel from kivy.utils import platform from kivy.uix.spinner import Spinner + class Navigatorss(MDNavigationDrawer): + """Navigators class contains image, title and logo.""" + image_source = StringProperty('images/qidenticon_two.png') title = StringProperty('Navigation') drawer_logo = StringProperty() @@ -58,9 +52,11 @@ class Navigatorss(MDNavigationDrawer): class Inbox(Screen): """Inbox Screen uses screen to show widgets of screens.""" + data = ListProperty() def __init__(self, *args, **kwargs): + """Method Parsing the address.""" super(Inbox, self).__init__(*args, **kwargs) if state.association == '': if BMConfigParser().addresses(): @@ -89,16 +85,31 @@ class Inbox(Screen): if queryreturn: for mail in queryreturn: third_text = mail[3].replace('\n', ' ') - data.append({'text': mail[4].strip(), 'secondary_text': mail[5][:10] + '...........' if len(mail[3]) > 10 else mail[3] + '\n' + " " + (third_text[:25] + '...!') if len(third_text) > 25 else third_text, 'receivedTime': mail[6] }) + data.append({ + 'text': mail[4].strip(), + 'secondary_text': mail[5][:10] + '...........' if len( + mail[3]) > 10 else mail[3] + '\n' + " " + ( + third_text[:25] + '...!') if len( + third_text) > 25 else third_text, + 'receivedTime': mail[6]}) for item in data: - meny = ThreeLineAvatarIconListItem(text=item['text'], secondary_text=item['secondary_text'], theme_text_color= 'Custom', text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['secondary_text'][0].upper() if (item['secondary_text'][0].upper() >= 'A' and item['secondary_text'][0].upper() <= 'Z') else '!'))) - meny.bind(on_press = partial(self.inbox_detail, item['receivedTime'])) + meny = ThreeLineAvatarIconListItem( + text=item['text'], + secondary_text=item['secondary_text'], + theme_text_color='Custom', + text_color=NavigateApp().theme_cls.primary_color) + meny.add_widget( + AvatarSampleWidget( + source='./images/text_images/{}.png'.format( + item['secondary_text'][0].upper() if ( + item['secondary_text'][0].upper() >= 'A' and item[ + 'secondary_text'][0].upper() <= 'Z') else '!'))) + meny.bind(on_press=partial(self.inbox_detail, item['receivedTime'])) carousel = Carousel(direction='right') if platform == 'android': carousel.height = 150 elif platform == 'linux': - carousel.height = meny.height - 10 + carousel.height = meny.height - 10 carousel.size_hint_y = None carousel.ignore_perpendicular_swipes = True carousel.data_index = 0 @@ -110,7 +121,7 @@ class Inbox(Screen): carousel.add_widget(del_btn) carousel.add_widget(meny) ach_btn = Button(text='Achieve') - ach_btn.background_color = (0,1,0,1) + ach_btn.background_color = (0, 1, 0, 1) ach_btn.bind(on_press=partial(self.archive, item['receivedTime'])) carousel.add_widget(ach_btn) carousel.index = 1 @@ -126,7 +137,7 @@ class Inbox(Screen): self.ids.ml.add_widget(content) def inbox_detail(self, receivedTime, *args): - """Load inbox page details""" + """Load inbox page details.""" state.detailPageType = 'inbox' state.sentMailTime = receivedTime if self.manager: @@ -140,7 +151,7 @@ class Inbox(Screen): src_mng_obj.current = 'mailDetail' def delete(self, data_index, instance, *args): - """Delete inbox mail from inbox listing""" + """Delete inbox mail from inbox listing.""" sqlExecute("UPDATE inbox SET folder = 'trash' WHERE received = {};".format(data_index)) msg_count_objs = self.parent.parent.parent.parent.children[2].children[0].ids if int(state.inbox_count) > 0: @@ -152,13 +163,13 @@ class Inbox(Screen): self.update_trash() def archive(self, data_index, instance, *args): - """Archive inbox mail from inbox listing""" + """Archive inbox mail from inbox listing.""" sqlExecute("UPDATE inbox SET folder = 'trash' WHERE received = {};".format(data_index)) self.ids.ml.remove_widget(instance.parent.parent) self.update_trash() def update_trash(self): - """Update trash screen mails which is deleted from inbox""" + """Update trash screen mails which is deleted from inbox.""" try: self.parent.screens[4].clear_widgets() self.parent.screens[4].add_widget(Trash()) @@ -167,11 +178,9 @@ class Inbox(Screen): self.parent.parent.screens[4].add_widget(Trash()) def refresh_callback(self, *args): - """A method that updates the state of your application - while the spinner remains on the screen.""" - + """A method that updates the state of your application while the spinner remains on the screen.""" def refresh_callback(interval): - """This methods is used for loading the inbox screen data""" + """Method used for loading the inbox screen data.""" self.ids.ml.clear_widgets() self.remove_widget(self.children[1]) try: @@ -187,7 +196,9 @@ class Inbox(Screen): class MyAddress(Screen): """MyAddress Screen uses screen to show widgets of screens.""" + def __init__(self, *args, **kwargs): + """Clock Schdule for method inbox accounts.""" super(MyAddress, self).__init__(*args, **kwargs) Clock.schedule_once(self.init_ui, 0) @@ -198,8 +209,15 @@ class MyAddress(Screen): for address in state.kivyapp.variable_1: data.append({'text': BMConfigParser().get(address, 'label'), 'secondary_text': address}) for item in data: - meny = TwoLineAvatarIconListItem(text=item['text'], secondary_text=item['secondary_text'], theme_text_color= 'Custom',text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['text'][0].upper() if (item['text'][0].upper() >= 'A' and item['text'][0].upper() <= 'Z') else '!'))) + meny = TwoLineAvatarIconListItem( + text=item['text'], + secondary_text=item['secondary_text'], + theme_text_color='Custom', + text_color=NavigateApp().theme_cls.primary_color) + meny.add_widget(AvatarSampleWidget( + source='./images/text_images/{}.png'.format( + item['text'][0].upper() if (item['text'][0].upper() >= 'A' and item[ + 'text'][0].upper() <= 'Z') else '!'))) meny.bind(on_press=partial(self.myadd_detail, item['secondary_text'], item['text'])) self.ids.ml.add_widget(meny) else: @@ -217,16 +235,15 @@ class MyAddress(Screen): pass def myadd_detail(self, fromaddress, label, *args): + """Myaddress Details.""" p = MyaddDetailPopup() p.open() p.set_address(fromaddress, label) def refresh_callback(self, *args): - """A method that updates the state of your application - while the spinner remains on the screen.""" - + """A method that updates the state of your application while the spinner remains on the screen.""" def refresh_callback(interval): - """This methods is used for loading the myaddress screen data""" + """Method used for loading the myaddress screen data.""" self.ids.ml.clear_widgets() self.remove_widget(self.children[1]) try: @@ -242,7 +259,9 @@ class MyAddress(Screen): class AddressBook(Screen): """AddressBook Screen uses screen to show widgets of screens.""" + def __init__(self, *args, **kwargs): + """Getting AddressBook Details.""" super(AddressBook, self).__init__(*args, **kwargs) Clock.schedule_once(self.init_ui, 0) @@ -251,9 +270,15 @@ class AddressBook(Screen): data = sqlQuery("SELECT label, address from addressbook") if data: for item in data: - meny = TwoLineAvatarIconListItem(text=item[0], secondary_text=item[1], theme_text_color='Custom',text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item[0][0].upper() if (item[0][0].upper() >= 'A' and item[0][0].upper() <= 'Z') else '!'))) - meny.bind(on_press = partial(self.addBook_detail, item[1], item[0])) + meny = TwoLineAvatarIconListItem( + text=item[0], + secondary_text=item[1], + theme_text_color='Custom', + text_color=NavigateApp().theme_cls.primary_color) + meny.add_widget(AvatarSampleWidget( + source='./images/text_images/{}.png'.format( + item[0][0].upper() if (item[0][0].upper() >= 'A' and item[0][0].upper() <= 'Z') else '!'))) + meny.bind(on_press=partial(self.addBook_detail, item[1], item[0])) carousel = Carousel(direction='right') if platform == 'android': carousel.height = 140 @@ -269,7 +294,7 @@ class AddressBook(Screen): del_btn.bind(on_press=partial(self.delete_address, item[1])) carousel.add_widget(del_btn) carousel.add_widget(meny) - carousel.index=1 + carousel.index = 1 self.ids.ml.add_widget(carousel) else: content = MDLabel(font_style='Body1', @@ -282,59 +307,69 @@ class AddressBook(Screen): self.ids.ml.add_widget(content) def refreshs(self, *args): + """Refresh the Widget.""" state.navinstance.ids.sc11.clear_widgets() state.navinstance.ids.sc11.add_widget(AddressBook()) def addBook_detail(self, address, label, *args): + """Addressbook Details.""" p = AddbookDetailPopup() p.open() p.set_addbook_data(address, label) def delete_address(self, address, instance, *args): - """Delete inbox mail from inbox listing""" + """Delete inbox mail from inbox listing.""" self.ids.ml.remove_widget(instance.parent.parent) sqlExecute("DELETE FROM addressbook WHERE address = '{}';".format(address)) class SelectableRecycleBoxLayout(FocusBehavior, LayoutSelectionBehavior, RecycleBoxLayout): - ''' Adds selection and focus behaviour to the view. ''' + """Adds selection and focus behaviour to the view.""" + pass class SelectableLabel(RecycleDataViewBehavior, Label): - ''' Add selection support to the Label ''' + """Add selection support to the Label.""" + index = None selected = BooleanProperty(False) selectable = BooleanProperty(True) def refresh_view_attrs(self, rv, index, data): - ''' Catch and handle the view changes ''' + """Catch and handle the view changes.""" self.index = index return super(SelectableLabel, self).refresh_view_attrs( rv, index, data) def on_touch_down(self, touch): - ''' Add selection on touch down ''' + """Add selection on touch down.""" if super(SelectableLabel, self).on_touch_down(touch): return True if self.collide_point(*touch.pos) and self.selectable: return self.parent.select_with_touch(self.index, touch) def apply_selection(self, rv, index, is_selected): - ''' Respond to the selection of items in the view. ''' + """Respond to the selection of items in the view.""" self.selected = is_selected if is_selected: print("selection changed to {0}".format(rv.data[index])) - rv.parent.txt_input.text = rv.parent.txt_input.text.replace(rv.parent.txt_input.text, rv.data[index]['text']) + rv.parent.txt_input.text = rv.parent.txt_input.text.replace( + rv.parent.txt_input.text, rv.data[index]['text']) class RV(RecycleView): + """Recycling View.""" + def __init__(self, **kwargs): + """Recycling Method.""" super(RV, self).__init__(**kwargs) class DropDownWidget(BoxLayout): + """Adding Dropdown Widget.""" + txt_input = ObjectProperty() rv = ObjectProperty() @@ -353,7 +388,7 @@ class DropDownWidget(BoxLayout): status, addressVersionNumber, streamNumber, ripe = decodeAddress( toAddress) if status == 'success': - from addresses import * + from addresses import addBMIfNotPresent toAddress = addBMIfNotPresent(toAddress) statusIconColor = 'red' if addressVersionNumber > 4 or addressVersionNumber <= 1: @@ -385,9 +420,8 @@ class DropDownWidget(BoxLayout): encoding, BMConfigParser().getint('bitmessagesettings', 'ttl')) state.check_sent_acc = fromAddress - state.msg_counter_objs = self.parent.parent.parent.parent.parent.parent.children[0].children[2].children[0].ids - # state.msg_counter_objs.send_cnt.badge_text = str(int(state.sent_count) + 1) - # state.sent_count = str(int(state.sent_count) + 1) + state.msg_counter_objs = \ + self.parent.parent.parent.parent.parent.parent.children[0].children[2].children[0].ids self.parent.parent.screens[3].clear_widgets() self.parent.parent.screens[3].add_widget(Sent()) toLabel = '' @@ -423,7 +457,6 @@ class DropDownWidget(BoxLayout): self.main_pop = Popup(title="Error", content=self.box, size_hint=(None, None), size=(550, 400), auto_dismiss=False, title_size=30) self.but.bind(on_press=self.main_pop.dismiss) - # self.main_pop.background = './images/popup.jpeg' self.main_pop.open() From a4d192f1c8922632c553b58c0a664548f8196909 Mon Sep 17 00:00:00 2001 From: lakshyacis Date: Mon, 5 Aug 2019 12:54:32 +0530 Subject: [PATCH 2/4] flake8 fixes part2 --- src/bitmessagekivy/mpybit.py | 285 +++++++++++++++++++++++++---------- 1 file changed, 205 insertions(+), 80 deletions(-) diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index b7d15bd9..9147a7eb 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -447,6 +447,7 @@ class DropDownWidget(BoxLayout): self.address_error_message(msg) def address_error_message(self, msg): + """Show Error Message.""" self.box = FloatLayout() self.lab = (Label(text=msg, font_size=25, size_hint=(None, None), pos_hint={'x': .25, 'y': .6})) @@ -461,20 +462,23 @@ class DropDownWidget(BoxLayout): class MyTextInput(TextInput): + """Takes the text input in the field.""" + txt_input = ObjectProperty() flt_list = ObjectProperty() word_list = ListProperty() - # this is the variable storing the number to which the look-up will start starting_no = NumericProperty(3) suggestion_text = '' def __init__(self, **kwargs): + """Getting Text Input.""" super(MyTextInput, self).__init__(**kwargs) def on_text(self, instance, value): - # find all the occurrence of the word + """Find all the occurrence of the word.""" self.parent.parent.parent.parent.ids.rv.data = [] - matches = [self.word_list[i] for i in range(len(self.word_list)) if self.word_list[i][:self.starting_no] == value[:self.starting_no]] + matches = [self.word_list[i] for i in range( + len(self.word_list)) if self.word_list[i][:self.starting_no] == value[:self.starting_no]] # display the data in the recycleview display_data = [] for i in matches: @@ -487,6 +491,7 @@ class MyTextInput(TextInput): self.parent.height = 400 def keyboard_on_key_down(self, window, keycode, text, modifiers): + """Key Down.""" if self.suggestion_text and keycode[1] == 'tab': self.insert_text(self.suggestion_text + ' ') return True @@ -494,14 +499,20 @@ class MyTextInput(TextInput): class Payment(Screen): + """Payment Method.""" + pass class Login(Screen): + """Login Screeen.""" + pass class NetworkStat(Screen): + """Method used to show network stat.""" + text_variable_1 = StringProperty('{0}::{1}'.format('Total Connections', '0')) text_variable_2 = StringProperty('Processed {0} per-to-per messages'.format('0')) text_variable_3 = StringProperty('Processed {0} brodcast messages'.format('0')) @@ -509,6 +520,7 @@ class NetworkStat(Screen): text_variable_5 = StringProperty('Processed {0} object to be synced'.format('0')) def __init__(self, *args, **kwargs): + """Init method for network stat.""" super(NetworkStat, self).__init__(*args, **kwargs) Clock.schedule_interval(self.init_ui, 1) @@ -525,17 +537,20 @@ class NetworkStat(Screen): class ContentNavigationDrawer(Navigatorss): + """Navigate Content Drawer.""" + pass class Random(Screen): + """Generates Random Address.""" + is_active = BooleanProperty(False) checked = StringProperty("") - # self.manager.parent.ids.create.children[0].source = 'images/plus-4-xxl.png' def generateaddress(self): + """Method for Address Generator.""" import queues - # queues.apiAddressGeneratorReturnQueue.queue.clear() streamNumberForAddress = 1 label = self.ids.label.text eighteenByteRipe = False @@ -549,7 +564,6 @@ class Random(Screen): nonceTrialsPerByte, payloadLengthExtraBytes) ) - # self.manager.current = 'add_sucess' self.manager.current = 'myaddress' self.ids.label.text = '' self.parent.parent.parent.parent.ids.toolbar.opacity = 1 @@ -561,14 +575,18 @@ class Random(Screen): class AddressSuccessful(Screen): + """Getting Address Detail.""" + pass class Sent(Screen): """Sent Screen uses screen to show widgets of screens.""" + data = ListProperty() def __init__(self, *args, **kwargs): + """Association with the screen.""" super(Sent, self).__init__(*args, **kwargs) if state.association == '': if BMConfigParser().addresses(): @@ -601,16 +619,30 @@ class Sent(Screen): if queryreturn: for mail in queryreturn: third_text = mail[3].replace('\n', ' ') - self.data.append({'text': mail[1].strip(), 'secondary_text': mail[2][:10] + '...........' if len(mail[2]) > 10 else mail[2] + '\n' + " " + (third_text[:25] + '...!') if len(third_text) > 25 else third_text, 'lastactiontime': mail[6]}) + self.data.append({ + 'text': mail[1].strip(), + 'secondary_text': mail[2][:10] + '...........' if len( + mail[2]) > 10 else mail[2] + '\n' + " " + (third_text[:25] + '...!') if len( + third_text) > 25 else third_text, + 'lastactiontime': mail[6]}) for item in self.data: - meny = ThreeLineAvatarIconListItem(text=item['text'], secondary_text=item['secondary_text'], theme_text_color= 'Custom', text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['secondary_text'][0].upper() if (item['secondary_text'][0].upper() >= 'A' and item['secondary_text'][0].upper() <= 'Z') else '!'))) - meny.bind(on_press = partial(self.sent_detail, item['lastactiontime'])) + meny = ThreeLineAvatarIconListItem( + text=item['text'], + secondary_text=item['secondary_text'], + theme_text_color='Custom', + text_color=NavigateApp().theme_cls.primary_color) + meny.add_widget( + AvatarSampleWidget( + source='./images/text_images/{}.png'.format( + item['secondary_text'][0].upper() if ( + item['secondary_text'][0].upper() >= 'A' and item['secondary_text'][ + 0].upper() <= 'Z') else '!'))) + meny.bind(on_press=partial(self.sent_detail, item['lastactiontime'])) carousel = Carousel(direction='right') if platform == 'android': carousel.height = 150 elif platform == 'linux': - carousel.height = meny.height - 10 + carousel.height = meny.height - 10 carousel.size_hint_y = None carousel.ignore_perpendicular_swipes = True carousel.data_index = 0 @@ -622,10 +654,10 @@ class Sent(Screen): carousel.add_widget(del_btn) carousel.add_widget(meny) ach_btn = Button(text='Achieve') - ach_btn.background_color = (0,1,0,1) + ach_btn.background_color = (0, 1, 0, 1) ach_btn.bind(on_press=partial(self.archive, item['lastactiontime'])) carousel.add_widget(ach_btn) - carousel.index=1 + carousel.index = 1 self.ids.ml.add_widget(carousel) else: content = MDLabel(font_style='Body1', @@ -638,7 +670,7 @@ class Sent(Screen): self.ids.ml.add_widget(content) def sent_detail(self, lastsenttime, *args): - """Load sent mail details""" + """Load sent mail details.""" state.detailPageType = 'sent' state.sentMailTime = lastsenttime if self.manager: @@ -651,7 +683,7 @@ class Sent(Screen): src_mng_obj.current = 'mailDetail' def delete(self, data_index, instance, *args): - """delete sent mail from sent mail listing""" + """Delete sent mail from sent mail listing.""" try: msg_count_objs = self.parent.parent.parent.parent.children[2].children[0].ids except Exception as e: @@ -667,13 +699,13 @@ class Sent(Screen): self.update_trash() def archive(self, data_index, instance, *args): - """archive sent mail from sent mail listing""" + """Archive sent mail from sent mail listing.""" sqlExecute("UPDATE sent SET folder = 'trash' WHERE lastactiontime = {};".format(data_index)) self.ids.ml.remove_widget(instance.parent.parent) self.update_trash() def update_trash(self): - """Update trash screen mails which is deleted from inbox""" + """Update trash screen mails which is deleted from inbox.""" try: self.parent.screens[4].clear_widgets() self.parent.screens[4].add_widget(Trash()) @@ -684,7 +716,9 @@ class Sent(Screen): class Trash(Screen): """Trash Screen uses screen to show widgets of screens.""" + def __init__(self, *args, **kwargs): + """Trash method, delete sent message and add in Trash.""" super(Trash, self).__init__(*args, **kwargs) Clock.schedule_once(self.init_ui, 0) @@ -694,38 +728,53 @@ class Trash(Screen): if BMConfigParser().addresses(): state.association = BMConfigParser().addresses()[0] - inbox = sqlQuery("SELECT toaddress, fromaddress, subject, message from inbox WHERE folder = 'trash' and fromaddress = '{}';".format(state.association)) - sent = sqlQuery("SELECT toaddress, fromaddress, subject, message from sent WHERE folder = 'trash' and fromaddress = '{}';".format(state.association)) + inbox = sqlQuery( + "SELECT toaddress, fromaddress, subject, message from inbox \ + WHERE folder = 'trash' and fromaddress = '{}';".format(state.association)) + sent = sqlQuery( + "SELECT toaddress, fromaddress, subject, message from sent \ + WHERE folder = 'trash' and fromaddress = '{}';".format(state.association)) trash_data = inbox + sent for item in trash_data: - meny = ThreeLineAvatarIconListItem(text=item[1], secondary_text=item[2], theme_text_color= 'Custom',text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item[2][0].upper() if (item[2][0].upper() >= 'A' and item[2][0].upper() <= 'Z') else '!'))) + meny = ThreeLineAvatarIconListItem( + text=item[1], + secondary_text=item[2], + theme_text_color='Custom', + text_color=NavigateApp().theme_cls.primary_color) + meny.add_widget(AvatarSampleWidget( + source='./images/text_images/{}.png'.format(item[2][0].upper() if ( + item[2][0].upper() >= 'A' and item[2][0].upper() <= 'Z') else '!'))) self.ids.ml.add_widget(meny) + class Page(Screen): + """Page Screen show widgets of page.""" + pass class Create(Screen): + """Creates the screen widgets.""" + def __init__(self, **kwargs): + """Getting Labels and address from addressbook.""" super(Create, self).__init__(**kwargs) widget_1 = DropDownWidget() - from helper_sql import * widget_1.ids.txt_input.word_list = [addr[1] for addr in sqlQuery("SELECT label, address from addressbook")] widget_1.ids.txt_input.starting_no = 2 self.add_widget(widget_1) -class AddressSuccessful(Screen): - pass - - class Setting(Screen): + """Setting the Screen components.""" + pass class NavigateApp(App): + """Navigation Layout of class.""" + theme_cls = ThemeManager() previous_date = ObjectProperty() obj_1 = ObjectProperty() @@ -753,7 +802,8 @@ class NavigateApp(App): ] def build(self): - import os + """Method builds the widget.""" + import os main_widget = Builder.load_file( os.path.join(os.path.dirname(__file__), 'main.kv')) self.nav_drawer = Navigatorss() @@ -765,10 +815,12 @@ class NavigateApp(App): return main_widget def run(self): + """Running the widgets.""" kivyuisignaler.release() super(NavigateApp, self).run() def show_address_success(self): + """Showing the succesfull address.""" content = MDLabel(font_style='Body1', theme_text_color='Secondary', text="Successfully Saved your contact address. " @@ -782,7 +834,7 @@ class NavigateApp(App): def showmeaddresses(name="text"): """Show the addresses in spinner to make as dropdown.""" if name == "text": - if bmconfigparserigParser().addresses(): + if BMConfigParser().addresses(): return BMConfigParser().addresses()[0][:16] + '..' else: return "textdemo" @@ -808,10 +860,23 @@ class NavigateApp(App): self.root.ids.scr_mngr.current = 'inbox' msg_counter_objs = self.root_window.children[1].children[2].children[0].ids - state.sent_count = str(sqlQuery("SELECT COUNT(*) FROM sent WHERE fromaddress = '{}' and folder = 'sent' ;".format(state.association))[0][0]) - state.inbox_count = str(sqlQuery("SELECT COUNT(*) FROM inbox WHERE fromaddress = '{}' and folder = 'inbox' ;".format(state.association))[0][0]) - state.trash_count = str(sqlQuery("SELECT (SELECT count(*) FROM sent where fromaddress = '{0}' and folder = 'trash' )+(SELECT count(*) FROM inbox where fromaddress = '{0}' and folder = 'trash') AS SumCount".format(state.association))[0][0]) - state.draft_count = str(sqlQuery("SELECT COUNT(*) FROM sent WHERE fromaddress = '{}' and folder = 'draft' ;".format(state.association))[0][0]) + state.sent_count = str( + sqlQuery( + "SELECT COUNT(*) FROM sent WHERE fromaddress = '{}' and folder = 'sent' ;".format( + state.association))[0][0]) + state.inbox_count = str( + sqlQuery( + "SELECT COUNT(*) FROM inbox WHERE fromaddress = '{}' and folder = 'inbox' ;".format( + state.association))[0][0]) + state.trash_count = str( + sqlQuery( + "SELECT (SELECT count(*) FROM sent where fromaddress = '{0}' and folder = 'trash' )\ + +(SELECT count(*) FROM inbox where fromaddress = '{0}' and folder = 'trash') AS SumCount".format( + state.association))[0][0]) + state.draft_count = str( + sqlQuery( + "SELECT COUNT(*) FROM sent WHERE fromaddress = '{}' and folder = 'draft' ;".format( + state.association))[0][0]) if msg_counter_objs: msg_counter_objs.send_cnt.badge_text = state.sent_count @@ -819,7 +884,6 @@ class NavigateApp(App): msg_counter_objs.trash_cnt.badge_text = state.trash_count msg_counter_objs.draft_cnt.badge_text = state.draft_count - def getInboxMessageDetail(self, instance): """It will get message detail after make selected message description.""" try: @@ -837,21 +901,24 @@ class NavigateApp(App): return "Bitmessage Login" def addingtoaddressbook(self): + """Adding to address Book.""" p = GrashofPopup() p.open() def getDefaultAccData(self): + """Getting Default Account Data.""" if BMConfigParser().addresses(): return BMConfigParser().addresses()[0] return 'Select Address' def addressexist(self): + """Checking address existence.""" if BMConfigParser().addresses(): return True return False def on_key(self, window, key, *args): - """This method is used for going on previous screen""" + """Method is used for going on previous screen.""" if key == 27: # the esc key if self.root.ids.scr_mngr.current == "mailDetail": self.root.ids.scr_mngr.current = 'sent' if state.detailPageType == 'sent' else 'inbox' @@ -878,17 +945,18 @@ class NavigateApp(App): return True def restart(self, *args): - """this method is used to set transition direction""" + """Method used to set transition direction.""" self.root.ids.scr_mngr.transition.direction = 'left' self.root.ids.scr_mngr.transition.unbind(on_complete=self.restart) def status_dispatching(self, data): + """Method used for status dispatching acknowledgment.""" ackData, message = data if state.ackdata == ackData: state.status.status = message def clear_composer(self): - """if slow down the nwe will make new composer edit screen""" + """If slow down the nwe will make new composer edit screen.""" self.root.ids.serch_btn.opacity = 0 self.root.ids.serch_btn.disabled = True composer_obj = self.root.ids.sc3.children[0].ids @@ -898,7 +966,7 @@ class NavigateApp(App): composer_obj.subject.text = '' def on_stop(self): - """On stop methos is used for stoping the runing script""" + """On stop methos is used for stoping the runing script.""" print("**************************EXITING FROM APPLICATION*****************************") import shutdown shutdown.doCleanShutdown() @@ -908,33 +976,46 @@ class NavigateApp(App): if BMConfigParser().addresses(): state.association = BMConfigParser().addresses()[0] if text == 'Sent': - state.sent_count = str(sqlQuery("SELECT COUNT(*) FROM {0} WHERE fromaddress = '{1}' and folder = '{0}' ;".format(text.lower(), state.association))[0][0]) + state.sent_count = str( + sqlQuery("SELECT COUNT(*) FROM {0} WHERE fromaddress = '{1}' and folder = '{0}' ;".format( + text.lower(), state.association))[0][0]) return state.sent_count elif text == 'Inbox': - state.inbox_count = str(sqlQuery("SELECT COUNT(*) FROM {0} WHERE fromaddress = '{1}' and folder = '{0}' ;".format(text.lower(), state.association))[0][0]) + state.inbox_count = str( + sqlQuery( + "SELECT COUNT(*) FROM {0} WHERE fromaddress = '{1}' and folder = '{0}' ;".format( + text.lower(), state.association))[0][0]) return state.inbox_count elif text == 'Trash': - state.trash_count = str(sqlQuery("SELECT (SELECT count(*) FROM sent where fromaddress = '{0}' and folder = 'trash' )+(SELECT count(*) FROM inbox where fromaddress = '{0}' and folder = 'trash') AS SumCount".format(state.association))[0][0]) + state.trash_count = str( + sqlQuery( + "SELECT (SELECT count(*) FROM sent where fromaddress = '{0}' and folder = 'trash' )\ + +(SELECT count(*) FROM inbox where fromaddress = '{0}' and folder = 'trash') AS SumCount".format( + state.association))[0][0]) return state.trash_count elif text == 'Draft': - state.draft_count = str(sqlQuery("SELECT COUNT(*) FROM sent WHERE fromaddress = '{1}' and folder = '{0}' ;".format(text.lower(), state.association))[0][0]) + state.draft_count = str( + sqlQuery( + "SELECT COUNT(*) FROM sent WHERE fromaddress = '{1}' and folder = '{0}' ;".format( + text.lower(), state.association))[0][0]) return state.draft_count def current_address_label(self, current_address=None): + """Getting current address labels.""" if BMConfigParser().addresses() or current_address: if current_address: first_name = current_address else: first_name = BMConfigParser().get(BMConfigParser().addresses()[0], 'label') f_name = first_name.split() - return f_name[0][:14]+ '...' if len(f_name[0])>15 else f_name[0] + return f_name[0][:14] + '...' if len(f_name[0]) > 15 else f_name[0] return '' def searchQuery(self, instance, text): - '''This method is used for showing searched mails''' + """Method used for showing searched mails.""" if self.root.ids.search_input.opacity == 0: self.root.ids.search_input.opacity = 1 - self.root.ids.search_input.size_hint = 4,None + self.root.ids.search_input.size_hint = 4, None # self.root.ids.serch_btn.opacity = 0 # self.root.ids.serch_btn.disabled = True self.root.ids.search_input.disabled = False @@ -957,10 +1038,10 @@ class NavigateApp(App): self.root.ids.scr_mngr.current = state.search_screen def reset_navdrawer(self, instance): - '''This methos is used for reseting navigation drawer''' + """Method used for reseting navigation drawer.""" self.root.ids.search_input.text = '' self.root.ids.search_input.opacity = 0 - self.root.ids.search_input.size_hint = 1,None + self.root.ids.search_input.size_hint = 1, None self.root.ids.search_input.disabled = True self.root.ids.toolbar.left_action_items = [['menu', lambda x: self.root.toggle_nav_drawer()]] self.root.ids.toolbar.title = self.current_address_label() @@ -969,7 +1050,7 @@ class NavigateApp(App): self.root.ids.reset_navbar.opacity = 0 self.root.ids.reset_navbar.disabled = True state.searcing_text = '' - if state.search_screen == 'inbox': + if state.search_screen == 'inbox': self.root.ids.sc1.clear_widgets() self.root.ids.sc1.add_widget(Inbox()) else: @@ -977,7 +1058,7 @@ class NavigateApp(App): self.root.ids.sc4.add_widget(Sent()) def check_search_screen(self, instance): - '''This method is used for showing search button only on inbox or sent screen''' + """Method used for showing search button only on inbox or sent screen.""" if instance.text == 'Inbox' or instance.text == 'Sent': self.root.ids.serch_btn.opacity = 1 self.root.ids.serch_btn.disabled = False @@ -993,7 +1074,10 @@ class NavigateApp(App): class GrashofPopup(Popup): + """Methods for saving contacts, error messages.""" + def __init__(self, **kwargs): + """Grash of pop screen settings.""" super(GrashofPopup, self).__init__(**kwargs) if state.screen_density[0] <= 720: self.size_hint_y = 0.4 @@ -1003,6 +1087,7 @@ class GrashofPopup(Popup): self.size_hint_x = 0.7 def savecontact(self): + """Method is used for Saving Contacts.""" my_addresses = self.parent.children[1].children[2].children[0].ids.btn.values entered_text = str(self.ids.label.text) if entered_text in my_addresses: @@ -1024,6 +1109,7 @@ class GrashofPopup(Popup): self.parent.children[1].ids.scr_mngr.current = 'addressbook' def show_error_message(self): + """Showing error message.""" content = MDLabel(font_style='Body1', theme_text_color='Secondary', text="Hey you are not allowed to save blank address contact. " @@ -1042,34 +1128,40 @@ class GrashofPopup(Popup): class AvatarSampleWidget(ILeftBody, Image): + """Avatar Sample Widget.""" + pass class IconLeftSampleWidget(ILeftBodyTouch, MDIconButton): + """Left icon sample widget.""" + pass class IconRightSampleWidget(IRightBodyTouch, MDCheckbox): + """Right icon sample widget.""" pass class NavigationDrawerTwoLineListItem( TwoLineListItem, NavigationDrawerHeaderBase): + """Navigation Drawer in Listitems.""" address_property = StringProperty() def __init__(self, **kwargs): + """Method for Navigation Drawer.""" super(NavigationDrawerTwoLineListItem, self).__init__(**kwargs) Clock.schedule_once(lambda dt: self.setup()) def setup(self): - """ - Binds Controller.current_account property. - """ + """Bind Controller.current_account property.""" pass def on_current_account(self, account): + """Account detail.""" pass def _update_specific_text_color(self, instance, value): @@ -1081,14 +1173,16 @@ class NavigationDrawerTwoLineListItem( class MailDetail(Screen): """MailDetail Screen uses to show the detail of mails.""" + to_addr = StringProperty() from_addr = StringProperty() subject = StringProperty() message = StringProperty() status = StringProperty() - page_type = StringProperty() + page_type = StringProperty() def __init__(self, *args, **kwargs): + """Mail Details method.""" super(MailDetail, self).__init__(*args, **kwargs) Clock.schedule_once(self.init_ui, 0) @@ -1096,15 +1190,20 @@ class MailDetail(Screen): """Clock Schdule for method MailDetail mails.""" self.page_type = state.detailPageType if state.detailPageType else '' if state.detailPageType == 'sent': - data = sqlQuery("select toaddress, fromaddress, subject, message , status, ackdata from sent where lastactiontime = {};".format(state.sentMailTime)) + data = sqlQuery( + "select toaddress, fromaddress, subject, message , status, ackdata from sent \ + where lastactiontime = {};".format(state.sentMailTime)) state.status = self state.ackdata = data[0][5] self.assign_mail_details(data) elif state.detailPageType == 'inbox': - data = sqlQuery("select toaddress, fromaddress, subject, message from inbox where received = {};".format(state.sentMailTime)) + data = sqlQuery( + "select toaddress, fromaddress, subject, message from inbox where received = {};".format( + state.sentMailTime)) self.assign_mail_details(data) - def assign_mail_details(self, data): + def assign_mail_details(self, data): + """Assigning mail details.""" self.to_addr = data[0][0] self.from_addr = data[0][1] self.subject = data[0][2].upper() @@ -1113,7 +1212,8 @@ class MailDetail(Screen): self.status = data[0][4] def delete_mail(self): - msg_count_objs =self.parent.parent.parent.parent.parent.children[2].children[0].ids + """Method for mail delete.""" + msg_count_objs = self.parent.parent.parent.parent.parent.children[2].children[0].ids if state.detailPageType == 'sent': sqlExecute("UPDATE sent SET folder = 'trash' WHERE lastactiontime = {};".format(state.sentMailTime)) msg_count_objs.send_cnt.badge_text = str(int(state.sent_count) - 1) @@ -1136,8 +1236,10 @@ class MailDetail(Screen): self.parent.parent.parent.parent.parent.ids.serch_btn.disabled = False def inbox_reply(self): - """This method is used for replying inbox messages""" - data = sqlQuery("select toaddress, fromaddress, subject, message from inbox where received = {};".format(state.sentMailTime)) + """Method used for replying inbox messages.""" + data = sqlQuery( + "select toaddress, fromaddress, subject, message from inbox where received = {};".format( + state.sentMailTime)) composer_obj = self.parent.parent.screens[2].children[0].ids composer_obj.ti.text = data[0][1] composer_obj.btn.text = data[0][1] @@ -1146,16 +1248,18 @@ class MailDetail(Screen): self.parent.parent.current = 'create' def copy_sent_mail(self): - """This method is used for copying sent mail to the composer""" + """Method used for copying sent mail to the composer.""" pass class MyaddDetailPopup(Popup): - """MyaddDetailPopup pop is used for showing my address detail""" + """MyaddDetailPopup pop is used for showing my address detail.""" + address_label = StringProperty() address = StringProperty() def __init__(self, **kwargs): + """My Address Details screen setting.""" super(MyaddDetailPopup, self).__init__(**kwargs) if state.screen_density[0] <= 720: self.size_hint_y = 0.32 @@ -1165,12 +1269,12 @@ class MyaddDetailPopup(Popup): self.size_hint_x = 0.7 def set_address(self, address, label): - """Getting address for displaying details on popup""" + """Getting address for displaying details on popup.""" self.address_label = label self.address = address def send_message_from(self): - """This method used to fill from address of composer autofield""" + """Method used to fill from address of composer autofield.""" window_obj = self.parent.children[1].ids window_obj.sc3.children[0].ids.ti.text = self.address window_obj.sc3.children[0].ids.btn.text = self.address @@ -1180,12 +1284,15 @@ class MyaddDetailPopup(Popup): window_obj.scr_mngr.current = 'create' self.dismiss() + class AddbookDetailPopup(Popup): - """AddbookDetailPopup pop is used for showing my address detail""" + """AddbookDetailPopup pop is used for showing my address detail.""" + address_label = StringProperty() address = StringProperty() def __init__(self, **kwargs): + """Method used set screen of address detail page.""" super(AddbookDetailPopup, self).__init__(**kwargs) if state.screen_density[0] <= 720: self.size_hint_y = 0.35 @@ -1195,20 +1302,23 @@ class AddbookDetailPopup(Popup): self.size_hint_x = 0.7 def set_addbook_data(self, address, label): - """Getting address book data for detial dipaly""" + """Getting address book data for detial dipaly.""" self.address_label = label self.address = address def update_addbook_label(self, address): - """Updating the label of address book address""" + """Updating the label of address book address.""" if str(self.ids.add_label.text): - sqlExecute("UPDATE addressbook SET label = '{}' WHERE address = '{}';".format(str(self.ids.add_label.text), address)) + sqlExecute( + "UPDATE addressbook SET label = '{}' WHERE address = '{}';".format( + str( + self.ids.add_label.text), address)) self.parent.children[1].ids.sc11.clear_widgets() self.parent.children[1].ids.sc11.add_widget(AddressBook()) self.dismiss() def send_message_to(self): - """This method used to fill to_address of composer autofield""" + """Method used to fill to_address of composer autofield.""" window_obj = self.parent.children[1].ids window_obj.sc3.children[0].ids.txt_input.text = self.address window_obj.sc3.children[0].ids.ti.text = '' @@ -1223,6 +1333,7 @@ class ShowQRCode(Screen): """ShowQRCode Screen uses to show the detail of mails.""" def qrdisplay(self): + """Method used for showing QR Code.""" self.ids.qr.clear_widgets() if platform == 'android': from kivy.garden.qrcode import QRCodeWidget @@ -1231,9 +1342,11 @@ class ShowQRCode(Screen): class Draft(Screen): """Draft screen is used to show the list of draft messages.""" + data = ListProperty() def __init__(self, *args, **kwargs): + """Method used for storing draft messages.""" super(Draft, self).__init__(*args, **kwargs) if state.association == '': if BMConfigParser().addresses(): @@ -1261,9 +1374,19 @@ class Draft(Screen): if queryreturn: for mail in queryreturn: third_text = mail[3].replace('\n', ' ') - self.data.append({'text': mail[1].strip(), 'secondary_text': mail[2][:10] + '...........' if len(mail[2]) > 10 else mail[2] + '\n' + " " + (third_text[:25] + '...!') if len(third_text) > 25 else third_text, 'lastactiontime': mail[6]}) + self.data.append({ + 'text': mail[1].strip(), + 'secondary_text': mail[2][:10] + '...........' if len( + mail[2]) > 10 else mail[2] + '\n' + " " + ( + third_text[:25] + '...!') if len( + third_text) > 25 else third_text, + 'lastactiontime': mail[6]}) for item in self.data: - meny = TwoLineAvatarIconListItem(text='Draft', secondary_text=item['text'], theme_text_color= 'Custom',text_color=NavigateApp().theme_cls.primary_color) + meny = TwoLineAvatarIconListItem( + text='Draft', + secondary_text=item['text'], + theme_text_color='Custom', + text_color=NavigateApp().theme_cls.primary_color) meny.add_widget(AvatarSampleWidget(source='./images/avatar.png')) carousel = Carousel(direction='right') if platform == 'android': @@ -1280,7 +1403,7 @@ class Draft(Screen): del_btn.bind(on_press=partial(self.delete_draft, item['lastactiontime'])) carousel.add_widget(del_btn) carousel.add_widget(meny) - carousel.index=1 + carousel.index = 1 self.ids.ml.add_widget(carousel) else: content = MDLabel(font_style='Body1', @@ -1293,7 +1416,7 @@ class Draft(Screen): self.ids.ml.add_widget(content) def delete_draft(self, data_index, instance, *args): - """This method is used to delete draft message permanently""" + """Method used to delete draft message permanently.""" sqlExecute("DELETE FROM sent WHERE lastactiontime = '{}';".format(data_index)) try: msg_count_objs = self.parent.parent.parent.parent.children[2].children[0].ids @@ -1305,7 +1428,7 @@ class Draft(Screen): self.ids.ml.remove_widget(instance.parent.parent) def draft_msg(self, src_object): - """This method is used for saving draft mails""" + """Method used for saving draft mails.""" composer_object = src_object.children[1].children[0].children[0].children[0].children[0].ids fromAddress = str(composer_object.ti.text) toAddress = str(composer_object.txt_input.text) @@ -1317,7 +1440,7 @@ class Draft(Screen): from addresses import decodeAddress status, addressVersionNumber, streamNumber, ripe = decodeAddress( toAddress) - from addresses import * + from addresses import addBMIfNotPresent toAddress = addBMIfNotPresent(toAddress) statusIconColor = 'red' stealthLevel = BMConfigParser().safeGetInt( @@ -1351,19 +1474,20 @@ class Draft(Screen): def show_search_btn(self): - '''This method is used to show search button''' + """Method used to show search button.""" self.root.ids.serch_btn.opacity = 1 self.root.ids.serch_btn.disabled = False def hide_search_btn(mgr_objs): - '''This method is used to hide search button and search box''' + """Method used to hide search button and search box.""" mgr_objs.parent.parent.parent.ids.serch_btn.opacity = 0 mgr_objs.parent.parent.parent.ids.serch_btn.disabled = True - mgr_objs.parent.parent.parent.ids.search_input.size_hint = 1,None + mgr_objs.parent.parent.parent.ids.search_input.size_hint = 1, None mgr_objs.parent.parent.parent.ids.search_input.disabled = True mgr_objs.parent.parent.parent.ids.search_input.opacity = 0 - mgr_objs.parent.parent.parent.ids.toolbar.left_action_items = [['menu', lambda x: mgr_objs.parent.parent.parent.toggle_nav_drawer()]] + mgr_objs.parent.parent.parent.ids.toolbar.left_action_items = \ + [['menu', lambda x: mgr_objs.parent.parent.parent.toggle_nav_drawer()]] mgr_objs.parent.parent.parent.ids.toolbar.title = NavigateApp().current_address_label() mgr_objs.parent.parent.parent.ids.myButton.opacity = 1 mgr_objs.parent.parent.parent.ids.myButton.disabled = False @@ -1372,9 +1496,10 @@ def hide_search_btn(mgr_objs): class CustomSpinner(Spinner): - '''This class is used for setting spinner size''' + """This class is used for setting spinner size.""" + def __init__(self, *args, **kwargs): - '''This methods is used for setting size of spinner''' + """Method used for setting size of spinner.""" super(CustomSpinner, self).__init__(*args, **kwargs) max = 2.8 - self.dropdown_cls.max_height = self.height * max + max * 4 \ No newline at end of file + self.dropdown_cls.max_height = self.height * max + max * 4 From e494a5589ac099bd826b1f34cc2ab178a67abc67 Mon Sep 17 00:00:00 2001 From: lakshyacis Date: Mon, 5 Aug 2019 15:49:19 +0530 Subject: [PATCH 3/4] Autopep8 fixes part1 --- src/bitmessagekivy/mpybit.py | 309 ++++++++++++++++++++++------------- 1 file changed, 194 insertions(+), 115 deletions(-) diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index 9147a7eb..e4e172bc 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -9,10 +9,15 @@ from kivymd.button import MDIconButton from kivymd.dialog import MDDialog from kivymd.label import MDLabel from kivymd.list import ILeftBody, ILeftBodyTouch, IRightBodyTouch -from kivymd.navigationdrawer import MDNavigationDrawer, NavigationDrawerHeaderBase +from kivymd.navigationdrawer import ( + MDNavigationDrawer, + NavigationDrawerHeaderBase) from kivymd.selectioncontrols import MDCheckbox from kivymd.theming import ThemeManager -from kivymd.list import ThreeLineAvatarIconListItem, TwoLineAvatarIconListItem, TwoLineListItem +from kivymd.list import ( + ThreeLineAvatarIconListItem, + TwoLineAvatarIconListItem, + TwoLineListItem) from kivy.properties import ListProperty, StringProperty, BooleanProperty from kivy.clock import Clock from bmconfigparser import BMConfigParser @@ -98,13 +103,14 @@ class Inbox(Screen): secondary_text=item['secondary_text'], theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget( - AvatarSampleWidget( - source='./images/text_images/{}.png'.format( - item['secondary_text'][0].upper() if ( - item['secondary_text'][0].upper() >= 'A' and item[ - 'secondary_text'][0].upper() <= 'Z') else '!'))) - meny.bind(on_press=partial(self.inbox_detail, item['receivedTime'])) + meny.add_widget(AvatarSampleWidget( + source='./images/text_images/{}.png'.format( + item['secondary_text'][0].upper() if ( + item['secondary_text'][0].upper() >= 'A' and item[ + 'secondary_text'][0].upper() <= 'Z') + else '!'))) + meny.bind(on_press=partial( + self.inbox_detail, item['receivedTime'])) carousel = Carousel(direction='right') if platform == 'android': carousel.height = 150 @@ -117,23 +123,26 @@ class Inbox(Screen): del_btn = Button(text='Delete') del_btn.background_normal = '' del_btn.background_color = (1, 0, 0, 1) - del_btn.bind(on_press=partial(self.delete, item['receivedTime'])) + del_btn.bind(on_press=partial( + self.delete, item['receivedTime'])) carousel.add_widget(del_btn) carousel.add_widget(meny) ach_btn = Button(text='Achieve') ach_btn.background_color = (0, 1, 0, 1) - ach_btn.bind(on_press=partial(self.archive, item['receivedTime'])) + ach_btn.bind(on_press=partial( + self.archive, item['receivedTime'])) carousel.add_widget(ach_btn) carousel.index = 1 self.ids.ml.add_widget(carousel) else: - content = MDLabel(font_style='Body1', - theme_text_color='Primary', - text="yet no message for this account!!!!!!!!!!!!!", - halign='center', - bold=True, - size_hint_y=None, - valign='top') + content = MDLabel( + font_style='Body1', + theme_text_color='Primary', + text="yet no message for this account!!!!!!!!!!!!!", + halign='center', + bold=True, + size_hint_y=None, + valign='top') self.ids.ml.add_widget(content) def inbox_detail(self, receivedTime, *args): @@ -152,11 +161,16 @@ class Inbox(Screen): def delete(self, data_index, instance, *args): """Delete inbox mail from inbox listing.""" - sqlExecute("UPDATE inbox SET folder = 'trash' WHERE received = {};".format(data_index)) - msg_count_objs = self.parent.parent.parent.parent.children[2].children[0].ids + sqlExecute( + "UPDATE inbox SET folder = 'trash' WHERE received = {};".format( + data_index)) + msg_count_objs = \ + self.parent.parent.parent.parent.children[2].children[0].ids if int(state.inbox_count) > 0: - msg_count_objs.inbox_cnt.badge_text = str(int(state.inbox_count) - 1) - msg_count_objs.trash_cnt.badge_text = str(int(state.trash_count) + 1) + msg_count_objs.inbox_cnt.badge_text = str( + int(state.inbox_count) - 1) + msg_count_objs.trash_cnt.badge_text = str( + int(state.trash_count) + 1) state.inbox_count = str(int(state.inbox_count) - 1) state.trash_count = str(int(state.trash_count) + 1) self.ids.ml.remove_widget(instance.parent.parent) @@ -164,7 +178,8 @@ class Inbox(Screen): def archive(self, data_index, instance, *args): """Archive inbox mail from inbox listing.""" - sqlExecute("UPDATE inbox SET folder = 'trash' WHERE received = {};".format(data_index)) + sqlExecute("UPDATE inbox SET folder = 'trash' WHERE \ + received = {};".format(data_index)) self.ids.ml.remove_widget(instance.parent.parent) self.update_trash() @@ -178,7 +193,8 @@ class Inbox(Screen): self.parent.parent.screens[4].add_widget(Trash()) def refresh_callback(self, *args): - """A method that updates the state of your application while the spinner remains on the screen.""" + """A method that updates the state of your application.""" + """While the spinner remains on the screen.""" def refresh_callback(interval): """Method used for loading the inbox screen data.""" self.ids.ml.clear_widgets() @@ -207,7 +223,9 @@ class MyAddress(Screen): if BMConfigParser().addresses() or state.kivyapp.variable_1: data = [] for address in state.kivyapp.variable_1: - data.append({'text': BMConfigParser().get(address, 'label'), 'secondary_text': address}) + data.append({ + 'text': BMConfigParser().get(address, 'label'), + 'secondary_text': address}) for item in data: meny = TwoLineAvatarIconListItem( text=item['text'], @@ -216,18 +234,22 @@ class MyAddress(Screen): text_color=NavigateApp().theme_cls.primary_color) meny.add_widget(AvatarSampleWidget( source='./images/text_images/{}.png'.format( - item['text'][0].upper() if (item['text'][0].upper() >= 'A' and item[ - 'text'][0].upper() <= 'Z') else '!'))) - meny.bind(on_press=partial(self.myadd_detail, item['secondary_text'], item['text'])) + item['text'][0].upper() if ( + item['text'][0].upper() >= 'A' and item['text'][ + 0].upper() <= 'Z') + else '!'))) + meny.bind(on_press=partial( + self.myadd_detail, item['secondary_text'], item['text'])) self.ids.ml.add_widget(meny) else: - content = MDLabel(font_style='Body1', - theme_text_color='Primary', - text="yet no address is created by user!!!!!!!!!!!!!", - halign='center', - bold=True, - size_hint_y=None, - valign='top') + content = MDLabel( + font_style='Body1', + theme_text_color='Primary', + text="yet no address is created by user!!!!!!!!!!!!!", + halign='center', + bold=True, + size_hint_y=None, + valign='top') self.ids.ml.add_widget(content) try: self.manager.current = 'login' @@ -241,7 +263,8 @@ class MyAddress(Screen): p.set_address(fromaddress, label) def refresh_callback(self, *args): - """A method that updates the state of your application while the spinner remains on the screen.""" + """A method that updates the state of your application.""" + """While the spinner remains on the screen.""" def refresh_callback(interval): """Method used for loading the myaddress screen data.""" self.ids.ml.clear_widgets() @@ -277,8 +300,11 @@ class AddressBook(Screen): text_color=NavigateApp().theme_cls.primary_color) meny.add_widget(AvatarSampleWidget( source='./images/text_images/{}.png'.format( - item[0][0].upper() if (item[0][0].upper() >= 'A' and item[0][0].upper() <= 'Z') else '!'))) - meny.bind(on_press=partial(self.addBook_detail, item[1], item[0])) + item[0][0].upper() if ( + item[0][0].upper() >= 'A' and item[0][ + 0].upper() <= 'Z') else '!'))) + meny.bind(on_press=partial( + self.addBook_detail, item[1], item[0])) carousel = Carousel(direction='right') if platform == 'android': carousel.height = 140 @@ -320,7 +346,8 @@ class AddressBook(Screen): def delete_address(self, address, instance, *args): """Delete inbox mail from inbox listing.""" self.ids.ml.remove_widget(instance.parent.parent) - sqlExecute("DELETE FROM addressbook WHERE address = '{}';".format(address)) + sqlExecute( + "DELETE FROM addressbook WHERE address = '{}';".format(address)) class SelectableRecycleBoxLayout(FocusBehavior, LayoutSelectionBehavior, @@ -385,14 +412,15 @@ class DropDownWidget(BoxLayout): if sendMessageToPeople: if toAddress != '' and subject and message: from addresses import decodeAddress - status, addressVersionNumber, streamNumber, ripe = decodeAddress( - toAddress) + status, addressVersionNumber, streamNumber, ripe = \ + decodeAddress(toAddress) if status == 'success': from addresses import addBMIfNotPresent toAddress = addBMIfNotPresent(toAddress) statusIconColor = 'red' if addressVersionNumber > 4 or addressVersionNumber <= 1: - print("addressVersionNumber > 4 or addressVersionNumber <= 1") + print("addressVersionNumber > 4 \ + or addressVersionNumber <= 1") if streamNumber > 1 or streamNumber == 0: print("streamNumber > 1 or streamNumber == 0") if statusIconColor == 'red': @@ -403,7 +431,8 @@ class DropDownWidget(BoxLayout): ackdata = genAckPayload(streamNumber, stealthLevel) t = () sqlExecute( - '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', + '''INSERT INTO sent VALUES + (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', '', toAddress, ripe, @@ -420,8 +449,8 @@ class DropDownWidget(BoxLayout): encoding, BMConfigParser().getint('bitmessagesettings', 'ttl')) state.check_sent_acc = fromAddress - state.msg_counter_objs = \ - self.parent.parent.parent.parent.parent.parent.children[0].children[2].children[0].ids + state.msg_counter_objs = self.parent.parent.parent.parent\ + .parent.parent.children[0].children[2].children[0].ids self.parent.parent.screens[3].clear_widgets() self.parent.parent.screens[3].add_widget(Sent()) toLabel = '' @@ -434,8 +463,10 @@ class DropDownWidget(BoxLayout): self.parent.parent.current = 'sent' self.ids.btn.text = 'select' self.ids.ti.text = '' - self.parent.parent.parent.parent.parent.ids.serch_btn.opacity = 1 - self.parent.parent.parent.parent.parent.ids.serch_btn.disabled = False + self.parent.parent.parent.parent.parent\ + .ids.serch_btn.opacity = 1 + self.parent.parent.parent.parent.parent\ + .ids.serch_btn.disabled = False return None else: @@ -449,14 +480,26 @@ class DropDownWidget(BoxLayout): def address_error_message(self, msg): """Show Error Message.""" self.box = FloatLayout() - self.lab = (Label(text=msg, font_size=25, - size_hint=(None, None), pos_hint={'x': .25, 'y': .6})) + self.lab = (Label( + text=msg, + font_size=25, + size_hint=(None, None), + pos_hint={'x': .25, 'y': .6})) self.box.add_widget(self.lab) - self.but = (Button(text="dismiss", size_hint=(None, None), - width=200, height=50, pos_hint={'x': .3, 'y': 0})) + self.but = (Button( + text="dismiss", + size_hint=(None, None), + width=200, + height=50, + pos_hint={'x': .3, 'y': 0})) self.box.add_widget(self.but) - self.main_pop = Popup(title="Error", content=self.box, - size_hint=(None, None), size=(550, 400), auto_dismiss=False, title_size=30) + self.main_pop = Popup( + title="Error", + content=self.box, + size_hint=(None, None), + size=(550, 400), + auto_dismiss=False, + title_size=30) self.but.bind(on_press=self.main_pop.dismiss) self.main_pop.open() @@ -476,15 +519,15 @@ class MyTextInput(TextInput): def on_text(self, instance, value): """Find all the occurrence of the word.""" + import pdb;pdb.set_trace() self.parent.parent.parent.parent.ids.rv.data = [] matches = [self.word_list[i] for i in range( - len(self.word_list)) if self.word_list[i][:self.starting_no] == value[:self.starting_no]] - # display the data in the recycleview + len(self.word_list)) if self.word_list[ + i][:self.starting_no] == value[:self.starting_no]] display_data = [] for i in matches: display_data.append({'text': i}) self.parent.parent.parent.parent.ids.rv.data = display_data - # ensure the size is okay if len(matches) <= 10: self.parent.height = (250 + (len(matches) * 20)) else: @@ -495,7 +538,8 @@ class MyTextInput(TextInput): if self.suggestion_text and keycode[1] == 'tab': self.insert_text(self.suggestion_text + ' ') return True - return super(MyTextInput, self).keyboard_on_key_down(window, keycode, text, modifiers) + return super(MyTextInput, self).keyboard_on_key_down( + window, keycode, text, modifiers) class Payment(Screen): @@ -513,11 +557,15 @@ class Login(Screen): class NetworkStat(Screen): """Method used to show network stat.""" - text_variable_1 = StringProperty('{0}::{1}'.format('Total Connections', '0')) - text_variable_2 = StringProperty('Processed {0} per-to-per messages'.format('0')) - text_variable_3 = StringProperty('Processed {0} brodcast messages'.format('0')) + text_variable_1 = StringProperty( + '{0}::{1}'.format('Total Connections', '0')) + text_variable_2 = StringProperty( + 'Processed {0} per-to-per messages'.format('0')) + text_variable_3 = StringProperty( + 'Processed {0} brodcast messages'.format('0')) text_variable_4 = StringProperty('Processed {0} public keys'.format('0')) - text_variable_5 = StringProperty('Processed {0} object to be synced'.format('0')) + text_variable_5 = StringProperty( + 'Processed {0} object to be synced'.format('0')) def __init__(self, *args, **kwargs): """Init method for network stat.""" @@ -529,11 +577,16 @@ class NetworkStat(Screen): import network.stats import shared from network import objectracker - self.text_variable_1 = '{0} :: {1}'.format('Total Connections', str(len(network.stats.connectedHostsList()))) - self.text_variable_2 = 'Processed {0} per-to-per messages'.format(str(shared.numberOfMessagesProcessed)) - self.text_variable_3 = 'Processed {0} brodcast messages'.format(str(shared.numberOfBroadcastsProcessed)) - self.text_variable_4 = 'Processed {0} public keys'.format(str(shared.numberOfPubkeysProcessed)) - self.text_variable_5 = '{0} object to be synced'.format(len(objectracker.missingObjects)) + self.text_variable_1 = '{0} :: {1}'.format( + 'Total Connections', str(len(network.stats.connectedHostsList()))) + self.text_variable_2 = 'Processed {0} per-to-per messages'.format( + str(shared.numberOfMessagesProcessed)) + self.text_variable_3 = 'Processed {0} brodcast messages'.format( + str(shared.numberOfBroadcastsProcessed)) + self.text_variable_4 = 'Processed {0} public keys'.format( + str(shared.numberOfPubkeysProcessed)) + self.text_variable_5 = '{0} object to be synced'.format( + len(objectracker.missingObjects)) class ContentNavigationDrawer(Navigatorss): @@ -568,8 +621,6 @@ class Random(Screen): self.ids.label.text = '' self.parent.parent.parent.parent.ids.toolbar.opacity = 1 self.parent.parent.parent.parent.ids.toolbar.disabled = False - - # state.myAddressObj = self.parent.parent.parent.parent.ids.sc10 self.parent.parent.parent.parent.ids.sc10.clear_widgets() self.parent.parent.parent.parent.ids.sc10.add_widget(MyAddress()) @@ -611,7 +662,8 @@ class Sent(Screen): xAddress = 'fromaddress' queryreturn = kivy_helper_search.search_sql( xAddress, account, "sent", where, what, False) - if state.msg_counter_objs and state.association == state.check_sent_acc: + if state.msg_counter_objs and state.association == \ + state.check_sent_acc: state.msg_counter_objs.send_cnt.badge_text = str(len(queryreturn)) state.sent_count = str(int(state.sent_count) + 1) state.check_sent_acc = None @@ -622,7 +674,8 @@ class Sent(Screen): self.data.append({ 'text': mail[1].strip(), 'secondary_text': mail[2][:10] + '...........' if len( - mail[2]) > 10 else mail[2] + '\n' + " " + (third_text[:25] + '...!') if len( + mail[2]) > 10 else mail[2] + '\n' + " " + ( + third_text[:25] + '...!') if len( third_text) > 25 else third_text, 'lastactiontime': mail[6]}) for item in self.data: @@ -631,13 +684,14 @@ class Sent(Screen): secondary_text=item['secondary_text'], theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget( - AvatarSampleWidget( - source='./images/text_images/{}.png'.format( - item['secondary_text'][0].upper() if ( - item['secondary_text'][0].upper() >= 'A' and item['secondary_text'][ - 0].upper() <= 'Z') else '!'))) - meny.bind(on_press=partial(self.sent_detail, item['lastactiontime'])) + meny.add_widget(AvatarSampleWidget( + source='./images/text_images/{}.png'.format( + item['secondary_text'][0].upper() if ( + item['secondary_text'][0].upper() >= 'A' and item[ + 'secondary_text'][0].upper() <= 'Z') + else '!'))) + meny.bind(on_press=partial( + self.sent_detail, item['lastactiontime'])) carousel = Carousel(direction='right') if platform == 'android': carousel.height = 150 @@ -650,23 +704,26 @@ class Sent(Screen): del_btn = Button(text='Delete') del_btn.background_normal = '' del_btn.background_color = (1.0, 0.0, 0.0, 1.0) - del_btn.bind(on_press=partial(self.delete, item['lastactiontime'])) + del_btn.bind(on_press=partial( + self.delete, item['lastactiontime'])) carousel.add_widget(del_btn) carousel.add_widget(meny) ach_btn = Button(text='Achieve') ach_btn.background_color = (0, 1, 0, 1) - ach_btn.bind(on_press=partial(self.archive, item['lastactiontime'])) + ach_btn.bind(on_press=partial( + self.archive, item['lastactiontime'])) carousel.add_widget(ach_btn) carousel.index = 1 self.ids.ml.add_widget(carousel) else: - content = MDLabel(font_style='Body1', - theme_text_color='Primary', - text="yet no message for this account!!!!!!!!!!!!!", - halign='center', - bold=True, - size_hint_y=None, - valign='top') + content = MDLabel( + font_style='Body1', + theme_text_color='Primary', + text="yet no message for this account!!!!!!!!!!!!!", + halign='center', + bold=True, + size_hint_y=None, + valign='top') self.ids.ml.add_widget(content) def sent_detail(self, lastsenttime, *args): @@ -685,22 +742,29 @@ class Sent(Screen): def delete(self, data_index, instance, *args): """Delete sent mail from sent mail listing.""" try: - msg_count_objs = self.parent.parent.parent.parent.children[2].children[0].ids + msg_count_objs = self.parent.parent.parent.parent.children[ + 2].children[0].ids except Exception as e: - msg_count_objs = self.parent.parent.parent.parent.parent.children[2].children[0].ids + msg_count_objs = self.parent.parent.parent.parent.parent.children[ + 2].children[0].ids if int(state.sent_count) > 0: - msg_count_objs.send_cnt.badge_text = str(int(state.sent_count) - 1) - msg_count_objs.trash_cnt.badge_text = str(int(state.trash_count) + 1) + msg_count_objs.send_cnt.badge_text = str( + int(state.sent_count) - 1) + msg_count_objs.trash_cnt.badge_text = str( + int(state.trash_count) + 1) state.sent_count = str(int(state.sent_count) - 1) state.trash_count = str(int(state.trash_count) + 1) - - sqlExecute("UPDATE sent SET folder = 'trash' WHERE lastactiontime = {};".format(data_index)) + sqlExecute( + "UPDATE sent SET folder = 'trash' \ + WHERE lastactiontime = {};".format(data_index)) self.ids.ml.remove_widget(instance.parent.parent) self.update_trash() def archive(self, data_index, instance, *args): """Archive sent mail from sent mail listing.""" - sqlExecute("UPDATE sent SET folder = 'trash' WHERE lastactiontime = {};".format(data_index)) + sqlExecute( + "UPDATE sent SET folder = 'trash' \ + WHERE lastactiontime = {};".format(data_index)) self.ids.ml.remove_widget(instance.parent.parent) self.update_trash() @@ -730,10 +794,12 @@ class Trash(Screen): inbox = sqlQuery( "SELECT toaddress, fromaddress, subject, message from inbox \ - WHERE folder = 'trash' and fromaddress = '{}';".format(state.association)) + WHERE folder = 'trash' and fromaddress = '{}';".format( + state.association)) sent = sqlQuery( "SELECT toaddress, fromaddress, subject, message from sent \ - WHERE folder = 'trash' and fromaddress = '{}';".format(state.association)) + WHERE folder = 'trash' and fromaddress = '{}';".format( + state.association)) trash_data = inbox + sent for item in trash_data: @@ -743,8 +809,9 @@ class Trash(Screen): theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) meny.add_widget(AvatarSampleWidget( - source='./images/text_images/{}.png'.format(item[2][0].upper() if ( - item[2][0].upper() >= 'A' and item[2][0].upper() <= 'Z') else '!'))) + source='./images/text_images/{}.png'.format( + item[2][0].upper() if (item[2][0].upper() >= 'A' and item[ + 2][0].upper() <= 'Z') else '!'))) self.ids.ml.add_widget(meny) @@ -761,7 +828,9 @@ class Create(Screen): """Getting Labels and address from addressbook.""" super(Create, self).__init__(**kwargs) widget_1 = DropDownWidget() - widget_1.ids.txt_input.word_list = [addr[1] for addr in sqlQuery("SELECT label, address from addressbook")] + widget_1.ids.txt_input.word_list = [ + addr[1] for addr in sqlQuery( + "SELECT label, address from addressbook")] widget_1.ids.txt_input.starting_no = 2 self.add_widget(widget_1) @@ -846,7 +915,8 @@ class NavigateApp(App): def getCurrentAccountData(self, text): """Get Current Address Account Data.""" - address_label = self.current_address_label(BMConfigParser().get(text, 'label')) + address_label = self.current_address_label( + BMConfigParser().get(text, 'label')) self.root_window.children[1].ids.toolbar.title = address_label state.association = text self.root.ids.sc1.clear_widgets() @@ -919,15 +989,16 @@ class NavigateApp(App): def on_key(self, window, key, *args): """Method is used for going on previous screen.""" - if key == 27: # the esc key + if key == 27: if self.root.ids.scr_mngr.current == "mailDetail": self.root.ids.scr_mngr.current = 'sent' if state.detailPageType == 'sent' else 'inbox' show_search_btn(self) - # this is for direction of the screen comesup elif self.root.ids.scr_mngr.current == "create": composer_objs = self.root - from_addr = str(self.root.children[1].children[0].children[0].children[0].children[0].ids.ti.text) - to_addr = str(self.root.children[1].children[0].children[0].children[0].children[0].ids.txt_input.text) + from_addr = str( + self.root.children[1].children[0].children[0].children[0].children[0].ids.ti.text) + to_addr = str( + self.root.children[1].children[0].children[0].children[0].children[0].ids.txt_input.text) if from_addr and to_addr: Draft().draft_msg(composer_objs) self.root.ids.serch_btn.opacity = 1 @@ -1006,7 +1077,8 @@ class NavigateApp(App): if current_address: first_name = current_address else: - first_name = BMConfigParser().get(BMConfigParser().addresses()[0], 'label') + first_name = BMConfigParser().get( + BMConfigParser().addresses()[0], 'label') f_name = first_name.split() return f_name[0][:14] + '...' if len(f_name[0]) > 15 else f_name[0] return '' @@ -1016,8 +1088,6 @@ class NavigateApp(App): if self.root.ids.search_input.opacity == 0: self.root.ids.search_input.opacity = 1 self.root.ids.search_input.size_hint = 4, None - # self.root.ids.serch_btn.opacity = 0 - # self.root.ids.serch_btn.disabled = True self.root.ids.search_input.disabled = False self.root.ids.search_input.focus = True self.root.ids.toolbar.left_action_items = [] @@ -1043,7 +1113,8 @@ class NavigateApp(App): self.root.ids.search_input.opacity = 0 self.root.ids.search_input.size_hint = 1, None self.root.ids.search_input.disabled = True - self.root.ids.toolbar.left_action_items = [['menu', lambda x: self.root.toggle_nav_drawer()]] + self.root.ids.toolbar.left_action_items = [ + ['menu', lambda x: self.root.toggle_nav_drawer()]] self.root.ids.toolbar.title = self.current_address_label() self.root.ids.myButton.opacity = 1 self.root.ids.myButton.disabled = False @@ -1215,15 +1286,18 @@ class MailDetail(Screen): """Method for mail delete.""" msg_count_objs = self.parent.parent.parent.parent.parent.children[2].children[0].ids if state.detailPageType == 'sent': - sqlExecute("UPDATE sent SET folder = 'trash' WHERE lastactiontime = {};".format(state.sentMailTime)) + sqlExecute("UPDATE sent SET folder = 'trash' WHERE lastactiontime = {};".format( + state.sentMailTime)) msg_count_objs.send_cnt.badge_text = str(int(state.sent_count) - 1) state.sent_count = str(int(state.sent_count) - 1) self.parent.parent.screens[3].clear_widgets() self.parent.parent.screens[3].add_widget(Sent()) self.parent.parent.current = 'sent' elif state.detailPageType == 'inbox': - sqlExecute("UPDATE inbox SET folder = 'trash' WHERE received = {};".format(state.sentMailTime)) - msg_count_objs.inbox_cnt.badge_text = str(int(state.inbox_count) - 1) + sqlExecute("UPDATE inbox SET folder = 'trash' WHERE received = {};".format( + state.sentMailTime)) + msg_count_objs.inbox_cnt.badge_text = str( + int(state.inbox_count) - 1) state.inbox_count = str(int(state.inbox_count) - 1) self.parent.parent.screens[0].clear_widgets() self.parent.parent.screens[0].add_widget(Inbox()) @@ -1337,7 +1411,8 @@ class ShowQRCode(Screen): self.ids.qr.clear_widgets() if platform == 'android': from kivy.garden.qrcode import QRCodeWidget - self.ids.qr.add_widget(QRCodeWidget(data=self.manager.get_parent_window().children[0].address)) + self.ids.qr.add_widget(QRCodeWidget( + data=self.manager.get_parent_window().children[0].address)) class Draft(Screen): @@ -1387,7 +1462,8 @@ class Draft(Screen): secondary_text=item['text'], theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/avatar.png')) + meny.add_widget(AvatarSampleWidget( + source='./images/avatar.png')) carousel = Carousel(direction='right') if platform == 'android': carousel.height = 150 @@ -1400,7 +1476,8 @@ class Draft(Screen): del_btn = Button(text='Delete') del_btn.background_normal = '' del_btn.background_color = (1.0, 0.0, 0.0, 1.0) - del_btn.bind(on_press=partial(self.delete_draft, item['lastactiontime'])) + del_btn.bind(on_press=partial( + self.delete_draft, item['lastactiontime'])) carousel.add_widget(del_btn) carousel.add_widget(meny) carousel.index = 1 @@ -1417,13 +1494,15 @@ class Draft(Screen): def delete_draft(self, data_index, instance, *args): """Method used to delete draft message permanently.""" - sqlExecute("DELETE FROM sent WHERE lastactiontime = '{}';".format(data_index)) + sqlExecute( + "DELETE FROM sent WHERE lastactiontime = '{}';".format(data_index)) try: msg_count_objs = self.parent.parent.parent.parent.children[2].children[0].ids except Exception as e: msg_count_objs = self.parent.parent.parent.parent.parent.children[2].children[0].ids if int(state.draft_count) > 0: - msg_count_objs.draft_cnt.badge_text = str(int(state.draft_count) - 1) + msg_count_objs.draft_cnt.badge_text = str( + int(state.draft_count) - 1) state.draft_count = str(int(state.draft_count) - 1) self.ids.ml.remove_widget(instance.parent.parent) From dbe69348f439e51790169dc807ffe47807377ec0 Mon Sep 17 00:00:00 2001 From: lakshyacis Date: Tue, 6 Aug 2019 15:35:03 +0530 Subject: [PATCH 4/4] Autopep8 part 2 --- src/bitmessagekivy/mpybit.py | 164 +++++++++++++++++++---------------- 1 file changed, 89 insertions(+), 75 deletions(-) diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index e4e172bc..483c230d 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -519,7 +519,6 @@ class MyTextInput(TextInput): def on_text(self, instance, value): """Find all the occurrence of the word.""" - import pdb;pdb.set_trace() self.parent.parent.parent.parent.ids.rv.data = [] matches = [self.word_list[i] for i in range( len(self.word_list)) if self.word_list[ @@ -909,7 +908,8 @@ class NavigateApp(App): return "textdemo" elif name == "values": if BMConfigParser().addresses(): - return [address[:16] + '..' for address in BMConfigParser().addresses()] + return [address[:16] + '..' + for address in BMConfigParser().addresses()] else: return "valuesdemo" @@ -929,24 +929,24 @@ class NavigateApp(App): self.root.ids.sc16.add_widget(Draft()) self.root.ids.scr_mngr.current = 'inbox' - msg_counter_objs = self.root_window.children[1].children[2].children[0].ids + msg_counter_objs = \ + self.root_window.children[1].children[2].children[0].ids state.sent_count = str( sqlQuery( - "SELECT COUNT(*) FROM sent WHERE fromaddress = '{}' and folder = 'sent' ;".format( - state.association))[0][0]) + "SELECT COUNT(*) FROM sent WHERE fromaddress = '{}' and \ + folder = 'sent' ;".format(state.association))[0][0]) state.inbox_count = str( sqlQuery( - "SELECT COUNT(*) FROM inbox WHERE fromaddress = '{}' and folder = 'inbox' ;".format( - state.association))[0][0]) - state.trash_count = str( - sqlQuery( - "SELECT (SELECT count(*) FROM sent where fromaddress = '{0}' and folder = 'trash' )\ - +(SELECT count(*) FROM inbox where fromaddress = '{0}' and folder = 'trash') AS SumCount".format( - state.association))[0][0]) + "SELECT COUNT(*) FROM inbox WHERE fromaddress = '{}' and \ + folder = 'inbox' ;".format(state.association))[0][0]) + state.trash_count = str(sqlQuery("SELECT (SELECT count(*) FROM sent \ + where fromaddress = '{0}' and folder = 'trash' ) \ + +(SELECT count(*) FROM inbox where fromaddress = '{0}' and \ + folder = 'trash') AS SumCount".format(state.association))[0][0]) state.draft_count = str( sqlQuery( - "SELECT COUNT(*) FROM sent WHERE fromaddress = '{}' and folder = 'draft' ;".format( - state.association))[0][0]) + "SELECT COUNT(*) FROM sent WHERE fromaddress = '{}' and \ + folder = 'draft' ;".format(state.association))[0][0]) if msg_counter_objs: msg_counter_objs.send_cnt.badge_text = state.sent_count @@ -955,7 +955,7 @@ class NavigateApp(App): msg_counter_objs.draft_cnt.badge_text = state.draft_count def getInboxMessageDetail(self, instance): - """It will get message detail after make selected message description.""" + """Getting message detail after selected message description.""" try: self.root.ids._mngr.current = 'page' except AttributeError: @@ -991,14 +991,15 @@ class NavigateApp(App): """Method is used for going on previous screen.""" if key == 27: if self.root.ids.scr_mngr.current == "mailDetail": - self.root.ids.scr_mngr.current = 'sent' if state.detailPageType == 'sent' else 'inbox' + self.root.ids.scr_mngr.current = \ + 'sent' if state.detailPageType == 'sent' else 'inbox' show_search_btn(self) elif self.root.ids.scr_mngr.current == "create": composer_objs = self.root - from_addr = str( - self.root.children[1].children[0].children[0].children[0].children[0].ids.ti.text) - to_addr = str( - self.root.children[1].children[0].children[0].children[0].children[0].ids.txt_input.text) + from_addr = str(self.root.children[1].children[0].children[ + 0].children[0].children[0].ids.ti.text) + to_addr = str(self.root.children[1].children[0].children[ + 0].children[0].children[0].ids.txt_input.text) if from_addr and to_addr: Draft().draft_msg(composer_objs) self.root.ids.serch_btn.opacity = 1 @@ -1038,7 +1039,7 @@ class NavigateApp(App): def on_stop(self): """On stop methos is used for stoping the runing script.""" - print("**************************EXITING FROM APPLICATION*****************************") + print("*******************EXITING FROM APPLICATION*******************") import shutdown shutdown.doCleanShutdown() @@ -1047,28 +1048,29 @@ class NavigateApp(App): if BMConfigParser().addresses(): state.association = BMConfigParser().addresses()[0] if text == 'Sent': - state.sent_count = str( - sqlQuery("SELECT COUNT(*) FROM {0} WHERE fromaddress = '{1}' and folder = '{0}' ;".format( + state.sent_count = str(sqlQuery( + "SELECT COUNT(*) FROM {0} WHERE fromaddress = '{1}' and \ + folder = '{0}' ;".format( text.lower(), state.association))[0][0]) return state.sent_count elif text == 'Inbox': - state.inbox_count = str( - sqlQuery( - "SELECT COUNT(*) FROM {0} WHERE fromaddress = '{1}' and folder = '{0}' ;".format( - text.lower(), state.association))[0][0]) + state.inbox_count = str(sqlQuery( + "SELECT COUNT(*) FROM {0} WHERE fromaddress = '{1}' and \ + folder = '{0}' ;".format( + text.lower(), state.association))[0][0]) return state.inbox_count elif text == 'Trash': - state.trash_count = str( - sqlQuery( - "SELECT (SELECT count(*) FROM sent where fromaddress = '{0}' and folder = 'trash' )\ - +(SELECT count(*) FROM inbox where fromaddress = '{0}' and folder = 'trash') AS SumCount".format( - state.association))[0][0]) + state.trash_count = str(sqlQuery( + "SELECT (SELECT count(*) FROM sent where fromaddress = '{0}' \ + and folder = 'trash' )+(SELECT count(*) FROM inbox where \ + fromaddress = '{0}' and folder = 'trash') AS SumCount".format( + state.association))[0][0]) return state.trash_count elif text == 'Draft': - state.draft_count = str( - sqlQuery( - "SELECT COUNT(*) FROM sent WHERE fromaddress = '{1}' and folder = '{0}' ;".format( - text.lower(), state.association))[0][0]) + state.draft_count = str(sqlQuery( + "SELECT COUNT(*) FROM sent WHERE fromaddress = '{1}' and \ + folder = '{0}' ;".format( + text.lower(), state.association))[0][0]) return state.draft_count def current_address_label(self, current_address=None): @@ -1129,7 +1131,7 @@ class NavigateApp(App): self.root.ids.sc4.add_widget(Sent()) def check_search_screen(self, instance): - """Method used for showing search button only on inbox or sent screen.""" + """Method shows search button on inbox and sent screen only.""" if instance.text == 'Inbox' or instance.text == 'Sent': self.root.ids.serch_btn.opacity = 1 self.root.ids.serch_btn.disabled = False @@ -1159,7 +1161,8 @@ class GrashofPopup(Popup): def savecontact(self): """Method is used for Saving Contacts.""" - my_addresses = self.parent.children[1].children[2].children[0].ids.btn.values + my_addresses = \ + self.parent.children[1].children[2].children[0].ids.btn.values entered_text = str(self.ids.label.text) if entered_text in my_addresses: self.ids.label.focus = True @@ -1181,12 +1184,13 @@ class GrashofPopup(Popup): def show_error_message(self): """Showing error message.""" - content = MDLabel(font_style='Body1', - theme_text_color='Secondary', - text="Hey you are not allowed to save blank address contact. " - "That's wrong!", - size_hint_y=None, - valign='top') + content = MDLabel( + font_style='Body1', + theme_text_color='Secondary', + text="Hey you are not allowed to save blank address contact. " + "That's wrong!", + size_hint_y=None, + valign='top') content.bind(texture_size=content.setter('size')) self.dialog = MDDialog(content=content, size_hint=(.8, None), @@ -1262,15 +1266,16 @@ class MailDetail(Screen): self.page_type = state.detailPageType if state.detailPageType else '' if state.detailPageType == 'sent': data = sqlQuery( - "select toaddress, fromaddress, subject, message , status, ackdata from sent \ - where lastactiontime = {};".format(state.sentMailTime)) + "select toaddress, fromaddress, subject, message, status, \ + ackdata from sent where lastactiontime = {};".format( + state.sentMailTime)) state.status = self state.ackdata = data[0][5] self.assign_mail_details(data) elif state.detailPageType == 'inbox': data = sqlQuery( - "select toaddress, fromaddress, subject, message from inbox where received = {};".format( - state.sentMailTime)) + "select toaddress, fromaddress, subject, message from inbox \ + where received = {};".format(state.sentMailTime)) self.assign_mail_details(data) def assign_mail_details(self, data): @@ -1284,18 +1289,21 @@ class MailDetail(Screen): def delete_mail(self): """Method for mail delete.""" - msg_count_objs = self.parent.parent.parent.parent.parent.children[2].children[0].ids + msg_count_objs = \ + self.parent.parent.parent.parent.parent.children[2].children[0].ids if state.detailPageType == 'sent': - sqlExecute("UPDATE sent SET folder = 'trash' WHERE lastactiontime = {};".format( - state.sentMailTime)) + sqlExecute( + "UPDATE sent SET folder = 'trash' WHERE \ + lastactiontime = {};".format(state.sentMailTime)) msg_count_objs.send_cnt.badge_text = str(int(state.sent_count) - 1) state.sent_count = str(int(state.sent_count) - 1) self.parent.parent.screens[3].clear_widgets() self.parent.parent.screens[3].add_widget(Sent()) self.parent.parent.current = 'sent' elif state.detailPageType == 'inbox': - sqlExecute("UPDATE inbox SET folder = 'trash' WHERE received = {};".format( - state.sentMailTime)) + sqlExecute( + "UPDATE inbox SET folder = 'trash' WHERE \ + received = {};".format(state.sentMailTime)) msg_count_objs.inbox_cnt.badge_text = str( int(state.inbox_count) - 1) state.inbox_count = str(int(state.inbox_count) - 1) @@ -1312,8 +1320,8 @@ class MailDetail(Screen): def inbox_reply(self): """Method used for replying inbox messages.""" data = sqlQuery( - "select toaddress, fromaddress, subject, message from inbox where received = {};".format( - state.sentMailTime)) + "select toaddress, fromaddress, subject, message from inbox where \ + received = {};".format(state.sentMailTime)) composer_obj = self.parent.parent.screens[2].children[0].ids composer_obj.ti.text = data[0][1] composer_obj.btn.text = data[0][1] @@ -1383,10 +1391,8 @@ class AddbookDetailPopup(Popup): def update_addbook_label(self, address): """Updating the label of address book address.""" if str(self.ids.add_label.text): - sqlExecute( - "UPDATE addressbook SET label = '{}' WHERE address = '{}';".format( - str( - self.ids.add_label.text), address)) + sqlExecute("UPDATE addressbook SET label = '{}' WHERE \ + address = '{}';".format(str(self.ids.add_label.text), address)) self.parent.children[1].ids.sc11.clear_widgets() self.parent.children[1].ids.sc11.add_widget(AddressBook()) self.dismiss() @@ -1483,23 +1489,26 @@ class Draft(Screen): carousel.index = 1 self.ids.ml.add_widget(carousel) else: - content = MDLabel(font_style='Body1', - theme_text_color='Primary', - text="yet no message for this account!!!!!!!!!!!!!", - halign='center', - bold=True, - size_hint_y=None, - valign='top') + content = MDLabel( + font_style='Body1', + theme_text_color='Primary', + text="yet no message for this account!!!!!!!!!!!!!", + halign='center', + bold=True, + size_hint_y=None, + valign='top') self.ids.ml.add_widget(content) def delete_draft(self, data_index, instance, *args): """Method used to delete draft message permanently.""" - sqlExecute( - "DELETE FROM sent WHERE lastactiontime = '{}';".format(data_index)) + sqlExecute("DELETE FROM sent WHERE lastactiontime = '{}';".format( + data_index)) try: - msg_count_objs = self.parent.parent.parent.parent.children[2].children[0].ids + msg_count_objs = \ + self.parent.parent.parent.parent.children[2].children[0].ids except Exception as e: - msg_count_objs = self.parent.parent.parent.parent.parent.children[2].children[0].ids + msg_count_objs = self.parent.parent.parent.parent.parent.children[ + 2].children[0].ids if int(state.draft_count) > 0: msg_count_objs.draft_cnt.badge_text = str( int(state.draft_count) - 1) @@ -1508,7 +1517,8 @@ class Draft(Screen): def draft_msg(self, src_object): """Method used for saving draft mails.""" - composer_object = src_object.children[1].children[0].children[0].children[0].children[0].ids + composer_object = src_object.children[1].children[0].children[ + 0].children[0].children[0].ids fromAddress = str(composer_object.ti.text) toAddress = str(composer_object.txt_input.text) subject = str(composer_object.subject.text) @@ -1517,8 +1527,8 @@ class Draft(Screen): sendMessageToPeople = True if sendMessageToPeople: from addresses import decodeAddress - status, addressVersionNumber, streamNumber, ripe = decodeAddress( - toAddress) + status, addressVersionNumber, streamNumber, ripe = \ + decodeAddress(toAddress) from addresses import addBMIfNotPresent toAddress = addBMIfNotPresent(toAddress) statusIconColor = 'red' @@ -1528,7 +1538,8 @@ class Draft(Screen): ackdata = genAckPayload(streamNumber, stealthLevel) t = () sqlExecute( - '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', + '''INSERT INTO sent VALUES + (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', '', toAddress, ripe, @@ -1560,6 +1571,7 @@ def show_search_btn(self): def hide_search_btn(mgr_objs): """Method used to hide search button and search box.""" + mgr_objs.parent.parent.parent.ids.serch_btn.opacity = 0 mgr_objs.parent.parent.parent.ids.serch_btn.disabled = True mgr_objs.parent.parent.parent.ids.search_input.size_hint = 1, None @@ -1567,7 +1579,8 @@ def hide_search_btn(mgr_objs): mgr_objs.parent.parent.parent.ids.search_input.opacity = 0 mgr_objs.parent.parent.parent.ids.toolbar.left_action_items = \ [['menu', lambda x: mgr_objs.parent.parent.parent.toggle_nav_drawer()]] - mgr_objs.parent.parent.parent.ids.toolbar.title = NavigateApp().current_address_label() + mgr_objs.parent.parent.parent.ids.toolbar.title = \ + NavigateApp().current_address_label() mgr_objs.parent.parent.parent.ids.myButton.opacity = 1 mgr_objs.parent.parent.parent.ids.myButton.disabled = False mgr_objs.parent.parent.parent.ids.reset_navbar.opacity = 0 @@ -1582,3 +1595,4 @@ class CustomSpinner(Spinner): super(CustomSpinner, self).__init__(*args, **kwargs) max = 2.8 self.dropdown_cls.max_height = self.height * max + max * 4 + print(args)