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

BUG-1894: Fixing excessive Imgur thumbnail downloading, which was wasting "credits", and caused 429 errors.

Browse source
This commit is contained in:
Robin 2016-11-14 20:53:16 +01:00
commit a9fd39fd45
3 changed files with 14 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Greenshot/releases/additional_files/readme.txt.template
View file

@ -12,7 +12,7 @@ All details to our tickets can be found here: https://greenshot.atlassian.net
This is a release candidate for the coming release of Greenshot. This is a release candidate for the coming release of Greenshot.
**Testing is not finished, use at your own risk...** **Testing is not finished, use at your own risk...**
Changes for the following reported tickets were added since 1.2.8.12: Changes for the following reported tickets were added since 1.2.8.14:
Fixed bugs: Fixed bugs:
* BUG-1762 Dropshadow & tornedge prompts for settings every time * BUG-1762 Dropshadow & tornedge prompts for settings every time
@ -22,6 +22,7 @@ Fixed bugs:
* BUG-1887 Editor hangs on exit - hang time proportional to number of objects * BUG-1887 Editor hangs on exit - hang time proportional to number of objects
* BUG-1890 Slight cropping around window on Windows 10 * BUG-1890 Slight cropping around window on Windows 10
* BUG-1892 Greenshot saves blank JPG file with reduce colors * BUG-1892 Greenshot saves blank JPG file with reduce colors
* BUG-1894 Imgur remote server error 429
* BUG-1896 JIRA Plugin doesn't work with JIRA Server v7.0 * BUG-1896 JIRA Plugin doesn't work with JIRA Server v7.0
* BUG-1898 Specify GPLv3 in the license text * BUG-1898 Specify GPLv3 in the license text
* BUG-1908 External Command, add commands at startup * BUG-1908 External Command, add commands at startup
@ -50,41 +51,14 @@ Added translation:
* Nederlands by Stephan Paternotte * Nederlands by Stephan Paternotte
1.2.8.12-cab854b RELEASE 1.2.8.14-b7c8384 RELEASE
There were some major issues with the authenticated (non anonymous) uploads to Imgur. Changes for this release:
After contacting Imgur they told us that their old API was deprecated or disabled, unfortunately this was not communicated. This has Imgur improvements for the newer API version, this is a backport from Greenshot 1.2.9
Although we are working hard on Greenshot 1.3, where we changed most of the Imgur code already, we can't release it. With the move to a new hosting platform, we also noticed our update checks are way to often, this needed to be reduced.
We did see a need to fix the imgur uploads, so in this release we quickly updated the Imgur API.
This should resolve a lot of tickets that were reported to us.
Additionally our website http://getgreenshot.org is hosted by sourceforge and they seem to have a lot of stability problems.
Due to these problems a bug in the Greenshot update check manifested itself and causes Greenshot to get slow or even stop responding.
In this version we fix the bug in the update check, and we are also working on a solution for the instability with our website.
Here is the list of chances:
This is a pre-release for the comming bug-fix release of Greenshot.
This version has changes, compared to 1.2.8.12, for the following reported tickets:
* BUG-1884: OCR has trailing blank spaces|
* BUG-1890: Slight cropping around window on Windows 10|
* BUG-1892: Greenshot saves blank JPG file with reduce colors|
* BUG-1898: Specify GPLv3 in the license text|
* BUG-1918: Speechbubble issue: Artifacts appeared when shadow is on and transparency is used|
* BUG-1933: Greenshot Installer sets bad registry key permission|
* BUG-1935: Delay when pasting and ShapeShifter from FlameFusion is running|
* BUG-1941: Error when creating speech bubble|
* BUG-1945: Failure starting Greenshot at system startup|
* BUG-1949: Can't delete Imgur upload
* BUG-1965: Activation border around window is visible in the capture
* FEATURE-945: Added environment variables to the external command
Testing is not finished, use at your own risk...
1.2.8.12 Release 1.2.8.12-cab854b Release
Bugs Resolved: Bugs Resolved:

12
GreenshotImgurPlugin/ImgurUtils.cs
View file

@ -46,7 +46,7 @@ namespace GreenshotImgurPlugin {
return; return;
} }
// Load the ImUr history // Load the ImUr history
List<string> hashes = new List<string>(); IList<string> hashes = new List<string>();
foreach(string hash in Config.ImgurUploadHistory.Keys) { foreach(string hash in Config.ImgurUploadHistory.Keys) {
hashes.Add(hash); hashes.Add(hash);
} }
@ -62,7 +62,7 @@ namespace GreenshotImgurPlugin {
ImgurInfo imgurInfo = RetrieveImgurInfo(hash, Config.ImgurUploadHistory[hash]); ImgurInfo imgurInfo = RetrieveImgurInfo(hash, Config.ImgurUploadHistory[hash]);
if (imgurInfo != null) { if (imgurInfo != null) {
RetrieveImgurThumbnail(imgurInfo); RetrieveImgurThumbnail(imgurInfo);
Config.runtimeImgurHistory.Add(hash, imgurInfo); Config.runtimeImgurHistory[hash] = imgurInfo;
} else { } else {
Log.DebugFormat("Deleting not found ImgUr {0} from config.", hash); Log.DebugFormat("Deleting not found ImgUr {0} from config.", hash);
Config.ImgurUploadHistory.Remove(hash); Config.ImgurUploadHistory.Remove(hash);
@ -113,11 +113,11 @@ namespace GreenshotImgurPlugin {
IDictionary<string, object> otherParameters = new Dictionary<string, object>(); IDictionary<string, object> otherParameters = new Dictionary<string, object>();
// add title // add title
if (title != null && Config.AddTitle) { if (title != null && Config.AddTitle) {
otherParameters.Add("title", title); otherParameters["title"]= title;
} }
// add filename // add filename
if (filename != null && Config.AddFilename) { if (filename != null && Config.AddFilename) {
otherParameters.Add("name", filename); otherParameters["name"] = filename;
} }
string responseString = null; string responseString = null;
if (Config.AnonymousAccess) { if (Config.AnonymousAccess) {
@ -171,7 +171,7 @@ namespace GreenshotImgurPlugin {
try try
{ {
var webRequest = OAuth2Helper.CreateOAuth2WebRequest(HTTPMethod.POST, Config.ImgurApi3Url + "/upload.xml", oauth2Settings); var webRequest = OAuth2Helper.CreateOAuth2WebRequest(HTTPMethod.POST, Config.ImgurApi3Url + "/upload.xml", oauth2Settings);
otherParameters.Add("image", new SurfaceContainer(surfaceToUpload, outputSettings, filename)); otherParameters["image"] = new SurfaceContainer(surfaceToUpload, outputSettings, filename);
NetworkHelper.WriteMultipartFormData(webRequest, otherParameters); NetworkHelper.WriteMultipartFormData(webRequest, otherParameters);
@ -307,7 +307,7 @@ namespace GreenshotImgurPlugin {
/// <param name="key"></param> /// <param name="key"></param>
private static void LogHeader(IDictionary<string, string> nameValues, string key) { private static void LogHeader(IDictionary<string, string> nameValues, string key) {
if (nameValues.ContainsKey(key)) { if (nameValues.ContainsKey(key)) {
Log.InfoFormat("key={0}", nameValues[key]); Log.InfoFormat("{0}={1}", key, nameValues[key]);
} }
} }

2
appveyor12.yml
View file

@ -38,7 +38,7 @@ environment:
secure: bjKXhFZkDqaq98XBrz5oQKQfT8CLpuv2ZAiBIwkzloaAPUs97b5yx6h/xFaE4NLS secure: bjKXhFZkDqaq98XBrz5oQKQfT8CLpuv2ZAiBIwkzloaAPUs97b5yx6h/xFaE4NLS
credentials_picasa_consumer_secret: credentials_picasa_consumer_secret:
secure: yNptTpmJWypbu9alOQtetxU66drr2FKxoPflNgRJdag= secure: yNptTpmJWypbu9alOQtetxU66drr2FKxoPflNgRJdag=
build_type: RC2 build_type: RC3
rsakey: rsakey:
secure: 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 secure: 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
before_build: before_build: