changeset 229:c1a814628461

Removing some arguments that aren't useful anymore.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 14 Mar 2014 08:37:13 -0700
parents 1ef50117ec58
children f74fe4d3e626
files wikked/commands/manage.py wikked/resolver.py wikked/wiki.py
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/wikked/commands/manage.py	Thu Mar 13 21:46:14 2014 -0700
+++ b/wikked/commands/manage.py	Fri Mar 14 08:37:13 2014 -0700
@@ -88,12 +88,9 @@
         parser.add_argument('path',
                 help="The path to a page to update specifically",
                 nargs='?')
-        parser.add_argument('--cache',
-                help="Re-cache all pages",
-                action='store_true')
 
     def run(self, ctx):
-        ctx.wiki.update(path=ctx.args.path, cache_ext_data=ctx.args.cache)
+        ctx.wiki.update(path=ctx.args.path)
 
         if ctx.args.debug and ctx.args.path:
             page_info = ctx.wiki.fs.getPageInfo(ctx.args.path)
@@ -105,6 +102,10 @@
             logger.debug("Page [%s]:" % page.url)
             logger.debug("--- formatted text ---")
             logger.debug(page.getFormattedText())
+            logger.debug("--- meta --")
+            logger.debug(page.getLocalMeta())
+            logger.debug("--- links ---")
+            logger.debug(page.getLocalLinks())
             logger.debug("--- resolved text ---")
             logger.debug(page.text)
 
--- a/wikked/resolver.py	Thu Mar 13 21:46:14 2014 -0700
+++ b/wikked/resolver.py	Fri Mar 14 08:37:13 2014 -0700
@@ -326,7 +326,7 @@
 
         # We'll have to format things...
         fmt_ctx = FormattingContext(self.page.url)
-        fmt = PageFormatter(self.wiki)
+        fmt = PageFormatter()
 
         # No match: return the 'empty' template.
         if len(matched_pages) == 0:
--- a/wikked/wiki.py	Thu Mar 13 21:46:14 2014 -0700
+++ b/wikked/wiki.py	Fri Mar 14 08:37:13 2014 -0700
@@ -135,8 +135,7 @@
                     self.root)
             else:
                 logger.debug("Setting up simple updater.")
-                self._page_updater = lambda wiki, url: wiki.update(
-                    url, cache_ext_data=True)
+                self._page_updater = lambda wiki, url: wiki.update(url)
         return self._page_updater
 
     def tryAddFormatter(self, formatters, module_name, module_func,
@@ -247,7 +246,7 @@
         s = ResolveScheduler(self, page_urls)
         s.run(num_workers)
 
-    def update(self, url=None, path=None, cache_ext_data=True):
+    def update(self, url=None, path=None):
         logger.info("Updating pages...")
         factory = lambda pi: FileSystemPage(self, pi)
         if url or path:
@@ -339,7 +338,7 @@
         self.scm.commit([path], commit_meta)
 
         # Update the DB and index with the modified page.
-        self.update(url, cache_ext_data=False)
+        self.update(url)
 
     def pageExists(self, url):
         """ Returns whether a page exists at the given URL.