Merge v25.1 updates into main (#66)

* Fixed exception caused by concurrent cache access

* Print images in image mode instead of PDF. Fixed EnableFileName to hide filenames in the thumbnails pane (fixes #65)

* Support for custom file name (fixes #65)

* Updated GroupDocs.Viewer for .NET to 25.1.1 (fixes #64)

* Updated affected distribution package versions

Author: vladimir-litvinchik

build/dependencies.props

@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup Label="Package Versions">
-		<GroupDocsViewer>24.12.0</GroupDocsViewer>
+		<GroupDocsViewer>25.1.1</GroupDocsViewer>
 
 		<MicrosoftExtensionsHttp>8.0.1</MicrosoftExtensionsHttp>
 		<MicrosoftExtensionsDependencyInjectionAbstractions>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractions>
@@ -35,18 +35,18 @@
 	</PropertyGroup>
 
 	<PropertyGroup Label="GroupDocs.Viewer UI Package Versions">
-		<GroupDocsViewerUI>8.0.1</GroupDocsViewerUI>
-		<GroupDocsViewerUIApi>8.0.1</GroupDocsViewerUIApi>
-		<GroupDocsViewerUIApiLocalCache>8.0.1</GroupDocsViewerUIApiLocalCache>
-		<GroupDocsViewerUIApiInMemoryCache>8.0.1</GroupDocsViewerUIApiInMemoryCache>
-		<GroupDocsViewerUIApiLocalStorage>8.0.1</GroupDocsViewerUIApiLocalStorage>
-		<GroupDocsViewerUIApiCloudStorage>8.0.1</GroupDocsViewerUIApiCloudStorage>
-		<GroupDocsViewerUIApiAzureStorage>8.0.1</GroupDocsViewerUIApiAzureStorage>
-		<GroupDocsViewerUIApiAwsS3Storage>8.0.1</GroupDocsViewerUIApiAwsS3Storage>
-		<GroupDocsViewerUICore>8.0.1</GroupDocsViewerUICore>
-		<GroupDocsViewerUISelfHostApi>8.0.1</GroupDocsViewerUISelfHostApi>
-		<GroupDocsViewerUISelfHostApiCrossPlatform>8.0.1</GroupDocsViewerUISelfHostApiCrossPlatform>
-		<GroupDocsViewerUICloudApi>8.0.1</GroupDocsViewerUICloudApi>
+		<GroupDocsViewerUI>8.0.2</GroupDocsViewerUI>
+		<GroupDocsViewerUIApi>8.0.2</GroupDocsViewerUIApi>
+		<GroupDocsViewerUIApiLocalCache>8.0.2</GroupDocsViewerUIApiLocalCache>
+		<GroupDocsViewerUIApiInMemoryCache>8.0.2</GroupDocsViewerUIApiInMemoryCache>
+		<GroupDocsViewerUIApiLocalStorage>8.0.2</GroupDocsViewerUIApiLocalStorage>
+		<GroupDocsViewerUIApiCloudStorage>8.0.2</GroupDocsViewerUIApiCloudStorage>
+		<GroupDocsViewerUIApiAzureStorage>8.0.2</GroupDocsViewerUIApiAzureStorage>
+		<GroupDocsViewerUIApiAwsS3Storage>8.0.2</GroupDocsViewerUIApiAwsS3Storage>
+		<GroupDocsViewerUICore>8.0.2</GroupDocsViewerUICore>
+		<GroupDocsViewerUISelfHostApi>8.0.2</GroupDocsViewerUISelfHostApi>
+		<GroupDocsViewerUISelfHostApiCrossPlatform>8.0.2</GroupDocsViewerUISelfHostApiCrossPlatform>
+		<GroupDocsViewerUICloudApi>8.0.2</GroupDocsViewerUICloudApi>
 	</PropertyGroup>
 
 </Project>

src/GroupDocs.Viewer.UI.API/Controllers/ViewerController.cs

@@ -109,10 +109,14 @@ public async Task<IActionResult> ViewData([FromBody] ViewDataRequest request)
                 var pages = await CreateViewDataPages(file, docInfo, pagesToCreate);
 
                 var searchTerm = await _searchTermResolver.ResolveSearchTermAsync(request.File);
+                var fileName = await _fileNameResolver.ResolveFileNameAsync(request.File);
                 var response = new ViewDataResponse
                 {
                     File = request.File,
                     FileType = docInfo.FileType,
+                    FileName = string.IsNullOrEmpty(fileName) 
+                        ? Path.GetFileName(request.File) 
+                        : fileName,
                     CanPrint = docInfo.PrintAllowed,
                     SearchTerm = searchTerm,
                     Pages = pages

src/GroupDocs.Viewer.UI.API/Models/ViewDataResponse.cs

@@ -17,6 +17,13 @@ public class ViewDataResponse
         [JsonPropertyName("fileType")]
         public string FileType { get; set; }
 
+        /// <summary>
+        /// Custom filename. 
+        /// Can be specified through registering `IFileNameResolver` service.
+        /// </summary>
+        [JsonPropertyName("fileName")]
+        public string FileName { get; set; }
+
         /// <summary>
         /// Indicates if printing of the document is allowed.
         /// </summary>
@@ -25,6 +32,7 @@ public class ViewDataResponse
 
         /// <summary>
         /// Search term from back to UI search after load document.
+        /// Can be specified through registering `ISearchTermResolver` service.
         /// </summary>
         [JsonPropertyName("searchTerm")]
         public string SearchTerm { get; set; }

src/GroupDocs.Viewer.UI.Core/Caching/CachingViewer.cs

@@ -102,17 +102,15 @@ public async Task<Thumb> GetThumbAsync(FileCredentials fileCredentials, int page
             return page;
         }
 
-        public Task<DocumentInfo> GetDocumentInfoAsync(FileCredentials fileCredentials)
+        public async Task<DocumentInfo> GetDocumentInfoAsync(FileCredentials fileCredentials)
         {
             var cacheKey = CacheKeys.FILE_INFO_CACHE_KEY;
-            return _fileCache.GetValueAsync(cacheKey, fileCredentials.FilePath, async () =>
+
+            using (await _asyncLock.LockAsync(fileCredentials.FilePath))
             {
-                using (await _asyncLock.LockAsync(fileCredentials.FilePath))
-                {
-                    return await _fileCache.GetValueAsync(cacheKey, fileCredentials.FilePath, () =>
+                return await _fileCache.GetValueAsync(cacheKey, fileCredentials.FilePath, () =>
                         _viewer.GetDocumentInfoAsync(fileCredentials));
-                }
-            });
+            }
         }
 
         public Task<byte[]> GetPdfAsync(FileCredentials fileCredentials)
@@ -173,7 +171,7 @@ private async Task<Pages> CreatePages(FileCredentials fileCredentials, int[] pag
                 var pages = Combine(pagesOrNulls, createdPages);
 
                 return pages;
-            }   
+            }
         }
 
         private async Task<Thumbs> CreateThumbs(FileCredentials fileCredentials, int[] pageNumbers)
@@ -248,7 +246,7 @@ private Task SaveToCache(string filePath, Pages createdPages)
                     var savePageTask = _fileCache.SetAsync(cacheKey, filePath, page.PageData);
                     var saveResourcesTask = SaveResourcesAsync(filePath, page.PageNumber, page.Resources);
 
-                    return new[] {savePageTask, saveResourcesTask};
+                    return new[] { savePageTask, saveResourcesTask };
                 });
 
             return Task.WhenAll(tasks);
@@ -313,7 +311,7 @@ private List<CachedPage> GetPagesOrNullsFromCache(string filePath, int[] pageNum
                     new CachedPage(page.pageNumber, _fileCache.TryGetValue<byte[]>(page.cacheKey, filePath)))
                 .ToList();
         }
-        
+
         private List<CachedThumb> GetThumbsOrNullsFromCache(string filePath, int[] pageNumbers)
         {
             return pageNumbers