the watcher will now detect full cleans of the output dir and rebuild

42Lines · Nov 1, 2023 · b05f0df · b05f0df
1 parent c7892d1
commit b05f0df
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/src/main/java/net/ftlines/css/scoper/ScopedFragmentResult.java b/src/main/java/net/ftlines/css/scoper/ScopedFragmentResult.java
@@ -14,9 +14,6 @@ public class ScopedFragmentResult {
 	private String newCss;
 	private String newHtml;
 
-	private ScopedFragmentResult() {
-	}
-
 	public ScopedFragmentResult(String oldCss, String oldHtml, String newCss, String newHtml,
 		CssScopeMetadata metadata) {
 		super();

diff --git a/src/main/java/net/ftlines/css/scoper/StandardSassCompiler.java b/src/main/java/net/ftlines/css/scoper/StandardSassCompiler.java
@@ -60,6 +60,7 @@ public void process() {
 
 			try {
 				Output z = new Compiler().compileFile(in.toUri(), out.toUri(), options);
+				out.getParent().toFile().mkdirs();
 				Files.write(out,z.getCss().getBytes(),
 						StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
 			} catch (CompilationException e) {

diff --git a/src/main/java/net/ftlines/css/scoper/Watcher.java b/src/main/java/net/ftlines/css/scoper/Watcher.java
@@ -79,23 +79,35 @@ public void start() throws Exception {
 			}
 			Thread.sleep(500);
 
-			WatchService watchService = FileSystems.getDefault().newWatchService();
-			List<WatchKey> registeredKeys = new ArrayList<>();
-			registeredKeys.addAll(registerRecursiveSourceWatchables(watchService, inputRootPath));
-			registeredKeys.addAll(registerRecursiveTargetWatchables(watchService, outputRootPath));
+			try(WatchService watchService = FileSystems.getDefault().newWatchService()) {
+				List<WatchKey> registeredKeys = new ArrayList<>();
+				registeredKeys.addAll(registerRecursiveSourceWatchables(watchService, inputRootPath));
+				registeredKeys.addAll(registerRecursiveTargetWatchables(watchService, outputRootPath));
 
-			phase = Phase.WATCHING;
-			phaseChangeFunction.accept(phase);
+				registeredKeys.add(outputRootPath.register(watchService,
+						new WatchEvent.Kind[] { StandardWatchEventKinds.ENTRY_CREATE,
+								StandardWatchEventKinds.ENTRY_DELETE, StandardWatchEventKinds.ENTRY_MODIFY },
+						SensitivityWatchEventModifier.HIGH));
 
-			WatchKey key;
-			while ((key = watchService.take()) != null && phase == Phase.WATCHING) {
-				processEvents(key.watchable(), key.pollEvents());
-				key.reset();
-			}
+				phase = Phase.WATCHING;
+				phaseChangeFunction.accept(phase);
+
+				WatchKey key;
+				while ((key = watchService.take()) != null && phase == Phase.WATCHING) {
+
+					if(!key.isValid()) {
+						System.out.println("Key '" + key.watchable() + "' is invalid .. rebuilding.");
+						break;
+					}
 
-			//Cleanup registered keys
-			registeredKeys.forEach(z -> z.cancel());
-			registeredKeys.clear();
+					processEvents(key.watchable(), key.pollEvents());
+					key.reset();
+				}
+
+				//Cleanup registered keys
+				registeredKeys.forEach(z -> z.cancel());
+				registeredKeys.clear();
+			}
 
 			Thread.sleep(2000);
 		}
@@ -120,7 +132,7 @@ && isChildPath(outputRootPath, workingDirPath)
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-			}
+			} 
 		}
 	}