Permalink
Browse files

Merge branch 'r/0.7' into dev

  • Loading branch information...
2 parents a76b1bd + 8bc2494 commit 834f6719f11dd7ad6e06646fc16f4498a1dc3259 @kierse committed Mar 3, 2011
Showing with 19 additions and 9 deletions.
  1. +3 −0 mediarover/command/configuration.py
  2. +2 −2 mediarover/config.py
  3. +1 −1 mediarover/version.py
  4. +13 −6 resources/config.template
@@ -49,6 +49,9 @@ def configuration(broker, args):
(options, args) = parser.parse_args(args)
+ if len(args) == 0:
+ print_epilog(parser, code=1)
+
if options.config:
broker.register(CONFIG_DIR, options.config)
@@ -415,11 +415,11 @@ def _locate_config_files(path):
if os.path.exists(path):
for file in ("mediarover.conf", "logging.conf", "sabnzbd_episode_sort_logging.conf"):
if not os.path.exists(os.path.join(path, file)):
- raise ConfigurationError("Missing config file '%s'. Run `python mediarover.py write-configs --config=%s`" % (os.path.join(path, file), path))
+ raise ConfigurationError("Missing config file '%s'. Run `python mediarover.py configuration --write --config=%s`" % (os.path.join(path, file), path))
if not os.access(os.path.join(path, file), os.R_OK):
raise ConfigurationError("Unable to read config file '%s' - check file permissions!" % os.path.join(path, file))
else:
- raise ConfigurationError("Configuration directory (%s) does not exist. Do you need to run `python mediarover.py write-configs`?" % path)
+ raise ConfigurationError("Configuration directory (%s) does not exist. Do you need to run `python mediarover.py configuration --write`?" % path)
def _validate_config(config, validator, filename):
""" validate the given config object using the given validator """
@@ -13,6 +13,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-__app_version__ = "0.7.0_beta"
+__app_version__ = "0.7.0"
__config_version__ = {'version': 7, 'min': 7}
__schema_version__ = 3
@@ -148,6 +148,7 @@
#
# 2. set series specific options. These options deterine how Media Rover treats
# both folders it finds on disk and source items that match watched series.
+ #
# Options include:
#
# a) option: ignore_series
@@ -163,7 +164,7 @@
# list of seasons.
#
# c) option: series_alias
- # values: comma separated list (ie. 1,2,3,4)
+ # values: comma separated list (ie. "Some Show", "Some Show (US)", "A longer name for some show")
# default: none (empty list)
# description: this option tells Media Rover to match source items to the current series that
# normally wouldn't be matched. This option is typically used when the series name
@@ -216,12 +217,18 @@
# NOTE: SOME filters can optionally be stored on the filesystem in the series directory. See
# http://wiki.github.com/kierse/mediarover/config-filter for more details
#
- # NOTE: Filters can also be placed in the series_filter.conf file, located in the Media Rover config directory.
- # Please note, filters found in series_filter.conf take precedent over those found below!
- #
- # See http://wiki.github.com/kierse/mediarover/config-filter for examples
- #
[[filter]]
+
+ # ATTENTION: Did you know that Media Rover can automatically generate your series filters for you?
+ # Once you've configured the [tv] subsection above, run the following on the command line:
+ #
+ # > python mediarover.py configuration --generate-filters
+ #
+ # This will add a new file to your Media Rover config directory called series_filter.conf
+ # containing a filter block for each series found in the directories pointed to by your
+ # tv_root option. These filters will use the application and user defaults indicated in
+ # the documentation above. Any changes you make to the generated series filters will be
+ # preserved and incorporated the next time you tell Media Rover to generate filters.
[[template]]

0 comments on commit 834f671

Please sign in to comment.