various fixes

Author: jon b

apphack.py

@@ -15,7 +15,7 @@ def get_toolbar(view):
 	sv=view.subviews()
 
 	for v in sv:
-		if v._get_objc_classname()=='OMTabViewToolbar':
+		if v._get_objc_classname().startswith(b'OMTabViewToolbar'):
 			return v
 		tb= get_toolbar(v)
 		if tb:
@@ -59,7 +59,6 @@ def remove_toolbar_button(index):
 	def run_script(sender):
 		'''run a script without clearing glbals'''
 		import editor
-		editor.reload_files()
-		execfile(editor.get_path(),globals())
+		exec(editor.get_text(),globals())
 
-	create_toolbar_button(run_script,'iow:play_32',0,'execfile')
+	create_toolbar_button(run_script,'iow:play_32',0,'execfile')

attribtext2.py

@@ -2,6 +2,7 @@
 # set attributed text dor existing textview
 # same works for Label, except dont need to set allowsAttributedTextEditing, or call on main thread
 from objc_util import *
+import re
 
 mystr='''here are some colors:
    red, yellow, blue, magenta, black, cyan
@@ -26,8 +27,9 @@
    for m in sre:
       st,end=m.span()
       l=end-st
-      mystro.addAttribute_value_range_('NSColor',color,NSRange(st,l))
-
+      mystro.addAttribute_value_range_('NSBackgroundColor',color,NSRange(st,l))
+      f=ObjCClass('UIFont').fontWithName_size_('Courier',15)
+      mystro.addAttribute_value_range_(ObjCInstance(c_void_p.in_dll(c,'NSFontAttributeName')),f,NSRange(st,l))
 # setup views
 import ui
 

attribtxt.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 # experiments with attributed strings
 
-from objc import *
+from objc_util import *
 import ctypes
 
 NSMutableAttributedString=ObjCClass('NSMutableAttributedString')
@@ -14,13 +14,13 @@
 
 sz=6.0
 traits=0
-for i in xrange(len(strtext)/2):
+for i in range(len(strtext)//2):
    f=UIFont.systemFontOfSize_traits_(sz,traits)
    nsr=NSRange(i,1)
    attrtext.addAttribute_value_range_(NSFontAttributeName,f,nsr)
    sz+=2.5
    traits+=1
-for i in xrange(len(strtext)/2,len(strtext)-1):
+for i in range(len(strtext)//2,len(strtext)-1):
    f=UIFont.systemFontOfSize_traits_(sz,traits)
    nsr=NSRange(i,1)
    attrtext.addAttribute_value_range_(NSFontAttributeName,f,nsr)
@@ -34,4 +34,4 @@
 lblobj=ObjCInstance(lbl._objc_ptr)
 lblobj.setAttributedText_(attrtext)
 lbl.size_to_fit()
-s=v.draw_snapshot()
+s=v.draw_snapshot()

completer.py

@@ -34,6 +34,9 @@ class completion_block_literal(Structure):
 c._Block_signature.restype=c_char_p
 c._Block_signature.argtypes=[c_void_p]
 
+c._Block_copy.argtypes=[c_void_p]
+c._Block_copy.restype=c_void_p
+
 class Suggestion(dict):
 	def __init__(self,casematches=True,fuzzy=False,isFuzzy=False,isKeyword=False,matchedRanges=0,name='apparent_endoding',rank=0,typ='function',underscores=False):
 
@@ -48,6 +51,26 @@ def __init__(self,casematches=True,fuzzy=False,isFuzzy=False,isKeyword=False,mat
 			'type': typ,
 			'underscores': underscores})
 import rlcompleterjb
+import ui,time
+def complete_later(blk,_requestid):
+	ui.cancel_delays()
+	blkcopy=c._Block_copy(c_void_p(blk))
+	logger.debug(blk,blkcopy)
+	b=cast(blkcopy,POINTER(completion_block_literal)).contents		
+	
+	s=Suggestion(matchedRanges=0, 
+								name='poop')
+	s2=Suggestion(matchedRanges=0, 
+								name='pooperiffic')
+	@ui.in_background
+	def invoke():
+		time.sleep(2)
+		completiondictlist=ns([s,s2])
+		on_main_thread(
+		b.invoke)(c_void_p(blkcopy),c_short(_requestid),completiondictlist)
+	#ui.delay(invoke,0.05)
+	invoke()
+		
 
 comp=rlcompleterjb.Completer()
 def complete(txt,_self):
@@ -87,9 +110,13 @@ def completion_block(_cmd,_requestid,completiondict):
 		#logger.debug('   calling orig({},{},{},{})'.format(position, cast(tv,c_void_p), requestid,cast(completion,c_void_p)))
 		#originalmethod(position, cast(tv,c_void_p), requestid,blk)
 		#sugg=ns([Suggestion(),])
-		sugg=ns(complete(str(ObjCInstance(tv).text())[0:position], c_void_p(_self)))
-		if sugg:
-			completion_block(completion,requestid, sugg.ptr)
+		
+		if 0:
+			sugg=ns(complete(str(ObjCInstance(tv).text())[0:position], c_void_p(_self)))
+			if sugg:
+				completion_block(completion,requestid, sugg.ptr)
+		else:
+			complete_later(completion,requestid)
 		logger.debug('   done orig')
 swizzle.swizzle(ObjCClass('PA2ConsoleCompletionProvider'),'suggestCompletionsForPosition:inTextView:requestID:completion:'
 ,suggestCompletionsForPosition_inTextView_requestID_completion_,type_encoding=None,debug=True)

keycommands.py

@@ -39,13 +39,16 @@ def handleCommandH(_cmd,_sel):
 #   note __keycommands_obj must hang around in globals, there is probably a more robust way to do this.  
 def replacement_keyCommands(_self,_cmd):
 		return __keycommands_obj.ptr
-replacement=create_objc_class('replacement',
-											ObjCClass('UIResponder'),			
-											[replacement_keyCommands])
-replacement_obj=replacement.new()
-newimp=c.method_getImplementation(replacement_obj.keyCommands.method)
-oldimp=c.method_setImplementation(app.keyCommands.method,newimp)
-
+		
+		
+if 0:		
+	replacement=create_objc_class('replacement',
+												ObjCClass('UIResponder'),			
+												[replacement_keyCommands])
+	replacement_obj=replacement.new()
+	newimp=c.method_getImplementation(replacement_obj.keyCommands.method)
+	oldimp=c.method_setImplementation(app.keyCommands.method,newimp)
+swizzle(UIApplication,'keyCommands',replacement_keyCommands)
 print 'testing if keycommand was added'
 assert(sel_getName(app.keyCommands()[-1].action())=='handleCommandH') #was key added?
 print 'testing that action was added'

notification_capture.py

@@ -10,6 +10,7 @@
 
 class GlobalNotificationObserver(object):
 	def __init__(self, excludes=('UI','NS','_UI'))	:
+		#self.captured=[]
 		self.captured={}
 		self.center=NSNotificationCenter.defaultCenter()
 		self.excludes=excludes
@@ -25,7 +26,8 @@ def _block(self,_cmd,notification):
 			obj=str(ObjCInstance(notification).object())
 			userInfo=str(ObjCInstance(notification).userInfo())
 
-			self.captured[name]=str(obj)+str(userInfo)
+			#self.captured.append(ObjCInstance(notification),)
+			self.captured[name]=ObjCInstance(notification)
 			#console.hud_alert(name)
 		except:
 			pass
@@ -54,9 +56,11 @@ def reset(self):
 		self.stop()
 		self.captured={}
 if __name__=='__main__':
-	g=GlobalNotificationObserver()
+	g=GlobalNotificationObserver(excludes='zzz')
 	g.start()
-
-
-
-
+	import ui,time
+	v=ui.View()
+	v.present('sheet')
+	time.sleep(5)
+	g.stop()
+	print(list(g.captured.keys()))

reprint_line.py

@@ -11,13 +11,15 @@ def reprint_line(text):
 	p= ts.paragraphs()[r.location-1]
 	ts.replaceCharactersInRange_withString_(p.range(),ns(text+'\n'))
 	tv.setNeedsLayout()
+	return p
 if __name__=='__main__':
 	import time,console
 	console.clear()
+	console.set_color(1,0,0)
 	print('Starting download')
 	print('downloading')
 	for i in range(0,100,10):
 		time.sleep(0.5)
 		p=reprint_line('downloading {}%'.format(i))
-	reprint_line('Complete!')
+	p=reprint_line('Complete!')
 

swizzlelog.py

@@ -5,49 +5,100 @@
 except:
 	import swizzle
 from objc_util import *
+import ctypes
+from ctypes import cast, POINTER, c_int, CFUNCTYPE
+import logging
+from objc_util import _block_descriptor
+
+logger = logging.getLogger('swizzle')
+if not logger.handlers:
+	hdlr = logging.FileHandler('swizzlelog.txt','w')
+	formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+	hdlr.setFormatter(formatter)
+	logger.addHandler(hdlr) 
+logger.setLevel(logging.DEBUG)
+logger.debug('logging started')
 def swizzlenop(cls,method):	
-	'''swizzles instance method of cls to print args, then call original.
+	'''unswizzles instance method of cls to print args, then call original.
 	cls is an ObjCClass.    method is selector name, including :'s
 	'''
 	from objc_util import ObjCInstance,parse_types
 	def swizzled(self,sel,*args):
 		return None
 	swizzle.swizzle(cls,method,swizzled)
+from threading import Lock
 
+def clsptr(c):
+   try:
+      return ObjCClass(c).ptr
+   except:
+      return None
+allclasses=[clsptr(c) for c in ObjCClass.get_names()]
+def isclass(obj):
+	ptr=ctypes.cast(obj,ctypes.POINTER(c_int))
+	if ptr[0] in allclasses:
+		return True
 def swizzlelog(cls,method):	
 	'''swizzles instance method of cls to print args, then call original.
 	cls is an ObjCClass.    method is selector name, including :'s
 	'''
 	from objc_util import ObjCInstance,parse_types
 	import time,ui
+	logger.debug('{} swizzled'.format(method))
 	def swizzled(self,sel,*args):
-		print('{}:{} called'.format(time.ctime(),method))
-		print (args)
-		argtypes=parse_types(ObjCInstanceMethod(ObjCInstance(self), method).encoding)[1][2:]
-		newargs=[]
-		for a,ty in zip(args,argtypes):
-			if a is not None and ty is c_void_p:
-				def p():
-					print (ObjCInstance(a))
-				ui.delay(p,1)
-				newargs.append(a)
+		with Lock():
+			logger.debug('# # # # # {} # # # # #'.format(method))
+			logger.debug('   self:{}'.format(self))			
+			logger.debug('   args:{}'.format(args))
+			argtypes=parse_types(
+				ObjCInstanceMethod(
+					ObjCInstance(self), 
+					method).encoding
+					)[1][2:]
+			newargs=[]
+			argidx=0
+			for a,ty in zip(args,argtypes):
+				argidx+=1
+				if a is not None and ty is c_void_p:
+					logger.debug('    {}\n       {}\n      {}'.format(argidx,ObjCInstance(a),ty))
+					newargs.append(ObjCInstance(a))
+				elif a is not None and ty is ObjCBlock:
+					def block_logger(_cmd,requestid,matches):
+						logger.debug('__logger_block: call to {}({}). args: {}, {}'.format(ObjCInstance(a),_cmd,requestid,matches))
+
+						#logger.debug('{}'.format(signature))
+						#invoke=cast(bb.ptr,POINTER(block_literal)).contents.invoke
+						#invoke(_cmd, requestid, matches)
+					blk=ObjCBlock(block_logger, restype=None,argtypes=[c_void_p, c_int,c_void_p])
+					newargs.append(blk)
+				else:
+					logger.debug('    {}\n       {}\n     {}'.format(argidx,(a),ty))
+					#ui.delay(p,1)
+					newargs.append(a)
+			selfinstance=ObjCInstance(self)
+			logger.debug(('self=',selfinstance))
+			try:
+				originalmethod=ObjCInstanceMethod(ObjCInstance(self), 'original'+method)
+				#logger.debug(originalmethod)
+			except AttributeError:
+				import console
+				console.hud_alert(method)
+				logger.debug('     attrib error, returning none')
+				return None
+			if originalmethod:
+				logger.debug(('     newargs',newargs))
+				returnval=originalmethod(*newargs)
+				logger.debug(('  =====>',returnval))
+			if isinstance(returnval,ObjCInstance):
+				return returnval.ptr
 			else:
-				def p():
-					print(a)
-				ui.delay(p,1)
-				newargs.append(a)
-		returnval= ObjCInstanceMethod(ObjCInstance(self), 'original'+method)(*newargs)
-		print('returnval',returnval)
-		if isinstance(returnval,ObjCInstance):
-			return returnval.ptr
-		else:
-			return returnval
+				return returnval
 	swizzle.swizzle(cls,method,swizzled,type_encoding=None,debug=True)
 def unswizzle(cls,method):
 	swizzle.unswizzle(cls,method)
 def is_swizzled(cls,method):
 	return swizzle.is_swizzled(cls,method)
-	
+unswizzle=swizzlenop
 
 
 #swizzlelog(ObjCClass("OMProgressHUD_PY3"),'showWithMessage:icon:duration:blockInteraction:')

tableview_rowheight.py

@@ -26,7 +26,8 @@ def tableView_heightForRowAtIndexPath_(_self,_sel,tv,path):
 		else:
 			return tv_py.row_height
 	except Exception as e:
-		print(e)
+		import traceback
+		traceback.print_exc()
 		return 44
 # set up the swizzle.. only needs to be do e once
 def setup_tableview_swizzle(override=False):