# Description of Changes This pull request includes several changes primarily focused on improving configuration management, removing deprecated methods, and updating paths for external dependencies. The most important changes are summarized below: ### Configuration Management Improvements: * Added a new `RuntimePathConfig` class to manage dynamic paths for operations and pipeline configurations (`src/main/java/stirling/software/SPDF/config/RuntimePathConfig.java`). * Removed the `bookAndHtmlFormatsInstalled` bean and its associated logic from `AppConfig` and `EndpointConfiguration` (`src/main/java/stirling/software/SPDF/config/AppConfig.java`, `src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java`). [[1]](diffhunk://#diff-4d774ec79aa55750c0a4739bee971b68877078b73654e863fd40ee924347e143L130-L138) [[2]](diffhunk://#diff-750f31f6ecbd64b025567108a33775cad339e835a04360affff82a09410b697dL12-L35) [[3]](diffhunk://#diff-750f31f6ecbd64b025567108a33775cad339e835a04360affff82a09410b697dL275-L280) ### External Dependency Path Updates: * Updated paths for `weasyprint` and `unoconvert` in `ExternalAppDepConfig` to use values from `RuntimePathConfig` (`src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java`). [[1]](diffhunk://#diff-c47af298c07c2622aa98b038b78822c56bdb002de71081e102d344794e7832a6R12-L33) [[2]](diffhunk://#diff-c47af298c07c2622aa98b038b78822c56bdb002de71081e102d344794e7832a6L104-R115) ### Minor Adjustments: * Corrected a typo from "Unoconv" to "Unoconvert" in `EndpointConfiguration` (`src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java`). --- ## Checklist ### General - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [ ] I have performed a self-review of my own code - [ ] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details.
205 lines
8.0 KiB
Java
205 lines
8.0 KiB
Java
package stirling.software.SPDF.utils;
|
|
|
|
import static java.nio.file.StandardWatchEventKinds.*;
|
|
|
|
import java.io.IOException;
|
|
import java.io.RandomAccessFile;
|
|
import java.nio.channels.FileChannel;
|
|
import java.nio.channels.FileLock;
|
|
import java.nio.file.*;
|
|
import java.util.*;
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
import java.util.function.Predicate;
|
|
import java.util.stream.Stream;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import stirling.software.SPDF.config.RuntimePathConfig;
|
|
|
|
@Component
|
|
@Slf4j
|
|
public class FileMonitor {
|
|
|
|
private final Map<Path, WatchKey> path2KeyMapping;
|
|
private final Set<Path> newlyDiscoveredFiles;
|
|
private final ConcurrentHashMap.KeySetView<Path, Boolean> readyForProcessingFiles;
|
|
private final WatchService watchService;
|
|
private final Predicate<Path> pathFilter;
|
|
private final Path rootDir;
|
|
private Set<Path> stagingFiles;
|
|
|
|
/**
|
|
* @param rootDirectory the root directory to monitor
|
|
* @param pathFilter the filter to apply to the paths, return true if the path should be
|
|
* monitored, false otherwise
|
|
*/
|
|
@Autowired
|
|
public FileMonitor(
|
|
@Qualifier("directoryFilter") Predicate<Path> pathFilter,
|
|
RuntimePathConfig runtimePathConfig)
|
|
throws IOException {
|
|
this.newlyDiscoveredFiles = new HashSet<>();
|
|
this.path2KeyMapping = new HashMap<>();
|
|
this.stagingFiles = new HashSet<>();
|
|
this.pathFilter = pathFilter;
|
|
this.readyForProcessingFiles = ConcurrentHashMap.newKeySet();
|
|
this.watchService = FileSystems.getDefault().newWatchService();
|
|
this.rootDir = Path.of(runtimePathConfig.getPipelineWatchedFoldersPath()).toAbsolutePath();
|
|
}
|
|
|
|
private boolean shouldNotProcess(Path path) {
|
|
return !pathFilter.test(path);
|
|
}
|
|
|
|
private void recursivelyRegisterEntry(Path dir) throws IOException {
|
|
WatchKey key = dir.register(watchService, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
|
|
path2KeyMapping.put(dir, key);
|
|
log.info("Registered directory: {}", dir);
|
|
|
|
try (Stream<Path> directoryVisitor = Files.walk(dir, 1)) {
|
|
final Iterator<Path> iterator = directoryVisitor.iterator();
|
|
while (iterator.hasNext()) {
|
|
Path path = iterator.next();
|
|
if (path.equals(dir) || shouldNotProcess(path)) continue;
|
|
|
|
if (Files.isDirectory(path)) {
|
|
recursivelyRegisterEntry(path);
|
|
} else if (Files.isRegularFile(path)) {
|
|
handleFileCreation(path);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
@Scheduled(fixedRate = 5000)
|
|
public void trackFiles() {
|
|
/*
|
|
All files observed changes in the last iteration will be considered as staging files.
|
|
If those files are not modified in current iteration, they will be considered as ready for processing.
|
|
*/
|
|
stagingFiles = new HashSet<>(newlyDiscoveredFiles);
|
|
readyForProcessingFiles.clear();
|
|
|
|
if (path2KeyMapping.isEmpty()) {
|
|
log.warn("not monitoring any directory, even the root directory itself: {}", rootDir);
|
|
if (Files.exists(
|
|
rootDir)) { // if the root directory exists, re-register the root directory
|
|
try {
|
|
recursivelyRegisterEntry(rootDir);
|
|
} catch (IOException e) {
|
|
log.error("unable to register monitoring", e);
|
|
}
|
|
}
|
|
}
|
|
|
|
WatchKey key;
|
|
while ((key = watchService.poll()) != null) {
|
|
final Path watchingDir = (Path) key.watchable();
|
|
key.pollEvents()
|
|
.forEach(
|
|
(evt) -> {
|
|
final Path path = (Path) evt.context();
|
|
final WatchEvent.Kind<?> kind = evt.kind();
|
|
if (shouldNotProcess(path)) return;
|
|
|
|
try {
|
|
if (Files.isDirectory(path)) {
|
|
if (kind == ENTRY_CREATE) {
|
|
handleDirectoryCreation(path);
|
|
}
|
|
/*
|
|
we don't need to handle directory deletion or modification
|
|
- directory deletion will be handled by key.reset()
|
|
- directory modification indicates a new file creation or deletion, which is handled by below
|
|
*/
|
|
}
|
|
Path relativePathFromRoot = watchingDir.resolve(path);
|
|
if (kind == ENTRY_CREATE) {
|
|
handleFileCreation(relativePathFromRoot);
|
|
} else if (kind == ENTRY_DELETE) {
|
|
handleFileRemoval(relativePathFromRoot);
|
|
} else if (kind == ENTRY_MODIFY) {
|
|
handleFileModification(relativePathFromRoot);
|
|
}
|
|
} catch (Exception e) {
|
|
log.error("Error while processing file: {}", path, e);
|
|
}
|
|
});
|
|
|
|
boolean isKeyValid = key.reset();
|
|
if (!isKeyValid) { // key is invalid when the directory itself is no longer exists
|
|
path2KeyMapping.remove((Path) key.watchable());
|
|
}
|
|
}
|
|
readyForProcessingFiles.addAll(stagingFiles);
|
|
}
|
|
|
|
private void handleDirectoryCreation(Path dir) throws IOException {
|
|
WatchKey key = dir.register(watchService, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
|
|
path2KeyMapping.put(dir, key);
|
|
}
|
|
|
|
private void handleFileRemoval(Path path) {
|
|
newlyDiscoveredFiles.remove(path);
|
|
stagingFiles.remove(path);
|
|
}
|
|
|
|
private void handleFileCreation(Path path) {
|
|
newlyDiscoveredFiles.add(path);
|
|
stagingFiles.remove(path);
|
|
}
|
|
|
|
private void handleFileModification(Path path) {
|
|
// the logic is the same
|
|
handleFileCreation(path);
|
|
}
|
|
|
|
/**
|
|
* Check if the file is ready for processing.
|
|
*
|
|
* <p>A file is ready for processing if it is not being modified for 5000ms.
|
|
*
|
|
* @param path the path of the file
|
|
* @return true if the file is ready for processing, false otherwise
|
|
*/
|
|
public boolean isFileReadyForProcessing(Path path) {
|
|
// 1. Check FileMonitor's ready list
|
|
boolean isReady = readyForProcessingFiles.contains(path.toAbsolutePath());
|
|
|
|
// 2. Check last modified timestamp
|
|
if (!isReady) {
|
|
try {
|
|
long lastModified = Files.getLastModifiedTime(path).toMillis();
|
|
long currentTime = System.currentTimeMillis();
|
|
isReady = (currentTime - lastModified) > 5000;
|
|
} catch (IOException e) {
|
|
log.info("Timestamp check failed for {}", path, e);
|
|
}
|
|
}
|
|
|
|
// 3. Direct file lock check
|
|
if (isReady) {
|
|
try (RandomAccessFile raf = new RandomAccessFile(path.toFile(), "rw");
|
|
FileChannel channel = raf.getChannel()) {
|
|
// Try acquiring an exclusive lock
|
|
FileLock lock = channel.tryLock();
|
|
if (lock == null) {
|
|
isReady = false;
|
|
} else {
|
|
lock.release();
|
|
}
|
|
} catch (IOException e) {
|
|
log.info("File lock detected on {}", path);
|
|
isReady = false;
|
|
}
|
|
}
|
|
|
|
return isReady;
|
|
}
|
|
}
|