conduit r1521 - in trunk: . conduit/modules/GoogleModule conduit/modules/ShutterflyModule

[jstowers svn gnome org]

Author: jstowers
Date: Tue Jun 17 01:06:45 2008
New Revision: 1521
URL: http://svn.gnome.org/viewvc/conduit?rev=1521&view=rev

Log:
2008-06-17  John Stowers  <john stowers gmail com>

	* conduit/modules/GoogleModule/GoogleModule.py: Support replacing youtube
	videos. Fixes #538416 (Philip Withnall)



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/GoogleModule/GoogleModule.py
   trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py

Modified: trunk/conduit/modules/GoogleModule/GoogleModule.py
==============================================================================
--- trunk/conduit/modules/GoogleModule/GoogleModule.py	(original)
+++ trunk/conduit/modules/GoogleModule/GoogleModule.py	Tue Jun 17 01:06:45 2008
@@ -1397,6 +1397,9 @@
         else:
             return None
 
+    def _extract_video_id (self, uri):
+        return uri.split ("/").pop ()
+
     def _do_login(self):
         # The YouTube login URL is slightly different to the normal Google one
         self.service.ClientLogin(self.username, self.password, auth_service_url="https://www.google.com/youtube/accounts/ClientLogin";)
@@ -1413,12 +1416,23 @@
             gvideo = self.service.InsertVideoEntry(
                                 self.gvideo,
                                 uploadInfo.url)
-            return Rid(uid=gvideo.id.text)
+            return Rid(uid=self._extract_video_id(gvideo.id.text))
         except Exception, e:
             raise Exceptions.SyncronizeError("YouTube Upload Error.")
 
-    def _replace_video (self, uploadInfo):
-        raise Exceptions.NotSupportedError("FIXME: Not supported yet")
+    def _replace_video (self, LUID, uploadInfo):
+        try:
+            self.gvideo = self.service.GetYouTubeVideoEntry(video_id=LUID)
+            self.gvideo.media = gdata.media.Group(
+                                title = gdata.media.Title(text=uploadInfo.name),
+                                description = gdata.media.Description(text=uploadInfo.description),
+                                category = gdata.media.Category(text=uploadInfo.category),
+                                keywords = gdata.media.Keywords(text=','.join(uploadInfo.keywords)))
+
+            gvideo = self.service.UpdateVideoEntry(self.gvideo)
+            return Rid(uid=self._extract_video_id(gvideo.id.text))
+        except Exception, e:
+            raise Exceptions.SyncronizeError("YouTube Update Error.")
 
     def refresh(self):
         DataProvider.TwoWay.refresh(self)
@@ -1435,7 +1449,7 @@
                 videos = self._favorite_videos (self.username)
 
             for video in videos:
-                self.entries[video.title.text] = self._get_flv_video_url (video.link[0].href)
+                self.entries[self._extract_video_id(video.id.text)] = video.link[0].href
         except Exception, err:
             log.debug("Error getting/parsing feed (%s)" % err)
             raise Exceptions.RefreshError
@@ -1445,7 +1459,7 @@
 
     def get(self, LUID):
         DataProvider.TwoWay.get(self, LUID)
-        url = self.entries[LUID]
+        url = self._get_flv_video_url(self.entries[LUID])
         log.debug("Title: '%s', Url: '%s'"%(LUID, url))
 
         f = Video.Video(URI=url)
@@ -1484,18 +1498,9 @@
                     #Replace the video
                     return self._replace_video(LUID, uploadInfo)
                 else:
-                    #Only upload the video if it is newer than the remote one
-                    url = self._get_flv_video_url(url)
-                    remoteFile = File.File(url)
-
-                    #This is a limited test for equality type comparison
-                    comp = video.compare(remoteFile,True)
-                    log.debug("Compared %s with %s to check if they are the same (size). Result = %s" % 
-                            (video.get_filename(),remoteFile.get_filename(),comp))
-                    if comp != conduit.datatypes.COMPARISON_EQUAL:
-                        raise Exceptions.SynchronizeConflictError(comp, video, remoteFile)
-                    else:
-                        return conduit.datatypes.Rid(uid=LUID)
+                    #We can't do an equality test by size, since YouTube reencodes videos
+                    #on upload, so we'll just do nothing.
+                    return conduit.datatypes.Rid(uid=LUID)
 
         log.debug("Uploading video URI = %s, Mimetype = %s, Original Name = %s" % (videoURI, mimeType, originalName))
 
@@ -1504,7 +1509,7 @@
 
     def finish(self, aborted, error, conflict):
         DataProvider.TwoWay.finish(self)
-        self.files = None
+        self.entries = None
 
     def get_configuration(self):
         return {

Modified: trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py
==============================================================================
--- trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py	(original)
+++ trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py	Tue Jun 17 01:06:45 2008
@@ -27,7 +27,7 @@
 	_description_ = _("Sync your Shutterfly photos")
 	_module_type_ = "sink"
 	_icon_ = "shutterfly"
-    _configurable_ = True
+	_configurable_ = True
 	
 	def __init__(self, *args):
 		Image.ImageSink.__init__(self)