Commit: 793d0537cf520b03f7a154ab3574b0abad798b8b - allura (git)

allura

Commit MetaInfo

• Révision: 793d0537cf520b03f7a154ab3574b0abad798b8b (tree)
• l'heure: 2010-06-12 03:17:14
• Auteur: Wolf <wolf@geek...>
• Commiter: Wolf

Message de Log

[#564] teach Wiki REST API and script to get_all

Change Summary

• modified: ForgeWiki/forgewiki/wiki_main.py
• modified: scripts/wiki-post.py

Modification

--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -647,7 +647,16 @@ Some *emphasized* and **strong** text
 class RootRestController(RestController):
 
     @expose('json:')
-    def get_one(self, title):
+    def get_all(self, **kw):
+        page_titles = []
+        pages = model.Page.query.find(dict(app_config_id=c.app.config._id))
+        for page in pages:
+            if has_artifact_access('read', page)():
+                page_titles.append(page.title)
+        return dict(pages=page_titles)
+
+    @expose('json:')
+    def get_one(self, title, **kw):
         page = model.Page.query.get(app_config_id=c.app.config._id, title=title)
         if page is None:
             raise exc.HTTPNotFound, title

--- a/scripts/wiki-post.py
+++ b/scripts/wiki-post.py
@@ -67,7 +67,7 @@ class Signer(object):
         return params
 
 def main():
-    usage = 'usage: %prog [options] PageName [file]'
+    usage = 'usage: %prog [options] [PageName [file]]'
     op = OptionParser(usage=usage)
     op.add_option('-c', '--config', metavar='CONFIG')
     op.add_option('-a', '--api-key', metavar='KEY')
@@ -75,9 +75,19 @@ def main():
     op.add_option('-u', '--url', metavar='URL')
     (options, args) = op.parse_args()
 
-    page = args[0]
-    f = open(args[1], 'r') if len(args)>1 else stdin
-    markdown = f.read()
+    pagename = None
+    markdown = None
+    method = 'GET'
+
+    pagename_given = len(args) >= 1
+    if pagename_given:
+        pagename = args[0]
+
+    filename_given = len(args) > 1
+    if filename_given:
+        method = 'PUT'
+        f = open(args[1], 'r')
+        markdown = f.read()
 
     config = ConfigParser()
     config.read([str(os.path.expanduser('~/.forge-api.ini')), str(options.config)])
@@ -86,12 +96,18 @@ def main():
     secret_key = options.secret_key or config.get('keys', 'secret-key')
     # print an error message if no keys are found
 
-    url = urljoin(options.url or config.get('wiki', 'url'), page)
+    url = options.url or config.get('wiki', 'url')
+    if pagename_given:
+        url = urljoin(url, pagename)
 
     sign = Signer(secret_key, api_key)
-    params = sign(urlparse(url).path, [('text', markdown)])
+    params = [('text', markdown)] if method=='PUT' else []
+    params = sign(urlparse(url).path, params)
     try:
-        result = urlopen(url, urlencode(params))
+        if method=='PUT':
+            result = urlopen(url, urlencode(params))
+        else:
+            result = urlopen(url+'?'+urlencode(params))
         stdout.write(result.read())
     except HTTPError, e:
         stdout.write(e.read())