From 3a0a8162ec7903801d3621094c23d9631ef5703a Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 30 May 2016 10:25:41 +0100 Subject: [PATCH] 0.2.0 use memBuilder --- dist/doc/file-walker.xqm.xml | 2 +- dist/quodatum-files-0.1.8.xar | Bin 5580 -> 0 bytes dist/quodatum-files-0.2.0.xar | Bin 0 -> 6604 bytes makejar.jardesc | 16 ----- makjar.jardesc | 2 +- package.xml | 6 ++ src/java/com/quodatum/file/Walker.java | 71 +++++++++++++--------- src/main/basex.xml | 2 +- src/main/content/quodatum-files-0.1.7.jar | Bin 4011 -> 0 bytes src/main/content/quodatum-files-0.1.9.jar | Bin 0 -> 5146 bytes src/main/expath-pkg.xml | 2 +- src/test/test.xqm | 4 +- tools/buildx.xqm | 2 +- 13 files changed, 55 insertions(+), 52 deletions(-) delete mode 100644 dist/quodatum-files-0.1.8.xar create mode 100644 dist/quodatum-files-0.2.0.xar delete mode 100644 makejar.jardesc delete mode 100644 src/main/content/quodatum-files-0.1.7.jar create mode 100644 src/main/content/quodatum-files-0.1.9.jar diff --git a/dist/doc/file-walker.xqm.xml b/dist/doc/file-walker.xqm.xml index d81b690..61eb0b9 100644 --- a/dist/doc/file-walker.xqm.xml +++ b/dist/doc/file-walker.xqm.xml @@ -1,6 +1,6 @@ - 2016-05-18T18:17:23.616+01:00 + 2016-05-29T22:56:58.097+01:00 1.1 diff --git a/dist/quodatum-files-0.1.8.xar b/dist/quodatum-files-0.1.8.xar deleted file mode 100644 index 6bdc90b01c7cf409a8f5d623e243e86d29bcf405..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5580 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 diff --git a/dist/quodatum-files-0.2.0.xar b/dist/quodatum-files-0.2.0.xar new file mode 100644 index 0000000000000000000000000000000000000000..ff5a9c4a98b100d220d2f3138a4df8845f01b539 GIT binary patch literal 6604 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 Sh<~2H`n^Pca~VMRXZL@uUouSq literal 0 HcmV?d00001 diff --git a/makejar.jardesc b/makejar.jardesc deleted file mode 100644 index b169638..0000000 --- a/makejar.jardesc +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/makjar.jardesc b/makjar.jardesc index e5f610e..f846580 100644 --- a/makjar.jardesc +++ b/makjar.jardesc @@ -1,6 +1,6 @@ - + diff --git a/package.xml b/package.xml index c190fff..5492280 100644 --- a/package.xml +++ b/package.xml @@ -41,5 +41,11 @@ + + + + + + \ No newline at end of file diff --git a/src/java/com/quodatum/file/Walker.java b/src/java/com/quodatum/file/Walker.java index 4efd27e..78567fe 100644 --- a/src/java/com/quodatum/file/Walker.java +++ b/src/java/com/quodatum/file/Walker.java @@ -4,55 +4,68 @@ * file walker * @see https://docs.oracle.com/javase/7/docs/api/java/nio/file/FileVisitResult.html */ -import static java.nio.file.FileVisitResult.*; +import static java.nio.file.FileVisitResult.CONTINUE; import java.io.IOException; import java.nio.file.FileVisitResult; import java.nio.file.Path; import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayDeque; -import java.util.Deque; -import org.basex.query.value.Value; -import org.basex.query.value.ValueBuilder; -import org.basex.query.value.node.FElem; +import org.basex.build.MemBuilder; +import org.basex.build.SingleParser; +import org.basex.core.MainOptions; +import org.basex.io.IOContent; +import org.basex.query.value.node.ANode; +import org.basex.query.value.node.DBNode; +import org.basex.util.Atts; +import org.basex.util.Token; public class Walker extends SimpleFileVisitor { final String cns = "http://www.w3.org/ns/xproc-step"; - Deque stack = new ArrayDeque(); - FElem site; + // builder + final byte[] DIR=Token.token("c:directory"); + final byte[] FILE=Token.token("c:file"); + final byte[] ERR=Token.token("c:error"); + final byte[] NAME=Token.token("name"); + final byte[] BASE=Token.token("xml:base"); + final Atts NSP = new Atts(Token.token("c"),Token.token(cns)); - public Walker(Path startingDir) { - site= new FElem("directory", cns) - .add("name",startingDir.getFileName().toString()) - .add("xml:base",startingDir.toUri().toString()); + SingleParser singleParser = new SingleParser(new IOContent(""), MainOptions.get()) + { + @Override + protected void parse() throws IOException {} + }; + MemBuilder memBuilder = new MemBuilder("", singleParser); + + + public Walker(Path startingDir) throws IOException { + memBuilder.init(); + preVisitDirectory(startingDir,null); } - public Value result() { - ValueBuilder vb = new ValueBuilder(); - vb.add(site); - return vb.value(); + public ANode result() { + return new DBNode(memBuilder.data()); } // Print information about // each type of file. @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attr) { - FElem elem = new FElem("file", cns).add("name", file.getFileName() - .toString()); - site.add(elem); + public FileVisitResult visitFile(Path file, BasicFileAttributes attr) throws IOException { + Atts atts = new Atts(NAME,Token.token(file.getFileName().toString())); + memBuilder.emptyElem(NAME, atts, NSP); return CONTINUE; } // Print each directory visited. @Override - public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) { - stack.push(site); - site = new FElem("directory", cns) - .add("name",dir.getFileName().toString()) - .add("xml:base",dir.toUri().toString()); + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + + Atts atts = new Atts(); + atts.add(NAME, Token.token(dir.getFileName().toString())); + atts.add(BASE, Token.token(dir.toUri().toString())); + memBuilder.openElem(DIR, atts, NSP); return CONTINUE; } @@ -60,7 +73,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) { @Override public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - site = stack.pop().add(site); + memBuilder.closeElem(); return CONTINUE; } @@ -70,9 +83,9 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) // and an error occurs, an IOException // is thrown. @Override - public FileVisitResult visitFileFailed(Path file, IOException exc) { - FElem elem = new FElem("error", cns).add("name", file.toString()); - site.add(elem); + public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException { + Atts atts = new Atts(NAME,Token.token(file.getFileName().toString())); + memBuilder.emptyElem(ERR, atts, NSP); return CONTINUE; } } \ No newline at end of file diff --git a/src/main/basex.xml b/src/main/basex.xml index f9e5abb..4c250b6 100644 --- a/src/main/basex.xml +++ b/src/main/basex.xml @@ -1,4 +1,4 @@ - quodatum-files-0.1.7.jar + quodatum-files-0.1.9.jar com.quodatum.file.Runner diff --git a/src/main/content/quodatum-files-0.1.7.jar b/src/main/content/quodatum-files-0.1.7.jar deleted file mode 100644 index b200a3ac9b2b7b17d3844d4dcc48b1391c3d1b21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4011 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 diff --git a/src/main/content/quodatum-files-0.1.9.jar b/src/main/content/quodatum-files-0.1.9.jar new file mode 100644 index 0000000000000000000000000000000000000000..3e4d78d5de0492a1a721ae2c48da04f15f690477 GIT binary patch literal 5146 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 hP4eEER{!55FQ~DO2GNOBQJ_A5`!Bk|20#D+ literal 0 HcmV?d00001 diff --git a/src/main/expath-pkg.xml b/src/main/expath-pkg.xml index 23676d0..3f43d07 100644 --- a/src/main/expath-pkg.xml +++ b/src/main/expath-pkg.xml @@ -1,7 +1,7 @@ File list and search in the XProc style diff --git a/src/test/test.xqm b/src/test/test.xqm index ec4fce3..f7e75d8 100644 --- a/src/test/test.xqm +++ b/src/test/test.xqm @@ -4,8 +4,8 @@ module namespace test = 'http://basex.org/modules/xqunit-tests'; :) import module namespace fw="quodatum.file.walker"; declare namespace c="http://www.w3.org/ns/xproc-step"; -declare variable $test:dir:="\\ODROID-JESSIE\sda1\pictures\Pictures"; - +declare variable $test:dirx:="\\ODROID-JESSIE\sda1\pictures\Pictures"; +declare variable $test:dir:="P:\pictures\Pictures"; (:~ directory-list :) declare diff --git a/tools/buildx.xqm b/tools/buildx.xqm index fc3fc32..4d88ee1 100644 --- a/tools/buildx.xqm +++ b/tools/buildx.xqm @@ -16,7 +16,7 @@ declare namespace pkg="http://expath.org/ns/pkg"; declare function files($src as xs:string) as xs:string* { fn:filter(file:list($src,fn:true()), - function ($f){file:is-file($src || $f)} + function ($f){($src || $f)=>fn:translate("\","/")=>file:is-file()} ) !fn:translate(.,"\","/") };