slight speed improvement by using printf instead of cat

diff --git a/widgets.sh b/widgets.sh
index 84b656774c3ead4b1f2c2a5334e67f496e7b6eb4..243d3a587e3de9737a6a04a52c6e908f41b14bcb 100755 (executable)
--- a/widgets.sh
+++ b/widgets.sh
@@ -93,31 +93,33 @@ w_bookmarks(){
     name="$(UNSTRING "$name")";
     search="$(UNSTRING "${search}" |URL)";
     filter="$(UNSTRING "${filter}" |URL)";
-    cat <<-EOF
-       [label .link . $(HTML "$name" |sed 's;&#44\;;&[wbr];g;')]
-       [a .link target=blank href="/?o=Name&s=${search}&f=${filter}" by Name]
-       [a .link target=blank href="/?o=Date&s=${search}&f=${filter}" by Date]
-       [a .link target=blank href="/?o=Length&s=${search}&f=${filter}" by Length]
-       [a .link target=blank href="/?o=Group&s=${search}&f=${filter}" by Group]
-       EOF
+    printf '
+      [label .link . %s]
+      [a .link target=blank href="/?o=Name&s=%s&f=%s" by Name]
+      [a .link target=blank href="/?o=Date&s=%s&f=%s" by Date]
+      [a .link target=blank href="/?o=Length&s=%s&f=%s" by Length]
+      [a .link target=blank href="/?o=Group&s=%s&f=%s" by Group]
+    ' "$(HTML "$name" |sed 's;&#44\;;&[wbr];g;')" \
+      "$search" "$filter"  "$search" "$filter" \
+      "$search" "$filter"  "$search" "$filter"
   done
   printf ']'
 }
 
 w_search(){
-  cat <<-EOF
-       [form #search method=GET action=./?
-         [select name=o size=1
-           [option disabled=disabled Order By]
-           [option value=Name ${w_coname} Name]
-           [option value=Date ${w_codate} Date]
-           [option value=Length ${w_colength} Length]
-           [option value=Group ${w_cogroup} Group]
-         ]
-         [input name=s placeholder=Search value="$(HTML "$SEARCH")"]
-         [a #t_avsearch href="#advsearch" Advanced]
-       ]
-       EOF
+  printf '
+    [form #search method=GET action=./?
+      [select name=o size=1
+        [option disabled=disabled Order By]
+        [option value=Name %s Name]
+        [option value=Date %s Date]
+        [option value=Length %s Length]
+        [option value=Group %s Group]
+      ]
+      [input name=s placeholder=Search value="%s"]
+      [a #t_avsearch href="#advsearch" Advanced]
+    ]' "$w_coname" "$w_codate" "$w_colength" "$w_cogroup" \
+       "$(HTML "$SEARCH")"
 }
 
 w_prefs(){
@@ -127,20 +129,19 @@ w_prefs(){
   tf=''; [ "$(COOKIE fakemp4)" = yes ] && tf=checked
   td=''; [ "$(COOKIE downscale)" = yes ] && td=checked
 
-  cat <<-EOF
-       [form #prefs method="POST" action="?a=setprefs"
-         [a href="#" x]
-         [hidden "ref" "${w_refuri}"]
-         [label for=prefs_ps Pagesize]
-         [input #prefs_ps type=number name=pagesize value="${LISTSIZE}"][br]
-         [radio "mode" "browse" ${tm:+checked=checked} #prefs_modebrowse] [label for=prefs_modebrowse Browse Folders][br]
-         [radio "mode" "index"  ${tm:-checked=checked} #prefs_modeindex ] [label for=prefs_modeindex View Full Index][br]
-         [checkbox "fakemp4" "yes" ${tf} #prefs_fmp4] [label for=prefs_fmp4 Fake .MP4 file type][br]
-         [checkbox "downscale" "yes" ${td} #prefs_downscale] [label for=prefs_downscale Prefer downscale to 480p][br]
-         [submit "index" "update" Force Index Update][br]
-         [submit "store" "store" Set Cookie]
-       ]
-       EOF
+  printf '
+  [form #prefs method="POST" action="?a=setprefs"
+    [a href="#" x]
+    [hidden "ref" "%s"]
+    [label for=prefs_ps Pagesize]
+    [input #prefs_ps type=number name=pagesize value="%i"][br]
+    [radio "mode" "browse" %s #prefs_modebrowse] [label for=prefs_modebrowse Browse Folders][br]
+    [radio "mode" "index"  %s #prefs_modeindex ] [label for=prefs_modeindex View Full Index][br]
+    [checkbox "fakemp4" "yes" %s #prefs_fmp4] [label for=prefs_fmp4 Fake .MP4 file type][br]
+    [checkbox "downscale" "yes" %s #prefs_downscale] [label for=prefs_downscale Prefer downscale to 480p][br]
+    [submit "index" "update" Force Index Update][br]
+    [submit "store" "store" Set Cookie]
+  ]' "${w_refuri}" "${LISTSIZE}" "${tm:+checked=checked}" "${tm:-checked=checked}" "$tf" "$td"
 }
 
 w_index(){
@@ -159,25 +160,24 @@ w_advsearch(){
   local n lbid tag category filter f t d
   filter="$(HTML "${FILTER}^")"
 
-  cat <<-EOF
-       [form #advsearch action=./?a=advsearch method=POST
-         [a href="#" X]
-         [p .help Refine the search further by setting additional search tags using the [strong "+and"] button.]
-       EOF
+  printf '[form #advsearch action=./?a=advsearch method=POST
+          [a href="#" X]
+          [p .help Refine the search further by setting additional search tags using the [strong "+and"] button.]'
 
   for n in 1 2 3 4 5 6 7 8 9 10; do
     f="${filter%%^*}"; filter="${filter#*^}"
-
     t=''; [ "$f" -a ! "${f%%~*}" ] && t=" "
-
     lbid="cat_${n}_(none)"
-    cat <<-EOF
-       [input .and type=checkbox name=and id="and_${n}" ${f:+checked=checked}][label for="and_${n}" +and
-       ][fieldset .select
-       [radio "pol_${n}" "pos" .pol ${t:-checked=checked} #pol_pos_${n}"][label for=pol_pos_${n} Any]
-       [radio "pol_${n}" "neg" .pol ${t:+checked=checked} #pol_neg_${n}"][label for=pol_neg_${n} None]
-       [label .head Category:]
-       EOF
+
+    printf \
+     '[input .and type=checkbox name=and id="and_%i" %s][label for="and_%i" +and
+      ][fieldset .select
+      [radio "pol_%i" "pos" .pol %s #pol_pos_%i"][label for=pol_pos_%i Any]
+      [radio "pol_%i" "neg" .pol %s #pol_neg_%i"][label for=pol_neg_%i None]
+      [label .head Category:]' \
+      "$n" "${f:+checked=checked}" "$n" \
+      "$n" "${t:-checked=checked}" "$n" "$n" \
+      "$n" "${t:+checked=checked}" "$n" "$n"
 
     f="|${f#\~}|"
     printf '%s\n$:\n' "$w_tags" \
@@ -216,16 +216,15 @@ w_advsearch(){
     printf ']'
   done
 
-  cat <<-EOF
-         [fieldset .submit [select name=order
-           [option disabled=disabled Order By]
-           [option value=Name ${w_coname} Name]
-           [option value=Date ${w_codate} Date]
-           [option value=Length ${w_colength} Length]
-           [option value=Group ${w_cogroup} Group]
-         ][button type=submit Apply Filter]]
-       ]
-       EOF
+  printf \
+   '[fieldset .submit [select name=order
+      [option disabled=disabled Order By]
+      [option value=Name %s Name]
+      [option value=Date %s Date]
+      [option value=Length %s Length]
+      [option value=Group %s Group]
+    ][button type=submit Apply Filter]]
+  ]' "$w_coname" "$w_codate" "$w_colength" "$w_cogroup"
 }
 
 w_delete(){