move parse_times to its own class

Author: MoralCode

models/times.py

@@ -0,0 +1,85 @@
+from models.time import Time, TimeType
+import logging, os
+
+logger = logging.getLogger(__name__)
+
+class Times():
+	start_time = None
+	end_time = None
+	
+	@classmethod
+	def from_shortcut_string(cls, times_string, assume_type=None):
+		"""
+		create a time object from a string
+		"""
+		logger.debug("creating times object from shortcut: " + times_string)
+		if times_string is None:
+			raise TypeError("Cannot create Times Object from value None")
+			
+		day = times_string.lower()
+
+		# set up some shortcut ranges
+		allday = cls(Time(0, 0, TimeType.AM), Time(11, 59, TimeType.PM))
+		workhours = cls(Time(9, 0, TimeType.AM), Time(5, 0, TimeType.PM))
+
+		if "24" in day:
+			return allday
+		elif "business" in day:
+			return workhours
+		elif "work" in day:
+			return workhours
+		elif "all day" in day:
+			return allday
+
+		raise ValueError("string '" + times_string + "' does not match a known pattern")
+			
+	@classmethod
+	def from_parse_results(cls, result, assume_type=None):
+		""" Takes values from the pyparsing results and converts them to the appropriate internal objects """
+		# assumes that all three (hours, minutes, am_pm) are the same length
+		res_dct = result.asDict()
+
+		start = res_dct.get("starttime")[0]
+		starttime = Time.from_parse_results(start)
+		
+		end = res_dct.get("endtime")[0]
+		endtime = Time.from_parse_results(end)
+		
+		if starttime.is_unknown() and assume_type is not None:
+			starttime.set_type(assume_type)
+
+		if endtime.is_unknown() and assume_type is not None:
+			endtime.set_type(assume_type)
+
+
+		if starttime.is_am() and endtime.is_am() and starttime.get_hours() > endtime.get_hours():
+			endtime.set_type(TimeType.PM)
+
+		return cls(starttime, endtime)
+		
+	def __init__(self, start_time, end_time):
+		if start_time is None or end_time is None:
+			raise TypeError("Cannot create Times Object from value None")
+	
+		logger.debug("creating times from " + str(start_time) + " and " + str(end_time))
+
+		self.start_time = start_time
+		self.end_time = end_time
+
+	def get_start_time(self):
+		return self.start_time
+	
+	def get_end_time(self):
+		return self.end_time
+	
+	def __str__(self):
+		return self.start_time + to + self.end_time
+
+	
+	def __eq__(self, other):
+		if not isinstance(other, Times):
+			# don't attempt to compare against unrelated types
+			raise NotImplementedError()
+		return self.start_time == other.start_time and self.end_time == other.end_time 
+
+

parse_opening_hours.py

@@ -14,6 +14,7 @@
 from models.day import Day, DaysEnum
 from models.days import Days
 from models.time import Time, TimeType
+from models.times import Times
 import unicodedata
 import os
 import logging
@@ -48,45 +49,21 @@ def json(self, assume_type=None):
 		# TODO: move parse days and parse times out of the json() function
 		days = Days.from_parse_results(self.openinghours)
 
-		start_time, end_time = parse_times(self.openinghours, assume_type=assume_type or self.assume_type)
+		times = Times.from_parse_results(self.openinghours, assume_type=assume_type or self.assume_type)
 
 
 		for day in days:
 			opening_hours_json.append(
 				create_entry(
 					str(day),
-					start_time,
-					end_time
+					str(times.get_start_time().get_as_military_time()),
+					str(times.get_end_time().get_as_military_time())
 				)
 			)
 
 		return opening_hours_json
 
-def parse_times(result, assume_type=None):
-	""" Takes values from the pyparsing results and converts them to the appropriate internal objects """
-	# assumes that all three (hours, minutes, am_pm) are the same length
-	res_dct = result.asDict()
 
-	start = res_dct.get("starttime")[0]
-	starttime = Time.from_parse_results(start)
-	
-	end = res_dct.get("endtime")[0]
-	endtime = Time.from_parse_results(end)
-	
-	if starttime.is_unknown() and assume_type is not None:
-		starttime.set_type(assume_type)
-
-	if endtime.is_unknown() and assume_type is not None:
-		endtime.set_type(assume_type)
-
-
-	if starttime.is_am() and endtime.is_am() and starttime.get_hours() > endtime.get_hours():
-		endtime.set_type(TimeType.PM)
-
-	return (
-		str(starttime.get_as_military_time()),
-		str(endtime.get_as_military_time())
-		)
 
 def create_entry(day, opening, closing, notes=None):
 	"""Creates a new JSON object representing a single time slot for a single day"""