Compare commits

..

No commits in common. "c8d14274720457d669ec7fb389b965eff019f4ee" and "38e46d6d1f66afa9bba88d8801dc0a7d11d06e19" have entirely different histories.

3 changed files with 10 additions and 19 deletions

View File

@ -2,17 +2,16 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AssemblyVersion>1.5.1</AssemblyVersion> <AssemblyVersion>1.4.2</AssemblyVersion>
<FileVersion>1.5.1</FileVersion> <FileVersion>1.4.2</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.8" /> <PackageReference Include="FubarCoder.RestSharp.Portable.Core" Version="4.0.8" />
<PackageReference Include="FubarCoder.RestSharp.Portable.HttpClient" Version="4.0.8" /> <PackageReference Include="FubarCoder.RestSharp.Portable.HttpClient" Version="4.0.8" />
<PackageReference Include="GoFileSharp" Version="1.0.2" />
<PackageReference Include="MegaApiClient" Version="1.10.2" /> <PackageReference Include="MegaApiClient" Version="1.10.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
@ -25,6 +24,9 @@
<Reference Include="Gitea"> <Reference Include="Gitea">
<HintPath>Resources\Gitea.dll</HintPath> <HintPath>Resources\Gitea.dll</HintPath>
</Reference> </Reference>
<Reference Include="GoFileSharp">
<HintPath>Resources\GoFileSharp.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,17 +1,12 @@
using EftPatchHelper.Interfaces; using EftPatchHelper.Interfaces;
using GoFileSharp; using GoFileSharp;
using GoFileSharp.Model;
using GoFileSharp.Model.GoFileData;
using GoFileSharp.Model.GoFileData.Wrappers; using GoFileSharp.Model.GoFileData.Wrappers;
namespace EftPatchHelper.Model namespace EftPatchHelper.Model
{ {
public class GoFileUpload : IFileUpload public class GoFileUpload : IFileUpload
{ {
private GoFile _goFile;
public FileInfo UploadFileInfo { get; private set; } public FileInfo UploadFileInfo { get; private set; }
private DirectLink? _directLink = null;
private GoFileFile _uploadedFile; private GoFileFile _uploadedFile;
private string _folderId; private string _folderId;
@ -21,11 +16,7 @@ namespace EftPatchHelper.Model
public GoFileUpload(FileInfo file, string apiToken, string folderId) public GoFileUpload(FileInfo file, string apiToken, string folderId)
{ {
_goFile = new GoFile(new GoFileOptions GoFile.ApiToken = apiToken;
{
ApiToken = apiToken
});
_folderId = folderId; _folderId = folderId;
UploadFileInfo = file; UploadFileInfo = file;
ServiceName = "GoFile"; ServiceName = "GoFile";
@ -35,12 +26,12 @@ namespace EftPatchHelper.Model
public string GetLink() public string GetLink()
{ {
return _directLink?.Link ?? ""; return _uploadedFile.DirectLink;
} }
public async Task<bool> UploadAsync(IProgress<double>? progress = null) public async Task<bool> UploadAsync(IProgress<double>? progress = null)
{ {
var folder = await _goFile.GetFolderAsync(_folderId); var folder = await GoFile.GetFolder(_folderId);
if (folder == null) if (folder == null)
{ {
@ -51,9 +42,7 @@ namespace EftPatchHelper.Model
if(uploadedFile == null) return false; if(uploadedFile == null) return false;
_directLink = await uploadedFile.AddDirectLink(); if(!await uploadedFile.SetDirectLink(true))
if(_directLink == null)
{ {
return false; return false;
} }