CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

- improved variable names

Browse source 
- fixed favicon issue
- removed regex config checking
This commit is contained in:
Max Schmitt 2017-02-26 21:44:47 +01:00
parent 54bbae58ee
commit b139c0650c
4 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ShareX.UploadersLib/FileUploaders/Plik.cs
View file

@ -25,9 +25,7 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer
public override bool CheckConfig(UploadersConfig config)
{
Regex APIrgx = new Regex(@"^([0-9A-Fa-f]{8}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{12})$");
Regex URLrgex = new Regex(@"^http(s)?://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$");
return URLrgex.IsMatch(config.PlikSettings.URL) && APIrgx.IsMatch(config.PlikSettings.APIKey);
return !string.IsNullOrEmpty(config.PlikSettings.URL) && !string.IsNullOrEmpty(config.PlikSettings.APIKey);
}
public override TabPage GetUploadersConfigTabPage(UploadersConfigForm form) => form.tpPlik;
@ -61,11 +59,11 @@ public override UploadResult Upload(Stream stream, string fileName)
metaDataReq.OneShot = Settings.OneShot;
metaDataReq.Ttl = Convert.ToInt32(GetMultiplyIndex(2, Settings.TTLUnit) * Settings.TTL * 60);
if (Settings.hasComment)
if (Settings.HasComment)
{
metaDataReq.Comment = Settings.Comment;
}
if (Settings.isSecured)
if (Settings.IsSecured)
{
metaDataReq.Login = Settings.Login;
metaDataReq.Password = Settings.Password;
@ -73,13 +71,13 @@ public override UploadResult Upload(Stream stream, string fileName)
string metaDataResp = SendRequest(HttpMethod.POST, Settings.URL + "/upload", JsonConvert.SerializeObject(metaDataReq), headers: requestHeaders);
UploadMetadataResponse metaData = JsonConvert.DeserializeObject<UploadMetadataResponse>(metaDataResp);
requestHeaders["x-uploadtoken"] = metaData.uploadToken;
string url = $"{Settings.URL}/file/{metaData.id}/{metaData.files[getMetaFileKey(metaData)].id.ToString()}/{fileName}";
string url = $"{Settings.URL}/file/{metaData.id}/{metaData.files[GetMetaDataFileKey(metaData)].id.ToString()}/{fileName}";
UploadResult FileDatReq = SendRequestFile(url, stream, fileName, "file", headers: requestHeaders);
return ConvertResult(metaData, FileDatReq);
}
private string getMetaFileKey(UploadMetadataResponse md)
private string GetMetaDataFileKey(UploadMetadataResponse md)
{
string firstElement = "";
foreach (var key in md.files)
@ -94,7 +92,7 @@ private UploadResult ConvertResult(UploadMetadataResponse metaData, UploadResult
{
UploadResult result = new UploadResult(fileDataReq.Response);
UploadMetadataResponse fileData = JsonConvert.DeserializeObject<UploadMetadataResponse>(fileDataReq.Response);
UploadMetadataResponseFile actFile = metaData.files[getMetaFileKey(metaData)];
UploadMetadataResponseFile actFile = metaData.files[GetMetaDataFileKey(metaData)];
result.URL = $"{Settings.URL}/file/{metaData.id}/{actFile.id.ToString()}/{actFile.fileName}";
return result;
}

4
ShareX.UploadersLib/FileUploaders/PlikSettings.cs
View file

@ -4,14 +4,14 @@ public class PlikSettings
{
public string URL = "";
public string APIKey = "";
public bool isSecured = false;
public bool IsSecured = false;
public string Login = "";
public string Password = "";
public bool Removable = false;
public bool OneShot = false;
public int TTLUnit = 0;
public decimal TTL = 30;
public bool hasComment = false;
public bool HasComment = false;
public string Comment = "";
}
}

8
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -601,8 +601,8 @@ public void LoadSettings()
txtPlikPassword.Text = Config.PlikSettings.Password;
txtPlikLogin.Text = Config.PlikSettings.Login;
txtPlikComment.Text = Config.PlikSettings.Comment;
cbPlikComment.Checked = Config.PlikSettings.hasComment;
cbPlikIsSecured.Checked = Config.PlikSettings.isSecured;
cbPlikComment.Checked = Config.PlikSettings.HasComment;
cbPlikIsSecured.Checked = Config.PlikSettings.IsSecured;
cbPlikRemovable.Checked = Config.PlikSettings.Removable;
cbPlikOneShot.Checked = Config.PlikSettings.OneShot;
nudPlikTTL.Value = Config.PlikSettings.TTL;
@ -2672,7 +2672,7 @@ private void txtPlikPassword_TextChanged(object sender, EventArgs e)
private void cbPlikIsSecured_CheckedChanged(object sender, EventArgs e)
{
Config.PlikSettings.isSecured = cbPlikIsSecured.Checked;
Config.PlikSettings.IsSecured = cbPlikIsSecured.Checked;
txtPlikLogin.ReadOnly = !cbPlikIsSecured.Checked;
txtPlikPassword.ReadOnly = !cbPlikIsSecured.Checked;
}
@ -2684,7 +2684,7 @@ private void cbPlikRemovable_CheckedChanged(object sender, EventArgs e)
private void cbPlikComment_CheckedChanged(object sender, EventArgs e)
{
Config.PlikSettings.hasComment = cbPlikComment.Checked;
Config.PlikSettings.HasComment = cbPlikComment.Checked;
txtPlikComment.ReadOnly = !cbPlikComment.Checked;
}

2
ShareX.UploadersLib/ShareX.UploadersLib.csproj
View file

@ -882,9 +882,9 @@
<None Include="Resources\document.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Plik.ico" />
<None Include="Favicons\Pastie.png" />
<Content Include="Favicons\AzureStorage.png" />
<None Include="Favicons\Plik.ico" />
<Content Include="Favicons\Uplea.ico" />
</ItemGroup>
<ItemGroup>