v 37

* prevent duplicate thumbnails when shared (jedierikb)
* prevent changing modes when using timer (jedierikb, mikhak)
* fix audio mesh share (jedierikb, mikhak)

git-svn-id: http://mediamods.com/public-svn/camera-activity/Record.activity@879 574bc980-5f2d-0410-acbc-c8f9f0eb14e0

1 files changed, 15 insertions, 7 deletions

diff --git a/record.py b/record.py
index d1b96e3..1c2fc21 100755
--- a/record.py
+++ b/record.py
@@ -426,7 +426,7 @@ class Record(activity.Activity):
 			audioImgFilepath = recd.getAudioImageFilepath()
 
 			destPath = os.path.join(Instance.tmpPath, "audioBundle")
-			destPath = utils.getUniqueFilepath(audioBundle, 0)
+			destPath = utils.getUniqueFilepath(destPath, 0)
 			cmd = "cat " + str(filepath) + " " + str(audioImgFilepath) + " > " + str(destPath)
 			self.__class__.log.debug(cmd)
 			os.system(cmd)
@@ -483,13 +483,21 @@ class Record(activity.Activity):
 				cmd = "split -a 1 -b " + str(recd.mediaBytes) + " " + str(filepath) + " " + str(bundlePath)
 				self.__class__.log.debug( cmd )
 				os.system( cmd )
-				bundleName = os.path.basename(bundlePath)
-				recd.mediaFilename = str(bundleName) + "a"
-				recd.audioImageFilename = str(bundleName) + "b"
-
 
-			else:
-				self.ui.showMeshRecd( recd )
+				bundleName = os.path.basename(bundlePath)
+				mediaFilename = str(bundleName) + "a"
+				mediaFilepath = os.path.join(Instance.tmpPath, mediaFilename)
+				mediaFilepathExt = os.path.join(Instance.tmpPath, mediaFilename+".ogg")
+				os.rename(mediaFilepath, mediaFilepathExt)
+				audioImageFilename = str(bundleName) + "b"
+				audioImageFilepath = os.path.join(Instance.tmpPath, audioImageFilename)
+				audioImageFilepathExt = os.path.join(Instance.tmpPath, audioImageFilename+".png")
+				os.rename(audioImageFilepath, audioImageFilepathExt)
+
+				recd.mediaFilename = os.path.basename(mediaFilepathExt)
+				recd.audioImageFilename = os.path.basename(audioImageFilepathExt)
+
+			self.ui.showMeshRecd( recd )
 		elif part > numparts:
 			self.__class__.log.error('More parts than required have arrived')