mirror of
https://github.com/greenshot/greenshot
synced 2025-08-14 10:47:02 -07:00
Added album selection to Photobucket
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2424 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
parent
5ed6737cf3
commit
3fa043782f
4 changed files with 150 additions and 50 deletions
|
@ -21,6 +21,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Xml;
|
||||
using Greenshot.IniFile;
|
||||
using Greenshot.Plugin;
|
||||
using GreenshotPlugin.Core;
|
||||
|
@ -29,21 +30,69 @@ namespace GreenshotPhotobucketPlugin {
|
|||
/// <summary>
|
||||
/// Description of PhotobucketUtils.
|
||||
/// </summary>
|
||||
public class PhotobucketUtils {
|
||||
public static class PhotobucketUtils {
|
||||
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(PhotobucketUtils));
|
||||
private static PhotobucketConfiguration config = IniConfig.GetIniSection<PhotobucketConfiguration>();
|
||||
|
||||
private PhotobucketUtils() {
|
||||
}
|
||||
private static readonly PhotobucketConfiguration config = IniConfig.GetIniSection<PhotobucketConfiguration>();
|
||||
|
||||
/// <summary>
|
||||
/// Do the actual upload to Photobucket
|
||||
/// For more details on the available parameters, see: http://api.Photobucket.com/resources_anon
|
||||
/// </summary>
|
||||
/// <returns>PhotobucketResponse</returns>
|
||||
public static PhotobucketInfo UploadToPhotobucket(ISurface surfaceToUpload, SurfaceOutputSettings outputSettings, string title, string filename) {
|
||||
public static PhotobucketInfo UploadToPhotobucket(ISurface surfaceToUpload, SurfaceOutputSettings outputSettings, string albumPath, string title, string filename) {
|
||||
string responseString;
|
||||
|
||||
if (string.IsNullOrEmpty(albumPath)) {
|
||||
albumPath = "!";
|
||||
}
|
||||
|
||||
OAuthSession oAuth = createSession();
|
||||
|
||||
IDictionary<string, object> signedParameters = new Dictionary<string, object>();
|
||||
// add album
|
||||
if (albumPath == null) {
|
||||
signedParameters.Add("id", config.Username);
|
||||
} else {
|
||||
signedParameters.Add("id", albumPath);
|
||||
}
|
||||
// add type
|
||||
signedParameters.Add("type", "image");
|
||||
// add title
|
||||
if (title != null) {
|
||||
signedParameters.Add("title", title);
|
||||
}
|
||||
// add filename
|
||||
if (filename != null) {
|
||||
signedParameters.Add("filename", filename);
|
||||
}
|
||||
IDictionary<string, object> unsignedParameters = new Dictionary<string, object>();
|
||||
// Add image
|
||||
unsignedParameters.Add("uploadfile", new SurfaceContainer(surfaceToUpload, outputSettings, filename));
|
||||
try {
|
||||
string apiUrl = "http://api.photobucket.com/album/!/upload";
|
||||
responseString = oAuth.MakeOAuthRequest(HTTPMethod.POST, apiUrl, apiUrl.Replace("api.photobucket.com", config.SubDomain), signedParameters, unsignedParameters, null);
|
||||
} catch (Exception ex) {
|
||||
LOG.Error("Error uploading to Photobucket.", ex);
|
||||
throw ex;
|
||||
} finally {
|
||||
if (!string.IsNullOrEmpty(oAuth.Token)) {
|
||||
config.Token = oAuth.Token;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(oAuth.TokenSecret)) {
|
||||
config.TokenSecret = oAuth.TokenSecret;
|
||||
}
|
||||
}
|
||||
LOG.Info(responseString);
|
||||
PhotobucketInfo PhotobucketInfo = PhotobucketInfo.FromUploadResponse(responseString);
|
||||
LOG.Debug("Upload to Photobucket was finished");
|
||||
return PhotobucketInfo;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper method to create an OAuth session object for contacting the Photobucket API
|
||||
/// </summary>
|
||||
/// <returns>OAuthSession</returns>
|
||||
private static OAuthSession createSession() {
|
||||
OAuthSession oAuth = new OAuthSession(PhotobucketCredentials.ConsumerKey, PhotobucketCredentials.ConsumerSecret);
|
||||
oAuth.CheckVerifier = false;
|
||||
// This url is configured in the Photobucket API settings in the Photobucket site!!
|
||||
|
@ -77,26 +126,22 @@ namespace GreenshotPhotobucketPlugin {
|
|||
}
|
||||
oAuth.Token = config.Token;
|
||||
oAuth.TokenSecret = config.TokenSecret;
|
||||
return oAuth;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get list of photobucket albums
|
||||
/// </summary>
|
||||
/// <returns>List<string></returns>
|
||||
public static List<string> RetrievePhotobucketAlbums() {
|
||||
string responseString;
|
||||
|
||||
OAuthSession oAuth = createSession();
|
||||
|
||||
IDictionary<string, object> signedParameters = new Dictionary<string, object>();
|
||||
// add album
|
||||
signedParameters.Add("id", config.Username);
|
||||
// add type
|
||||
signedParameters.Add("type", "image");
|
||||
// add title
|
||||
if (title != null) {
|
||||
signedParameters.Add("title", title);
|
||||
}
|
||||
// add filename
|
||||
if (filename != null) {
|
||||
signedParameters.Add("filename", filename);
|
||||
}
|
||||
IDictionary<string, object> unsignedParameters = new Dictionary<string, object>();
|
||||
// Add image
|
||||
unsignedParameters.Add("uploadfile", new SurfaceContainer(surfaceToUpload, outputSettings, filename));
|
||||
try {
|
||||
string apiUrl = "http://api.photobucket.com/album/!/upload";
|
||||
responseString = oAuth.MakeOAuthRequest(HTTPMethod.POST, apiUrl, apiUrl.Replace("api.photobucket.com", config.SubDomain), signedParameters, unsignedParameters, null);
|
||||
string apiUrl = string.Format("http://api.photobucket.com/album/{0}", config.Username);
|
||||
responseString = oAuth.MakeOAuthRequest(HTTPMethod.GET, apiUrl, apiUrl.Replace("api.photobucket.com", config.SubDomain), signedParameters, null, null);
|
||||
} catch (Exception ex) {
|
||||
LOG.Error("Error uploading to Photobucket.", ex);
|
||||
throw ex;
|
||||
|
@ -108,10 +153,43 @@ namespace GreenshotPhotobucketPlugin {
|
|||
config.TokenSecret = oAuth.TokenSecret;
|
||||
}
|
||||
}
|
||||
LOG.Info(responseString);
|
||||
PhotobucketInfo PhotobucketInfo = PhotobucketInfo.ParseResponse(responseString);
|
||||
try {
|
||||
XmlDocument doc = new XmlDocument();
|
||||
doc.LoadXml(responseString);
|
||||
List<string> albums = new List<string>();
|
||||
recurseAlbums(albums, null, doc.GetElementsByTagName("content").Item(0).ChildNodes);
|
||||
LOG.DebugFormat("Albums: {0}", string.Join(",", albums.ToArray()));
|
||||
return albums;
|
||||
} catch(Exception e) {
|
||||
LOG.Error("Error while Reading albums: ", e);
|
||||
}
|
||||
|
||||
LOG.Debug("Upload to Photobucket was finished");
|
||||
return PhotobucketInfo;
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Parse the album nodes recursively
|
||||
/// </summary>
|
||||
/// <param name="albums"></param>
|
||||
/// <param name="path"></param>
|
||||
/// <param name="nodes"></param>
|
||||
private static void recurseAlbums(List<string>albums, string path, XmlNodeList nodes) {
|
||||
foreach(XmlNode node in nodes) {
|
||||
if (node.Name != "album") {
|
||||
continue;
|
||||
}
|
||||
string currentAlbum = node.Attributes["name"].Value;
|
||||
string currentPath = currentAlbum;
|
||||
if (path != null && path.Length > 0) {
|
||||
currentPath = string.Format("{0}/{1}", path, currentAlbum);
|
||||
}
|
||||
|
||||
albums.Add(currentPath);
|
||||
if (node.Attributes["subalbum_count"] != null && node.Attributes["subalbum_count"].Value != "0") {
|
||||
recurseAlbums(albums, currentPath, node.ChildNodes);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue