Replace %p with a page number when invoking path launcher

for details see: https://github.com/moosotc/llpp/issues/45#issuecomment-1028683741

malc committed 4 years ago

Commit a51c29b1 parent e656df14 files · +18 −6Browse files

Unified · Split

4 files

@@ -172,7 +172,7 @@ o Text searching is very naive\|} · 171 unmodified lines
172	open Utils	172	open Utils
173		173
174	let gotourl launcher url =	174	let gotourl launcher url =
175	let command = Str.global_replace Utils.Re.percent url launcher in	175	let command = Str.global_replace Utils.Re.percents url launcher in
176	try ignore @@ spawn command []	176	try ignore @@ spawn command []
177	with exn -> dolog "failed to execute `%s': %s" command @@ exntos exn	177	with exn -> dolog "failed to execute `%s': %s" command @@ exntos exn
178		178

   if emptystr conf.pathlauncher
   then adderrmsg "path launcher" "command set"
   else
-    let cmd = Str.global_replace Re.percent !S.path conf.pathlauncher in
+    let n =
+      match !S.layout with
+      | l :: _ -> string_of_int l.pageno
+      | _ -> E.s
+    in
+    let cmd = Str.global_replace Re.percents !S.path conf.pathlauncher in
+    let cmd =
+      if nonemptystr n
+      then Str.global_replace Re.percentp n cmd
+      else cmd
+    in
     match spawn cmd [] with
     | exception exn ->
        adderrfmt "spawn" "failed to execute `%s': %s" cmd @@ exntos exn
             "don't know where to save attachment"
      else
        let filename = Ffi.getfileannot opaque slinkindex in
-       let savecmd = Str.global_replace Re.percent filename conf.savecmd in
+       let savecmd = Str.global_replace Re.percents filename conf.savecmd in
        let path =
          getcmdoutput
            (adderrfmt savecmd
   then adderrmsg "savepath-command is empty"
          "don't know where to save modified document"
   else
-    let savecmd = Str.global_replace Re.percent !S.path conf.savecmd in
+    let savecmd = Str.global_replace Re.percents !S.path conf.savecmd in
     let path =
       getcmdoutput
         (adderrfmt savecmd "failed to obtain path to the saved copy: %s")

@@ -113,7 +113,8 @@ let getenvdef name def = · 112 unmodified lines
113		113
114	module Re = struct	114	module Re = struct
115	let crlf = Str.regexp "[\r\n]"	115	let crlf = Str.regexp "[\r\n]"
116	let percent = Str.regexp "%s"	116	let percents = Str.regexp "%s"
		117	let percentp = Str.regexp "%p"
117	let whitespace = Str.regexp "[ \t]"	118	let whitespace = Str.regexp "[ \t]"
118	end	119	end
119		120

 module Re :
   sig
     val crlf : Str.regexp
-    val percent : Str.regexp
+    val percents : Str.regexp
+    val percentp : Str.regexp
     val whitespace : Str.regexp
   end
 val addchar : string -> char -> string

Keyboard shortcuts