diff --git a/src/main/java/org/genesys2/server/api/v1/RepositoryController.java b/src/main/java/org/genesys2/server/api/v1/RepositoryController.java index 11813c408861eea9b65d4fa2c9f96bf50c86328f..7f304b248166598a2a28d1d614e0bfea89e8dfd7 100644 --- a/src/main/java/org/genesys2/server/api/v1/RepositoryController.java +++ b/src/main/java/org/genesys2/server/api/v1/RepositoryController.java @@ -283,11 +283,11 @@ public class RepositoryController { private FolderDetails folderDetails(final Path path) throws InvalidRepositoryPathException { FolderDetails fd = new FolderDetails(); fd.folder = repositoryService.getFolder(path); - fd.subFolders = repositoryService.getFolders(path); + fd.subFolders = repositoryService.getFolders(path, RepositoryFolder.DEFAULT_SORT); if (fd.folder == null && !path.toAbsolutePath().toString().equals("/")) { throw new ResourceNotFoundException("No such folder"); } - fd.files = repositoryService.getFiles(path); + fd.files = repositoryService.getFiles(path, RepositoryFile.DEFAULT_SORT); fd.gallery = imagegalleryService.loadImageGallery(path); return fd; } diff --git a/src/main/java/org/genesys2/server/mvc/WiewsController.java b/src/main/java/org/genesys2/server/mvc/WiewsController.java index f66e4f2b208fc3e829038e0cf7377383dd72048f..5a8294c29895c9fdf43af832f2e2abdcb7ddc436 100644 --- a/src/main/java/org/genesys2/server/mvc/WiewsController.java +++ b/src/main/java/org/genesys2/server/mvc/WiewsController.java @@ -558,13 +558,13 @@ public class WiewsController extends BaseController { } List subPaths = new ArrayList<>(); - for (RepositoryFolder subPath : repositoryService.listPaths(repositoryPath)) { + for (RepositoryFolder subPath : repositoryService.listPathsRecursively(repositoryPath)) { if (!subPath.getFolderPath().equals(repositoryPath)) { subPaths.add(institutePath.relativize(subPath.getFolderPath()).toString()); } } - model.addAttribute("fileList", repositoryService.getFiles(repositoryPath)); + model.addAttribute("fileList", repositoryService.getFiles(repositoryPath, RepositoryFile.DEFAULT_SORT)); model.addAttribute("currentPath", repositoryPath); model.addAttribute("subPaths", subPaths); model.addAttribute("imageGallery", imageGalleryService.loadImageGallery(repositoryPath)); @@ -745,7 +745,7 @@ public class WiewsController extends BaseController { response.setContentType("text/csv;charset=UTF-16LE"); response.setHeader("Content-Disposition", "attachment; filename=" + wiewsCode + "_files_metadata.csv "); - Stream files = repositoryService.streamFiles(wiewsPath); + Stream files = repositoryService.streamFiles(wiewsPath, RepositoryFile.DEFAULT_SORT); filesMetadataInfo.downloadMetadata(files, response, '\t', '"', '\\', "\n", "UTF-16LE"); } diff --git a/src/main/java/org/genesys2/server/mvc/admin/RepositoryController.java b/src/main/java/org/genesys2/server/mvc/admin/RepositoryController.java index b999e90b2a2e070453fc695d1810387c434e4646..e2dd88da4fa0d06e5316996b2bb5d450e8205852 100644 --- a/src/main/java/org/genesys2/server/mvc/admin/RepositoryController.java +++ b/src/main/java/org/genesys2/server/mvc/admin/RepositoryController.java @@ -115,11 +115,11 @@ public class RepositoryController extends BaseController { } RepositoryFolder currentFolder = repositoryService.getFolder(path); - List fileList = repositoryService.getFiles(path); + List fileList = repositoryService.getFiles(path, RepositoryFile.DEFAULT_SORT); model.addAttribute("fileList", fileList); model.addAttribute("currentPath", path); model.addAttribute("currentFolder", currentFolder); - model.addAttribute("subPaths", repositoryService.getFolders(path)); + model.addAttribute("subPaths", repositoryService.getFolders(path, RepositoryFolder.DEFAULT_SORT)); model.addAttribute("imageGallery", imageGalleryService.loadImageGallery(path)); diff --git a/src/main/java/org/genesys2/spring/config/ApplicationStartup.java b/src/main/java/org/genesys2/spring/config/ApplicationStartup.java index b0e8ad0513c9f85bc76dcd7ecc445f7b70f1efa9..9655f489c55b551c81ef3ee9b8519bfa1772deff 100644 --- a/src/main/java/org/genesys2/spring/config/ApplicationStartup.java +++ b/src/main/java/org/genesys2/spring/config/ApplicationStartup.java @@ -262,7 +262,7 @@ public class ApplicationStartup implements InitializingBean, ApplicationListener private void ensureInsituteFolders() throws Exception { asAdminInvoker.invoke(() -> { - List wiewsFolders = repositoryService.getFolders(Paths.get("/wiews")); + List wiewsFolders = repositoryService.getFolders(Paths.get("/wiews"), RepositoryFolder.DEFAULT_SORT); for (RepositoryFolder instFolder: wiewsFolders) { LOG.warn("Ensuring inheritance for {}", instFolder.getFolderPath()); FaoInstitute institute = instituteRepository.findByCode(instFolder.getName());