src/Builder4/ClutterFiles.bjs
[app.Builder.js] / src / Project / Gtk.vala
index 608bf98..706fe68 100644 (file)
@@ -163,14 +163,14 @@ namespace Project {
                 *  
                 */
                
-               public Gee.ArrayList<string> allFiles(string in_path)
+               public Gee.ArrayList<string> filesAll(string in_path)
                {
                        var ret =  new Gee.ArrayList<string>();
                        
                        var dirname = this.resolve_path(
                                this.resolve_path_combine_path(this.firstPath(),in_path));
                        
-                       GLib.debug("SCAN %s\n", dirname);
+                       GLib.debug("SCAN %s", dirname);
                                // scan the directory for files -- ending with vala || c
                        
 
@@ -183,7 +183,7 @@ namespace Project {
           
                        try {
                                var file_enum = dir.enumerate_children(
-                                       GLib.FileAttribute.STANDARD_DISPLAY_NAME
+                                       "standard::*"
                                        GLib.FileQueryInfoFlags.NONE, 
                                        null
                                );
@@ -193,8 +193,15 @@ namespace Project {
                                while ((next_file = file_enum.next_file(null)) != null) {
                                        var fn = next_file.get_display_name();
                                        
-                                       GLib.debug("SCAN %s - checking %s\n", dirname, fn);
+                                       if (next_file.get_file_type () == GLib.FileType.DIRECTORY) {
                                         
+                                               GLib.debug("SKIP %s not regular  ", fn);
+                                               continue;
+                                       }
+                                       if (!Regex.match_simple("^text", next_file.get_content_type())) {
+                                               continue;
+                                       }
+                                       GLib.debug("SCAN ADD %s : %s", fn, next_file.get_content_type());
                                        ret.add(in_path + "/" + fn);
                                         
                                        // any other valid types???
@@ -208,90 +215,153 @@ namespace Project {
                        return ret;
                }
                
-               
-               public Gee.ArrayList<string> files(string in_path)
+               public Gee.ArrayList<string> filesForCompile(string in_path)
                {
+                       var allfiles = this.filesAll(in_path);
                        var ret =  new Gee.ArrayList<string>();
-                       var cfiles =  new Gee.ArrayList<string>();
-                       
-                       var dirname = this.resolve_path(
-                               this.resolve_path_combine_path(this.firstPath(),in_path));
                        
-                       GLib.debug("SCAN %s\n", dirname);
-                               // scan the directory for files -- ending with vala || c
                        
-
-                       var dir = File.new_for_path(dirname);
-                       if (!dir.query_exists()) {
-                               GLib.debug("SCAN %s - skip - does not exist\n", dirname);
-                               return ret;
-                       }
-         
-          
-                       try {
-                               var file_enum = dir.enumerate_children(
-                                       GLib.FileAttribute.STANDARD_DISPLAY_NAME, 
-                                       GLib.FileQueryInfoFlags.NONE, 
-                                       null
-                               );
-               
-                
-                               FileInfo next_file; 
-                               while ((next_file = file_enum.next_file(null)) != null) {
-                                       var fn = next_file.get_display_name();
-                                       
-                                       GLib.debug("SCAN %s - checking %s\n", dirname, fn);
+                       for (var i = 0; i < allfiles.size; i ++) {
+                               var fn = allfiles.get(i);
+                               try {
                                        if (Regex.match_simple("\\.vala$", fn)) {
-                                               ret.add(in_path + "/" + fn);
+                                               ret.add( fn);
                                                continue;
                                        }
-                                       
+                                       // vala.c -- ignore..
                                        if (Regex.match_simple("\\.vala\\.c$", fn)) {
                                                continue;
                                        }
-                                       if (Regex.match_simple("\\.c$", fn)) {
-                                               
-                                               // if we have a vala file with the same name 
-                                               // then do not add it...
-                                               
-                                               cfiles.add(in_path + "/" + fn);
+                                       // not a c file...
+                                       if (!Regex.match_simple("\\.c$", fn)) {
                                                continue;
                                        }
-                                       // any other valid types???
-                               
-                               }
-                               
-                       } catch(Error e) {
-                               GLib.warning("oops - something went wrong scanning the projects\n");
-                       }       
-                       
-                       if 
-                                
-                               // add the cfiles to ret - if they do not have a vala...
-                       for (var i = 0; i < cfiles.size; i ++) {
+                                       
+                                       // is the c file the same as a vala file...
+                                       
+                                        
+                                       
+                                       var vv = (new Regex("\\.c$")).replace( fn, fn.length, 0, ".vala");
                                
-                               var fn = cfiles.get(i);
-                               vv = fn;
-                               try {
-                                       vv = (new Regex("\\.c$")).replace( fn, fn, 0, ".vala");
+                                       
+                                               
+                                       if (allfiles.index_of( vv) > -1) {
+                                               continue;
+                                       }
+                                       // add the 'c' file..
+                                       ret.add(fn);
                                } catch (Error e) {
                                        continue;
                                }
+                       }
+                       // sort.
+                       ret.sort((fa,fb) => {
+                               return ((string)fa).collate((string) fb);
+                       });
+                       return ret;
+                       
+               }
+               
+               public Gee.ArrayList<string> filesForOpen(string in_path)
+               {
+                       var allfiles = this.filesAll(in_path);
+                       var ret =  new Gee.ArrayList<string>();
+                       GLib.debug("SCAN %s - %d files",in_path, allfiles.size);
+                       
+                       for (var i = 0; i < allfiles.size; i ++) {
+                               var fn = allfiles.get(i);
+                               var bn  = GLib.Path.get_basename(fn);
+                               try {
+                                       
+                                       if (Regex.match_simple("\\.vala\\.c$", fn)) {
+                                               GLib.debug("SKIP %s - vala.c",fn);
+
+                                               continue;
+                                       }
+                                       
+                                       if (Regex.match_simple("\\.bjs$", fn)) {
+                                               GLib.debug("SKIP %s - .bjs",fn);
+                                               continue;
+                                       }
+                                       
+                                       if (Regex.match_simple("\\~$", fn)) {
+                                               GLib.debug("SKIP %s - ~",fn);
+                                               continue;
+                                       }
+                                       if (Regex.match_simple("\\.stamp$", fn)) {
+                                               GLib.debug("SKIP %s - .o",fn);
+                                               continue;
+                                       }
+                                       if ("stamp-h1" == bn) {
+                                               GLib.debug("SKIP %s - .o",fn);
+                                               continue;
+                                       }
+                                       
+                                       // confgure.am
+                                       if ("config.h" == bn || "config.h.in" == bn || "config.log" == bn  || "configure" == bn ) {
+                                               if (allfiles.index_of( in_path +"/configure.ac") > -1) {
+                                                       continue;
+                                               }
+                                       }
+                                       // makefile
+                                       if ("Makefile" == bn || "Makefile.in" == bn ) {
+                                               if (allfiles.index_of( in_path +"/Makefile.am") > -1) {
+                                                       continue;
+                                               }
+                                       }
+                                       
+                                       if (Regex.match_simple("^\\.", bn)) {
+                                               GLib.debug("SKIP %s - hidden",fn);
+                                               continue;
+                                       }
+                                       if (Regex.match_simple("\\.vala$", fn)) {
+                                               var vv = (new Regex("\\.vala$")).replace( fn, fn.length, 0, ".bjs");
+                                               if (allfiles.index_of( vv) > -1) {
+                                                       GLib.debug("SKIP %s - .vala (got bjs)",fn);
+                                                       continue;
+                                               }
+                                               GLib.debug("ADD %s",fn);
+                                               ret.add( fn);
+                                               continue;
+                                       }
+                                       // vala.c -- ignore..
                                        
+                                       // not a c file...
+                                       if (Regex.match_simple("\\.c$", fn)) {
                                                
-                               if (ret.index_of( vv) > -1) {
+                                               var vv = (new Regex("\\.c$")).replace( fn, fn.length, 0, ".vala");
+                                               if (allfiles.index_of( vv) > -1) {
+                                                       GLib.debug("SKIP %s - .c (got vala)",fn);
+                                                       continue;
+                                               }
+                                               GLib.debug("ADD %s",fn);                                                
+                                               ret.add( fn);
+                                               continue;
+                                       }
+                                       
+                                       if (GLib.Path.get_basename( fn) == "config1.builder") {
+                                               continue;
+                                       }
+                                       // not .c / not .vala /not .bjs.. -- other type of file..
+                                       // allow ???
+                                       GLib.debug("ADD %s",fn);
+                                       // add the 'c' file..
+                                       ret.add(fn);
+                               } catch (Error e) {
+                                       GLib.debug("Exception %s",e.message);
                                        continue;
                                }
-                               ret.add(fn);
                        }
-                                               
-                        
-                       GLib.debug("SCAN %s = returning %d", dirname, ret.size);
-                        
+                       // sort.
+                       ret.sort((fa,fb) => {
+                               return ((string)fa).collate((string) fb);
+                       });
                        return ret;
                        
-
                }
+               
+               
+                
  
 
                public   string  resolve_path_combine_path(string first, string second)