Merge pull request #1 from Vanderlay/xphour-restart-process

xp/hour and restart the process if you completed all the pokestops

Author: Vystery

dirty.py

@@ -4,10 +4,27 @@
 import pokemon_pb2
 import location
 import config
+import main
 from multiprocessing import Process
 
 multi=False
 
+argsStored = []
+startTime = time.time()
+accessToken=None
+globalltype=None
+
+def restartProcess():
+	global argsStored
+	if accessToken is not None and globalltype is not None:
+		start_private_show(accessToken,globalltype,argsStored.location)
+	else:
+		access_token,ltype=main.get_acces_token(argsStored.username,argsStored.password,argsStored.type.lower())
+		if access_token is not None:
+			start_private_show(access_token,ltype,argsStored.location)
+		else:
+			print '[-] access_token bad'
+
 def start_private_show(access_token,ltype,loc):
 	location.set_location(loc)
 	print '[+] Token:',access_token[:40]+'...'
@@ -30,11 +47,11 @@ def split_list(a_list):
 	half = len(a_list)/2
 	return a_list[:half], a_list[half:]
 
-def work_half_list(part,local_ses,new_rcp_point):
+def work_half_list(part,ses,new_rcp_point):
 	for t in part:
 		if config.debug:
 			print '[!] farming pokestop..'
-		work_with_stops(t,local_ses.ses,new_rcp_point)
+		work_with_stops(t,ses,new_rcp_point)
 
 def work_stop(local_ses,new_rcp_point):
 	proto_all=logic.all_stops(local_ses)
@@ -82,11 +99,24 @@ def work_with_stops(current_stop,ses,new_rcp_point):
 				print "[!] charging"
 			elif st==1:
 				print "[!] walking.."
+				expPerHour()
 				time.sleep(14)
 				work_with_stops(current_stop,ses,new_rcp_point)
 			else:
 				print "[?]:",st
 		else:
 			print '[-] tmp_api empty'
 	except:
-		print '[-] error work_with_stops'
+		print '[-] error work_with_stops - Trying to restart process'
+		restartProcess()
+
+def expPerHour():
+	diff = time.time() - startTime
+	minutesRun = diff/60.
+	hoursRun = minutesRun/60.
+	earned = float(config.earned_xp)
+	if hoursRun > 0:
+		expHour = int(earned/hoursRun)
+	else:
+		expHour = "n/a"
+	print "[!] Gained: %s (%s exp/h)"%(config.earned_xp,expHour)

main.py

@@ -35,6 +35,8 @@ def get_acces_token(usr,pws,type):
 		print '[!] I am a poketrainer..'
 		access_token= login.login_pokemon(usr,pws)
 		ltype='ptc'
+	dirty.accessToken = access_token
+	dirty.globalltype = ltype
 	return access_token,ltype
 
 def main():
@@ -50,20 +52,20 @@ def main():
 	parser.add_argument("-t", "--type", help="Google/PTC", required=True)
 	parser.add_argument("-l", "--location", help="Location", required=True)
 	#parser.add_argument("-d", "--distance", help="Distance", required=True)
-	args = parser.parse_args()
-	if not args.username:
-		args.username = getpass("Username: ")
-	if not args.password:
-		args.password = getpass("Password: ")
-	if 'ptc' in args.type.lower() or 'goo' in args.type.lower():
-		#config.distance=args.distance
-		access_token,ltype=get_acces_token(args.username,args.password,args.type.lower())
+	dirty.argsStored = parser.parse_args()
+	if not dirty.argsStored.username:
+		dirty.argsStored.username = getpass("Username: ")
+	if not dirty.argsStored.password:
+		dirty.argsStored.password = getpass("Password: ")
+	if 'ptc' in dirty.argsStored.type.lower() or 'goo' in dirty.argsStored.type.lower():
+		#config.distance=dirty.argsStored.distance
+		access_token,ltype=get_acces_token(dirty.argsStored.username,dirty.argsStored.password,dirty.argsStored.type.lower())
 		if access_token is not None:
-			dirty.start_private_show(access_token,ltype,args.location)
+			dirty.start_private_show(access_token,ltype,dirty.argsStored.location)
 		else:
 			print '[-] access_token bad'
 	else:
-		print '[!] used type "%s" only Google or PTC valid'%(args.type.lower())
+		print '[!] used type "%s" only Google or PTC valid'%(dirty.argsStored.type.lower())
 
 if __name__ == '__main__':
 	main()