Skip to content

Commit 63555a6

Browse files
committed
Add 'removed' options to assorted applications.
This adds back several command line options removed from 0.25, tagging them as such as an informative error to the user.
1 parent ddb9514 commit 63555a6

File tree

6 files changed

+100
-18
lines changed

6 files changed

+100
-18
lines changed

mythtv/programs/mythbackend/commandlineparser.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,26 @@ void MythBackendCommandLineParser::LoadArguments(void)
9292
"recordings.");
9393
add("--user", "username", "",
9494
"Drop permissions to username after starting.", "");
95+
96+
add("--upnprebuild", "upnprebuild", false, "", "")
97+
->SetRemoved("The UPnP server no longer maintains its own list\n"
98+
" of video content, and instead uses the shared\n"
99+
" list of the Video Library. Update the Video Library\n"
100+
" content list from within mythfrontend, or on the\n"
101+
" command line using 'mythutil --scanvideos'.",
102+
"0.25");
103+
add("--infile", "inputfile", "", "", "")
104+
->SetRemoved("mythbackend is no longer used for preview\n"
105+
" generation. Please use mythpreviewgen.", "0.25");
106+
add("--outfile", "outputfile", "", "", "")
107+
->SetRemoved("mythbackend is no longer used for preview\n"
108+
" generation. Please use mythpreviewgen.", "0.25");
109+
add("--chanid", "chanid", "", "", "")
110+
->SetRemoved("mythbackend is no longer used for preview\n"
111+
" generation. Please use mythpreviewgen.", "0.25");
112+
add("--starttime", "starttime", "", "", "")
113+
->SetRemoved("mythbackend is no longer used for preview\n"
114+
" generation. Please use mythpreviewgen.", "0.25");
95115
}
96116

97117
QString MythBackendCommandLineParser::GetHelpHeader(void) const

mythtv/programs/mythcommflag/commandlineparser.cpp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,29 @@ void MythCommFlagCommandLineParser::LoadArguments(void)
8686
->SetGroup("Advanced");
8787
add("--dry-run", "dryrun", false,
8888
"Don't actually queue operation, just list what would be done", "");
89+
90+
add("--sleep", "fullspeed", false, "", "")
91+
->SetRemoved("If your system is incapable of performing\n"
92+
" commercial detection without disrupting other\n"
93+
" operations, use the jobqueue execution window\n"
94+
" settings to ensure tasks do not run during the\n"
95+
" time you may be running such other operations.",
96+
"0.25");
97+
add("--nopercentage", "nopercentage", false, "", "")
98+
->SetRemoved("Use --noprogress instead.", "0.25");
99+
add("--very-quiet", "veryquiet", false, "", "")
100+
->SetRemoved("Use --quiet instead. Can be used multiple times\n"
101+
" for increased effect.", "0.25");
102+
add("--all", "runall", false, "", "")
103+
->SetRemoved("Use --queue with no content definition for\n"
104+
" similar behavior. Will queue all tasks to be\n"
105+
" run through the jobqueue, rather than run them\n"
106+
" all synchronously within this instance.", "0.25");
107+
add("--allstart", "allstart", "", "", "")
108+
->SetRemoved("and is no longer available in this version.", "0.25");
109+
add("--allend", "allend", "", "", "")
110+
->SetRemoved("and is no longer available in this version.", "0.25");
111+
add("--hogcpu", "hogcpu", "", "", "")
112+
->SetRemoved("and is no longer available in this version.", "0.25");
89113
}
90114

mythtv/programs/mythfilldatabase/commandlineparser.cpp

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
8383
"overwrite channel names, frequencies, etc. with "
8484
"values available from the data source. This will "
8585
"override custom channel names, which is why it "
86-
"is disabled by default.");
86+
"is disabled by default.")
87+
->SetGroup("Channel List Handling");
8788
add("--remove-new-channels", "removechannels", false,
8889
"disable new channels on datadirect web interface",
8990
"When using DataDirect, ask mythfilldatabase to "
@@ -93,14 +94,16 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
9394
"MythTV by running mythfilldatabase without this "
9495
"option. New digital channels cannot be directly "
9596
"imported and thus are disabled automatically.")
96-
->SetBlocks("file");
97+
->SetBlocks("file")
98+
->SetGroup("Channel List Handling");
9799
add("--do-not-filter-new-channels", "nofilterchannels", false,
98100
"don't filter ATSC channels for addition",
99101
"Normally, MythTV tries to avoid adding ATSC "
100102
"channels to NTSC channel lineups. This option "
101103
"restores the behavior of adding every channel in "
102104
"the downloaded channel lineup to MythTV's lineup, "
103-
"in case MythTV's smarts fail you.");
105+
"in case MythTV's smarts fail you.")
106+
->SetGroup("Channel List Handling");
104107
// need documentation for this one
105108
add("--cardtype", "cardtype", "", "", "No information.");
106109

@@ -116,48 +119,55 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
116119
" #[-#]\n"
117120
" all\n\n"
118121
"example:\n"
119-
" --refresh today --refresh 4-8 --refresh nottomorrow");
122+
" --refresh today --refresh 4-8 --refresh nottomorrow")
123+
->SetGroup("Filtering");
120124

121125
add("--max-days", "maxdays", 0, "force number of days to update",
122126
"Force the maximum number of days, counting today, "
123127
"for the guide data grabber to check for future "
124-
"listings.");
128+
"listings.")
129+
->SetGroup("Filtering");
125130
add("--refresh-today", "refreshtoday", false, "",
126131
"This option is only valid for selected grabbers.\n"
127132
"Force a refresh for today's guide data.\nThis can be used "
128133
"in combination with other --refresh-<n> options.\n"
129134
"If being used with datadirect, this option should not be "
130135
"used, rather use --dd-grab-all to pull all listings each time.")
131-
->SetDeprecated("use --refresh instead");
136+
->SetDeprecated("use --refresh instead")
137+
->SetGroup("Filtering");
132138
add("--dont-refresh-tomorrow", "dontrefreshtomorrow", false, "",
133139
"This option is only valid for selected grabbers.\n"
134140
"Prevent mythfilldatabase from pulling information for "
135141
"tomorrow's listings. Data for tomorrow is always pulled "
136142
"unless specifically specified otherwise.\n"
137143
"If being used with datadirect, this option should not be "
138144
"used, rather use --dd-grab-all to pull all listings each time.")
139-
->SetDeprecated("use --refresh instead");
145+
->SetDeprecated("use --refresh instead")
146+
->SetGroup("Filtering");
140147
add("--refresh-second", "refreshsecond", false, "",
141148
"This option is only valid for selected grabbers.\n"
142149
"Force a refresh for guide data two days from now. This can "
143150
"be used in combination with other --refresh-<n> options.\n"
144151
"If being used with datadirect, this option should not be "
145152
"used, rather use --dd-grab-all to pull all listings each time.")
146-
->SetDeprecated("use --refresh instead");
153+
->SetDeprecated("use --refresh instead")
154+
->SetGroup("Filtering");
147155
add("--refresh-day", "refreshday", 0U, "",
148156
"This option is only valid for selected grabbers.\n"
149157
"Force a refresh for guide data on a specific day. This can "
150158
"be used in combination with other --refresh-<n> options.\n"
151159
"If being used with datadirect, this option should not be "
152160
"used, rather use --dd-grab-all to pull all listings each time.")
153-
->SetDeprecated("use --refresh instead");
161+
->SetDeprecated("use --refresh instead")
162+
->SetGroup("Filtering");
154163
add("--dont-refresh-tba", "dontrefreshtba", false,
155164
"don't refresh \"To be announced\" programs",
156165
"This option is only valid for selected grabbers.\n"
157166
"Prevent mythfilldatabase from automatically refreshing any "
158167
"programs marked as \"To be announced\".\n"
159168
"If being used with datadirect, this option should not be "
160-
"used, rather use --dd-grab-all to pull all listings each time.");
169+
"used, rather use --dd-grab-all to pull all listings each time.")
170+
->SetGroup("Filtering");
161171

162172
add("--refresh-all", "refreshall", false, "",
163173
"This option is only valid for selected grabbers.\n"
@@ -169,7 +179,8 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
169179
->SetBlocks("dontrefreshtomorrow")
170180
->SetBlocks("refreshsecond")
171181
->SetBlocks("refreshday")
172-
->SetBlocks("maxdays");
182+
->SetBlocks("maxdays")
183+
->SetGroup("Filtering");
173184

174185
add("--dd-grab-all", "ddgraball", false,
175186
"refresh full data using DataDirect",
@@ -187,15 +198,28 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
187198
add("--only-update-channels", "onlychannels", false,
188199
"only update channel lineup",
189200
"Download as little listings data as possible to update the "
190-
"channel lineup.");
201+
"channel lineup.")
202+
->SetGroup("Channel List Handling");
191203
add("--no-mark-repeats", "markrepeats", true, "do not mark repeats", "");
192204
add("--export-icon-map", "exporticonmap", "iconmap.xml",
193-
"export icon map to file", "");
205+
"export icon map to file", "")
206+
->SetGroup("Channel Icon Handling");
194207
add("--import-icon-map", "importiconmap", "iconmap.xml",
195-
"import icon map to file", "");
208+
"import icon map to file", "")
209+
->SetGroup("Channel Icon Handling");
196210
add("--update-icon-map", "updateiconmap", false,
197-
"updates icon map icons", "");
211+
"updates icon map icons", "")
212+
->SetGroup("Channel Icon Handling");
198213
add("--reset-icon-map", "reseticonmap", "", "resets icon maps",
199214
"Reset all icon maps. If given 'all' as an optional value, reset "
200-
"channel icons as well.");
215+
"channel icons as well.")
216+
->SetGroup("Channel Icon Handling");
217+
218+
add("--graboptions", "graboptions", "", "", "")
219+
->SetRemoved("mythfilldatabase now passes any text after an\n"
220+
" independent '--' directly to the external grabber.\n"
221+
" e.g. mythfilldatabase -- --daily", "0.25");
222+
add("--mark-repeats", "oldmarkrepeats", "", "", "")
223+
->SetRemoved("This is now the default behavior. Use\n"
224+
" --no-mark-repeats to disable.", "0.25");
201225
}

mythtv/programs/mythfrontend/commandlineparser.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,16 @@ void MythFrontendCommandLineParser::LoadArguments(void)
3737
"Start the frontend within specified plugin.", "")
3838
->SetGroup("Startup Behavior")
3939
->SetBlocks("jumppoint");
40-
40+
41+
add(QStringList( QStringList() << "-G" << "--get-setting" ),
42+
"getsetting", "", "", "")
43+
->SetRemoved("Use the Services API instead.", "0.25");
44+
add(QStringList( QStringList() << "-u" << "--upgrade-schema" ),
45+
"upgradeschema", "", "", "")
46+
->SetRemoved("The frontend is no longer allowed to update\n"
47+
" the primary database schema. Use mythtv-setup\n"
48+
" or restart your primary backend to have it\n"
49+
" perform the task automatically.", "0.25");
4150
}
4251

4352
QString MythFrontendCommandLineParser::GetHelpHeader(void) const

mythtv/programs/mythlcdserver/commandlineparser.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@ void MythLCDServerCommandLineParser::LoadArguments(void)
2626
"Message display duration (in seconds)", "");
2727
add(QStringList( QStringList() << "-x" << "--debuglevel" ), "debug", 0,
2828
"debug verbosity", "Control debugging verbosity, values from 0-10");
29+
30+
add("--nodaemon", "nodaemon", false, "", "")
31+
->SetRemoved("This is the default behavior. No need for an argument.",
32+
"0.25");
2933
}
3034

mythtv/programs/mythutil/commandlineparser.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ void MythUtilCommandLineParser::LoadArguments(void)
120120
add("--pids", "pids", "", "Pids to process", "")
121121
->SetRequiredChildOf("pidfilter")
122122
->SetRequiredChildOf("pidprinter");
123-
add("--ptspids", "ptspids", "", "Pids to extract PTS from", "");
123+
add("--ptspids", "ptspids", "", "Pids to extract PTS from", "")
124+
->SetGroup("MPEG-TS");
124125
add("--packetsize", "packetsize", 188, "TS Packet Size", "")
125126
->SetChildOf("pidcounter")
126127
->SetChildOf("pidfilter");

0 commit comments

Comments
 (0)