Browse Source

file pre loader fix

master
gsd 6 days ago
parent
commit
c540781572
  1. 4
      ext/python-docker-client/dockerclient.py
  2. 12
      src/main/java/app/controllers/FileController.java
  3. 6
      src/main/java/app/repositories/FileRepository.java

4
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):

12
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;
}
}

6
src/main/java/app/repositories/FileRepository.java

@ -11,6 +11,12 @@ public interface FileRepository extends CrudRepository<DbFile, UUID> {
@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);
}

Loading…
Cancel
Save