X-Git-Url: https://www.yuggoth.org/gitweb?p=weather.git;a=blobdiff_plain;f=weather.py;h=a93f1ed4903c27d49d191b2c4dda836da1249b87;hp=6073a5ce0486bef699a0b816982b83b696f39646;hb=b755668b64a70bb7b0efbf1bd0aff8c310471ee1;hpb=155d8574dfe4715cdf1e62afcc95cf8b871bf0e7

diff --git a/weather.py b/weather.py
index 6073a5c..a93f1ed 100644
--- a/weather.py
+++ b/weather.py
@@ -1,32 +1,43 @@
+# weather.py version 1.1, http://fungi.yuggoth.org/weather/
 # Copyright (c) 2006 Jeremy Stanley <fungi@yuggoth.org>, all rights reserved.
 # Licensed per terms in the LICENSE file distributed with this software.
 
-version = "1.0"
+"""Contains various object definitions needed by the weather utility."""
+
+version = "1.1"
 
 class Selections:
 	"""An object to contain selection data."""
 	def __init__(self):
 		"""Store the config, options and arguments."""
 		self.config = get_config()
-		self.options, self.arguments = get_options()
+		self.options, self.arguments = get_options(self.config)
 		if self.arguments:
 			self.arguments = [(x.lower()) for x in self.arguments]
 		else: self.arguments = [ None ]
 	def get(self, option, argument=None):
 		"""Retrieve data from the config or options."""
-		if not argument: argument = "default"
-		if self.config.has_option(argument, option):
+		if not argument: return self.options.__dict__[option]
+		elif not self.config.has_section(argument):
+			import sys
+			sys.stderr.write("ERROR: no alias defined for " \
+				+ argument + "\n")
+			sys.exit(1)
+		elif self.config.has_option(argument, option):
 			return self.config.get(argument, option)
 		else: return self.options.__dict__[option]
-	def get_boolean(self, option, argument=None):
+	def get_bool(self, option, argument=None):
 		"""Get data and coerce to a boolean if necessary."""
-		data = self.get(option, argument)
-		if type(data) is str:
-			if eval(data): return True
-			else: return False
-		else:
-			if data: return True
-			else: return False
+		return bool(self.get(option, argument))
+
+def bool(data):
+	"""Coerce data to a boolean value."""
+	if type(data) is str:
+		if eval(data): return True
+		else: return False
+	else:
+		if data: return True
+		else: return False
 
 def quote(words):
 	"""Wrap a string in quotes if it contains spaces."""
@@ -68,6 +79,8 @@ def get_metar(id, verbose=False):
 		for line in lines:
 			for heading in headings:
 				if line.startswith(heading + ":"):
+					if line.endswith(":0"):
+						line = line[:-2]
 					output.append("   " + line)
 		return "\n".join(output)
 
@@ -87,43 +100,66 @@ def get_forecast(city, st, verbose=False):
 				output.append(line.replace(".", "   ", 1))
 		return "\n".join(output)
 
-def get_options():
+def get_options(config):
 	"""Parse the options passed on the command line."""
 	import optparse
 	usage = "usage: %prog [ options ] [ alias [ alias [...] ] ]"
 	verstring = "%prog " + version
 	option_parser = optparse.OptionParser(usage=usage, version=verstring)
+	if config.has_option("default", "city"):
+		default_city = config.get("default", "city")
+	else: default_city = "Raleigh Durham"
 	option_parser.add_option("-c", "--city",
 		dest="city",
-		default="Raleigh Durham",
+		default=default_city,
 		help="the city name (ex: \"Raleigh Durham\")")
+	if config.has_option("default", "forecast"):
+		default_forecast = bool(config.get("default", "forecast"))
+	else: default_forecast = False
 	option_parser.add_option("-f", "--forecast",
 		dest="forecast",
 		action="store_true",
-		default=False,
-		help="include forecast (needs -c and -s)")
+		default=default_forecast,
+		help="include a local forecast")
+	if config.has_option("default", "id"):
+		default_id = config.get("default", "id")
+	else: default_id = "KRDU"
 	option_parser.add_option("-i", "--id",
 		dest="id",
-		default="KRDU",
+		default=default_id,
 		help="the METAR station ID (ex: KRDU)")
 	option_parser.add_option("-l", "--list",
 		dest="list",
 		action="store_true",
 		default=False,
 		help="print a list of configured aliases")
+	if config.has_option("default", "conditions"):
+		default_conditions = bool(config.get("default", "conditions"))
+	else: default_conditions = True
 	option_parser.add_option("-n", "--no-conditions",
 		dest="conditions",
 		action="store_false",
-		default=True,
-		help="disable output of current conditions (implies --forecast)")
+		default=default_conditions,
+		help="disable output of current conditions (forces -f)")
+	option_parser.add_option("-o", "--omit-forecast",
+		dest="forecast",
+		action="store_false",
+		default=default_forecast,
+		help="omit the local forecast (cancels -f)")
+	if config.has_option("default", "st"):
+		default_st = config.get("default", "st")
+	else: default_st = "NC"
 	option_parser.add_option("-s", "--st",
 		dest="st",
-		default="NC",
+		default=default_st,
 		help="the state abbreviation (ex: NC)")
+	if config.has_option("default", "verbose"):
+		default_verbose = bool(config.get("default", "verbose"))
+	else: default_verbose = False
 	option_parser.add_option("-v", "--verbose",
 		dest="verbose",
 		action="store_true",
-		default=False,
+		default=default_verbose,
 		help="show full decoded feeds")
 	options, arguments = option_parser.parse_args()
 	return options, arguments
@@ -134,9 +170,9 @@ def get_config():
 	config = ConfigParser.ConfigParser()
 	import os.path
 	rcfiles = [
-		".weatherrc",
+		"/etc/weatherrc",
 		os.path.expanduser("~/.weatherrc"),
-		"/etc/weatherrc"
+		"weatherrc"
 		]
 	import os
 	for rcfile in rcfiles:
@@ -153,7 +189,7 @@ def get_config():
 def list_aliases(config):
 	"""Return a formatted list of aliases defined in the config."""
 	sections = []
-	for section in config.sections():
+	for section in sorted(config.sections()):
 		if section.lower() not in sections and section != "default":
 			sections.append(section.lower())
 	output = "configured aliases..."