diff options
| author | erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0> | 2007-11-01 01:46:21 (GMT) |
|---|---|---|
| committer | erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0> | 2007-11-01 01:46:21 (GMT) |
| commit | 9a56874f57c225d06335b3697b8eaf5e15e29741 (patch) | |
| tree | c00dca7adbef234a8d8fe81bedbb3083ae88bdd6 /serialize.py | |
| parent | 9dfa0aac7af0187cc90fd3b857335660218214f3 (diff) | |
datastore refactoring fixes
git-svn-id: http://mediamods.com/public-svn/camera-activity/Record.activity@800 574bc980-5f2d-0410-acbc-c8f9f0eb14e0
Diffstat (limited to 'serialize.py')
| -rw-r--r-- | serialize.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/serialize.py b/serialize.py index 94d21e9..08ef5b1 100644 --- a/serialize.py +++ b/serialize.py @@ -3,6 +3,8 @@ from xml.dom.minidom import getDOMImplementation from xml.dom.minidom import parse import cStringIO +from sugar.datastore import datastore + from constants import Constants import utils @@ -254,13 +256,13 @@ def saveMediaHash( mediaTypes, mediaHashs ): root.appendChild( mediaEl ) mtype = mediaTypes[recd.type] - mmime = mtype[Constants.keyMime] - _saveMedia( mediaEl, recd, mmime ) + recd.mime = mtype[Constants.keyMime] + _saveMedia( mediaEl, recd ) return album -def _saveMedia( el, recd, mime ): +def _saveMedia( el, recd ): if ( (recd.buddy == True) and (recd.datastoreId == None) and (not recd.downloadedFromBuddy) ): pixbuf = recd.getThumbPixbuf( ) buddyThumb = str( utils.getStringFromPixbuf(pixbuf) ) @@ -294,11 +296,10 @@ def _saveMediaToDatastore( el, recd ): recd.titleChange = False #save the title to the xml recd.savedMedia = True - - _saveXml( xmlFile, el, recd ) + _saveXml( el, recd ) else: recd.savedMedia = True - _saveXml( xmlFile, el, recd ) + _saveXml( el, recd ) else: #this will remove the media from being accessed on the local disk since it puts it away into cold storage @@ -313,7 +314,7 @@ def _saveMediaToDatastore( el, recd ): colors = str(recd.colorStroke.hex) + "," + str(recd.colorFill.hex) mediaObject.metadata['icon-color'] = colors - mediaObject.metadata['mime_type'] = mmime + mediaObject.metadata['mime_type'] = recd.mime mediaObject.metadata['activity'] = Constants.activityId @@ -328,4 +329,4 @@ def _saveMediaToDatastore( el, recd ): recd.thumbFilename = None recd.savedMedia = True - _saveXml( xmlFile, el, recd )
\ No newline at end of file + _saveXml( el, recd )
\ No newline at end of file |