src/Project/Gtk.vala
[app.Builder.js] / src / Project / Gtk.vala
index c09fc3e..ae506c4 100644 (file)
@@ -151,13 +151,22 @@ namespace Project {
                        }
         
                }
-                
+               /**
+                * get a list of files for a folder..
+                * 
+                * - in the project manager this has to list all possible compilable 
+                *   files  - eg. exclue XXX.vala.c or XXX.c with the same name as 
+                *   a vala file (so to ignore the generated files)
+                * 
+                * - for the editor navigation - this should exclude all files that
+                *   are vala based on a bjs file..
+                *  
+                */
                
-               public Gee.ArrayList<string> files(string in_path)
+               public Gee.ArrayList<string> filesAll(string 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));
                        
@@ -174,7 +183,7 @@ namespace Project {
           
                        try {
                                var file_enum = dir.enumerate_children(
-                                               GLib.FileAttribute.STANDARD_DISPLAY_NAME, 
+                                       GLib.FileAttribute.STANDARD_DISPLAY_NAME, 
                                        GLib.FileQueryInfoFlags.NONE, 
                                        null
                                );
@@ -185,52 +194,146 @@ namespace Project {
                                        var fn = next_file.get_display_name();
                                        
                                        GLib.debug("SCAN %s - checking %s\n", dirname, fn);
+                                       if (!GLib.FileUtils.test(in_path + "/" + fn, GLib.FileTest.IS_REGULAR)) {
+                                               continue;
+                                       }
+                                       ret.add(in_path + "/" + fn);
+                                        
+                                       // any other valid types???
+                               
+                               }
+                               
+                       } catch(Error e) {
+                               GLib.warning("oops - something went wrong scanning the projects\n");
+                       }       
+                       
+                       return ret;
+               }
+               
+               public Gee.ArrayList<string> filesForCompile(string in_path)
+               {
+                       var allfiles = this.filesAll(in_path);
+                       var ret =  new Gee.ArrayList<string>();
+                       
+                       
+                       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;
                                        }
+                                       // not a c file...
+                                       if (!Regex.match_simple("\\.c$", fn)) {
+                                               continue;
+                                       }
+                                       
+                                       // is the c file the same as a vala file...
+                                       
+                                        
+                                       
+                                       var vv = (new Regex("\\.c$")).replace( fn, fn.length, 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>();
+                       
+                       
+                       for (var i = 0; i < allfiles.size; i ++) {
+                               var fn = allfiles.get(i);
+                               try {
                                        
                                        if (Regex.match_simple("\\.vala\\.c$", fn)) {
+                                               GLib.debug("SKIP %s - vala.c",fn);
+
                                                continue;
                                        }
-                                       if (Regex.match_simple("\\.c$", fn)) {
+                                       
+                                       if (Regex.match_simple("\\.bjs$", fn)) {
+                                               GLib.debug("SKIP %s - .bjs",fn);
+                                               continue;
+                                       }
+                                       if (Regex.match_simple("\\.o$", fn)) {
+                                               GLib.debug("SKIP %s - .o",fn);
+                                               continue;
+                                       }
+                                       if (Regex.match_simple("\\~$", fn)) {
+                                               GLib.debug("SKIP %s - ~",fn);
+                                               continue;
+                                       }
+                                       
+                                       if (Regex.match_simple("^\\.", GLib.Path.get_basename(fn))) {
+                                               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) {
+                                                       continue;
+                                               }
                                                
-                                               // if we have a vala file with the same name 
-                                               // then do not add it...
+                                               ret.add( fn);
+                                               continue;
+                                       }
+                                       // vala.c -- ignore..
+                                       
+                                       // not a c file...
+                                       if (Regex.match_simple("\\.c$", fn)) {
                                                
-                                               cfiles.add(in_path + "/" + fn);
+                                               var vv = (new Regex("\\.c$")).replace( fn, fn.length, 0, ".vala");
+                                               if (allfiles.index_of( vv) > -1) {
+                                                       continue;
+                                               }
+                                               ret.add( fn);
                                                continue;
                                        }
-                                       // any other valid types???
-                               
-                               }
-                               
-                               
-                               
-                               
-                               
-                               // add the cfiles to ret - if they do not have a vala...
-                               for (var i = 0; i < cfiles.size; i ++) {
                                        
-                                       var fn = cfiles.get(i);
-                                       var vv = (new Regex("\\.c$")).replace( fn, fn, 0, ".vala");
-                                                       
-                                       if (ret.index_of( vv) > -1) {
+                                       if (GLib.Path.get_basename( fn) == "config1.builder") {
                                                continue;
                                        }
-                                       ret.add(cfiles.get(i));
+                                       // not .c / not .vala /not .bjs.. -- other type of file..
+                                       // allow ???
+                                       
+                                       // add the 'c' file..
+                                       ret.add(fn);
+                               } catch (Error e) {
+                                       continue;
                                }
-                                               
-                                      
-                       } catch(Error e) {
-                               GLib.warning("oops - something went wrong scanning the projects\n");
                        }
-                       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)