IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/files

Browse Source
This commit is contained in:
Ilya Oleshko 2020-04-16 12:51:17 +03:00
commit c704b7f598
6 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
products/ASC.Files/Server/Controllers/FilesController.cs
View File

@ -546,15 +546,15 @@ namespace ASC.Api.Documents
/// ]]>
/// </returns>
[Create("{folderId}/upload/create_session", DisableFormat = true)]
public object CreateUploadSession(string folderId, string fileName, long fileSize, string relativePath, bool encrypted)
public object CreateUploadSession(string folderId, SessionModel sessionModel)
{
return FilesControllerHelperString.CreateUploadSession(folderId, fileName, fileSize, relativePath, encrypted);
return FilesControllerHelperString.CreateUploadSession(folderId, sessionModel.FileName, sessionModel.FileSize, sessionModel.RelativePath, sessionModel.Encrypted);
}
[Create("{folderId:int}/upload/create_session")]
public object CreateUploadSession(int folderId, string fileName, long fileSize, string relativePath, bool encrypted)
public object CreateUploadSession(int folderId, SessionModel sessionModel)
{
return FilesControllerHelperInt.CreateUploadSession(folderId, fileName, fileSize, relativePath, encrypted);
return FilesControllerHelperInt.CreateUploadSession(folderId, sessionModel.FileName, sessionModel.FileSize, sessionModel.RelativePath, sessionModel.Encrypted);
}
/// <summary>

18
products/ASC.Files/Server/Core/Entries/File.cs
View File

@ -215,9 +215,15 @@ namespace ASC.Files.Core
}
public object NativeAccessor { get; set; }
public FilesLinkUtility FilesLinkUtility { get; }
public FileUtility FileUtility { get; }
public FileConverter FileConverter { get; }
[NonSerialized]
private readonly FilesLinkUtility FilesLinkUtility;
[NonSerialized]
private readonly FileUtility FileUtility;
[NonSerialized]
private readonly FileConverter FileConverter;
private T _folderIdDisplay;
@ -235,10 +241,8 @@ namespace ASC.Files.Core
public static string Serialize(File<T> file)
{
using (var ms = new FileEntrySerializer().ToXml(file))
{
return Encoding.UTF8.GetString(ms.ToArray());
}
using var ms = new FileEntrySerializer().ToXml(file);
return Encoding.UTF8.GetString(ms.ToArray());
}
}
}

5
products/ASC.Files/Server/Core/Entries/FileEntry.cs
View File

@ -32,6 +32,8 @@ using ASC.Web.Files.Classes;
namespace ASC.Files.Core
{
[DataContract(Name = "entry", Namespace = "")]
[Serializable]
public abstract class FileEntry : ICloneable
{
public FileEntry(Global global)
@ -107,7 +109,8 @@ namespace ASC.Files.Core
public FileEntryType FileEntryType;
public Global Global { get; }
[NonSerialized]
protected Global Global;
private string _modifiedByString;
private string _createByString;

2
products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
View File

@ -251,7 +251,7 @@ namespace ASC.Files.Helpers
if (FilesLinkUtility.IsLocalFileUploader)
{
var session = FileUploader.InitiateUpload(file.FolderID.ToString(), (file.ID ?? default).ToString(), file.Title, file.ContentLength, encrypted);
var session = FileUploader.InitiateUpload(file.FolderID, (file.ID ?? default), file.Title, file.ContentLength, encrypted);
var response = ChunkedUploadSessionHelper.ToResponseObject(session, true);
return new

2
products/ASC.Files/Server/Helpers/ThirdpartyConfiguration.cs
View File

@ -64,7 +64,7 @@ namespace ASC.Web.Files.Helpers
public IEnumerable<string> ThirdPartyProviders
{
get { return (Configuration["files:thirdparty:enable"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries); }
get { return (Configuration.GetSection("files:thirdparty:enable").Get<string[]>() ?? new string[] { }).ToList(); }
}
public bool SupportInclusion

10
products/ASC.Files/Server/Model/SessionModel.cs Normal file
View File

@ -0,0 +1,10 @@
namespace ASC.Files.Model
{
public class SessionModel
{
public string FileName { get; set; }
public long FileSize { get; set; }
public string RelativePath { get; set; }
public bool Encrypted { get; set; }
}
}