summaryrefslogtreecommitdiffstats
path: root/conversion
diff options
context:
space:
mode:
Diffstat (limited to 'conversion')
-rw-r--r--conversion/ConvertDirectory.java13
-rw-r--r--conversion/ConvertFile.java5
2 files changed, 10 insertions, 8 deletions
diff --git a/conversion/ConvertDirectory.java b/conversion/ConvertDirectory.java
index 3dbb8eb..2a0f6a9 100644
--- a/conversion/ConvertDirectory.java
+++ b/conversion/ConvertDirectory.java
@@ -23,6 +23,7 @@ package scruf.conversion;
import java.io.*;
import scruf.index.*;
+import scruf.status.*;
public class ConvertDirectory {
private ConvertFile html;
@@ -41,22 +42,28 @@ public class ConvertDirectory {
// index creator for the present directory.
IndexCreator index = new IndexCreator(directory);
// iterate through the directory.
+ System.out.println("Current Directory: "+directory.getAbsolutePath());
for(File file:directory.listFiles(new FileSieve())) {
if(file.isFile()) {
can = canConvert.check(file);
if(can) {
- System.out.println("Converting..."+file.getName());
+ System.out.println("Converting..."+file.getAbsolutePath());
html.convert(file);
index.add(file);
}
}
else if(file.isDirectory()) {
- this.convert(file);
+ ++DirectoryInfo.level;
+ this.convert(file);
}
}
boolean convertIndex = (index.shouldConvert() ||
canConvert.check(index.indexFile()));
- if(convertIndex)
+ if(convertIndex) {
+ System.out.println("Converting..."+index.indexFile().getAbsolutePath());
html.convert(index.indexFile());
+ }
+ --DirectoryInfo.level;
}
+
}
diff --git a/conversion/ConvertFile.java b/conversion/ConvertFile.java
index 6767717..4f2d7bd 100644
--- a/conversion/ConvertFile.java
+++ b/conversion/ConvertFile.java
@@ -34,11 +34,6 @@ public class ConvertFile {
}
public void convert(File file) {
/**
- * footer is optional, so it is null
- * by default.
- */
- PresentFile.footer = null;
- /**
* takes the present file reference
* for use outside this method.
*/