diff --git a/src/netnode.py b/src/netnode.py --- a/src/netnode.py +++ b/src/netnode.py @@ -3,11 +3,11 @@ import socket import logging as log import config as conf -from networkers import NetworkReader,NetworkWriter +from networkers import NetworkReader, NetworkWriter from hashtree import HashTree -lockFile = os.path.join(conf.directory,"dirty.lock") +lock_file = os.path.join(conf.directory, "dirty.lock") class FailedConnection(Exception): pass @@ -15,13 +15,13 @@ class LockedException(Exception): pass class IncompatibleException(Exception): pass -class BaseConnection: # abstract +class BaseConnection: # abstract def __init__(self): self._socket = None self.incoming = None self.outcoming = None - def createNetworkers(self): + def create_networkers(self): fr = self._socket.makefile(mode="rb") fw = self._socket.makefile(mode="wb") @@ -40,35 +40,35 @@ class BaseConnection: # abstract class NetNode: - def __init__(self, filename, treeFile=""): + def __init__(self, filename, tree_file=""): self._incoming = None self._outcoming = None self._filename = filename - self._treeFile = treeFile + self._tree_file = tree_file - if treeFile: - self._tree = HashTree.load(treeFile) + if tree_file: + self._tree = HashTree.load(tree_file) else: - self._tree = HashTree.fromFile(filename) + self._tree = HashTree.from_file(filename) - self._newLeaves = dict() + self._new_leaves = dict() - def isLocked(self): - return os.path.isfile(lockFile) + def is_locked(self): + return os.path.isfile(lock_file) def _lock(self): try: - f = open(lockFile,"x") + f = open(lock_file, "x") f.close() except FileExistsError: raise LockedException() def _unlock(self): - os.remove(lockFile) + os.remove(lock_file) - def _updateTree(self): + def _update_tree(self): log.info("updating hash tree...") - self._tree.batchUpdate(self._newLeaves.items()) - self._tree.save(self._treeFile) + self._tree.batch_update(self._new_leaves.items()) + self._tree.save(self._tree_file) log.info("tree updated")