github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.

Browse source
This commit is contained in:
RKrom 2013-12-04 17:46:02 +01:00
parent 2a8e2475d8
commit a03bc31aef
247 changed files with 6986 additions and 8233 deletions
Download patch file Download diff file Expand all files Collapse all files

40
GreenshotFlickrPlugin/FlickrUtils.cs
View file

@ -68,21 +68,20 @@ namespace GreenshotFlickrPlugin {
}
try {
IDictionary<string, object> signedParameters = new Dictionary<string, object>();
signedParameters.Add("content_type","2"); // Screenshot
signedParameters.Add("tags","Greenshot");
signedParameters.Add("is_public", config.IsPublic?"1":"0");
signedParameters.Add("is_friend", config.IsFriend?"1":"0");
signedParameters.Add("is_family", config.IsFamily?"1":"0");
signedParameters.Add("content_type", "2"); // Screenshot
signedParameters.Add("tags", "Greenshot");
signedParameters.Add("is_public", config.IsPublic ? "1" : "0");
signedParameters.Add("is_friend", config.IsFriend ? "1" : "0");
signedParameters.Add("is_family", config.IsFamily ? "1" : "0");
signedParameters.Add("safety_level", string.Format("{0}", (int)config.SafetyLevel));
signedParameters.Add("hidden", config.HiddenFromSearch?"1":"2");
signedParameters.Add("hidden", config.HiddenFromSearch ? "1" : "2");
IDictionary<string, object> otherParameters = new Dictionary<string, object>();
otherParameters.Add("photo", new SurfaceContainer(surfaceToUpload, outputSettings, filename));
string response = oAuth.MakeOAuthRequest(HTTPMethod.POST, "http://api.flickr.com/services/upload/", signedParameters, otherParameters, null);
string photoId = GetPhotoId(response);
// Get Photo Info
signedParameters = new Dictionary<string, object>();
signedParameters.Add("photo_id", photoId);
signedParameters = new Dictionary<string, object> { { "photo_id", photoId } };
string photoInfo = oAuth.MakeOAuthRequest(HTTPMethod.POST, "http://api.flickr.com/services/rest/?method=flickr.photos.getInfo", signedParameters, null, null);
return GetUrl(photoInfo);
} catch (Exception ex) {
@ -102,9 +101,26 @@ namespace GreenshotFlickrPlugin {
try {
XmlDocument doc = new XmlDocument();
doc.LoadXml(response);
XmlNodeList nodes = doc.GetElementsByTagName("url");
if(nodes.Count > 0) {
return nodes.Item(0).InnerText;
if (config.UsePageLink) {
XmlNodeList nodes = doc.GetElementsByTagName("url");
if (nodes.Count > 0) {
return nodes.Item(0).InnerText;
}
} else {
XmlNodeList nodes = doc.GetElementsByTagName("photo");
if (nodes.Count > 0) {
var item = nodes.Item(0);
if (item != null) {
if (item.Attributes != null) {
string farmId = item.Attributes["farm"].Value;
string serverId = item.Attributes["server"].Value;
string photoId = item.Attributes["id"].Value;
string secret = item.Attributes["secret"].Value;
return string.Format("http://farm{0}.staticflickr.com/{1}/{2}_{3}.jpg", farmId, serverId, photoId, secret);
}
}
}
}
} catch (Exception ex) {
LOG.Error("Error parsing Flickr Response.", ex);
@ -117,7 +133,7 @@ namespace GreenshotFlickrPlugin {
XmlDocument doc = new XmlDocument();
doc.LoadXml(response);
XmlNodeList nodes = doc.GetElementsByTagName("photoid");
if(nodes.Count > 0) {
if (nodes.Count > 0) {
return nodes.Item(0).InnerText;
}
} catch (Exception ex) {