diff options
| author | erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0> | 2007-11-15 03:51:16 (GMT) |
|---|---|---|
| committer | erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0> | 2007-11-15 03:51:16 (GMT) |
| commit | e6dc6339ce3568fe5fc6cf25bb803c0cb5feda8b (patch) | |
| tree | 6ee1911b4f0239d3f112e93d0f8d7e3b8df2d729 /recorded.py | |
| parent | 25395014e74856ac77750b85ce220606e7f7b3af (diff) | |
v40 changes
git-svn-id: http://mediamods.com/public-svn/camera-activity/Record.activity@900 574bc980-5f2d-0410-acbc-c8f9f0eb14e0
Diffstat (limited to 'recorded.py')
| -rw-r--r-- | recorded.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/recorded.py b/recorded.py index fcdc315..1c22973 100644 --- a/recorded.py +++ b/recorded.py @@ -108,7 +108,7 @@ class Recorded: def getThumbFilepath( self ): - return os.path.join(Instance.tmpPath, self.thumbFilename) + return os.path.join(Instance.instancePath, self.thumbFilename) def getAudioImagePixbuf( self ): @@ -126,7 +126,7 @@ class Recorded: def getAudioImageFilepath( self ): if (self.audioImageFilename != None): - audioFilepath = os.path.join(Instance.tmpPath, self.audioImageFilename) + audioFilepath = os.path.join(Instance.instancePath, self.audioImageFilename) return os.path.abspath(audioFilepath) else: return self.getThumbFilepath() @@ -136,24 +136,24 @@ class Recorded: if (self.datastoreId == None): if (not self.buddy): #just taken by you, so it is in the tempSessionDir - mediaFilepath = os.path.join(Instance.tmpPath, self.mediaFilename) + mediaFilepath = os.path.join(Instance.instancePath, self.mediaFilename) return os.path.abspath(mediaFilepath) else: if (self.downloadedFromBuddy): #the user has requested the high-res version, and it has downloaded - mediaFilepath = os.path.join(Instance.tmpPath, self.mediaFilename) + mediaFilepath = os.path.join(Instance.instancePath, self.mediaFilename) return os.path.abspath(mediaFilepath) else: if self.mediaFilename == None: #creating a new filepath, probably just got here from the mesh ext = Constants.mediaTypes[self.type][Constants.keyExt] - recdPath = os.path.join(Instance.tmpPath, "recdFile_"+self.mediaMd5+"."+ext) + recdPath = os.path.join(Instance.instancePath, "recdFile_"+self.mediaMd5+"."+ext) recdPath = utils.getUniqueFilepath(recdPath, 0) self.mediaFilename = os.path.basename(recdPath) - mediaFilepath = os.path.join(Instance.tmpPath, self.mediaFilename) + mediaFilepath = os.path.join(Instance.instancePath, self.mediaFilename) return os.path.abspath(mediaFilepath) else: - mediaFilepath = os.path.join(Instance.tmpPath, self.mediaFilename) + mediaFilepath = os.path.join(Instance.instancePath, self.mediaFilename) return os.path.abspath(mediaFilepath) else: #pulling from the datastore, regardless of who took it, cause we got it |