isInteractive mode passed in the Rpg construct instead of the init

Author: padawin

core/Rpg.py

@@ -15,11 +15,12 @@
 class Rpg:
 	_debug = False
 
-	def __init__(self, debug=False, renderMode=RENDER_TEXT):
+	def __init__(self, debug=False, renderMode=RENDER_TEXT, isInteractive=True):
 		self._player = None
 		self._debug = debug
 		self._renderMode = renderMode
 		self._action = []
+		self._isInteractive = isInteractive
 
 	def init(self, world, login, password, action=None):
 		if world is None:
@@ -90,7 +91,7 @@ def run(self):
 		else ask the player to enter a command
 		'''
 		if len(self._action) > 0:
-			print(self._runAction(isInteractive=False))
+			print(self._runAction())
 		else:
 			c = ''
 			result = 0
@@ -106,7 +107,7 @@ def run(self):
 
 				if c != "":
 					self._action = self.parseTypedAction(c)
-					result = self._runAction(isInteractive=True)
+					result = self._runAction()
 
 				if result == command_factory.quit:
 					break
@@ -116,9 +117,9 @@ def run(self):
 					print(result)
 					print("")
 
-	def _runAction(self, isInteractive):
+	def _runAction(self):
 		try:
-			c = command_factory.factory.create(self._player, self._action, isInteractive)
+			c = command_factory.factory.create(self._player, self._action, self._isInteractive)
 
 			if c == command_factory.quit:
 				return c

rRpg

@@ -43,7 +43,9 @@ def main(argv):
 	render = core.Rpg.RENDER_TEXT
 	if args.json is not False:
 		render = core.Rpg.RENDER_JSON
-	rpg = core.Rpg.Rpg(args.debug, render)
+
+	isInteractive = args.action == []
+	rpg = core.Rpg.Rpg(args.debug, render, isInteractive)
 
 	world = str(args.world)
 	login = None

tests/common.py

@@ -10,9 +10,9 @@ def __init__(self, methodName='runTest'):
 		unittest.TestCase.__init__(self, methodName)
 		core.config.memoization_enabled = False
 		self.dbFile = "/tmp/rpg.db"
-		self.rpgText = Rpg.Rpg(renderMode=Rpg.RENDER_TEXT)
+		self.rpgText = Rpg.Rpg(renderMode=Rpg.RENDER_TEXT, isInteractive=False)
 		self.rpgText.init(self.dbFile, 'TEST_PLAYER', 'TEST_PLAYER')
-		self.rpgJSON = Rpg.Rpg(renderMode=Rpg.RENDER_JSON)
+		self.rpgJSON = Rpg.Rpg(renderMode=Rpg.RENDER_JSON, isInteractive=False)
 		self.rpgJSON.init(self.dbFile, 'TEST_PLAYER', 'TEST_PLAYER')
 
 	def setUp(self):