Minor refactoring

This commit is contained in:
Miroslav Stampar 2014-04-06 18:19:54 +02:00
parent 3beb1ae2a1
commit 9c7fbd1a90
2 changed files with 12 additions and 6 deletions

View File

@ -140,6 +140,11 @@ class PROXY_TYPE:
SOCKS4 = "SOCKS4" SOCKS4 = "SOCKS4"
SOCKS5 = "SOCKS5" SOCKS5 = "SOCKS5"
class REGISTRY_OPERATION:
READ = "read"
ADD = "add"
DELETE = "delete"
class DUMP_FORMAT: class DUMP_FORMAT:
CSV = "CSV" CSV = "CSV"
HTML = "HTML" HTML = "HTML"

View File

@ -10,6 +10,7 @@ import os
from lib.core.common import randomStr from lib.core.common import randomStr
from lib.core.data import conf from lib.core.data import conf
from lib.core.data import logger from lib.core.data import logger
from lib.core.enums import REGISTRY_OPERATION
class Registry: class Registry:
""" """
@ -49,11 +50,11 @@ class Registry:
def _createLocalBatchFile(self): def _createLocalBatchFile(self):
self._batPathFp = open(self._batPathLocal, "w") self._batPathFp = open(self._batPathLocal, "w")
if self._operation == "read": if self._operation == REGISTRY_OPERATION.READ:
lines = self._batRead lines = self._batRead
elif self._operation == "add": elif self._operation == REGISTRY_OPERATION.ADD:
lines = self._batAdd lines = self._batAdd
elif self._operation == "delete": elif self._operation == REGISTRY_OPERATION.DELETE:
lines = self._batDel lines = self._batDel
for line in lines: for line in lines:
@ -70,7 +71,7 @@ class Registry:
os.unlink(self._batPathLocal) os.unlink(self._batPathLocal)
def readRegKey(self, regKey, regValue, parse=False): def readRegKey(self, regKey, regValue, parse=False):
self._operation = "read" self._operation = REGISTRY_OPERATION.READ
Registry._initVars(self, regKey, regValue, parse=parse) Registry._initVars(self, regKey, regValue, parse=parse)
self._createRemoteBatchFile() self._createRemoteBatchFile()
@ -90,7 +91,7 @@ class Registry:
return data return data
def addRegKey(self, regKey, regValue, regType, regData): def addRegKey(self, regKey, regValue, regType, regData):
self._operation = "add" self._operation = REGISTRY_OPERATION.ADD
Registry._initVars(self, regKey, regValue, regType, regData) Registry._initVars(self, regKey, regValue, regType, regData)
self._createRemoteBatchFile() self._createRemoteBatchFile()
@ -103,7 +104,7 @@ class Registry:
self.delRemoteFile(self._batPathRemote) self.delRemoteFile(self._batPathRemote)
def delRegKey(self, regKey, regValue): def delRegKey(self, regKey, regValue):
self._operation = "delete" self._operation = REGISTRY_OPERATION.DELETE
Registry._initVars(self, regKey, regValue) Registry._initVars(self, regKey, regValue)
self._createRemoteBatchFile() self._createRemoteBatchFile()