removed deprecated options

nixnodes · nixnodes · commit 9e48c2502d76 · 2015-08-11T07:44:04.000+02:00
diff --git a/MANUAL b/MANUAL
@@ -402,10 +402,10 @@ Updated: 16/11/2014
 	 ...
 	
 	
-	Now do the same, but apply a regex filter (--regex) to dirnames 
+	Now do the same, but apply a regex filter (-regex) to dirnames 
 	to -exec ONLY what is matched and quit after first match (--imatchq):
 	
-	 ./glutil -d --silent -execv "./myscript.sh {dir} {files} {time}" --regex \
+	 ./glutil -d --silent -execv "./myscript.sh {dir} {files} {time}" -regex \
 	 "\/The\.Simpsons" --imatchq
 	
 	Output:
diff --git a/freebsd/scripts/gb_get.sh b/freebsd/scripts/gb_get.sh
@@ -1,6 +1,6 @@
 #!/usr/local/bin/bash
 # DO NOT EDIT THESE LINES
-#@MACRO:getscore-f:{m:exe} -x {m:arg1} --silent --dir --exec "{m:spec1} $(basename {arg}) score"
+#@MACRO:getscore-f:{m:exe} -x {m:arg1} --silent --dir -exec "{m:spec1} $(basename {arg}) score"
 #
 ## Retrieves game info using giantbomb API (XML)
 #
diff --git a/freebsd/scripts/imdb_get.sh b/freebsd/scripts/imdb_get.sh
@@ -23,7 +23,7 @@
 # DO NOT EDIT/REMOVE THESE LINES
 #@VERSION:2
 #@REVISION:51
-#@MACRO:imdb|iMDB lookups based on folder names (filesystem) [-arg1=<path>] [-arg2=<path regex>]:{exe} -x {arg1} -lom "depth>0" --lom "mode=4" --silent --sort asc,mtime --dir --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" --execv `{spec1} \{basepath\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{path\} 0 '' '' 3` {arg2}
+#@MACRO:imdb|iMDB lookups based on folder names (filesystem) [-arg1=<path>] [-arg2=<path regex>]:{exe} -x {arg1} -lom "depth>0" -lom "mode=4" --silent --sort asc,mtime --dir --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv `{spec1} \{basepath\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{path\} 0 '' '' 3` {arg2}
 #@MACRO:imdb-d|iMDB lookups based on folder names (dirlog) [-arg1=<regex filter>]:{exe} -d --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{basedir\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 0 '' '' {arg3}" -l: dir -regexi "{arg1}" 
 #@MACRO:imdb-su|Update existing imdblog records, pass query/dir name through the search engine:{exe} -a --imdblog={?q:imdb@file} --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{dir\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 1 \{year\}" 
 #@MACRO:imdb-su-id|Update imdblog records using existing imdbID's, no searching is done:{exe} -a --imdblog={?q:imdb@file} --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{imdbid\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 2 \{basedir\} \{year\}" 
@@ -38,7 +38,7 @@
 #
 ## Gets movie info using iMDB native API and omdbapi (XML)
 #
-## Requires: - glutil-2.5 or above
+## Requires: - glutil-2.6.2 or above
 ##           - libxml2 v2.7.7 or above 
 ##           - curl, date, egrep, sed, expr, recode (optional), awk
 #
@@ -228,7 +228,7 @@ if ! [[ $7 -eq 2 ]]; then
 
 #        if [ $UPDATE_IMDBLOG -eq 1 ] && [ $DENY_IMDBID_DUPE -eq 1 ]; then
 #                s_q=`echo "$QUERY" | sed 's/\+/\\\\\0/g'`
-#                cad $2 "--iregexi" "dir,^$s_q\$" "$3"
+#                cad $2 "! -iregex" "dir,^$s_q\$" "$3"
 #       fi
 
         DTMP=`imdb_do_query "$QUERY""&ex=1"`
diff --git a/freebsd/scripts/killslow.sh b/freebsd/scripts/killslow.sh
@@ -161,7 +161,7 @@ if [ $SLOW -eq 1 ] && [ -f "/tmp/du-ks/$4" ]; then
 		}
 
     	g_FILE=`echo $6 | cut -f 2- -d " "`
-    	[ -n "$g_FILE" ]  && $7 -e dupefile --match "$g_FILE" --loglevel=6 -vvv
+    	[ -n "$g_FILE" ]  && $7 -e dupefile -match "$g_FILE" --loglevel=6 -vvv
     fi    	
 elif [ $SLOW -eq 1 ]; then
 	touch "/tmp/du-ks/$4"
diff --git a/scripts/imdb_get.sh b/scripts/imdb_get.sh
@@ -18,7 +18,7 @@
 # DO NOT EDIT/REMOVE THESE LINES
 #@VERSION:2
 #@REVISION:51
-#@MACRO:imdb|iMDB lookups based on folder names (filesystem) [-arg1=<path>] [-arg2=<path regex>]:{exe} -x {arg1} -lom "depth>0" --lom "mode=4" --silent --sort asc,mtime --dir --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" --execv `{spec1} \{basepath\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{path\} 0 '' '' 3` {arg2}
+#@MACRO:imdb|iMDB lookups based on folder names (filesystem) [-arg1=<path>] [-arg2=<path regex>]:{exe} -x {arg1} -lom "depth>0 && mode=4" --silent --sort asc,mtime --dir --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" --execv `{spec1} \{basepath\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{path\} 0 '' '' 3` {arg2}
 #@MACRO:imdb-d|iMDB lookups based on folder names (dirlog) [-arg1=<regex filter>]:{exe} -d --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{basedir\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 0 '' '' {arg3}" -l: dir -regexi "{arg1}" 
 #@MACRO:imdb-su|Update existing imdblog records, pass query/dir name through the search engine:{exe} -a --imdblog={?q:imdb@file} --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{dir\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 1 \{year\}" 
 #@MACRO:imdb-su-id|Update imdblog records using existing imdbID's, no searching is done:{exe} -a --imdblog={?q:imdb@file} --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{imdbid\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 2 \{basedir\} \{year\}" 
@@ -33,7 +33,7 @@
 #
 ## Gets movie info using iMDB native API and omdbapi (XML)
 #
-## Requires: - glutil-2.5 or above
+## Requires: - glutil-2.6.2 or above
 ##           - libxml2 v2.7.7 or above 
 ##           - curl, date, egrep, sed, expr, recode (optional), awk
 #
diff --git a/scripts/loc_dm.sh b/scripts/loc_dm.sh
@@ -19,7 +19,7 @@
 # DO NOT EDIT/REMOVE THESE LINES
 #@VERSION:1
 #@REVISION:2
-#@MACRO:loc-dm:{m:exe} --daemon  --glroot "{m:glroot}" --xretry -x "{m:glroot}/io/glud" -lom "depth>0" -regex "basepath,gld\.in\." --lom "mode=1" --preexec `mkdir -p {m:glroot}/io/glud; chmod 777 {m:glroot}/io/glud` --loop 0 --usleep 300000 --silent -execv "{m:spec1} {path} {?rd:basepath:^gld\.in\.} {m:exe} {glroot}"
+#@MACRO:loc-dm:{m:exe} --daemon  --glroot "{m:glroot}" --xretry -x "{m:glroot}/io/glud" -lom "depth>0" -regex "basepath,gld\.in\." -lom "mode=1" --preexec `mkdir -p {m:glroot}/io/glud; chmod 777 {m:glroot}/io/glud` --loop 0 --usleep 300000 --silent -execv "{m:spec1} {path} {?rd:basepath:^gld\.in\.} {m:exe} {glroot}"
 ## Install script dependencies + libs into glftpd root, preserving library paths (requires mlocate)
 #
 ## Offers functionality to processes that would otherwise require higher priviledges.
@@ -60,11 +60,11 @@ process_query(){
         	async_reply OK || async_reply BAD
         ;;
     nuke ) 
-	ii=`${GLUTIL} -d --name "dir,*${2}" -exec "${glroot}/bin/nuker -N \"${4}\" -r /etc/glftpd.conf -n \"{dir}\" 3 \"${3}\"" --silent`
+	ii=`${GLUTIL} -d -name "dir,*${2}" -exec "${glroot}/bin/nuker -N \"${4}\" -r /etc/glftpd.conf -n \"{dir}\" 3 \"${3}\"" --silent`
 		async_reply "${ii}" 
 	;;
     unnuke ) 
-	ii=`${GLUTIL} -d --name "dir,*${2}" -exec "${glroot}/bin/nuker -N \"${4}\" -r /etc/glftpd.conf -u \"{dir}\" \"${3}\"" --silent`
+	ii=`${GLUTIL} -d -name "dir,*${2}" -exec "${glroot}/bin/nuker -N \"${4}\" -r /etc/glftpd.conf -u \"{dir}\" \"${3}\"" --silent`
 		async_reply "${ii}" 
 	;;
         *)
diff --git a/scripts/misc/macros.glutil b/scripts/misc/macros.glutil
@@ -1,6 +1,6 @@
 #@REVISION:63
 #
-## NOTE: Requires glutil 2.5 or higher
+## NOTE: Requires glutil 2.6.2 or higher
 #
 ## These are basically just sets of glutil arguments and 
 ##  bash commands, packed into macros for convinience
@@ -97,11 +97,11 @@
 #
 ## Requires logs built with DATABASE_TYPE=0 (see tvrage/imdb_get.sh)
 #
-#@MACRO:tvrage-make-infolinks|Creates folders with release info inside respective folders for every tvlog record erasing any existing ones first:{exe} --tvlog={?q:tvrage@file} -h --silent --exec `rm "\{glroot\}\{dir\}/[ TVRAGE "*;mkdir "\{glroot\}\{dir\}/[ TVRAGE - \{class\} - \{genres\} ]"` {arg1}
+#@MACRO:tvrage-make-infolinks|Creates folders with release info inside respective folders for every tvlog record erasing any existing ones first:{exe} --tvlog={?q:tvrage@file} -h --silent -exec `rm "\{glroot\}\{dir\}/[ TVRAGE "*;mkdir "\{glroot\}\{dir\}/[ TVRAGE - \{class\} - \{genres\} ]"` {arg1}
 #
 ## <make-imdb-dirlinks>
 #
-#@MACRO:imdb-make-infolinks|Creates folders with release info inside respective folders for every imdblog record erasing any existing ones first:{exe} --imdblog={?q:imdb@file} -a --silent --exec `rm "{glroot}\{dir\}/[ IMDB "*;mkdir "\{dir\}" "\{glroot\}\{dir\}/[ IMDB - \{score\} | \{votes\} votes - \{genres\} ]"` {arg1}
+#@MACRO:imdb-make-infolinks|Creates folders with release info inside respective folders for every imdblog record erasing any existing ones first:{exe} --imdblog={?q:imdb@file} -a --silent -exec `rm "{glroot}\{dir\}/[ IMDB "*;mkdir "\{dir\}" "\{glroot\}\{dir\}/[ IMDB - \{score\} | \{votes\} votes - \{genres\} ]"` {arg1}
 #
 # <dirlog-to-ascii> *DEPRECATED - added export option (-E) to glutil, see --help*
 #
@@ -124,12 +124,12 @@
 ##  If --dirlog=<path> is not specified, glutil reverts to 
 ##   default dirlog path
 #
-#@MACRO:dirlog-to-ascii|Convert dirlog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -d --dirlog={?q:dirlog@file} --esredir={arg1} --execv `echo -e "dir \{dir\}\nstatus \{status\}\ntime \{time\}\nuser \{user\}\ngroup \{group\}\nfiles \{files\}\nsize \{size\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}` 
-#@MACRO:imdb-to-ascii|Convert imdblog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -a --imdblog={?q:imdb@file} --imdblog=\{imdbfile\} --esredir={arg1} --execv `echo -e "dir \{dir\}\ntime \{time\}\nimdbid \{imdbid\}\nplot \{plot\}\nscore \{score\}\ngenre \{genre\}\nvotes \{votes\}\ntitle \{title\}\nactors \{actors\}\nrated \{rated\}\nyear \{year\}\nreleased \{released\}\nruntime \{runtime\}\ndirector \{director\}\n"` {arg2} --silent --postexec `echo  "" >> {arg1}` 
-#@MACRO:tvrage-to-ascii|Convert tvlog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -h --tvlog={?q:tvrage@file} --esredir={arg1} --execv `echo -e "dir \{dir\}\ntime \{time\}\nshowid \{showid\}\nname \{name\}\nlink \{link\}\ncountry \{country\}\nairtime \{airtime\}\nairday \{airday\}\nruntime \{runtime\}\nstarted \{started\}\nended \{ended\}\nseasons \{seasons\}\nclass \{class\}\ngenre \{genre\}\nstatus \{status\}\nstartyear \{startyear\}\nendyear \{endyear\}\nnetwork \{network\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}`
+#@MACRO:dirlog-to-ascii|Convert dirlog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -d --dirlog={?q:dirlog@file} --esredir={arg1} -execv `echo -e "dir \{dir\}\nstatus \{status\}\ntime \{time\}\nuser \{user\}\ngroup \{group\}\nfiles \{files\}\nsize \{size\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}` 
+#@MACRO:imdb-to-ascii|Convert imdblog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -a --imdblog={?q:imdb@file} --imdblog=\{imdbfile\} --esredir={arg1} -execv `echo -e "dir \{dir\}\ntime \{time\}\nimdbid \{imdbid\}\nplot \{plot\}\nscore \{score\}\ngenre \{genre\}\nvotes \{votes\}\ntitle \{title\}\nactors \{actors\}\nrated \{rated\}\nyear \{year\}\nreleased \{released\}\nruntime \{runtime\}\ndirector \{director\}\n"` {arg2} --silent --postexec `echo  "" >> {arg1}` 
+#@MACRO:tvrage-to-ascii|Convert tvlog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -h --tvlog={?q:tvrage@file} --esredir={arg1} -execv `echo -e "dir \{dir\}\ntime \{time\}\nshowid \{showid\}\nname \{name\}\nlink \{link\}\ncountry \{country\}\nairtime \{airtime\}\nairday \{airday\}\nruntime \{runtime\}\nstarted \{started\}\nended \{ended\}\nseasons \{seasons\}\nclass \{class\}\ngenre \{genre\}\nstatus \{status\}\nstartyear \{startyear\}\nendyear \{endyear\}\nnetwork \{network\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}`
 #
 ##
-#@MACRO:tvrage-to-sql:{exe} -h --tvlog={?q:tvrage@file} --silent --execv `echo "insert into TVRAGE.shows (name, link, country, started, ended, seasons, status, runtime, airtime, airday, class, genres, showid, time, network, dir, startyear, endyear) VALUES('\{name\}', '\{link\}', '\{country\}', '\{started\}', '\{ended\}', '\{seasons\}', '\{status\}', '\{runtime\}', '\{airtime\}', '\{airday\}', '\{class\}', '\{genres\}', '\{showid\}', '\{time\}', '\{network\}', '\{dir\}', '\{startyear\}', '\{endyear\}');"` --esredir "{arg1}"
+#@MACRO:tvrage-to-sql:{exe} -h --tvlog={?q:tvrage@file} --silent -execv `echo "insert into TVRAGE.shows (name, link, country, started, ended, seasons, status, runtime, airtime, airday, class, genres, showid, time, network, dir, startyear, endyear) VALUES('\{name\}', '\{link\}', '\{country\}', '\{started\}', '\{ended\}', '\{seasons\}', '\{status\}', '\{runtime\}', '\{airtime\}', '\{airday\}', '\{class\}', '\{genres\}', '\{showid\}', '\{time\}', '\{network\}', '\{dir\}', '\{startyear\}', '\{endyear\}');"` --esredir "{arg1}"
 #
 ## <dirlog-clean-dupes>
 #
diff --git a/src/arg_opts.c b/src/arg_opts.c
@@ -2587,38 +2587,26 @@ _gg_opt gg_f_ref[] =
 #ifdef _GL_DUMMY_NONE
 
 #endif
-        { .id = 0x0068, .on = "--regexi", .ac = 1, .op = opt_g_d_regexi },
         { .id = 0x0468, .on = "-regexi", .ac = 1, .op = opt_g_d_regexi },
-        { .id = 0x006A, .on = "--regex", .ac = 1, .op = opt_g_d_regex },
         { .id = 0x046A, .on = "-regex", .ac = 1, .op = opt_g_d_regex },
-        { .id = 0x0041, .on = "--match", .ac = 1, .op = opt_g_d_match },
         { .id = 0x0441, .on = "-match", .ac = 1, .op = opt_g_d_match },
-        { .id = 0x1041, .on = "--name", .ac = 1, .op = opt_g_d_fname },
         { .id = 0x1441, .on = "-name", .ac = 1, .op = opt_g_d_fname },
-        { .id = 0x1043, .on = "--namei", .ac = 1, .op = opt_g_d_fnamei },
         { .id = 0x1443, .on = "-namei", .ac = 1, .op = opt_g_d_fnamei },
-        { .id = 0x0006, .on = "--lom", .ac = 1, .op = opt_g_d_lom_match },
         { .id = 0x0406, .on = "-lom", .ac = 1, .op = opt_g_d_lom_match },
         { .id = 0x1000, .on = "!", .ac = 0, .op = opt_g_negate },
         { .id = 0x1001, .on = "-fd:", .ac = 0, .op = opt_g_tfd },
         { .id = 0x1001, .on = "-l:", .ac = 1, .op = opt_g_lookup },
         { .id = 0x1001, .on = "-prune:", .ac = 0, .op = opt_g_tfd },
-        { .id = 0x0002, .on = "and", .ac = 0, .op = opt_g_operator_and },
-        { .id = 0x0003, .on = "or", .ac = 0, .op = opt_g_operator_or },
         { .id = 0x2002, .on = "-and", .ac = 0, .op = opt_g_operator_and },
         { .id = 0x2003, .on = "-or", .ac = 0, .op = opt_g_operator_or },
         { .id = 0x0004, .on = "(", .ac = 0, .op = opt_g_m_raise_level },
         { .id = 0x0005, .on = ")", .ac = 0, .op = opt_g_m_lower_level },
         { .id = 0x0070, .on = "-y", .ac = 0, .op = opt_g_flinks },
-        { .id = 0x0071, .on = "--allowsymbolic", .ac = 0, .op = opt_g_flinks },
         { .id = 0x0072, .on = "--followlinks", .ac = 0, .op = opt_g_flinks },
-        { .id = 0x0073, .on = "--allowlinks", .ac = 0, .op = opt_g_flinks },
-        { .id = 0x0074, .on = "--execv", .ac = 1, .op = opt_execv },
         { .id = 0x0075, .on = "-execv", .ac = 1, .op = opt_execv },
         { .id = 0x0076, .on = "-execv-", .ac = 1, .op = opt_execv_stdin },
         { .id = 0x0077, .on = "-exec", .ac = 1, .op = opt_exec },
         { .id = 0x0078, .on = "-exec-", .ac = 1, .op = opt_exec_stdin },
-        { .id = 0x0079, .on = "--exec", .ac = 1, .op = opt_exec },
         { .id = 0x007A, .on = "--fix", .ac = 0, .op = opt_g_fix },
         { .id = 0x007C, .on = "--memlimit", .ac = 1, .op = opt_memb_limit },
         { .id = 0x007D, .on = "--memlimita", .ac = 1, .op = opt_memb_limit_in },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/usr/local/bin/bash`
`2`	`2`	`# DO NOT EDIT THESE LINES`
`3`		`-#@MACRO:getscore-f:{m:exe} -x {m:arg1} --silent --dir --exec "{m:spec1} $(basename {arg}) score"`
	`3`	`+#@MACRO:getscore-f:{m:exe} -x {m:arg1} --silent --dir -exec "{m:spec1} $(basename {arg}) score"`
`4`	`4`	`#`
`5`	`5`	`## Retrieves game info using giantbomb API (XML)`
`6`	`6`	`#`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ if [ $SLOW -eq 1 ] && [ -f "/tmp/du-ks/$4" ]; then`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	g_FILE=`echo $6 \| cut -f 2- -d " "`
`164`		`- [ -n "$g_FILE" ] && $7 -e dupefile --match "$g_FILE" --loglevel=6 -vvv`
	`164`	`+ [ -n "$g_FILE" ] && $7 -e dupefile -match "$g_FILE" --loglevel=6 -vvv`
`165`	`165`	`fi`
`166`	`166`	`elif [ $SLOW -eq 1 ]; then`
`167`	`167`	`touch "/tmp/du-ks/$4"`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`# DO NOT EDIT/REMOVE THESE LINES`
`19`	`19`	`#@VERSION:2`
`20`	`20`	`#@REVISION:51`
`21`		-#@MACRO:imdb\|iMDB lookups based on folder names (filesystem) [-arg1=<path>] [-arg2=<path regex>]:{exe} -x {arg1} -lom "depth>0" --lom "mode=4" --silent --sort asc,mtime --dir --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" --execv `{spec1} \{basepath\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{path\} 0 '' '' 3` {arg2}
	`21`	+#@MACRO:imdb\|iMDB lookups based on folder names (filesystem) [-arg1=<path>] [-arg2=<path regex>]:{exe} -x {arg1} -lom "depth>0 && mode=4" --silent --sort asc,mtime --dir --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" --execv `{spec1} \{basepath\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{path\} 0 '' '' 3` {arg2}
`22`	`22`	`#@MACRO:imdb-d\|iMDB lookups based on folder names (dirlog) [-arg1=<regex filter>]:{exe} -d --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{basedir\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 0 '' '' {arg3}" -l: dir -regexi "{arg1}"`
`23`	`23`	`#@MACRO:imdb-su\|Update existing imdblog records, pass query/dir name through the search engine:{exe} -a --imdblog={?q:imdb@file} --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{dir\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 1 \{year\}"`
`24`	`24`	`#@MACRO:imdb-su-id\|Update imdblog records using existing imdbID's, no searching is done:{exe} -a --imdblog={?q:imdb@file} --silent --loglevel=1 --preexec "{exe} --imdblog={?q:imdb@file} --backup imdb" -execv "{spec1} \{imdbid\} \{exe\} \{imdbfile\} \{glroot\} \{siterootn\} \{dir\} 2 \{basedir\} \{year\}"`
`@@ -33,7 +33,7 @@`
`33`	`33`	`#`
`34`	`34`	`## Gets movie info using iMDB native API and omdbapi (XML)`
`35`	`35`	`#`
`36`		`-## Requires: - glutil-2.5 or above`
	`36`	`+## Requires: - glutil-2.6.2 or above`
`37`	`37`	`## - libxml2 v2.7.7 or above`
`38`	`38`	`## - curl, date, egrep, sed, expr, recode (optional), awk`
`39`	`39`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#@REVISION:63`
`2`	`2`	`#`
`3`		`-## NOTE: Requires glutil 2.5 or higher`
	`3`	`+## NOTE: Requires glutil 2.6.2 or higher`
`4`	`4`	`#`
`5`	`5`	`## These are basically just sets of glutil arguments and`
`6`	`6`	`## bash commands, packed into macros for convinience`
`@@ -97,11 +97,11 @@`
`97`	`97`	`#`
`98`	`98`	`## Requires logs built with DATABASE_TYPE=0 (see tvrage/imdb_get.sh)`
`99`	`99`	`#`
`100`		-#@MACRO:tvrage-make-infolinks\|Creates folders with release info inside respective folders for every tvlog record erasing any existing ones first:{exe} --tvlog={?q:tvrage@file} -h --silent --exec `rm "\{glroot\}\{dir\}/[ TVRAGE "*;mkdir "\{glroot\}\{dir\}/[ TVRAGE - \{class\} - \{genres\} ]"` {arg1}
	`100`	+#@MACRO:tvrage-make-infolinks\|Creates folders with release info inside respective folders for every tvlog record erasing any existing ones first:{exe} --tvlog={?q:tvrage@file} -h --silent -exec `rm "\{glroot\}\{dir\}/[ TVRAGE "*;mkdir "\{glroot\}\{dir\}/[ TVRAGE - \{class\} - \{genres\} ]"` {arg1}
`101`	`101`	`#`
`102`	`102`	`## <make-imdb-dirlinks>`
`103`	`103`	`#`
`104`		-#@MACRO:imdb-make-infolinks\|Creates folders with release info inside respective folders for every imdblog record erasing any existing ones first:{exe} --imdblog={?q:imdb@file} -a --silent --exec `rm "{glroot}\{dir\}/[ IMDB "*;mkdir "\{dir\}" "\{glroot\}\{dir\}/[ IMDB - \{score\} \| \{votes\} votes - \{genres\} ]"` {arg1}
	`104`	+#@MACRO:imdb-make-infolinks\|Creates folders with release info inside respective folders for every imdblog record erasing any existing ones first:{exe} --imdblog={?q:imdb@file} -a --silent -exec `rm "{glroot}\{dir\}/[ IMDB "*;mkdir "\{dir\}" "\{glroot\}\{dir\}/[ IMDB - \{score\} \| \{votes\} votes - \{genres\} ]"` {arg1}
`105`	`105`	`#`
`106`	`106`	`# <dirlog-to-ascii> DEPRECATED - added export option (-E) to glutil, see --help`
`107`	`107`	`#`
`@@ -124,12 +124,12 @@`
`124`	`124`	`## If --dirlog=<path> is not specified, glutil reverts to`
`125`	`125`	`## default dirlog path`
`126`	`126`	`#`
`127`		-#@MACRO:dirlog-to-ascii\|Convert dirlog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -d --dirlog={?q:dirlog@file} --esredir={arg1} --execv `echo -e "dir \{dir\}\nstatus \{status\}\ntime \{time\}\nuser \{user\}\ngroup \{group\}\nfiles \{files\}\nsize \{size\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}`
`128`		-#@MACRO:imdb-to-ascii\|Convert imdblog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -a --imdblog={?q:imdb@file} --imdblog=\{imdbfile\} --esredir={arg1} --execv `echo -e "dir \{dir\}\ntime \{time\}\nimdbid \{imdbid\}\nplot \{plot\}\nscore \{score\}\ngenre \{genre\}\nvotes \{votes\}\ntitle \{title\}\nactors \{actors\}\nrated \{rated\}\nyear \{year\}\nreleased \{released\}\nruntime \{runtime\}\ndirector \{director\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}`
`129`		-#@MACRO:tvrage-to-ascii\|Convert tvlog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -h --tvlog={?q:tvrage@file} --esredir={arg1} --execv `echo -e "dir \{dir\}\ntime \{time\}\nshowid \{showid\}\nname \{name\}\nlink \{link\}\ncountry \{country\}\nairtime \{airtime\}\nairday \{airday\}\nruntime \{runtime\}\nstarted \{started\}\nended \{ended\}\nseasons \{seasons\}\nclass \{class\}\ngenre \{genre\}\nstatus \{status\}\nstartyear \{startyear\}\nendyear \{endyear\}\nnetwork \{network\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}`
	`127`	+#@MACRO:dirlog-to-ascii\|Convert dirlog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -d --dirlog={?q:dirlog@file} --esredir={arg1} -execv `echo -e "dir \{dir\}\nstatus \{status\}\ntime \{time\}\nuser \{user\}\ngroup \{group\}\nfiles \{files\}\nsize \{size\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}`
	`128`	+#@MACRO:imdb-to-ascii\|Convert imdblog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -a --imdblog={?q:imdb@file} --imdblog=\{imdbfile\} --esredir={arg1} -execv `echo -e "dir \{dir\}\ntime \{time\}\nimdbid \{imdbid\}\nplot \{plot\}\nscore \{score\}\ngenre \{genre\}\nvotes \{votes\}\ntitle \{title\}\nactors \{actors\}\nrated \{rated\}\nyear \{year\}\nreleased \{released\}\nruntime \{runtime\}\ndirector \{director\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}`
	`129`	+#@MACRO:tvrage-to-ascii\|Convert tvlog records into ASCII format, suitable for re-injection using -z; Arguments\: -arg1=<output file>; Requires glutil-1.9-18 or above:{exe} -h --tvlog={?q:tvrage@file} --esredir={arg1} -execv `echo -e "dir \{dir\}\ntime \{time\}\nshowid \{showid\}\nname \{name\}\nlink \{link\}\ncountry \{country\}\nairtime \{airtime\}\nairday \{airday\}\nruntime \{runtime\}\nstarted \{started\}\nended \{ended\}\nseasons \{seasons\}\nclass \{class\}\ngenre \{genre\}\nstatus \{status\}\nstartyear \{startyear\}\nendyear \{endyear\}\nnetwork \{network\}\n"` {arg2} --silent --postexec `echo "" >> {arg1}`
`130`	`130`	`#`
`131`	`131`	`##`
`132`		-#@MACRO:tvrage-to-sql:{exe} -h --tvlog={?q:tvrage@file} --silent --execv `echo "insert into TVRAGE.shows (name, link, country, started, ended, seasons, status, runtime, airtime, airday, class, genres, showid, time, network, dir, startyear, endyear) VALUES('\{name\}', '\{link\}', '\{country\}', '\{started\}', '\{ended\}', '\{seasons\}', '\{status\}', '\{runtime\}', '\{airtime\}', '\{airday\}', '\{class\}', '\{genres\}', '\{showid\}', '\{time\}', '\{network\}', '\{dir\}', '\{startyear\}', '\{endyear\}');"` --esredir "{arg1}"
	`132`	+#@MACRO:tvrage-to-sql:{exe} -h --tvlog={?q:tvrage@file} --silent -execv `echo "insert into TVRAGE.shows (name, link, country, started, ended, seasons, status, runtime, airtime, airday, class, genres, showid, time, network, dir, startyear, endyear) VALUES('\{name\}', '\{link\}', '\{country\}', '\{started\}', '\{ended\}', '\{seasons\}', '\{status\}', '\{runtime\}', '\{airtime\}', '\{airday\}', '\{class\}', '\{genres\}', '\{showid\}', '\{time\}', '\{network\}', '\{dir\}', '\{startyear\}', '\{endyear\}');"` --esredir "{arg1}"
`133`	`133`	`#`
`134`	`134`	`## <dirlog-clean-dupes>`
`135`	`135`	`#`