indexurl

pppadump/commands/index.py

@@ -98,6 +98,8 @@ def main (args):
 
     p.add_argument("--files", default=False, action="store_true", help="include files (experimental)")
 
+    p.add_argument("--filebased", default=False, action="store_true", help="uses (reconstructed) urls instead of file paths")
+
     pg = p.add_argument_group('template variables')
     pg.add_argument("--feedurl", default="feed.xml", help="rss: to use as feeds own (self) link, default: feed.xml")
     pg.add_argument("--siteurl", default=None, help="rss: to use as channel's site link, default: the etherpad url")
@@ -292,29 +294,54 @@ def main (args):
                     pass
 
         
-        # Not sure this goes here but fixing relpaths with output is quite nice...         
+        # Below is somehow a mess since one the one hand I'm trying to keep the file based publiching
-        if args.output:
+        # ethos while my setup is not really (reverse proxy, etc.) 
-            outpath = Path(args.output).parent
+        # Fix (1): settings.json has indexurl which stands for the base URL 
-            for v in p["versions"]:
+        # Fix (2): added argument <p.add_argument("--filebased", default=False, action="store_true", help="uses (reconstructed) urls instead of file paths")>      
-                if v["type"] != "pad":
-                    vpath = Path(v["path"])
-                    try:
-                        # 2 types (pathlib or os.path)
-                        # v["path"] = vpath.parent.relative_to(outpath).joinpath(vpath.name)
-                        v["path"] = os.path.join(os.path.relpath(vpath.parent, outpath), vpath.name)
 
-                        # path or url??? if it's a file based publishing ethos, it should be path non?
+        if args.output:
-                        # puttting this here since templates are using url... 
+
-                        v["url"] = v["path"]
+            if args.filebased:
+
+                # work with paths
+                
+                outpath = Path(args.output).parent
+                for v in p["versions"]:
+
+                    if v["type"] != "pad":
+                        vpath = Path(v["path"])
+
+                        try:
+                            v["path"] = os.path.join(os.path.relpath(vpath.parent, outpath), vpath.name)
+                            v["url"] = v["path"]
+                        except Exception as e:
+                            pass
+
+                if not p["link"].startswith("http"):
+                    vpath = Path(p["link"])
+                    try:
+                        p["link"] = os.path.join(os.path.relpath(vpath.parent, outpath), vpath.name)
                     except Exception as e:
                         pass
 
-            if not p["link"].startswith("http"):
+            else:
-                vpath = Path(p["link"])
+
-                try:
+                # work with URLs
-                    p["link"] = os.path.join(os.path.relpath(vpath.parent, outpath), vpath.name)
+
-                except Exception as e:
+                indexurl = info["indexurl"]
-                    pass
+                outpath = Path(args.output).parent
+
+                for v in p["versions"]:
+
+                    if v["type"] != "pad":
+
+                        vpath = Path(v["url"])
+
+                        # strip output dir....
+                        relpath = Path(*vpath.parts[1:])
+
+                        v["url"] = os.path.join(indexurl, relpath)
+
                                     
 
 

pppadump/commands/init.py

@@ -73,6 +73,7 @@ def main(args):
     p.add_argument("arg", nargs="*", default=[], help="optional positional args: path etherpadurl")
     p.add_argument("--path", default=None, help="path to initialize")
     p.add_argument("--padurl", default=None, help="")
+    p.add_argument("--indexurl", default=None, help="")
     p.add_argument("--apikey", default=None, help="")
     p.add_argument("--verbose", default=False, action="store_true", help="")
     p.add_argument("--reinit", default=False, action="store_true", help="")
@@ -114,6 +115,15 @@ def main(args):
             break
         apiurl = input("Please type the URL of the etherpad: ").strip()
     padinfo["apiurl"] = apiurl
+
+
+    indexurl = args.indexurl
+    while True:
+        if indexurl:
+            break
+        indexurl = input("Please type the URL of the index to be generated (i.e. should differ from padurl): ").strip()
+    padinfo["indexurl"] = indexurl
+
     apikey = args.apikey
     while True:
         if apikey: