Changeset 31301 for lang/javascript/wshutils

Timestamp:

03/17/09 07:37:11 (4 years ago)

Author:

moriyoshi

Message:

* Implementing glob-matching option.

Files:

• lang/javascript/wshutils/trunk/WSHUtils/DirectoryWalker.js (modified) (2 diffs)

lang/javascript/wshutils/trunk/WSHUtils/DirectoryWalker.js

@@ -32 +32 @@
 
 WSHUtils.DirectoryWalker.prototype = {
-    initialize: function(path) {
+    initialize: function(path, options) {
+        if (typeof options == 'undefined') {
+            options     = {
+                files: '*',
+                excludes: []
+            };
+        }
+
+        var ex_matcher = [];
+        for (var i = options.excludes.length; --i >= 0;) {
+            ex_matcher[i] = new WSHUtils.GlobMatcher(options.excludes[i]);
+        }
+
         this.queue = [ FileSystemObject.GetFolder(path) ];
+        this.matcher = new WSHUtils.GlobMatcher(options.files);
+        this.ex_matcher = ex_matcher;
         this.currentFolder = null;
         this.current = null;
@@ -50 +64 @@
 
     item: function() {
-        if (this.current == null) {
-            if (this.queue.length > 0) {
-                this.currentFolder = this.queue.pop();
-                WScript.Echo(this.currentFolder);
-                for (var i = new Enumerator(this.currentFolder.SubFolders);
-                        !i.atEnd(); i.moveNext()) {
-                    this.queue.push(i.item()); 
+        for (;; this.current.moveNext()) {
+            if (this.current == null || this.current.atEnd()) {
+                if (this.queue.length > 0) {
+                    this.currentFolder = this.queue.pop();
+                    for (var i = new Enumerator(this.currentFolder.SubFolders);
+                            !i.atEnd(); i.moveNext()) {
+                        var folder = i.item();
+                        if (!this.matcher.match(folder.Name))
+                            continue;
+                        var j = this.ex_matcher.length;
+                        while (--j >= 0) {
+                            if (this.ex_matcher[j].match(folder.Name)) 
+                                break;
+                        }
+                        if (j >= 0)
+                            continue;
+                        this.queue.push(folder); 
+                    }
+                    this.current = new Enumerator(this.currentFolder.Files);
+                } else {
+                    return null;
                 }
-                this.current = new Enumerator(this.currentFolder.Files);
             }
+
+            if (this.current.atEnd())
+                continue;
+
+            var file = this.current.item();
+            if (!this.matcher.match(file.Name))
+                continue;
+            var j = this.ex_matcher.length;
+            while (--j >= 0) {
+                if (this.ex_matcher[j].match(file.Name)) 
+                    break;
+            }
+            if (j >= 0)
+                continue;
+
+            return file;
         }
-        return this.current != null ? this.current.item(): null;
     }
 };