Browse Source

LanguageCode parameter added for DocumentAppService.GetResourceAsync

pull/1180/head
Yunus Emre Kalkan 7 years ago
parent
commit
256e6ebce6
  1. 4
      modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
  2. 2
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStore.cs
  3. 2
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentStore.cs
  4. 4
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs

4
modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs

@ -72,12 +72,12 @@ namespace Volo.Docs.Documents
public async Task<DocumentResourceDto> GetResourceAsync(GetDocumentResourceInput input) public async Task<DocumentResourceDto> GetResourceAsync(GetDocumentResourceInput input)
{ {
var project = await _projectRepository.GetAsync(input.ProjectId); var project = await _projectRepository.GetAsync(input.ProjectId);
var cacheKey = $"Resource@{project.ShortName}#{input.Name}#{input.Version}"; var cacheKey = $"Resource@{project.ShortName}#{input.LanguageCode}#{input.Name}#{input.Version}";
async Task<DocumentResourceDto> GetResourceAsync() async Task<DocumentResourceDto> GetResourceAsync()
{ {
var store = _documentStoreFactory.Create(project.DocumentStoreType); var store = _documentStoreFactory.Create(project.DocumentStoreType);
var documentResource = await store.GetResource(project, input.Name, input.Version); var documentResource = await store.GetResource(project, input.Name, input.LanguageCode, input.Version);
return ObjectMapper.Map<DocumentResource, DocumentResourceDto>(documentResource); return ObjectMapper.Map<DocumentResource, DocumentResourceDto>(documentResource);
} }

2
modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStore.cs

@ -12,7 +12,7 @@ namespace Volo.Docs.Documents
Task<List<VersionInfo>> GetVersionsAsync(Project project); Task<List<VersionInfo>> GetVersionsAsync(Project project);
Task<DocumentResource> GetResource(Project project, string resourceName, string version); Task<DocumentResource> GetResource(Project project, string resourceName, string languageCode, string version);
Task<LanguageConfig> GetLanguageListAsync(Project project, string version); Task<LanguageConfig> GetLanguageListAsync(Project project, string version);
} }

2
modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentStore.cs

@ -55,7 +55,7 @@ namespace Volo.Docs.FileSystem.Documents
return JsonConvert.DeserializeObject<LanguageConfig>(configAsJson); return JsonConvert.DeserializeObject<LanguageConfig>(configAsJson);
} }
public async Task<DocumentResource> GetResource(Project project, string resourceName, string version) public async Task<DocumentResource> GetResource(Project project, string resourceName, string languageCode, string version)
{ {
var projectFolder = project.GetFileSystemPath(); var projectFolder = project.GetFileSystemPath();
var path = Path.Combine(projectFolder, resourceName); var path = Path.Combine(projectFolder, resourceName);

4
modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs

@ -91,9 +91,9 @@ namespace Volo.Docs.GitHub.Documents
return versions; return versions;
} }
public async Task<DocumentResource> GetResource(Project project, string resourceName, string version) public async Task<DocumentResource> GetResource(Project project, string resourceName, string languageCode, string version)
{ {
var rawRootUrl = CalculateRawRootUrl(project.GetGitHubUrl(version)); var rawRootUrl = CalculateRawRootUrlWithLanguageCode(project.GetGitHubUrl(version), languageCode);
var content = await DownloadWebContentAsByteArrayAsync( var content = await DownloadWebContentAsByteArrayAsync(
rawRootUrl + resourceName, rawRootUrl + resourceName,
project.GetGitHubAccessTokenOrNull(), project.GetGitHubAccessTokenOrNull(),

Loading…
Cancel
Save