From c540781572077468f4c5bba401ff00ad1ef47b02 Mon Sep 17 00:00:00 2001 From: gsd Date: Sun, 11 May 2025 19:32:29 +0300 Subject: [PATCH] file pre loader fix --- ext/python-docker-client/dockerclient.py | 4 ++-- src/main/java/app/controllers/FileController.java | 12 ++++++------ src/main/java/app/repositories/FileRepository.java | 6 ++++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ext/python-docker-client/dockerclient.py b/ext/python-docker-client/dockerclient.py index 1ad4b52..9345a71 100644 --- a/ext/python-docker-client/dockerclient.py +++ b/ext/python-docker-client/dockerclient.py @@ -37,8 +37,8 @@ class Client: async with session.get(self.url, ssl = False) as response: self.servers = await response.json() return self.servers - except: - traceback.print_exc() + except Exception as err: + print(f"Srv request err {err}") return [] async def update_stats(self, sc): diff --git a/src/main/java/app/controllers/FileController.java b/src/main/java/app/controllers/FileController.java index bc29bf9..e868e9a 100644 --- a/src/main/java/app/controllers/FileController.java +++ b/src/main/java/app/controllers/FileController.java @@ -136,19 +136,19 @@ public class FileController { public String getUrl(String tags) { logger.info("Search " + tags + " in files"); - DbFile dbFile = fileRepository.getDbFilesByTag(tags); - if (dbFile == null) + UUID uuid = fileRepository.getUUIDFilesByTag(tags); + if (uuid == null) throw new RuntimeException("Cannot find: " + tags); logger.info("Search {} end with success", tags); - return endpoint+"/"+dbFile.getId(); + return endpoint+"/"+uuid; } public String getUrlWithNameAndTag(String filename, String tag) { logger.info("Search {} with tag: {} in files", filename, tag); - DbFile dbFile = fileRepository.getDbFileByFilenameAndTag(filename + ".%", tag); - if (dbFile == null) + UUID uuid = fileRepository.getUUIDByFilenameAndTag(filename + ".%", tag); + if (uuid == null) throw new RuntimeException("Cannot find: " + filename); logger.info("Search {} with tag: {} end with success", filename, tag); - return endpoint+"/"+dbFile.getId(); + return endpoint+"/"+uuid; } } diff --git a/src/main/java/app/repositories/FileRepository.java b/src/main/java/app/repositories/FileRepository.java index c01d528..190a4e5 100644 --- a/src/main/java/app/repositories/FileRepository.java +++ b/src/main/java/app/repositories/FileRepository.java @@ -11,6 +11,12 @@ public interface FileRepository extends CrudRepository { @Query("select f from DbFile f where position(:tags in f.tags) > 0 order by f.timestamp desc limit 1") DbFile getDbFilesByTag(@Param(value = "tags") String tags); + @Query("select f.id from DbFile f where position(:tags in f.tags) > 0 order by f.timestamp desc limit 1") + UUID getUUIDFilesByTag(@Param(value = "tags") String tags); + @Query("select f from DbFile f where f.filename like :filename and position(:tag in f.tags) > 0 order by f.timestamp desc limit 1") DbFile getDbFileByFilenameAndTag(@Param(value = "filename") String filename, @Param(value = "tag") String tag); + + @Query("select f.id from DbFile f where f.filename like :filename and position(:tag in f.tags) > 0 order by f.timestamp desc limit 1") + UUID getUUIDByFilenameAndTag(@Param(value = "filename") String filename, @Param(value = "tag") String tag); }