From 80866f89b78d9c0ca6a41ac1712e61bf252ae69e Mon Sep 17 00:00:00 2001 From: Sweidan Omar Date: Tue, 25 Jan 2022 11:41:27 +0000 Subject: [PATCH] #311 git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32887 --- .../jobs/steps/MoveJpegToIsilonStep.java | 27 +++++++++++-------- .../server/steps/MoveJpegToIsilonStep.java | 27 +++++++++++-------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java b/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java index 2b2a13ba..48580358 100644 --- a/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java +++ b/server/-product/production/LOCAL/jobs/steps/MoveJpegToIsilonStep.java @@ -41,6 +41,7 @@ public class MoveJpegToIsilonStep extends JobStep { sourceStoreUri.setProtocol(RemoteStoreProtocol.valueOf(sourceProtocol)); FileVisitor visitor = new SimpleFileVisitor() { + boolean isFolderDateBeforeNow = false; String fileNamePattern = "yyyymmdd"; SimpleDateFormat dateFormatter = new SimpleDateFormat(fileNamePattern); Date currentDate = new Date(); // initializes with the current date @@ -52,22 +53,26 @@ public class MoveJpegToIsilonStep extends JobStep { if (Files.isDirectory(path)) { dateFromFileName = dateFormatter.parse(path.toString().substring(0, 8)); if (!(dateFromFileName.compareTo(currentDate) > 0)) { + isFolderDateBeforeNow = false; return FileVisitResult.SKIP_SUBTREE; } else { + isFolderDateBeforeNow = true; return FileVisitResult.CONTINUE; } } else { - String fileExtension = FilenameUtils.getExtension(path.toString()); - - if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) { - logger.info("path: {}", path.toString()); - foundItems.add(path.toString()); - StoreUri targetStoreUri = getManager() - .createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri); - targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol)); - targetStoreUri.setRootPath(targetFolder); - - copyFile(path, Paths.get(targetStoreUri.getRootPath())); + if (isFolderDateBeforeNow) { + String fileExtension = FilenameUtils.getExtension(path.toString()); + + if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) { + logger.info("path: {}", path.toString()); + foundItems.add(path.toString()); + StoreUri targetStoreUri = getManager() + .createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri); + targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol)); + targetStoreUri.setRootPath(targetFolder); + + copyFile(path, Paths.get(targetStoreUri.getRootPath())); + } } } } catch (ParseException e) { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MoveJpegToIsilonStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MoveJpegToIsilonStep.java index 2b2a13ba..48580358 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MoveJpegToIsilonStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MoveJpegToIsilonStep.java @@ -41,6 +41,7 @@ public class MoveJpegToIsilonStep extends JobStep { sourceStoreUri.setProtocol(RemoteStoreProtocol.valueOf(sourceProtocol)); FileVisitor visitor = new SimpleFileVisitor() { + boolean isFolderDateBeforeNow = false; String fileNamePattern = "yyyymmdd"; SimpleDateFormat dateFormatter = new SimpleDateFormat(fileNamePattern); Date currentDate = new Date(); // initializes with the current date @@ -52,22 +53,26 @@ public class MoveJpegToIsilonStep extends JobStep { if (Files.isDirectory(path)) { dateFromFileName = dateFormatter.parse(path.toString().substring(0, 8)); if (!(dateFromFileName.compareTo(currentDate) > 0)) { + isFolderDateBeforeNow = false; return FileVisitResult.SKIP_SUBTREE; } else { + isFolderDateBeforeNow = true; return FileVisitResult.CONTINUE; } } else { - String fileExtension = FilenameUtils.getExtension(path.toString()); - - if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) { - logger.info("path: {}", path.toString()); - foundItems.add(path.toString()); - StoreUri targetStoreUri = getManager() - .createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri); - targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol)); - targetStoreUri.setRootPath(targetFolder); - - copyFile(path, Paths.get(targetStoreUri.getRootPath())); + if (isFolderDateBeforeNow) { + String fileExtension = FilenameUtils.getExtension(path.toString()); + + if (fileExtension.equals("jpg") || fileExtension.equals("jpeg")) { + logger.info("path: {}", path.toString()); + foundItems.add(path.toString()); + StoreUri targetStoreUri = getManager() + .createStoreUri(RemoteStoreProtocol.valueOf(targetProtocol), targetUri); + targetStoreUri.setProtocol(RemoteStoreProtocol.valueOf(targetProtocol)); + targetStoreUri.setRootPath(targetFolder); + + copyFile(path, Paths.get(targetStoreUri.getRootPath())); + } } } } catch (ParseException e) { -- 2.54.0