Changeset 355

Timestamp:

07/09/09 16:04:16 (4 years ago)

Author:

brent

Message:

Fixed the way folder views are written to the filesystem, to match the link rewrites.

Location:

enpraxis.staticsite/trunk

Files:

• enpraxis.staticsite.egg-info/PKG-INFO (modified) (1 diff)
• enpraxis/staticsite/utilities/staticsiteutility.py (modified) (3 diffs)

enpraxis.staticsite/trunk/enpraxis.staticsite.egg-info/PKG-INFO

@@ -1 +1 @@
 Metadata-Version: 1.0
 Name: enpraxis.staticsite
-Version: 1.0dev-r294
+Version: 1.0dev-r345
 Summary: Create a static web site from your plone instance.
 Home-page: http://svn.plone.org/svn/plone/plone.example

enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py

@@ -131 +131 @@
             self.processDocument(url, portal, dpath, ssprops)
         else:
+            # Write the object to the filesystem
             raw = self._httpget(url) 
             self._writeFile(path, raw)
+            # Process the view of the object
             aurl = urlparse(url)
             aurl = urlunparse((aurl[0], aurl[1], aurl[2] + '-view.html', aurl[3], aurl[4], aurl[5]))
             print 'vvv '+  aurl
             self.processDocument(url + '/view', portal, dpath, ssprops, alturl=aurl)
+            # If it is an image process the fullscreen view
             if ctype in ['Image']:
                 aurl = urlparse(url)
@@ -204 +207 @@
 
     def deployDocumentActions(self, portal, current, dpath, soup, ssprops):
+        # Look for document actions
         raw_da = soup.find('div', {'class':'documentActions'})
         if raw_da:
+            # Step through document actions and see if they are in the soup
             da = portal.portal_actions.document_actions.listActions()
             for x in da:
+                # If we are not ignoring the action
                 if x.id not in ssprops.getProperty('actions_to_ignore'):
+                    # Find the action in the soup
                     act = raw_da.find('li', id='document-action-%s' %x.id)
                     if act:
                         link = act.find('a')
                         if link and link.has_key('href'):
+                            # Process the action
                             url = link['href']
                             upath = urlparse(link['href'])
-                            if upath[2].split('/')[-1] in ssprops.getProperty('views_to_add'):
+                            p = upath[2].split('/')
+                            # If we are going to add the action, process it
+                            if p[-1] in ssprops.getProperty('views_to_add'):
                                 mpath = self._getObjPath(url, portal.portal_url(), dpath)
                                 mpath = os.path.split(mpath)
@@ -221 +231 @@
                                 asoup = BeautifulSoup(raw)
                                 body = self.runDocumentFilters(portal, current, asoup, ssprops)
-                                mpath = '%s-%s.html' %(mpath[0], mpath[1])
-                                self._writeFile(mpath, body)
+                                q = p[:-1]
+                                results = portal.portal_catalog.searchResults(query={'path':'/'.join(q[:-1]),}, id=q[-1])
+                                if results:
+                                    if results[0].is_folderish:
+                                        mpath = '%s/index-%s.html' %(mpath[0], mpath[1])
+                                    else:
+                                        mpath = '%s-%s.html' %(mpath[0], mpath[1])
+                                    self._writeFile(mpath, body)
 
     def runViewFilters(self, id, portal, current, soup, ssprops):