Changeset 1443

Timestamp:

07/01/08 21:49:54 (5 months ago)

Author:

rob

Message:

Refs #158: Added create project actions
* added Buffer.iterViewers
* changed position of File/New/Text file so that the create project actions can appear before them
* added project name to project ini file
* fixed problem with shell command that left spaces at the end of the command line -- ctags was barfing on those

Location:

trunk/peppy

Files:

• buffers.py (modified) (1 diff)
• mainmenu.py (modified) (1 diff)
• plugins/project.py (modified) (9 diffs)

trunk/peppy/buffers.py

@@ -348 +348 @@
         self.viewers.append(mode) # keep track of views
         assert self.dprint("views of %s: %s" % (self,self.viewers))
+    
+    def iterViewers(self):
+        """Return an iterator over all the views of this buffer"""
+        for view in self.viewers:
+            yield view
     
     def forEachView(self, func_name):

trunk/peppy/mainmenu.py

@@ -64 +64 @@
     tooltip = "New plain text file"
     icon = "icons/page_white_text_new.png"
-    default_menu = ("File/New", -2)
+    default_menu = ("File/New", -99)
     key_bindings = {'win': "C-N", 'mac': "C-N"}
 

trunk/peppy/plugins/project.py

@@ -17 +17 @@
 import peppy.vfs as vfs
 
+from peppy.buffers import *
 from peppy.yapsy.plugins import *
 from peppy.actions import *
@@ -49 +50 @@
         wildcards = self.ctags_exclude.split()
         excludes = " ".join(["--exclude=%s" % w for w in wildcards])
-        args = "-o %s %s %s %s" % (ctags_file, ProjectPlugin.classprefs.ctags_args, self.ctags_extra_args, excludes)
+        
+        # Put the output file last in this list because extra spaces at the end
+        # don't get squashed like they do from the shell.  Ctags will actually
+        # try to look for a filename called " ", which fails.
+        args = "%s %s %s -o %s" % (ProjectPlugin.classprefs.ctags_args, self.ctags_extra_args, excludes, ctags_file)
         cmd = "%s %s" % (ProjectPlugin.classprefs.ctags_command, args)
         dprint(cmd)
@@ -86 +91 @@
                 else:
                     self.dprint(line)
-        except Exception, e:
-            raise
-        dprint(self.tags.keys())
+        except LookupError, e:
+            dprint("Tag file %s not found" % filename)
+            pass
     
     def getTag(self, tag):
@@ -96 +101 @@
 class ProjectInfo(CTAGS):
     default_prefs = (
+        StrParam('project_name', '', 'Project name'),
         DirParam('build_dir', '', 'working directory in which to build', fullwidth=True),
         StrParam('build_command', '', 'shell command to build project, relative to working directory', fullwidth=True),
@@ -277 +283 @@
 
 
-class ShowProjectSettings(SelectAction):
-    """Edit project settigns"""
+
+class ProjectActionMixin(object):
+    def getProjectDir(self, cwd):
+        dlg = wx.DirDialog(self.frame, "Choose Top Level Directory",
+                           defaultPath = cwd)
+        retval = dlg.ShowModal()
+        if retval == wx.ID_OK:
+            path = dlg.GetPath()
+            dprint(path)
+            info = ProjectPlugin.createProject(path)
+        else:
+            info = None
+        dlg.Destroy()
+        return info
+    
+    def showProjectPreferences(self, info):
+        dlg = ProjectSettings(self.frame, info)
+        retval = dlg.ShowModal()
+        if retval == wx.ID_OK:
+            dlg.applyPreferences()
+            info.savePrefs()
+    
+    def createProject(self):
+        cwd = self.frame.cwd()
+        info = self.getProjectDir(cwd)
+        if info:
+            self.showProjectPreferences(info)
+            info.regenerateTags()
+
+
+class CreateProject(ProjectActionMixin, SelectAction):
+    """Create a new project"""
+    name = "Project..."
+    default_menu = ("File/New", 20)
+
+    def action(self, index=-1, multiplier=1):
+        self.createProject()
+
+
+class CreateProjectFromExisting(ProjectActionMixin, SelectAction):
+    """Create a new project"""
+    name = "Project From Existing Code..."
+    default_menu = ("File/New", 21)
+
+    def action(self, index=-1, multiplier=1):
+        self.createProject()
+
+class ShowProjectSettings(ProjectActionMixin, SelectAction):
+    """Edit project settings"""
     name = "Project Settings..."
     default_menu = ("Project", -990)
@@ -285 +338 @@
         if self.mode.project_info:
             info = self.mode.project_info
-            dlg = ProjectSettings(self.frame, info)
-            retval = dlg.ShowModal()
-            if retval == wx.ID_OK:
-                dlg.applyPreferences()
-                info.savePrefs()
+            self.showProjectPreferences(info)
 
 
@@ -398 +447 @@
 
     @classmethod
-    def registerProject(cls, mode):
-        url = cls.findProjectURL(mode.buffer.url)
+    def registerProject(cls, mode, url=None):
+        if url is None:
+            url = cls.findProjectURL(mode.buffer.url)
         if url:
-            if str(url) not in cls.known_projects:
+            if url not in cls.known_projects:
                 info = ProjectInfo(url)
-                cls.known_projects[str(url)] = info
+                cls.known_projects[url] = info
             else:
-                info = cls.known_projects[str(url)]
-            mode.project_info = info
+                info = cls.known_projects[url]
+            if mode:
+                mode.project_info = info
             dprint("found project %s" % info)
-        else:
+            return info
+        elif mode:
             mode.project_info = None
     
@@ -414 +466 @@
     def getProjectInfo(cls, mode):
         url = cls.findProjectURL(mode.buffer.url)
-        if url and str(url) in cls.known_projects:
-            return cls.known_projects[str(url)]
+        if url and url in cls.known_projects:
+            return cls.known_projects[url]
         return None
+    
+    @classmethod
+    def createProject(cls, topdir):
+        url = vfs.normalize(topdir)
+        if url in cls.known_projects:
+            raise TypeError("Project already exists.")
+        proj_dir = url.resolve2(cls.classprefs.project_directory)
+        vfs.make_folder(proj_dir)
+        info = cls.registerProject(None, proj_dir)
+        info.savePrefs()
+        dprint(info)
+        buffers = BufferList.getBuffers()
+        for buffer in buffers:
+            if buffer.url.scheme != "file":
+                continue
+            dprint("prefix=%s topdir=%s" % (buffer.url.path.get_prefix(url.path), url.path))
+            if buffer.url.path.get_prefix(url.path) == url.path:
+                dprint("belongs in project! %s" % buffer.url.path)
+                for mode in buffer.iterViewers():
+                    mode.project_info = info
+            else:
+                dprint("not in project: %s" % buffer.url.path)
+        return info
 
     @classmethod
@@ -438 +513 @@
         if mode.buffer.url in self.known_project_dirs:
             actions.extend([SaveProjectTemplate, BuildProject, RunProject, RebuildCtags])
-        actions.append(ShowProjectSettings)
+        actions.extend([CreateProject, CreateProjectFromExisting, ShowProjectSettings])
         return actions