Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

GetFiles and GetFolder by folder path

Browse Source
This commit is contained in:
Pavel Vesely
2020-03-07 01:36:25 +01:00
parent b9b89e6046
commit 92444ccf75
6 changed files with 104 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Oqtane.Client/Services/FileService.cs
View File

@ -1,9 +1,11 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.Logging;
using Microsoft.JSInterop;
using Oqtane.Models;
using Oqtane.Shared;
@ -12,12 +14,14 @@ namespace Oqtane.Services
{
public class FileService : ServiceBase, IFileService
{
private readonly ILogger<FileService> _logger;
private readonly HttpClient _http;
private readonly SiteState _siteState;
private readonly NavigationManager _navigationManager;
private readonly IJSRuntime _jsRuntime;
public FileService(HttpClient http, SiteState siteState, NavigationManager navigationManager, IJSRuntime jsRuntime)
public FileService(HttpClient http, SiteState siteState, NavigationManager navigationManager, IJSRuntime jsRuntime, ILogger<FileService> Logger)
{
_http = http;
_siteState = siteState;
@ -40,6 +44,21 @@ namespace Oqtane.Services
return await _http.GetJsonAsync<List<File>>(apiurl + "?folder=" + Folder);
}
public async Task<List<File>> GetFilesAsync(int siteId, string folderPath)
{
try
{
if (!folderPath.EndsWith("\\")) folderPath += "\\";
var path = WebUtility.UrlEncode(folderPath);
return await _http.GetJsonAsync<List<File>>($"{apiurl}/{siteId}/{path}");
}
catch (Exception e)
{
_logger.LogDebug(e,"Folder not found: {path}");
}
return null;
}
public async Task<File> GetFileAsync(int FileId)
{
return await _http.GetJsonAsync<File>(apiurl + "/" + FileId.ToString());

24
Oqtane.Client/Services/FolderService.cs
View File

@ -6,6 +6,9 @@ using Microsoft.AspNetCore.Components;
using System.Collections.Generic;
using Oqtane.Shared;
using System;
using System.Diagnostics.CodeAnalysis;
using System.Net;
using Microsoft.Extensions.Logging;
namespace Oqtane.Services
{
@ -14,12 +17,14 @@ namespace Oqtane.Services
private readonly HttpClient _http;
private readonly SiteState _siteState;
private readonly NavigationManager _navigationManager;
public FolderService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
private readonly ILogger<FolderService> _logger;
public FolderService(HttpClient http, SiteState siteState, NavigationManager navigationManager, ILogger<FolderService> logger)
{
_http = http;
_siteState = siteState;
_navigationManager = navigationManager;
_logger = logger;
}
private string apiurl
@ -38,6 +43,21 @@ namespace Oqtane.Services
{
return await _http.GetJsonAsync<Folder>(apiurl + "/" + FolderId.ToString());
}
public async Task<Folder> GetFolderAsync(int siteId, [NotNull]string folderPath)
{
try
{
if (!folderPath.EndsWith("\\")) folderPath += "\\";
var path = WebUtility.UrlEncode(folderPath);
return await _http.GetJsonAsync<Folder>($"{apiurl}/{siteId}/{path}");
}
catch (Exception e)
{
_logger.LogDebug(e,"Folder not found: {path}");
}
return null;
}
public async Task<Folder> AddFolderAsync(Folder Folder)
{

1
Oqtane.Client/Services/Interfaces/IFileService.cs
View File

@ -17,5 +17,6 @@ namespace Oqtane.Services
Task<string> UploadFilesAsync(string Folder, string[] Files, string FileUploadName);
Task<byte[]> DownloadFileAsync(int FileId);
Task<List<File>> GetFilesAsync(int siteId, string folderPath);
}
}

2
Oqtane.Client/Services/Interfaces/IFolderService.cs
View File

@ -1,5 +1,6 @@
using Oqtane.Models;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
namespace Oqtane.Services
@ -12,5 +13,6 @@ namespace Oqtane.Services
Task<Folder> UpdateFolderAsync(Folder Folder);
Task UpdateFolderOrderAsync(int SiteId, int FolderId, int? ParentId);
Task DeleteFolderAsync(int FolderId);
Task<Folder> GetFolderAsync(int siteId, [NotNull]string folderPath);
}
}