Moved shared.py functions to respective files, updated function call references & isort imports

Author: kdcis

src/api.py

@@ -57,21 +57,23 @@
 """
 
 import base64
-import ConfigParser
 import errno
 import hashlib
-import httplib
 import json
 import random  # nosec
 import socket
 import subprocess
 import time
-import xmlrpclib
 from binascii import hexlify, unhexlify
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
 from struct import pack
 
+import ConfigParser
+import httplib
+import xmlrpclib
+from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
+
 import defaults
+import helper_addressbook
 import helper_inbox
 import helper_sent
 import network.stats
@@ -80,18 +82,14 @@
 import shared
 import shutdown
 import state
-from addresses import (
-    addBMIfNotPresent,
-    calculateInventoryHash,
-    decodeAddress,
-    decodeVarint,
-    varintDecodeError
-)
+from addresses import (addBMIfNotPresent, calculateInventoryHash,
+                       decodeAddress, decodeVarint, varintDecodeError)
 from bmconfigparser import BMConfigParser
 from debug import logger
 from helper_sql import SqlBulkExecute, sqlExecute, sqlQuery, sqlStoredProcedure
 from inventory import Inventory
 from network.threads import StoppableThread
+from storage import filesystem
 from version import softwareVersion
 
 try:  # TODO: write tests for XML vulnerabilities
@@ -214,8 +212,8 @@ def run(self):
         if BMConfigParser().safeGet(
                 'bitmessagesettings', 'apivariant') == 'json':
             try:
-                from jsonrpclib.SimpleJSONRPCServer import (
-                    SimpleJSONRPCServer as RPCServerBase)
+                from jsonrpclib.SimpleJSONRPCServer import \
+                    SimpleJSONRPCServer as RPCServerBase
             except ImportError:
                 logger.warning(
                     'jsonrpclib not available, failing back to XML-RPC')
@@ -863,7 +861,7 @@ def HandleDeleteAddress(self, address):
                 13, 'Could not find this address in your keys.dat file.')
         self.config.save()
         queues.UISignalQueue.put(('writeNewAddressToTable', ('', '', '')))
-        shared.reloadMyAddressHashes()
+        filesystem.reloadMyAddressHashes()
         return "success"
 
     @command('getAllInboxMessages')
@@ -1205,7 +1203,7 @@ def HandleAddSubscription(self, address, label=''):
             raise APIError(16, 'You are already subscribed to that address.')
         sqlExecute(
             "INSERT INTO subscriptions VALUES (?,?,?)", label, address, True)
-        shared.reloadBroadcastSendersForWhichImWatching()
+        helper_addressbook.reloadBroadcastSendersForWhichImWatching()
         queues.UISignalQueue.put(('rerenderMessagelistFromLabels', ''))
         queues.UISignalQueue.put(('rerenderSubscriptions', ''))
         return 'Added subscription.'
@@ -1219,7 +1217,7 @@ def HandleDeleteSubscription(self, address):
 
         address = addBMIfNotPresent(address)
         sqlExecute("DELETE FROM subscriptions WHERE address=?", address)
-        shared.reloadBroadcastSendersForWhichImWatching()
+        helper_addressbook.reloadBroadcastSendersForWhichImWatching()
         queues.UISignalQueue.put(('rerenderMessagelistFromLabels', ''))
         queues.UISignalQueue.put(('rerenderSubscriptions', ''))
         return 'Deleted subscription if it existed.'

src/bitmessagecurses/__init__.py

@@ -10,27 +10,29 @@
 #     * python2-pythondialog
 #  * dialog
 
-import ConfigParser
 import curses
 import os
 import sys
 import time
 from textwrap import fill
 from threading import Timer
 
+import ConfigParser
 from dialog import Dialog
+
+import helper_addressbook
 import helper_sent
 import l10n
 import network.stats
 import queues
 import shared
 import shutdown
 import state
-
 from addresses import addBMIfNotPresent, decodeAddress
 from bmconfigparser import BMConfigParser
 from helper_sql import sqlExecute, sqlQuery
 from inventory import Inventory
+from storage import filesystem
 
 # pylint: disable=global-statement
 
@@ -635,15 +637,15 @@ def handlech(c, stdscr):
                             else:
                                 addresses[addrcur][3] = 0       # black
                             addresses[addrcur][1] = True
-                            shared.reloadMyAddressHashes()      # Reload address hashes
+                            filesystem.reloadMyAddressHashes()      # Reload address hashes
                         elif t == "5":       # Disable address
                             a = addresses[addrcur][2]
                             BMConfigParser().set(a, "enabled", "false")     # Set config
                             addresses[addrcur][3] = 8       # Set color to gray
                             # Write config
                             BMConfigParser().save()
                             addresses[addrcur][1] = False
-                            shared.reloadMyAddressHashes()      # Reload address hashes
+                            filesystem.reloadMyAddressHashes()      # Reload address hashes
                         elif t == "6":      # Delete address
                             r, t = d.inputbox("Type in \"I want to delete this address\"", width=50)
                             if r == d.DIALOG_OK and t == "I want to delete this address":
@@ -703,7 +705,7 @@ def handlech(c, stdscr):
                             r, t = d.inputbox("New subscription address")
                             if r == d.DIALOG_OK:
                                 addr = addBMIfNotPresent(t)
-                                if not shared.isAddressInMySubscriptionsList(addr):
+                                if not helper_addressbook.isAddressInMySubscriptionsList(addr):
                                     r, t = d.inputbox("New subscription label")
                                     if r == d.DIALOG_OK:
                                         label = t
@@ -713,29 +715,29 @@ def handlech(c, stdscr):
                                         subscriptions.reverse()
 
                                         sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", label, addr, True)
-                                        shared.reloadBroadcastSendersForWhichImWatching()
+                                        helper_addressbook.reloadBroadcastSendersForWhichImWatching()
                         elif t == "2":
                             r, t = d.inputbox("Type in \"I want to delete this subscription\"")
                             if r == d.DIALOG_OK and t == "I want to delete this subscription":
                                 sqlExecute(
                                     "DELETE FROM subscriptions WHERE label=? AND address=?",
                                     subscriptions[subcur][0],
                                     subscriptions[subcur][1])
-                                shared.reloadBroadcastSendersForWhichImWatching()
+                                helper_addressbook.reloadBroadcastSendersForWhichImWatching()
                                 del subscriptions[subcur]
                         elif t == "3":
                             sqlExecute(
                                 "UPDATE subscriptions SET enabled=1 WHERE label=? AND address=?",
                                 subscriptions[subcur][0],
                                 subscriptions[subcur][1])
-                            shared.reloadBroadcastSendersForWhichImWatching()
+                            helper_addressbook.reloadBroadcastSendersForWhichImWatching()
                             subscriptions[subcur][2] = True
                         elif t == "4":
                             sqlExecute(
                                 "UPDATE subscriptions SET enabled=0 WHERE label=? AND address=?",
                                 subscriptions[subcur][0],
                                 subscriptions[subcur][1])
-                            shared.reloadBroadcastSendersForWhichImWatching()
+                            helper_addressbook.reloadBroadcastSendersForWhichImWatching()
                             subscriptions[subcur][2] = False
                 elif menutab == 6:
                     set_background_title(d, "Address Book Dialog Box")
@@ -764,7 +766,7 @@ def handlech(c, stdscr):
                                 subscriptions.reverse()
 
                                 sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", label, addr, True)
-                                shared.reloadBroadcastSendersForWhichImWatching()
+                                helper_addressbook.reloadBroadcastSendersForWhichImWatching()
                         elif t == "3":
                             r, t = d.inputbox("Input new address")
                             if r == d.DIALOG_OK:

src/bitmessagemain.py

@@ -19,6 +19,7 @@
 app_dir = pathmagic.setup()
 
 import depends
+
 depends.check_dependencies()
 
 import getopt
@@ -30,25 +31,25 @@
 import traceback
 
 import defaults
+import helper_addressbook
 import shared
 import shutdown
 import state
 from bmconfigparser import BMConfigParser
 from debug import logger  # this should go before any threads
-from helper_startup import (
-    adjustHalfOpenConnectionsLimit, fixSocket, start_proxyconfig)
+from helper_startup import (adjustHalfOpenConnectionsLimit, fixSocket,
+                            start_proxyconfig)
 from inventory import Inventory
 # Network objects and threads
-from network import (
-    BMConnectionPool, Dandelion, AddrThread, AnnounceThread, BMNetworkThread,
-    InvThread, ReceiveQueueThread, DownloadThread, UploadThread
-)
+from network import (AddrThread, AnnounceThread, BMConnectionPool,
+                     BMNetworkThread, Dandelion, DownloadThread, InvThread,
+                     ReceiveQueueThread, UploadThread)
 from network.knownnodes import readKnownNodes
 from singleinstance import singleinstance
+from storage import filesystem
 # Synchronous threads
-from threads import (
-    set_thread_name, printLock,
-    addressGenerator, objectProcessor, singleCleaner, singleWorker, sqlThread)
+from threads import (addressGenerator, objectProcessor, printLock,
+                     set_thread_name, singleCleaner, singleWorker, sqlThread)
 
 
 def signal_handler(signum, frame):
@@ -235,8 +236,8 @@ def start(self):
 
         # Not needed if objproc disabled
         if state.enableObjProc:
-            shared.reloadMyAddressHashes()
-            shared.reloadBroadcastSendersForWhichImWatching()
+            filesystem.reloadMyAddressHashes()
+            helper_addressbook.reloadBroadcastSendersForWhichImWatching()
 
             # API is also objproc dependent
             if config.safeGetBoolean('bitmessagesettings', 'apienabled'):