Skip to content

use IHttpContextAccessor for build local files path #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stupakviktor merged 2 commits into from
Jun 9, 2025
Merged

use IHttpContextAccessor for build local files path #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f27ad69
use IHttpContextAccessor for build local files path
stupakviktor Jun 9, 2025
cbabc6a
add new version for release 8.0.3
stupakviktor Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/GroupDocs.Editor.UI.Api/Extensions/EditorServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.FeatureManagement;
using System;

namespace GroupDocs.Editor.UI.Api.Extensions;

Expand Down Expand Up @@ -44,6 +43,7 @@ public static IServiceCollection AddEditor<T>(
{
services.AddAutoMapper(typeof(DocumentInfoProfile));
services.AddMemoryCache();
services.AddHttpContextAccessor();
services.AddSingleton<IIdGeneratorService, IdGeneratorService>();
var featureManager = (IFeatureManager)services.BuildServiceProvider().GetService(typeof(IFeatureManager))!;
if (featureManager.IsEnabledAsync(EditorProductFamily.WordProcessing).Result)
Expand Down
2 changes: 1 addition & 1 deletion src/GroupDocs.Editor.UI.Api/GroupDocs.Editor.UI.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>GroupDocs.Editor.UI.Api</PackageId>
<Version>8.0.2</Version>
<Version>8.0.3</Version>
<Description>GroupDocs.Editor.UI.Api containing base API features required by GroupDocs.Editor.UI see https://github.com/groupdocs-editor/GroupDocs.Editor-for-.NET-UI for more details.</Description>
<PackageTags>GroupDocs;Editor;UI;API;ASP.NET Core;</PackageTags>
<Company>GroupDocs</Company>
Expand Down
1 change: 1 addition & 0 deletions src/GroupDocs.Editor.UI.Api/GroupDocs.Editor.UI.Api.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 34 additions & 39 deletions src/GroupDocs.Editor.UI.Api/Services/Implementation/EditorService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public EditorService(
await using Stream stream = new MemoryStream();
using Editor editor = new(request.Format);
editor.Save(stream);
var documentCode = _idGenerator.GenerateDocumentCode();
var originalFile = _storage.SaveFile(new List<FileContent>
Guid documentCode = _idGenerator.GenerateDocumentCode();
Task<IEnumerable<StorageResponse<StorageFile>>> originalFile = _storage.SaveFile(new List<FileContent>
{
new()
{
Expand All @@ -72,7 +72,7 @@ public EditorService(

//TODO will be rework on next releases.
stream.Seek(0, SeekOrigin.Begin);
var info = GetDocumentInfo(stream);
IDocumentInfo info = GetDocumentInfo(stream);
metaFile.DocumentInfo = _mapper.Map<StorageDocumentInfo>(info);
await _metaFileStorageCache.UpdateFiles(metaFile);
return metaFile;
Expand All @@ -95,8 +95,8 @@ public async Task<StorageMetaFile<TLoadOptions, TEditOptions>> UploadDocument(Up
{
await using Stream documentStream = request.Stream;
using Editor editor = new(documentStream, request.LoadOptions);
var documentCode = _idGenerator.GenerateDocumentCode();
var originalFile = await _storage.SaveFile(new List<FileContent>
Guid documentCode = _idGenerator.GenerateDocumentCode();
IEnumerable<StorageResponse<StorageFile>> originalFile = await _storage.SaveFile(new List<FileContent>
{
new()
{
Expand All @@ -120,7 +120,7 @@ public async Task<StorageMetaFile<TLoadOptions, TEditOptions>> UploadDocument(Up
}
catch (Exception e)
{
_logger.LogError(e, "Catch error while save file {fileName}", request.FileName);
_logger.LogError(e, "Catch error while save file {FileName}", request.FileName);
throw;
}
}
Expand Down Expand Up @@ -157,7 +157,7 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =
SpreadsheetEditOptions spreadsheetEdit => spreadsheetEdit.WorksheetIndex.ToString(),
_ => "0"
};
var convertedFile = new StorageSubFile<TEditOptions>(metaFile.OriginalFile.FileName, subIndex)
StorageSubFile<TEditOptions> convertedFile = new StorageSubFile<TEditOptions>(metaFile.OriginalFile.FileName, subIndex)
{ DocumentCode = metaFile.DocumentCode, EditOptions = editOptions };
await _storage.RemoveFolder(PathBuilder.New(convertedFile.DocumentCode, new[] { convertedFile.SubCode }));
HtmlSaveOptions saveOptions = new()
Expand All @@ -167,11 +167,11 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =
HtmlTagCase = HtmlCss.Serialization.TagRenderingCase.LowerCase,
SavingCallback = new StorageCallback<TEditOptions>(_storage, convertedFile)
};
using var originalDocument =
using StorageDisposableResponse<Stream> originalDocument =
await _storage.DownloadFile(PathBuilder.New(convertedFile.DocumentCode, new[] { metaFile.OriginalFile.FileName }));
if (originalDocument is not { IsSuccess: true } || originalDocument.Response == null)
{
_logger.LogError("Cannot download file {file}", metaFile.OriginalFile.FileName);
_logger.LogError("Cannot download file {FileName}", metaFile.OriginalFile.FileName);
throw new ArgumentNullException($"Cannot download file {metaFile.OriginalFile.FileName}");
}
using Editor editor = new(originalDocument.Response, loadOptions);
Expand All @@ -180,7 +180,7 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =
await using StreamWriter writer = new(document);
doc.Save(writer, saveOptions);
await writer.FlushAsync();
var storageFile = (await _storage
StorageResponse<StorageFile>? storageFile = (await _storage
.SaveFile(
new[]
{
Expand Down Expand Up @@ -208,7 +208,7 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =
}
catch (Exception exception)
{
_logger.LogError(exception, "Failed to convert file with code: {documentCode}", metaFile.DocumentCode);
_logger.LogError(exception, "Failed to convert file with code: {DocumentCode}", metaFile.DocumentCode);
throw;
}
}
Expand All @@ -221,16 +221,16 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =
public async Task<StorageMetaFile<TLoadOptions, TEditOptions>?> ConvertPreviews(Guid documentCode)
{
const string previewFolder = "preview";
var metaFile = await _metaFileStorageCache.DownloadFile(documentCode);
StorageMetaFile<TLoadOptions, TEditOptions>? metaFile = await _metaFileStorageCache.DownloadFile(documentCode);
if (metaFile == null)
{
return null;
}
using var originalDocument =
using StorageDisposableResponse<Stream> originalDocument =
await _storage.DownloadFile(PathBuilder.New(metaFile.DocumentCode, new[] { metaFile.OriginalFile.FileName }));
if (originalDocument is not { IsSuccess: true } || originalDocument.Response == null)
{
_logger.LogError("Cannot download file {file}", metaFile.OriginalFile.FileName);
_logger.LogError("Cannot download file {FileName}", metaFile.OriginalFile.FileName);
throw new ArgumentNullException($"Cannot download file {metaFile.OriginalFile.FileName}");
}

Expand All @@ -249,7 +249,7 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =
ResourceStream = svgPreview.ByteContent,
ResourceType = ResourceType.Preview
};
var preview =
StorageResponse<StorageFile>? preview =
(await _storage.SaveFile(new List<FileContent> { file }, PathBuilder.New(documentCode, new[] { previewFolder }))).FirstOrDefault();
if (preview is { IsSuccess: true, Response: not null })
{
Expand All @@ -264,10 +264,11 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =
/// <summary>
/// Saves the document to PDF format. If an edited version of the document exists, it will be converted; otherwise, the original document will be converted.
/// </summary>
/// <exception cref="ArgumentNullException"></exception>
/// <returns></returns>
public async Task<FileContent?> SaveToPdf(DownloadPdfRequest request)
{
var metaFile = await _metaFileStorageCache.DownloadFile(request.DocumentCode);
StorageMetaFile<TLoadOptions, TEditOptions>? metaFile = await _metaFileStorageCache.DownloadFile(request.DocumentCode);
if (metaFile == null)
{
return null;
Expand All @@ -276,12 +277,12 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =

try
{
using var originalDocument =
using StorageDisposableResponse<Stream> originalDocument =
await _storage.DownloadFile(PathBuilder.New(metaFile.DocumentCode, new[] { metaFile.OriginalFile.FileName }));
if (originalDocument is not { IsSuccess: true } || originalDocument.Response == null)
{
_logger.LogError("Cannot download file {file}", metaFile.OriginalFile.FileName);
throw new ArgumentNullException($"Cannot download file {metaFile.OriginalFile.FileName}");
_logger.LogError("Cannot download file {FileName}", metaFile.OriginalFile.FileName);
throw new ArgumentNullException(nameof(metaFile.OriginalFile.FileName), $"Cannot download file {metaFile.OriginalFile.FileName}");
}
using Editor editor = new(originalDocument.Response, metaFile.OriginalLoadOptions);
using EditableDocument doc = metaFile.StorageSubFiles.Any(a => a.Value.IsEdited)
Expand Down Expand Up @@ -312,16 +313,16 @@ public IDocumentInfo GetDocumentInfo(Stream stream, TLoadOptions? loadOptions =
/// <returns></returns>
public async Task<FileContent?> ConvertToDocument(DownloadDocumentRequest request)
{
var metaFile = await _metaFileStorageCache.DownloadFile(request.DocumentCode);
StorageMetaFile<TLoadOptions, TEditOptions>? metaFile = await _metaFileStorageCache.DownloadFile(request.DocumentCode);
if (metaFile == null)
{
return null;
}
using var originalDocument =
using StorageDisposableResponse<Stream> originalDocument =
await _storage.DownloadFile(PathBuilder.New(metaFile.DocumentCode, new[] { metaFile.OriginalFile.FileName }));
if (originalDocument is not { IsSuccess: true } || originalDocument.Response == null)
{
_logger.LogError("Cannot download file {file}", metaFile.OriginalFile.FileName);
_logger.LogError("Cannot download file {FileName}", metaFile.OriginalFile.FileName);
throw new ArgumentNullException($"Cannot download file {metaFile.OriginalFile.FileName}");
}
using Editor editor = new(originalDocument.Response, metaFile.OriginalLoadOptions);
Expand Down Expand Up @@ -364,16 +365,13 @@ public async Task<StorageResponse<StorageSubFile<TEditOptions>>> UpdateHtmlConte
string htmlContents)
{
await _storage.RemoveFile(PathBuilder.New(currentContent.DocumentCode, new[] { currentContent.SubCode, currentContent.EditedHtmlName }));
if (currentContent.Resources.ContainsKey(currentContent.EditedHtmlName))
{
currentContent.Resources.Remove(currentContent.EditedHtmlName);
}
using var stream = new MemoryStream();
var writer = new StreamWriter(stream);
currentContent.Resources.Remove(currentContent.EditedHtmlName);
using MemoryStream stream = new MemoryStream();
StreamWriter writer = new StreamWriter(stream);
await writer.WriteAsync(htmlContents);
await writer.FlushAsync();
stream.Seek(0, SeekOrigin.Begin);
var storageFile =
StorageResponse<StorageFile>? storageFile =
(await _storage.SaveFile(new[] { new FileContent { FileName = currentContent.EditedHtmlName, ResourceStream = stream, ResourceType = ResourceType.HtmlContent } },
PathBuilder.New(currentContent.DocumentCode, new[] { currentContent.SubCode }))).FirstOrDefault();
if (storageFile is not { IsSuccess: true } || storageFile.Response == null)
Expand All @@ -390,10 +388,7 @@ public async Task<StorageUpdateResourceResponse<StorageSubFile<TEditOptions>, St
if (!string.IsNullOrWhiteSpace(resource.OldResourceName))
{
await _storage.RemoveFile(PathBuilder.New(currentContent.DocumentCode, new[] { currentContent.SubCode, resource.OldResourceName }));
if (currentContent.Resources.ContainsKey(resource.OldResourceName))
{
currentContent.Resources.Remove(resource.OldResourceName);
}
currentContent.Resources.Remove(resource.OldResourceName);
}
ResourceType type;
switch (resource.ResourceType)
Expand All @@ -411,11 +406,11 @@ public async Task<StorageUpdateResourceResponse<StorageSubFile<TEditOptions>, St
type = ResourceType.Audio;
break;
default:
_logger.LogError("Resource with type: {type} is unknown", resource.ResourceType);
_logger.LogError("Resource with type: {ResourceType} is unknown", resource.ResourceType);
throw new ArgumentOutOfRangeException($"Resource with type: {resource.ResourceType} is unknown");
}
await using var fileStream = resource.File.OpenReadStream();
var storageFile =
await using Stream fileStream = resource.File.OpenReadStream();
StorageResponse<StorageFile>? storageFile =
(await _storage.SaveFile(new[] { new FileContent { FileName = resource.File.FileName, ResourceStream = fileStream, ResourceType = type } },
PathBuilder.New(currentContent.DocumentCode, new[] { currentContent.SubCode }))).FirstOrDefault();
if (storageFile is not { IsSuccess: true } || storageFile.Response == null)
Expand Down Expand Up @@ -474,17 +469,17 @@ private async Task<EditableDocument> EditableDocumentFromMarkup(StorageSubFile<T
{
try
{
var response =
StorageResponse<string> response =
await _storage.GetFileText(PathBuilder.New(oneSubFile.DocumentCode, new[] { oneSubFile.SubCode, oneSubFile.EditedHtmlName }));
if (response is not { IsSuccess: true } || response.Response == null)
{
throw new ArgumentException("Cannot get a html file from storage", nameof(response.Response));
}

List<IHtmlResource> resources = new(oneSubFile.Resources.Count);
foreach (var oneFile in oneSubFile.Resources.Values)
foreach (StorageFile oneFile in oneSubFile.Resources.Values)
{
var stream = await _storage.DownloadFile(PathBuilder.New(oneSubFile.DocumentCode, new[] { oneSubFile.SubCode, oneFile.FileName }));
StorageDisposableResponse<Stream> stream = await _storage.DownloadFile(PathBuilder.New(oneSubFile.DocumentCode, new[] { oneSubFile.SubCode, oneFile.FileName }));
if (stream is not { IsSuccess: true } || stream.Response == null)
{
continue;
Expand Down
Loading