CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-04 04:06:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #158 from Dinnerbone/gfycat

Browse source 
Don't resize gfycat uploads and update progress bar during transcode
This commit is contained in:
Jaex 2014-06-01 04:42:26 +03:00
commit ad1f00a51e
2 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
UploadersLib/FileUploaders/GfycatUploader.cs
View file

@ -59,16 +59,43 @@ public override UploadResult Upload(Stream stream, string fileName)
private void TranscodeFile(string key, UploadResult result)
{
string json = SendRequest(HttpMethod.GET, "https://upload.gfycat.com/transcode/" + key);
GfycatTranscodeResponse response = JsonConvert.DeserializeObject<GfycatTranscodeResponse>(json);
string transcodeJson = SendRequest(HttpMethod.GET, "https://upload.gfycat.com/transcodeRelease/" + key + "?noResize=true");
GfycatTranscodeResponse transcodeResponse = JsonConvert.DeserializeObject<GfycatTranscodeResponse>(transcodeJson);
if (response.Task == GfycatTask.COMPLETE)
if (transcodeResponse.IsOk)
{
result.URL = "http://gfycat.com/" + response.GfyName;
ProgressManager progress = new ProgressManager(10000);
if (AllowReportProgress)
{
OnProgressChanged(progress);
}
while (!stopUpload)
{
string statusJson = SendRequest(HttpMethod.GET, "https://upload.gfycat.com/status/" + key);
GfycatStatusResponse response = JsonConvert.DeserializeObject<GfycatStatusResponse>(statusJson);
if (response.Error != null)
{
result.Errors.Add(response.Error);
result.IsSuccess = false;
break;
} else if (response.GfyName != null) {
result.IsSuccess = true;
result.URL = "https://gfycat.com/" + response.GfyName;
break;
}
else
{
if (AllowReportProgress && progress.UpdateProgress((progress.Length - progress.Position) / response.Time))
{
OnProgressChanged(progress);
}
}
}
}
else
{
result.Errors.Add(response.Error);
result.Errors.Add(transcodeResponse.Error);
result.IsSuccess = false;
}
}
@ -76,13 +103,15 @@ private void TranscodeFile(string key, UploadResult result)
public class GfycatTranscodeResponse
{
public GfycatTask Task { get; set; }
public string GfyName { get; set; }
public bool IsOk { get; set; }
public string Error { get; set; }
}
public enum GfycatTask {
ERROR,
COMPLETE
public class GfycatStatusResponse
{
public string Task { get; set; }
public int Time { get; set; }
public string GfyName { get; set; }
public string Error { get; set; }
}
}

2
UploadersLib/HelperClasses/ProgressManager.cs
View file

@ -79,7 +79,7 @@ public ProgressManager(long length)
smoothTimer.Start();
}
public bool UpdateProgress(int bytesRead)
public bool UpdateProgress(long bytesRead)
{
Position += bytesRead;
speedTest += bytesRead;