added --no-raw-ext option to suppress (additional) extensions on pad ids

etherdump/commands/pull.py

@@ -48,6 +48,7 @@ def main (args):
     p.add_argument("--folder", default=False, action="store_true", help="dump files in a folder named PADID (meta, text, html, dhtml), default: False")
     p.add_argument("--output", default=False, action="store_true", help="output changed padids on stdout")
     p.add_argument("--force", default=False, action="store_true", help="reload, even if revisions count matches previous")
+    p.add_argument("--no-raw-ext", default=False, action="store_true", help="save plain text as padname with no (additional) extension")
 
     p.add_argument("--css", default="/styles.css", help="add css url to output pages, default: /styles.css")
     p.add_argument("--script", default="/versions.js", help="add script url to output pages, default: /versions.js")
@@ -56,6 +57,10 @@ def main (args):
 
     args = p.parse_args(args)
 
+    raw_ext = ".raw.txt"
+    if args.no_raw_ext:
+        raw_ext = ""
+
     info = loadpadinfo(args.padinfo)
     data = {}
     data['apikey'] = info['apikey']
@@ -161,10 +166,10 @@ def main (args):
                 ##########################################
                 if args.nopublish and args.nopublish in text:
                     # NEED TO PURGE ANY EXISTING DOCS
-                    try_deleting((p+".raw.txt",p+".raw.html",p+".diff.html",p+".meta.json"))
+                    try_deleting((p+raw_ext,p+".raw.html",p+".diff.html",p+".meta.json"))
                     continue
 
-                ver["path"] = p+".raw.txt"
+                ver["path"] = p+raw_ext
                 ver["url"] = quote(ver["path"])
                 with open(ver["path"], "w") as f:
                     f.write(text.encode("utf-8"))
@@ -177,7 +182,7 @@ def main (args):
         # todo, make this process reflect which files actually were made
         versionbaseurl = quote(padid.encode("utf-8"))
         links.append({"href":versions[0]["url"], "rel":"alternate", "type":"text/html", "title":"Etherpad"})
-        links.append({"href":versionbaseurl+".raw.txt", "rel":"alternate", "type":"text/plain", "title":"Plain text"})
+        links.append({"href":versionbaseurl+raw_ext, "rel":"alternate", "type":"text/plain", "title":"Plain text"})
         links.append({"href":versionbaseurl+".raw.html", "rel":"alternate", "type":"text/html", "title":"HTML"})
         links.append({"href":versionbaseurl+".diff.html", "rel":"alternate", "type":"text/html", "title":"HTML with author colors"})
         links.append({"href":versionbaseurl+".meta.json", "rel":"alternate", "type":"application/json", "title":"Meta data"})