f-spot r4344 - in trunk/extensions: . FlickrExport FlickrExport/FlickrNet

[lmilesi svn gnome org]

Author: lmilesi
Date: Mon Sep 15 11:48:22 2008
New Revision: 4344
URL: http://svn.gnome.org/viewvc/f-spot?rev=4344&view=rev

Log:
2008-09-15  Lorenzo Milesi <maxxer yetopen it>

        * FlickrExport/FlickrExport.cs: enable Zooomr export, don't display
        progress bar if max is 0.
        * FlickrExport/FlickrNet/Flickr.cs: fixes for Zooomr export
        * FlickrExport/FlickrExport.addin.xml: add Zooomr, bump addin ver
        * FlickrExport/FlickrRemote.cs: added Zooomr api keys. fix bgo#383243



Modified:
   trunk/extensions/ChangeLog
   trunk/extensions/FlickrExport/FlickrExport.addin.xml
   trunk/extensions/FlickrExport/FlickrExport.cs
   trunk/extensions/FlickrExport/FlickrNet/Flickr.cs
   trunk/extensions/FlickrExport/FlickrRemote.cs

Modified: trunk/extensions/FlickrExport/FlickrExport.addin.xml
==============================================================================
--- trunk/extensions/FlickrExport/FlickrExport.addin.xml	(original)
+++ trunk/extensions/FlickrExport/FlickrExport.addin.xml	Mon Sep 15 11:48:22 2008
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.4.4.100"
+	version="0.4.4.101"
 	name="Flickr Export"
 	description="This extension allows you to export your photos to Flickr and 23hq."
 	author="F-Spot team"
@@ -14,5 +14,6 @@
 	<Extension path = "/FSpot/Menus/Exports">
 		<ExportMenuItem id="Flickr" _label = "_Flickr..." class = "FSpotFlickrExport.FlickrExport" />
 		<ExportMenuItem id="23hq" _label = "_23hq..." class = "FSpotFlickrExport.TwentyThreeHQExport" />
+		<ExportMenuItem id="zooomr" _label = "_Zooomr..." class = "FSpotFlickrExport.ZooomrExport" />
 	</Extension>
 </Addin>

Modified: trunk/extensions/FlickrExport/FlickrExport.cs
==============================================================================
--- trunk/extensions/FlickrExport/FlickrExport.cs	(original)
+++ trunk/extensions/FlickrExport/FlickrExport.cs	Mon Sep 15 11:48:22 2008
@@ -20,6 +20,14 @@
 		}
 	}
 
+	public class ZooomrExport : FlickrExport
+	{
+		public override void Run (IBrowsableCollection selection)
+		{
+			Run (SupportedService.Zooomr, selection, false);
+		}
+	}
+
 	public class FlickrExport : FSpot.Extensions.IExporter {
 		IBrowsableCollection selection;
 
@@ -118,11 +126,14 @@
 										auth.User.Username,
 										current_service.Name);
 					auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.Username);
-					used_bandwidth.Visible = !fr.Connection.PeopleGetUploadStatus().IsPro;
-					used_bandwidth.Fraction = fr.Connection.PeopleGetUploadStatus().PercentageUsed;
-					used_bandwidth.Text = string.Format (Catalog.GetString("Used {0} of your allowed {1} monthly quota"), 
+					used_bandwidth.Visible = !fr.Connection.PeopleGetUploadStatus().IsPro && 
+									fr.Connection.PeopleGetUploadStatus().BandwidthMax > 0;
+					if (used_bandwidth.Visible) {
+						used_bandwidth.Fraction = fr.Connection.PeopleGetUploadStatus().PercentageUsed;
+						used_bandwidth.Text = string.Format (Catalog.GetString("Used {0} of your allowed {1} monthly quota"), 
 									SizeUtil.ToHumanReadable(fr.Connection.PeopleGetUploadStatus().BandwidthUsed), 
 									SizeUtil.ToHumanReadable(fr.Connection.PeopleGetUploadStatus().BandwidthMax));
+					}
 					break;
 				}
 				state = value;
@@ -371,12 +382,17 @@
 			progress_dialog.ButtonLabel = Gtk.Stock.Ok;
 
 			if (open && ids.Count != 0) {
-				string view_url = string.Format ("http://www.{0}/tools/uploader_edit.gne?ids";, current_service.Name);
-				bool first = true;
-
-				foreach (string id in ids) {
-					view_url = view_url + (first ? "=" : ",") + id;
-					first = false;
+				string view_url;
+				if (current_service.Name == "Zooomr.com")
+					view_url = string.Format ("http://www.{0}/photos/{1}/";, current_service.Name, auth.User.Username);
+				else {
+					view_url = string.Format ("http://www.{0}/tools/uploader_edit.gne?ids";, current_service.Name);
+					bool first = true;
+
+					foreach (string id in ids) {
+						view_url = view_url + (first ? "=" : ",") + id;
+						first = false;
+					}
 				}
 
 				GnomeUtil.UrlShow (view_url);

Modified: trunk/extensions/FlickrExport/FlickrNet/Flickr.cs
==============================================================================
--- trunk/extensions/FlickrExport/FlickrNet/Flickr.cs	(original)
+++ trunk/extensions/FlickrExport/FlickrNet/Flickr.cs	Mon Sep 15 11:48:22 2008
@@ -54,7 +54,7 @@
 
 		private string[] _baseUrl = new string[] { 
 															"http://api.flickr.com/services/rest/";, 
-															"http://beta.zooomr.com/bluenote/api/rest";,
+															"http://www.zooomr.com/api/rest/";,
 															"http://www.23hq.com/services/rest/"};
 
 		private string UploadUrl
@@ -63,7 +63,7 @@
 		}
 		private static string[] _uploadUrl = new string[] {
 															  "http://api.flickr.com/services/upload/";,
-															  "http://beta.zooomr.com/bluenote/api/upload";,
+															  "http://www.zooomr.com/api/upload";,
 															  "http://www.23hq.com/services/upload/"};
 
 		private string ReplaceUrl
@@ -72,7 +72,7 @@
 		}
 		private static string[] _replaceUrl = new string[] {
 															   "http://api.flickr.com/services/replace/";,
-															   "http://beta.zooomr.com/bluenote/api/replace";,
+															   "http://www.zooomr.com/api/replace";,
 															   "http://www.23hq.com/services/replace/"};
 
 		private string AuthUrl
@@ -81,7 +81,7 @@
 		}
 		private static string[] _authUrl = new string[] {
 															   "http://www.flickr.com/services/auth/";,
-															   "http://beta.zooomr.com/auth/";,
+															   "http://www.zooomr.com/services/auth/";,
 															   "http://www.23hq.com/services/auth/"};
 
 		private string _apiKey;
@@ -443,7 +443,8 @@
             {
                 // This is needed in the Compact Framework
                 // See for more details: http://msdn2.microsoft.com/en-us/library/1afx2b0f.aspx
-                req.GetRequestStream().Close();
+              	if (req.Method=="POST")
+	                req.GetRequestStream().Close();
             }
 
 			try
@@ -701,7 +702,7 @@
 			FlickrNet.Response response = GetResponseNoCache(parameters);
 			if( response.Status == ResponseStatus.OK )
 			{
-				return response.AllElements[0].InnerText;
+				return response.AllElements[CurrentService==SupportedService.Zooomr?1:0].InnerText;
 			}
 			else
 			{
@@ -772,7 +773,7 @@
 			FlickrNet.Response response = GetResponseNoCache(parameters);
 			if( response.Status == ResponseStatus.OK )
 			{
-				Auth auth = new Auth(response.AllElements[0]);
+				Auth auth = new Auth(response.AllElements[CurrentService==SupportedService.Zooomr?1:0]);
 				return auth;
 			}
 			else
@@ -820,7 +821,7 @@
 			FlickrNet.Response response = GetResponseNoCache(parameters);
 			if( response.Status == ResponseStatus.OK )
 			{
-				Auth auth = new Auth(response.AllElements[0]);
+				Auth auth = new Auth(response.AllElements[CurrentService==SupportedService.Zooomr?1:0]);
 				return auth;
 			}
 			else

Modified: trunk/extensions/FlickrExport/FlickrRemote.cs
==============================================================================
--- trunk/extensions/FlickrExport/FlickrRemote.cs	(original)
+++ trunk/extensions/FlickrExport/FlickrRemote.cs	Mon Sep 15 11:48:22 2008
@@ -210,7 +210,7 @@
 		public static Service [] Supported = {
 			new Service (SupportedService.Flickr, "Flickr.com", "c6b39ee183385d9ce4ea188f85945016", "0a951ac44a423a04", TOKEN_FLICKR),
 			new Service (SupportedService.TwentyThreeHQ, "23hq.com", "c6b39ee183385d9ce4ea188f85945016", "0a951ac44a423a04", TOKEN_23HQ),
-			new Service (SupportedService.Zooomr, "Zooomr.com", "unknown", "unknown", TOKEN_ZOOOMR)
+			new Service (SupportedService.Zooomr, "Zooomr.com", "a2075d8ff1b7b059df761649835562e4", "6c66738681", TOKEN_ZOOOMR)
 		};
 		
 		public Service (SupportedService id, string name, string api_key, string secret, string pref)