dump last json and better time check

Author: Andargor

.gitignore

@@ -60,4 +60,5 @@ target/
 *.xz
 cookies.txt
 *.ini
-lastQuery
+*.time
+*.json

edce/config.py

@@ -36,8 +36,9 @@ def getString(section, key):
 	return res
 
 def performSetup():
-	username = input("Frontier Store Username (leave empty to be prompted at runtime): ").strip()
-	password = getpass.getpass('Frontier Store Password (leave empty to be prompted at runtime): ').strip()
+	print("Enter your Frontier Store credentials here. You can leave your username or password empty, however you will be prompted every time you run the edce_client.py script.")
+	username = input("Frontier Store Username: ").strip()
+	password = getpass.getpass('Frontier Store Password: ').strip()
 	enableEDDN = input("Send market data to EDDN. No private information is sent. [Y/n]: ").strip().lower()
 
 	Config = configparser.ConfigParser()

edce/globals.py

@@ -4,8 +4,7 @@
 	exit()
 
 name = "EDCE"
-version = "0.3"
+version = "1.0"
 
 interactive = False
 debug = False
-lastQuery = 0

edce/query.py

@@ -124,13 +124,18 @@ def initSession():
 	return session
 
 def writeQueryTime():
-	with open("lastQuery", "w") as f:
+	with open("last.time", "w") as f:
 		f.write("%d" % time.time())
 		f.close()
 
+def writeRawJSON(filename, data):
+	with open(filename, "w") as f:
+		f.write(data)
+		f.close()		
+		
 def readQueryTime():
 	try:
-		with open("lastQuery", "r") as f:
+		with open("last.time", "r") as f:
 			t = int(f.readline())
 			f.close()
 			if edce.globals.debug:
@@ -192,6 +197,7 @@ def performQuery(s=None):
 
 	res = submitProfile(session)
 	if checkProfileData(res):
+		writeRawJSON("last.json",res)
 		writeQueryTime()
 		return res
 

edce_client.py

@@ -15,21 +15,21 @@
 
 edce.globals.interactive = True
 edce.globals.debug = False
-edce.eddn.testSchema = True
+edce.eddn.testSchema = False
 
 try:
 	res = edce.query.performQuery()
 
 	data = edce.util.edict(res)
 	edce.util.writeJSONLog(data.commander.name,data.lastSystem.name,data)
 
-	shipId = "%s" % data.commander.currentShipId
 	station = ""
 	if data.commander.docked:
 		station = "/" + data.lastStarport.name
 	print("CMDR:\t" + data.commander.name)
 	print("System:\t" + data.lastSystem.name + station)
 
+	shipId = "%s" % data.commander.currentShipId
 	if shipId in data.ships:
 		print("Ship:\t" + data.ships[shipId].name)