Ticket #3532: trac-admin-wiki-import-stdin-4297-trunk.diff

trac/admin/console.py

@@ -673 +673 @@
             self._do_wiki_remove(name)
         elif arg[0] == 'import' and len(arg) == 3:
             title = arg[1]
-            file = arg[2]
+            file = (len(arg) == 3 and arg[2]) or None
             self._do_wiki_import(file, title)
         elif arg[0] == 'export'  and len(arg) in [2,3]:
             page = arg[1]
@@ -705 +705 @@
 
     def _do_wiki_import(self, filename, title, cursor=None,
                         create_only=[]):
-        if not os.path.isfile(filename):
-            raise Exception, '%s is not a file' % filename
+        if not filename:
+            data = to_unicode(sys.stdin.readlines(), 'utf-8')
+        else:
+            if not os.path.isfile(filename):
+                raise Exception, '%s is not a file' % filename
+            f = open(filename,'r')
+            data = to_unicode(f.read(), 'utf-8')
 
-        f = open(filename,'r')
-        data = to_unicode(f.read(), 'utf-8')
-
         # Make sure we don't insert the exact same page twice
         rows = self.db_query("SELECT text FROM wiki WHERE name=%s "
                              "ORDER BY version DESC LIMIT 1", cursor,