Merge remote-tracking branch 'refs/remotes/origin/work'

.gitignore

@@ -53,4 +53,6 @@ tmp.py
 __pycache__
 build
 dist
-*.do
+*.do.cfg
+*.do.state
+.gitignore

README.md

@@ -7,6 +7,7 @@ Differences from original API:
 - 'stopRecording' and 'capturePhoto' waits till operation is really ended and return produced file name.
 - Values provided to commands should be correct strings, compared to integers in original API.
 - 'adapter', 'adapter_status' and 'battery_status' callbacks are available in addition to all other. .setCB() used to set/get callbacks.
+- 'deleteFile' and 'getFileList' commands require path relative to DCIM folder.
 
 Try not to call same commands simultaneously from different threads: camera response is not clearly identified with caller and response can be mixed.
 
@@ -15,9 +16,6 @@ Try not to call same commands simultaneously from different threads: camera resp
 -	formatSDCard  
 		NSFW
 
--	deleteFile  
-		Considered vulnerable, maybe later
-
 -	downloadFile
 -	cancelDownload  
 		Redundant, available by http
@@ -29,4 +27,4 @@ Try not to call same commands simultaneously from different threads: camera resp
 		Maybe later
 
 -	startRecording datetime  
-		Lazy to implement
+		Lazy to implement due to specific input value format

Yi4kAPI.do

@@ -0,0 +1,27 @@
+-feature 1: +0 "yiClasses.py" kii 17/01/12 17:35:58
+	add error constants
+
+ feature 2: +0 "yiClasses.py" kii 17/01/12 21:23:35
+	implement nonblocking execution, use callbacks
+
+!feature 3: +0 "yiClasses.py" kii 17/05/21 04:42:41
+	predefined limit of supplied variables
+
+!feature 4: +0 "" kii 17/01/15 05:17:26
+	redundant
+
+!feature 5: +0 "yiClasses.py" kii 17/04/02 15:11:56
+	continously recieve result
+
++ux 6: +0 "__init__.py" kii 17/05/21 04:41:47
+	add sample usecase
+
++ 8: +0 "" kii 17/05/21 04:41:19
+	detect disconnect
+
++check 9: +0 "yiAPI.py" kii 17/05/21 04:41:21
+	test if disconnected
+
++fix 10: +0 "__init__.py" kii 17/05/21 04:41:44
+	getFileList not listing all files	
+

__init__.py

@@ -1,18 +1,15 @@
 '''
-Lightweighted version of Yi4k API, reverse-engineered from official Java API.
-It is limited so:
-	- values provided to commands should be correct strings,
-	- camera data exchanging operations are blocking,
-	- no callbacks are supported.
+Lightweighted version of Yi4k API, based on official Java API.
+Values provided to commands should be correct strings.
+
+deleteFile and getFileList commands require path relative to DCIM folder.
+deleteFile though could be unsafe by supplying '..' path.
 
 Commands not implemented:
 
 	formatSDCard
 		NSFW
 
-	deleteFile
-		Considered vulnerable, maybe later
-
 	downloadFile
 	cancelDownload
 		Redundant, available by http
@@ -24,8 +21,7 @@
 		Maybe later
 
 	startRecording datetime
-		Lazy to implement
-
+		Lazy to implement due to specific input value format
 '''
 
 
@@ -48,11 +44,15 @@
 )
 
 getFileList=		YiAPICommandGen(1282, 'getFileList',
-	params= {'param':'/tmp/fuse_d'},
+	params= {'param':'/tmp/fuse_d/DCIM/'},
+	variable= 'param',
 	resultCB= lambda res: res['listing']
 )
 
-#deleteFile=		YiAPICommandGen(1281, 'deleteFile', {}, {'param': '/tmp/fuse_d/DCIM'}, resultCB= lambda res: res['listing'])
+deleteFile=		YiAPICommandGen(1281, 'deleteFile',
+	params= {'param':'/tmp/fuse_d/DCIM/'},
+	variable= 'param'
+)
 
 startViewFinder=		YiAPICommandGen(259, 'startViewFinder')
 stopViewFinder=		YiAPICommandGen(260, 'stopViewFinder')

changelog.txt

@@ -1,3 +1,10 @@
+v1.4
+	add:
+		- handle connection loss
+		- deleteFile command, path is relative to DCIM folder
+	fix:
+		- getFileList accepts path relative to DCIM folder
+
 v1.3
 	add:
 		- 'start_album' and 'stop_album' events.

test/testApi.py

@@ -32,8 +32,8 @@ def set_ok(_res):
 print('getSettings: %s' % str(res))
 res= a.cmd(stopRecording)
 print('(err:stopped) stopRecording: %s' % str(res))
-time.sleep(40)
-print('=============Paused to test manual recording tart/stop and shange settings')
+print('=============Paused to test manual recording start/stop and shange settings')
+time.sleep(20)
 print('')
 
 
@@ -49,6 +49,8 @@ def set_ok(_res):
 
 res= a.cmd(stopRecording)
 print('stopRecording: %s' % str(res))
+res= a.cmd(deleteFile, str(res).split('/tmp/fuse_d/DCIM/')[1])
+print('deleted: %s' % str(res))
 res= a.cmd(setVideoExposureValue, resEv)
 print('setVideoExposureValue: %s' % str(res))
 time.sleep(4)

yiAPI.py

@@ -91,7 +91,11 @@ def cmd(self, _command, _val=None):
 		timeoutCmd= threading.Timer(self.commandTimeout, runCmd.blockingEvent.set)
 		timeoutCmd.start()
 
-		self.cmdSend(runCmd.cmdSend)                                	
+		if not self.cmdSend(runCmd.cmdSend):
+			logging.critical('Socket error while sending')
+
+			runCmd.blockingEvent.set()
+			self.sock= None
 
 		runCmd.blockingEvent.wait()
 		timeoutCmd.cancel()
@@ -108,9 +112,14 @@ def cmd(self, _command, _val=None):
 	def cmdSend(self, _cmdDict):
 		logging.debug("Send %s" % _cmdDict)
 
-		self.sock.sendall( bytes(json.dumps(_cmdDict),'ascii') )
+		try:
+			self.sock.sendall( bytes(json.dumps(_cmdDict),'ascii') )
+		except:
+			return
 
 		self.tick+= 1
+		return True
+
 
 
 	def setCB(self, _type=None, _cb=None):

yiAPICommand.py

@@ -15,7 +15,8 @@
 		dict of non-changing parameters.
 
 	variable
-		name or list of names to be assigned later with apply()
+		name or list of names to be assigned later with makeCmd().
+		If variable is defined in params as string, it's appended.
 '''
 class YiAPICommandGen():
 	resultReq= None
@@ -44,7 +45,7 @@ def __init__(self,
 		if params:
 			self.params.update(params)
 
-		if not isinstance(variable, list) and not isinstance(variable, tuple):
+		if not isinstance(variable, (list, tuple)):
 			variable= [variable]
 
 		self.variable= variable
@@ -75,7 +76,11 @@ def makeCmd(self, _cmdPrep, _val=None):
 			_val= [_val]
 
 		for pair in zip(self.variable,_val):
-			_cmdPrep[pair[0]]= pair[1]
+			if pair[0] in _cmdPrep and isinstance(_cmdPrep[pair[0]], str):
+				if isinstance(pair[1], str):
+					_cmdPrep[pair[0]]+= pair[1]
+			else:
+				_cmdPrep[pair[0]]= pair[1]
 
 
 		return YiAPICommand(_cmdPrep, self.resultReq, self.resultCB)

yiAPIListener.py

@@ -3,7 +3,7 @@
 
 
 '''
-Constantly listen to opened Yi4k camera for sultable response.
+Constantly listen to opened Yi4k camera for suitable response.
 Most of response will be the result of commands sent to camera, while some of the responce
 is camera state, pushed periodically.
 '''