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

No need to null check uploader service anymore

Browse source
This commit is contained in:
Jaex 2016-03-22 21:24:26 +02:00
parent 134fc241c2
commit 47cda1eb29
4 changed files with 27 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShareX.UploadersLib/Forms/EmailForm.Designer.cs generated
View file

@ -86,6 +86,7 @@ private void InitializeComponent()
//
// EmailForm
//
this.AcceptButton = this.btnSend;
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;

7
ShareX.UploadersLib/Forms/EmailForm.resx
View file

@ -280,7 +280,7 @@
<value>Bottom, Right</value>
</data>
<data name="btnSend.Location" type="System.Drawing.Point, System.Drawing">
<value>216, 232</value>
<value>136, 232</value>
</data>
<data name="btnSend.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 24</value>
@ -307,7 +307,7 @@
<value>Bottom, Right</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>136, 232</value>
<value>216, 232</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 24</value>
@ -339,6 +339,9 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>298, 265</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>ShareX - Send Email</value>
</data>

28
ShareX.UploadersLib/UploadersConfig.cs
View file

@ -389,40 +389,24 @@ public bool IsValid<T>(int index)
public bool IsValid(ImageDestination destination)
{
if (destination != ImageDestination.FileUploader)
{
ImageUploaderService service = UploaderFactory.GetImageUploaderServiceByEnum(destination);
if (service != null) return service.CheckConfig(this);
}
return true;
if (destination == ImageDestination.FileUploader) return true;
return UploaderFactory.GetImageUploaderServiceByEnum(destination).CheckConfig(this);
}
public bool IsValid(TextDestination destination)
{
if (destination != TextDestination.FileUploader)
{
TextUploaderService service = UploaderFactory.GetTextUploaderServiceByEnum(destination);
if (service != null) return service.CheckConfig(this);
}
return true;
if (destination == TextDestination.FileUploader) return true;
return UploaderFactory.GetTextUploaderServiceByEnum(destination).CheckConfig(this);
}
public bool IsValid(FileDestination destination)
{
FileUploaderService service = UploaderFactory.GetFileUploaderServiceByEnum(destination);
if (service != null) return service.CheckConfig(this);
return true;
return UploaderFactory.GetFileUploaderServiceByEnum(destination).CheckConfig(this);
}
public bool IsValid(UrlShortenerType destination)
{
URLShortenerService service = UploaderFactory.GetURLShortenerServiceByEnum(destination);
if (service != null) return service.CheckConfig(this);
return true;
return UploaderFactory.GetURLShortenerServiceByEnum(destination).CheckConfig(this);
}
public bool IsValid(URLSharingServices destination)

50
ShareX/WorkerTask.cs
View file

@ -806,18 +806,13 @@ private void DoAfterUploadJobs()
public UploadResult UploadImage(Stream stream, string fileName)
{
ImageUploaderService service = UploaderFactory.GetImageUploaderServiceByEnum(Info.TaskSettings.ImageDestination);
ImageUploader imageUploader = UploaderFactory.GetImageUploaderServiceByEnum(Info.TaskSettings.ImageDestination).CreateUploader(Program.UploadersConfig);
if (service != null)
if (imageUploader != null)
{
ImageUploader imageUploader = service.CreateUploader(Program.UploadersConfig);
PrepareUploader(imageUploader);
if (imageUploader != null)
{
PrepareUploader(imageUploader);
return imageUploader.Upload(stream, fileName);
}
return imageUploader.Upload(stream, fileName);
}
return null;
@ -827,18 +822,13 @@ public UploadResult UploadText(Stream stream, string fileName)
{
Program.UploadersConfig.TextFormat = Info.TaskSettings.AdvancedSettings.TextFormat;
TextUploaderService service = UploaderFactory.GetTextUploaderServiceByEnum(Info.TaskSettings.TextDestination);
TextUploader textUploader = UploaderFactory.GetTextUploaderServiceByEnum(Info.TaskSettings.TextDestination).CreateUploader(Program.UploadersConfig);
if (service != null)
if (textUploader != null)
{
TextUploader textUploader = service.CreateUploader(Program.UploadersConfig);
PrepareUploader(textUploader);
if (textUploader != null)
{
PrepareUploader(textUploader);
return textUploader.UploadText(stream, fileName);
}
return textUploader.UploadText(stream, fileName);
}
return null;
@ -862,18 +852,13 @@ public UploadResult UploadFile(Stream stream, string fileName)
break;
}
FileUploaderService service = UploaderFactory.GetFileUploaderServiceByEnum(fileDestination);
FileUploader fileUploader = UploaderFactory.GetFileUploaderServiceByEnum(fileDestination).CreateUploader(Program.UploadersConfig);
if (service != null)
if (fileUploader != null)
{
FileUploader fileUploader = service.CreateUploader(Program.UploadersConfig);
PrepareUploader(fileUploader);
if (fileUploader != null)
{
PrepareUploader(fileUploader);
return fileUploader.Upload(stream, fileName);
}
return fileUploader.Upload(stream, fileName);
}
return null;
@ -881,16 +866,11 @@ public UploadResult UploadFile(Stream stream, string fileName)
public UploadResult ShortenURL(string url)
{
URLShortenerService service = UploaderFactory.GetURLShortenerServiceByEnum(Info.TaskSettings.URLShortenerDestination);
URLShortener urlShortener = UploaderFactory.GetURLShortenerServiceByEnum(Info.TaskSettings.URLShortenerDestination).CreateShortener(Program.UploadersConfig);
if (service != null)
if (urlShortener != null)
{
URLShortener urlShortener = service.CreateShortener(Program.UploadersConfig);
if (urlShortener != null)
{
return urlShortener.ShortenURL(url);
}
return urlShortener.ShortenURL(url);
}
return null;