somewhat better inputfield matching regex + allow control over the action (load,...

diff --git a/examples/scripts/formfiller.sh b/examples/scripts/formfiller.sh
index e7ef3b5..45cde69 100755 (executable)
--- a/examples/scripts/formfiller.sh
+++ b/examples/scripts/formfiller.sh
@@ -1,9 +1,16 @@
 #!/bin/bash
 
-# simple login form filler for uzbl.
-# put the form entry values you want to add (eg login information) in the file $keydir/<domain>
-# in the format <fieldname>: <value>
-# (these files can be automatically created for you by setting editor and triggering this script on a site without a config)
+# simple html form (eg for logins) filler (and manager) for uzbl.
+# uses settings files like: $keydir/<domain>
+# files contain lines like: <fieldname>: <value>
+
+
+# user arg 1:
+# edit: force editing the file (falls back to new if not found)
+# new:  start with a new file.
+# load: try to load from file into form
+
+# something else (or empty): if file not available: new, otherwise load.
 
 [ -d /usr/share/uzbl/examples/data/forms  ] && keydir=/usr/share/uzbl/examples/data/forms  # you will probably get permission denied errors here.
 [ -d $XDG_DATA_HOME/uzbl/forms            ] && keydir=$XDG_DATA_HOME/uzbl/forms
@@ -20,13 +27,34 @@ fifo=$1;   shift
 socket=$1; shift
 url=$1;    shift
 title=$1;  shift
+action=$1
 
 [ -d $keydir ] || mkdir $keydir || exit 1
 
+if [ "$action" != 'edit' -a  "$action" != 'new' -a "$action" != 'load' ]
+then
+       action=new
+       [[ -e $keydir/$domain ]] && action=load
+elif [ "$action" == 'edit' ] && [[ ! -e $keydir/$domain ]]
+then
+       action=new
+fi
 domain=$(echo $url | sed -re 's|(http\|https)+://([A-Za-z0-9\.]+)/.*|\2|')
-if [[ -e $keydir/$domain ]]; then
+
+
+#regex='s|.*<input.*?name="([[:graph:]]+)".*?/>.*|\1: |p' # sscj's first version, does not work on http://wiki.archlinux.org/index.php?title=Special:UserLogin&returnto=Main_Page
+ regex='s|.*<input.*?name="([^"]*)".*|\1: |p' #works on arch wiki, but not on http://lists.uzbl.org/listinfo.cgi/uzbl-dev-uzbl.org TODO: improve
+
+
+if [ "$action" = 'load' ]
+then
+       [[ -e $keydir/$domain ]] || exit 2
        gawk -F': ' '{ print "act js document.getElementsByName(\"" $1 "\")[0].value = \"" $2 "\";"}' $keydir/$domain >> $fifo
 else
-       curl "$url" | grep '<input' | sed -nre 's|.*<input.*?name="([[:graph:]]+)".*?/>.*|\1: |p' > $keydir/$domain
-       $editor $keydir/$domain
+       if [ "$action" == 'new' ]
+       then
+               curl "$url" | grep '<input' | sed -nre "$regex" > $keydir/$domain
+       fi
+       [[ -e $keydir/$domain ]] || exit 3 #this should never happen, but you never know.
+       $editor $keydir/$domain #TODO: if user aborts save in editor, the file is already overwritten
 fi