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 #169 from KamilKZ/master

Browse source 
Copy.com URL types support
This commit is contained in:
Jaex 2014-06-09 20:43:06 +03:00
commit b4332561a6
5 changed files with 90 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ShareX/UploadTask.cs
View file

@ -815,7 +815,8 @@ public UploadResult UploadFile(Stream stream, string fileName)
case FileDestination.Copy:
fileUploader = new Copy(Program.UploadersConfig.CopyOAuthInfo, Program.UploadersConfig.CopyAccountInfo)
{
UploadPath = NameParser.Parse(NameParserType.URL, Copy.TidyUploadPath(Program.UploadersConfig.CopyUploadPath))
UploadPath = NameParser.Parse(NameParserType.URL, Copy.TidyUploadPath(Program.UploadersConfig.CopyUploadPath)),
URLType = Program.UploadersConfig.CopyURLType
};
break;
case FileDestination.GoogleDrive:

223
UploadersLib/FileUploaders/Copy.cs
View file

@ -41,6 +41,7 @@ public sealed class Copy : FileUploader, IOAuth
public OAuthInfo AuthInfo { get; set; }
public CopyAccountInfo AccountInfo { get; set; }
public string UploadPath { get; set; }
public CopyURLType URLType { get; set; }
private const string APIVersion = "1";
@ -50,11 +51,6 @@ public sealed class Copy : FileUploader, IOAuth
private const string URLFiles = URLAPI + "/files";
private const string URLMetaData = URLAPI + "/meta/";
private const string URLLinks = URLAPI + "/links";
//private const string URLShares = URLAPI + "/shares/" + Root;
//private const string URLCopy = URLAPI + "/fileops/copy";
//private const string URLCreateFolder = URLAPI + "/fileops/create_folder";
//private const string URLDelete = URLAPI + "/fileops/delete";
//private const string URLMove = URLAPI + "/fileops/move";
private const string URLPublicDirect = "http://copy.com";
private const string URLRequestToken = "https://api.copy.com/oauth/request";
@ -118,7 +114,8 @@ public CopyAccountInfo GetAccountInfo()
#region Files and metadata
/*// https://www.dropbox.com/developers/core/api#files-GET
// https://developers.copy.com/documentation#api-calls/filesystem - Download Raw File Conents
// GET https://api.copy.com/rest/files/PATH/TO/FILE
public bool DownloadFile(string path, Stream downloadStream)
{
if (!string.IsNullOrEmpty(path) && OAuthInfo.CheckOAuth(AuthInfo))
@ -129,7 +126,7 @@ public bool DownloadFile(string path, Stream downloadStream)
}
return false;
}*/
}
// https://developers.copy.com/documentation#api-calls/filesystem - Create File or Directory
// POST https://api.copy.com/rest/files/PATH/TO/FILE?overwrite=true
@ -158,14 +155,15 @@ public UploadResult UploadFile(Stream stream, string path, string fileName)
if (content != null)
{
AllowReportProgress = false;
result.URL = CreatePublicURL(content.objects[0].path);
result.URL = CreatePublicURL(content.objects[0].path, URLType);
}
}
return result;
}
// https://developers.copy.com/documentation#api-calls/filesystem
// https://developers.copy.com/documentation#api-calls/filesystem - Read Root Directory
// GET https://api.copy.com/rest/meta/copy
public CopyContentInfo GetMetadata(string path)
{
CopyContentInfo contentInfo = null;
@ -187,168 +185,46 @@ public CopyContentInfo GetMetadata(string path)
return contentInfo;
}
/*public bool IsExists(string path)
{
DropboxContentInfo contentInfo = GetMetadata(path, false);
return contentInfo != null && !contentInfo.Is_deleted;
}
// https://www.dropbox.com/developers/core/api#shares
public string CreateShareableLink(string path, DropboxURLType urlType)
{
if (!string.IsNullOrEmpty(path) && OAuthInfo.CheckOAuth(AuthInfo))
{
string url = Helpers.CombineURL(URLShares, Helpers.URLPathEncode(path));
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("short_url", urlType == DropboxURLType.Shortened ? "true" : "false");
string query = OAuthManager.GenerateQuery(url, args, HttpMethod.POST, AuthInfo);
string response = SendRequest(HttpMethod.POST, query);
if (!string.IsNullOrEmpty(response))
{
DropboxShares shares = JsonConvert.DeserializeObject<DropboxShares>(response);
if (urlType == DropboxURLType.Direct)
{
Match match = Regex.Match(shares.URL, @"https?://(?:www\.)?dropbox.com/s/(?<path>\w+/.+)");
if (match.Success)
{
string urlPath = match.Groups["path"].Value;
if (!string.IsNullOrEmpty(urlPath))
{
return Helpers.CombineURL(URLShareDirect, urlPath);
}
}
}
else
{
return shares.URL;
}
}
}
return null;
}*/
#endregion Files and metadata
#region File operations
/*// https://www.dropbox.com/developers/core/api#fileops-copy
public DropboxContentInfo Copy(string from_path, string to_path)
{
DropboxContentInfo contentInfo = null;
if (!string.IsNullOrEmpty(from_path) && !string.IsNullOrEmpty(to_path) && OAuthInfo.CheckOAuth(AuthInfo))
{
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("root", Root);
args.Add("from_path", from_path);
args.Add("to_path", to_path);
string query = OAuthManager.GenerateQuery(URLCopy, args, HttpMethod.POST, AuthInfo);
string response = SendRequest(HttpMethod.POST, query);
if (!string.IsNullOrEmpty(response))
{
contentInfo = JsonConvert.DeserializeObject<DropboxContentInfo>(response);
}
}
return contentInfo;
}
// https://www.dropbox.com/developers/core/api#fileops-create-folder
public DropboxContentInfo CreateFolder(string path)
{
DropboxContentInfo contentInfo = null;
if (!string.IsNullOrEmpty(path) && OAuthInfo.CheckOAuth(AuthInfo))
{
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("root", Root);
args.Add("path", path);
string query = OAuthManager.GenerateQuery(URLCreateFolder, args, HttpMethod.POST, AuthInfo);
string response = SendRequest(HttpMethod.POST, query);
if (!string.IsNullOrEmpty(response))
{
contentInfo = JsonConvert.DeserializeObject<DropboxContentInfo>(response);
}
}
return contentInfo;
}
// https://www.dropbox.com/developers/core/api#fileops-delete
public DropboxContentInfo Delete(string path)
{
DropboxContentInfo contentInfo = null;
if (!string.IsNullOrEmpty(path) && OAuthInfo.CheckOAuth(AuthInfo))
{
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("root", Root);
args.Add("path", path);
string query = OAuthManager.GenerateQuery(URLDelete, args, HttpMethod.POST, AuthInfo);
string response = SendRequest(HttpMethod.POST, query);
if (!string.IsNullOrEmpty(response))
{
contentInfo = JsonConvert.DeserializeObject<DropboxContentInfo>(response);
}
}
return contentInfo;
}
// https://www.dropbox.com/developers/core/api#fileops-move
public DropboxContentInfo Move(string from_path, string to_path)
{
DropboxContentInfo contentInfo = null;
if (!string.IsNullOrEmpty(from_path) && !string.IsNullOrEmpty(to_path) && OAuthInfo.CheckOAuth(AuthInfo))
{
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("root", Root);
args.Add("from_path", from_path);
args.Add("to_path", to_path);
string query = OAuthManager.GenerateQuery(URLMove, args, HttpMethod.POST, AuthInfo);
string response = SendRequest(HttpMethod.POST, query);
if (!string.IsNullOrEmpty(response))
{
contentInfo = JsonConvert.DeserializeObject<DropboxContentInfo>(response);
}
}
return contentInfo;
}*/
#endregion File operations
public override UploadResult Upload(Stream stream, string fileName)
{
return UploadFile(stream, UploadPath, fileName);
}
/// <summary>
/// Link types:
/// Shortened: http://copy.com/BWr9OswktCLl
/// Extended: http://www.copy.com/s/BWr9OswktCLl/2014-06-05_17-00-01.mp4
/// Direct: http://copy.com/BWr9OswktCLl/2014-06-05_17-00-01.mp4
/// </summary>
public string CreatePublicURL(string path) // TODO: Add link type parameter
public string GetLinkURL(CopyLinksInfo link, string path, CopyURLType urlType = CopyURLType.Default)
{
switch (urlType)
{
case CopyURLType.Default:
return link.url;
case CopyURLType.Shortened:
return link.url_short;
case CopyURLType.Direct:
//use regex to get everything past the last '/' in path - the filename
//default = 'http://www.copy.com/s/' + link.id + file(regex)
//direct = 'http://copy.com/' + link.id + file(regex)
//NOTE: link.id and filename need a '/' between, but the regex should provide that...
//NOTE2: 'default' will use link.url because that's what the official docs state, even though it's not the true link,
//links can be a gallery, and the link.url is the link to the gallery..
Match match = Regex.Match(path, @"\/[^\/]+$"); // one '/' and multiple 'not /' and end
if (match.Success)
{
return URLPublicDirect + "/" + link.id + match.ToString();
}
else
{
return string.Empty;
}
}
return string.Empty; //theoretically this shouldn't happen as urlType will default to 'Default' and all options are covered, but an error is an error...
}
public string CreatePublicURL(string path, CopyURLType urlType = CopyURLType.Default)
{
path = path.Trim('/');
@ -367,22 +243,24 @@ public string CreatePublicURL(string path) // TODO: Add link type parameter
if (!string.IsNullOrEmpty(response))
{
return JsonConvert.DeserializeObject<CopyLinksInfo>(response).url_short;
CopyLinksInfo link = JsonConvert.DeserializeObject<CopyLinksInfo>(response);
return GetLinkURL(link, path, urlType);
}
return string.Empty;
}
public string GetPublicURL(string path)
public string GetPublicURL(string path, CopyURLType urlType = CopyURLType.Default)
{
path = path.Trim('/');
CopyContentInfo fileInfo = GetMetadata(path);
foreach (CopyLinksInfo link in fileInfo.links)
{
if (!link.expired)
if (!link.expired && link.@public)
{
return link.url_short;
return GetLinkURL(link, path, urlType);
}
}
@ -400,6 +278,13 @@ public static string TidyUploadPath(string uploadPath)
}
}
public enum CopyURLType
{
Default,
Shortened,
Direct
}
public class CopyAccountInfo
{
public long id { get; set; } // The user's unique Copy ID.
@ -439,7 +324,7 @@ public class CopyLinksInfo
public string permissions { get; set; }
}
public class CopyContentInfo // https://api.copy.com/rest/meta also works on rest/meta/copy
public class CopyContentInfo // https://api.copy.com/rest/meta also works on 'rest/files'
{
public string id { get; set; } // Internal copy name
public string path { get; set; } // hmm?

27
UploadersLib/GUI/UploadersConfigForm.Designer.cs generated
View file

@ -125,6 +125,8 @@ private void InitializeComponent()
this.lblDropboxPath = new System.Windows.Forms.Label();
this.txtDropboxPath = new System.Windows.Forms.TextBox();
this.tpCopy = new System.Windows.Forms.TabPage();
this.lblCopyURLType = new System.Windows.Forms.Label();
this.cbCopyURLType = new System.Windows.Forms.ComboBox();
this.pbCopyLogo = new System.Windows.Forms.PictureBox();
this.btnCopyRegister = new System.Windows.Forms.Button();
this.lblCopyStatus = new System.Windows.Forms.Label();
@ -1417,6 +1419,8 @@ private void InitializeComponent()
// tpCopy
//
this.tpCopy.Controls.Add(this.pbCopyLogo);
this.tpCopy.Controls.Add(this.lblCopyURLType);
this.tpCopy.Controls.Add(this.cbCopyURLType);
this.tpCopy.Controls.Add(this.btnCopyRegister);
this.tpCopy.Controls.Add(this.lblCopyStatus);
this.tpCopy.Controls.Add(this.lblCopyPath);
@ -1430,6 +1434,25 @@ private void InitializeComponent()
this.tpCopy.Text = "Copy";
this.tpCopy.UseVisualStyleBackColor = true;
//
// lblCopyURLType
//
this.lblCopyURLType.AutoSize = true;
this.lblCopyURLType.Location = new System.Drawing.Point(16, 299);
this.lblCopyURLType.Name = "lblCopyURLType";
this.lblCopyURLType.Size = new System.Drawing.Size(68, 13);
this.lblCopyURLType.TabIndex = 3;
this.lblCopyURLType.Text = "URL type:";
//
// cbCopyURLType
//
this.cbCopyURLType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbCopyURLType.FormattingEnabled = true;
this.cbCopyURLType.Location = new System.Drawing.Point(88, 295);
this.cbCopyURLType.Name = "cbCopyURLType";
this.cbCopyURLType.Size = new System.Drawing.Size(121, 21);
this.cbCopyURLType.TabIndex = 8;
this.cbCopyURLType.SelectedIndexChanged += new System.EventHandler(this.cbCopyURLType_SelectedIndexChanged);
//
// pbCopyLogo
//
this.pbCopyLogo.Cursor = System.Windows.Forms.Cursors.Hand;
@ -1455,7 +1478,7 @@ private void InitializeComponent()
//
this.lblCopyStatus.AutoSize = true;
this.lblCopyStatus.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
this.lblCopyStatus.Location = new System.Drawing.Point(16, 304);
this.lblCopyStatus.Location = new System.Drawing.Point(16, 324);
this.lblCopyStatus.Name = "lblCopyStatus";
this.lblCopyStatus.Size = new System.Drawing.Size(45, 16);
this.lblCopyStatus.TabIndex = 9;
@ -4144,6 +4167,8 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox txtDropboxPath;
private System.Windows.Forms.TabPage tpCopy;
private System.Windows.Forms.Label lblCopyURLType;
private System.Windows.Forms.ComboBox cbCopyURLType;
private GUI.OAuth2Control oAuthCopy;
private System.Windows.Forms.Button btnCopyShowFiles;
private System.Windows.Forms.PictureBox pbCopyLogo;

7
UploadersLib/GUI/UploadersConfigForm.cs
View file

@ -310,6 +310,8 @@ public void LoadSettings(UploadersConfig uploadersConfig)
}
txtCopyPath.Text = Config.CopyUploadPath;
cbCopyURLType.Items.AddRange(Helpers.GetEnumNamesProper<CopyURLType>());
cbCopyURLType.SelectedIndex = (int)Config.CopyURLType;
UpdateCopyStatus();
// Google Drive
@ -999,6 +1001,11 @@ private void oAuthCopy_CompleteButtonClicked(string code)
CopyAuthComplete(code);
}
private void cbCopyURLType_SelectedIndexChanged(object sender, EventArgs e)
{
Config.CopyURLType = (CopyURLType)cbCopyURLType.SelectedIndex;
}
#endregion Copy
#region Google Drive

1
UploadersLib/UploadersConfig.cs
View file

@ -127,6 +127,7 @@ public class UploadersConfig : SettingsBase<UploadersConfig>
public OAuthInfo CopyOAuthInfo = null;
public CopyAccountInfo CopyAccountInfo = null;
public string CopyUploadPath = "ShareX/%y/%mo";
public CopyURLType CopyURLType = CopyURLType.Default;
// Google Drive