Changeset 1647

Timestamp:

12/05/06 04:08:20 (2 years ago)

Author:

coderanger

Message:

CombineWikiPlugin:

I think its pretty close to done.

Files:

• combinewikiplugin/0.10/combinewiki/formats.py (modified) (4 diffs)

combinewikiplugin/0.10/combinewiki/formats.py

@@ -117 +117 @@
-    STANDALONE_LINK_RE = re.compile(r'<a class="(?:missing )?wiki"[^>]*>([^>]+?)(?:\?)?</a>')
-    HR_RE = re.compile(r'<hr />')
+    LINK_RE = re.compile(r'<a[^>]* href="([^"]*)"[^>]*>([^>]*)</a>')
-    
-    def combinewiki_formats(self, req):
@@ -125 +126 @@
-        #formatter = Formatter(self.env, req)
-        formatter = TiddlyWikiFormatter(self.env, req)
+
+        def make_link(md):
+            href, label = md.groups()
+            #if href.startswith(req.href.wiki()):
+            #    href = href[len(req.href.wiki())+1:]
+            #    if href == label:
+            #        return href
+            if href.startswith('/'):
+                href = req.abs_href(href)
+            return '[[%s|%s]]'%(label, href)
-
-        for name in pages:
@@ -144 +155 @@
-            formatted = self.STANDALONE_LINK_RE.sub('\\1', formatted)
-            formatted = self.HR_RE.sub('----', formatted)
+            formatted = self.LINK_RE.sub(make_link, formatted)
-            tiddler['content'] = formatted
-
@@ -159 +171 @@
-        default_page('MainMenu', '\n'.join(pages))
-        default_page('SiteTitle', title)
+        default_page('SiteSubtitle', '')
+        default_page('DefaultTiddlers', pages[0])
-            
-        req.hdf['combinewiki.tiddlers'] = tiddlers