From aeccd2600e87bf8c01ccfd8b35fd76fb4b061b27 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 29 Mar 2017 12:38:01 -0400 Subject: [PATCH] 2017-03-29 Fred Gleason * Added a man page for rddbcheck(8). --- ChangeLog | 2 + docs/docbook/Makefile.am | 4 + docs/docbook/rddbcheck.xml | 171 ++++++++++++++++++++++++++++++++++ rivendell.spec.in | 1 + utils/rddbcheck/rddbcheck.cpp | 1 - utils/rddbcheck/rddbcheck.h | 2 +- 6 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 docs/docbook/rddbcheck.xml diff --git a/ChangeLog b/ChangeLog index 7f81d500..d2085653 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15673,3 +15673,5 @@ * Added a '--rehash=' directive to rddbcheck(8). * Added a 'Rehash' Web API call. * Added an 'RDRehash' class in 'lib/rdrehash.cpp' and 'lib/rdrehash.h'. +2017-03-29 Fred Gleason + * Added a man page for rddbcheck(8). diff --git a/docs/docbook/Makefile.am b/docs/docbook/Makefile.am index 6691b824..0a09ff4c 100644 --- a/docs/docbook/Makefile.am +++ b/docs/docbook/Makefile.am @@ -34,6 +34,7 @@ all-local: cae.html\ cae.pdf\ rdclilogedit.1\ + rddbcheck.8\ rdmarkerset.8\ rdrevert.8\ rdexport.1\ @@ -44,6 +45,7 @@ all-local: cae.html\ web_api.pdf man_MANS = rdclilogedit.1\ + rddbcheck.8\ rdexport.1\ rdimport.1\ rdmarkerset.8\ @@ -54,6 +56,8 @@ EXTRA_DIST = cae.html\ cae.xml\ rdclilogedit.1\ rdclilogedit.xml\ + rddbcheck.8\ + rddbcheck.xml\ rdmarkerset.8\ rdmarkerset.xml\ rdrevert.8\ diff --git a/docs/docbook/rddbcheck.xml b/docs/docbook/rddbcheck.xml new file mode 100644 index 00000000..e72caca8 --- /dev/null +++ b/docs/docbook/rddbcheck.xml @@ -0,0 +1,171 @@ + + + + + rddbcheck + 8 + June 2016 + Linux Audio Manual + + + rddbcheck + Tool for checking and repairing Rivendell databases + + + + + Fred + Gleason + fredg@paravelsystems.com + + Application Author + + + + + + + rddbcheck + OPTIONS + + + + + Description + + rddbcheck8 is a command-line + tool for checking the consistency of a Rivendell database and (perhaps) + repairing any inconsistencies found. When invoked without any options, + rddbcheck8 will run all of the + "inexpensive" consistency checks, report any problems found + and offer to repair the problem. + + + + Options + + + + dir-name + + + + Move any "orphaned" audio files found to the + dir-name directory. + + + + + + + + + + + Automatically answer all interactive prompts with + No. + + + + + + + grp-name + + + + Move carts with missing/invalid GROUP information to the + grp-name group. + + + + + + + target + + + + Run the REHASH check. The + target value can be one of the following: + + + + + Cart number --e.g. 123456 + + + + Check hashs for all cuts within the specified cart. + + + + + + Cart/cut specification --e.g. 123456_001 + + + + Check the hash for the specified cut. + + + + + + ALL + + + + Check hashes for all cuts in the audio store. + + + + + + + + + + user-name + + + + Use the user-name Rivendell user. + Default value is user. + + + + + + + + + + + Automatically answer all interactive prompts with + Yes. + + + + + + + See Also + + + rdmarkerset8 + + , + + rdrevert8 + + + + + + + diff --git a/rivendell.spec.in b/rivendell.spec.in index 78f5c1e6..a21b6788 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -290,6 +290,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/rdexport.1.gz %{_mandir}/man1/rdimport.1.gz %{_mandir}/man1/rdclilogedit.1.gz +%{_mandir}/man8/rddbcheck.8.gz %{_mandir}/man8/rdmarkerset.8.gz %{_mandir}/man8/rdrevert.8.gz %doc AUTHORS diff --git a/utils/rddbcheck/rddbcheck.cpp b/utils/rddbcheck/rddbcheck.cpp index 6253197f..379ca962 100644 --- a/utils/rddbcheck/rddbcheck.cpp +++ b/utils/rddbcheck/rddbcheck.cpp @@ -164,7 +164,6 @@ MainObject::MainObject(QObject *parent) if(!orphan_group_name.isEmpty()) { QString sql=QString().sprintf("select NAME from GROUPS where NAME=\"%s\"", (const char *)orphan_group_name); - printf("SQL: %s\n",(const char *)sql); QSqlQuery *q=new QSqlQuery(sql); if(!q->first()) { fprintf(stderr,"rddbcheck: invalid group \"%s\"\n", diff --git a/utils/rddbcheck/rddbcheck.h b/utils/rddbcheck/rddbcheck.h index 95d656ea..3486da2b 100644 --- a/utils/rddbcheck/rddbcheck.h +++ b/utils/rddbcheck/rddbcheck.h @@ -31,7 +31,7 @@ #include #include -#define RDDBCHECK_USAGE "[options]\n\nCheck the Rivendell database and audio store for consistency\nand correctness.\n\n--yes\n Answer all questions with 'yes'\n\n--no\n Answer all questions with 'no'\n\n--user=\n Connect using the Rivendell user (default is \"user\").\n\n--orphan-group=\n Move carts with missing/invalid GROUP information to the \n group.\n\n--dump-cuts-dir=\n Move orphaned cut audio to the directory.\n\n--rehash=/ALL" +#define RDDBCHECK_USAGE "[options]\n" // // Global Variables