qmsk.web: comparison urltree.py

equal deleted inserted replaced

-:e4fbf480fbee
+:a1da82870a6b
 class LabelValue (object) :
 """
 Represents the value of a ValueLabel... love these names
 """
-def __init__ (self, label, value) :
+def __init__ (self, label, value, is_default) :
 """
 Just store
 """
 self.label = label
 self.value = value
+self.is_default = is_default
 def __str__ (self) :
-return "%s=%r" % (self.label.key, self.value)
+return "%s%s" % (self.label.key, "=%r" % (self.value, ) if not self.is_default else '')
 def __repr__ (self) :
 return "<%s>" % self
 class Label (object) :
 Return a string representing this label, using the values in the given value_dict if needed
 """
 abstract
+def build_default (self, value_dict) :
+"""
+Return an (is_default, value) tuple
+"""
+abstract
 class EmptyLabel (Label) :
 """
 An empty label, i.e. just a slash in the URL
 """
 # only empty segments
 if value == '' :
 return True
 def build (self, values) :
-return str(self)
+return ''
+def build_default (self, values) :
+return (False, '')
 def __str__ (self) :
 return ''
 class StaticLabel (Label) :
 # match name
 if value == self.name :
 return True
 def build (self, values) :
-return str(self)
+return self.name
+def build_default (self, values) :
+return (False, self.name)
 def __str__ (self) :
 return self.name
 class ValueLabel (Label) :
 """
 # lookup the value obj to use
 value = values.get(self.key)
-if not value and self.default :
+if not value and self.default is not None :
 value = self.default
 elif not value :
 raise URLError("No value given for label %r" % (self.key, ))
 # convert value back to str
 value = self.type.build(value)
 return value
+def build_default (self, values) :
+"""
+Check if we have a value in values, and return based on that
+XXX: copy-paste from build()
+"""
+# state
+is_default = False
+# lookup the value obj to use
+value = values.get(self.key)
+if not value and self.default is not None :
+is_default = True
+value = self.default
+elif not value :
+raise URLError("No value given for label %r" % (self.key, ))
+# convert value back to str
+value = self.type.build(value)
+# return
+return (is_default, value)
 class SimpleValueLabel (ValueLabel) :
 """
 A label that has a name and a simple string value
 """
 Match -> LabelValue
 """
 # default?
 if value is None and self.default is not None :
-return LabelValue(self, self.default)
+return LabelValue(self, self.default, True)
 # only non-empty values!
 elif value :
 # test
 if not self.type.test(value) :
 return False
 # convert with type
 value = self.type.parse(value)
-return LabelValue(self, value)
+return LabelValue(self, value, False)
 def __str__ (self) :
 return '{%s%s%s}' % (
 self.key,
 (':%s' % (self.type_name, ) if self.type_name else ''),
 self.handler = handler
 self.defaults = defaults
 # query string
 self.query_args = dict()
+# remove prepending root /
+url_mask = url_mask.lstrip('/')
 # parse any query string
 # XXX: conflicts with regexp syntax
 if '/?' in url_mask :
 url_mask, query_mask = url_mask.split('/?')
 """
 # start with the defaults
 kwargs = self.defaults.copy()
+# ...dict of those label values which are set to defaults
+default_labels = {}
 # then add all the values
 for label_value in label_values :
 kwargs[label_value.label.key] = label_value.value
+# add key to default_values?
+if label_value.is_default :
+default_labels[label_value.label.key] = label_value.label
 # then parse all query args
 for key, value in request.get_args() :
-# unknown key?
+# lookup in our defined query args
-if key not in self.query_args :
+if key in self.query_args :
-# ignore?
+# lookup spec
-if self.config.ignore_extra_args :
+type, default = self.query_args[key]
-continue
+# override URL params if they were not given
-else :
+elif key in default_labels :
-raise URLError("Unrecognized query argument: %r" % (key, ))
+type, default = default_labels[key].type, None
-# lookup spec
+# be strict about extraneous query args?
-type, default = self.query_args[key]
+elif self.config.ignore_extra_args :
+raise URLError("Unrecognized query argument: %r" % (key, ))
 # normalize empty value to None
 if not value :
 value = None
 # execute the handler
 return self.handler(request, **kwargs)
 def build (self, request, **values) :
 """
-Build an absolute URL pointing to this target, with the given values
+Build an absolute URL pointing to this target, with the given values. Default values are left off if they
-"""
+are at the end of the URL.
+"""
-# build URL from request page prefix and our labels
-return request.page_prefix + '/'.join(label.build(values) for label in self.label_path)
+# collect segments as a list of (is_default, segment) values
+segments = [(False, request.page_prefix)] + [label.build_default(values) for label in self.label_path]
+# trim default items off the end
+for is_default, segment in segments[::-1] :
+if is_default :
+segments.pop(-1)
+else :
+break
+assert segments
+# join
+return '/'.join(segment for is_default, segment in segments)
 def __str__ (self) :
 return '/'.join(str(label) for label in self.label_path)
 def __repr__ (self) :
 def add_url (self, url) :
 """
 Adds the given URL to the tree. The URL must begin with a root slash.
 """
 # get url's label path
 path = url.get_label_path()
-# should begin with root
-root_label = path.pop(0)
-assert root_label == self.root.label, "URL must begin with root"
 # add to root
 self.root.add_url(url, path)
 def match (self, url) :

changeset 51	a1da82870a6b
parent 50	e4fbf480fbee
child 52	2136cdc95b86