Changeset 530

Timestamp:

08/06/09 16:43:23 (3 years ago)

Author:

david

Message:

updating base_files logic to output into appropriate asset folders on filesystem, and properly rewrite links to those assets

Files:

• enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py (modified) (8 diffs)

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

@@ -79 +79 @@
         for x in ssprops.getProperty('base_files'):
             objurl = urlunparse((url[0], url[1], '/'.join(urlpath + [x]), url[3], url[4], url[5]))
-            path = self._getObjPath(objurl, portal_url, dpath)
+            #path = self._getObjPath(objurl, portal_url, dpath)
             raw = self._httpget(objurl)
-            if 'text' not in guess_type(x):
+            ftype = guess_type(x)[0]
+            if ftype is None:
+                path = self._getObjPath(objurl, portal_url, dpath)                
+                self._writeFile(path, raw)                
+            elif 'css' in ftype:
+                path = self._getObjPath(objurl, portal_url, dpath + 'css/')
+                self._writeFile(path, raw)
+            elif 'javascript' in ftype:
+                path = self._getObjPath(objurl, portal_url, dpath + 'js/')                
+                self._writeFile(path, raw)
+            elif 'image' in ftype:
+                path = self._getObjPath(objurl, portal_url, dpath + 'images/')
                 self._writeFile(path, raw, True)
             else:
+                path = self._getObjPath(objurl, portal_url, dpath)                
                 self._writeFile(path, raw)
-
-        # Deploy CSS
+                
+        # Deploy Current Theme CSS
         cssreg = context.portal_css
         cssurl = cssreg.absolute_url()
@@ -98 +110 @@
                 self._writeFile(path, raw)
 
-        # Deploy CSS Images into the appropriate skin folder
+        # Deploy Current Theme CSS Images into the appropriate skin folder
         css_images = ssprops.getProperty('css_images')
         if len(css_images) > 0:            
@@ -224 +236 @@
         soup = BeautifulSoup(raw)
         self.deployDocumentActions(portal, aurl, dpath, soup, ssprops)
-        self.deployPresentationView(portal, aurl, dpath, soup, ssprops)                
+        self.deployPresentationView(portal, aurl, dpath, soup, ssprops)        
         self.deployNonActionNonHTMLViews(portal, aurl, dpath, soup, ssprops)
         if isFolderish:
@@ -237 +249 @@
             mpath += '.html'
         self._writeFile(mpath, body)
+
 
     def deployPresentationView(self, portal, current, dpath, soup, ssprops):
@@ -264 +277 @@
                         mpath += '.html'
                     self._writeFile(mpath, body)            
-
+            
 
     def deployDocumentActions(self, portal, current, dpath, soup, ssprops):
@@ -335 +348 @@
         self.filterJSLinks(soup, current)
         self.filterS5BaseUrl(soup, current)        
+        self.filterBaseFilesLinks(soup, current, portal, ssprops)
         self.filterImageFullscreenBackLink(soup, current)
         self.filterCSSValidatorLink(soup, current, portal, ssprops)
@@ -425 +439 @@
             url = ie_css.split('url(')[-1]
             url = url.split(');')[0]
+            url.replace('IEFixes.css', 'css/IEFixes.css')
             nurl = self._convertLinkToRelative(url, current)
             ie_css.replaceWith('''<!--[if IE]>
@@ -471 +486 @@
                 if back.has_key('href'):
                     back['href'] = current.replace('image_view_fullscreen.html', 'view.html')
+
+    def filterBaseFilesLinks(self, soup, current, portal, ssprops):
+        portal_url = portal.portal_url()
+        for x in ssprops.getProperty('base_files'):
+            ftype = guess_type(x)[0]
+            if ftype is None:
+                pass
+            elif 'css' in ftype:
+                tags = soup.findAll('link', {'href' : re.compile(x)})
+                for tag in tags:
+                    abs_link = self._convertLinkToAbsolute(tag['href'], current)
+                    rel_link = self._convertLinkToRelative(abs_link, current)
+                    tag['href']  = rel_link.replace(x, 'css/%s' % x) 
+            elif 'javascript' in ftype:              
+                tags = soup.findAll('script', {'src' : re.compile(x)})
+                for tag in tags:
+                    abs_link = self._convertLinkToAbsolute(tag['src'], current)
+                    rel_link = self._convertLinkToRelative(abs_link, current)                    
+                    tag['src']  = rel_link.replace(x, 'js/%s' % x)  
+            elif 'image' in ftype:
+                tags = soup.findAll('img', {'src' : re.compile(x)})
+                for tag in tags:
+                    rel_link = self._convertLinkToRelative(tag['src'], current)
+                    tag['src']  = rel_link.replace(x, 'images/%s' % x)
+
+
+
 
     def getDocumentLinks(self, soup):