Fixed #14 (changed cache type and size detection)

Author: tomasbedrich

pycaching/cache.py

@@ -97,37 +97,36 @@ class Cache(object):
     }
 
     _possible_types = {
-        "Traditional Cache",
-        "Multi-Cache",
-        "Unknown Cache",
-        "Mystery Cache",
-        "Letterbox Hybrid",
-        "Event Cache",
-        "Mega-Event Cache",
-        "Giga-Event Cache",
-        "Earthcache",
-        "Cache In Trash Out Event",
-        "Webcam Cache",
-        "Virtual Cache",
-        "Wherigo Cache",
-        "Lost And Found Event Cache",
-        "Project Ape Cache",
-        "Groundspeak Hq",
-        "Gps Adventures Exhibit",
-        "Groundspeak Block Party",
-        "Locationless (Reverse) Cache",
+        # key is cache image url, used for parsing: http://www.geocaching.com/images/WptTypes/[KEY].gif
+        "2": "Traditional Cache",
+        "3": "Multi-cache",
+        "8": "Mystery Cache",
+        "__8": "Unknown Cache",  # same as Mystery, key not used
+        "5": "Letterbox hybrid",
+        "6": "Event Cache",
+        "mega": "Mega-Event Cache",
+        "giga": "Giga-Event Cache",
+        "earthcache": "Earthcache",
+        "13": "Cache in Trash out Event",
+        "11": "Webcam Cache",
+        "4": "Virtual Cache",
+        "1858": "Wherigo Cache",
+        "10Years_32": "Lost and Found Event Cache",
+        "ape_32": "Project Ape Cache",
+        "HQ_32": "Groundspeak HQ",
+        "1304": "GPS Adventures Exhibit",
+        "4738": "Groundspeak Block Party",
+        "12": "Locationless (Reverse) Cache",
     }
 
     _possible_sizes = {
-        "nano",
-        "micro",
-        "small",
-        "regular",
-        "large",
-        "very large",
-        "not chosen",
-        "virtual",
-        "other"
+        "micro": "micro",
+        "small": "small",
+        "regular": "regular",
+        "large": "large",
+        "not_chosen": "not chosen",
+        "virtual": "virtual",
+        "other": "other",
     }
 
     def __init__(self, wp, geocaching, *, name=None, cache_type=None, location=None, state=None,
@@ -225,11 +224,14 @@ def cache_type(self):
 
     @cache_type.setter
     def cache_type(self, cache_type):
-        cache_type = cache_type.strip().title()
+        cache_type = cache_type.strip()
         cache_type = cache_type.replace("Geocache", "Cache")
-        if cache_type not in self._possible_types:
+        if cache_type in self._possible_types.values():  # try to search in values
+            self._cache_type = cache_type
+        elif cache_type in self._possible_types.keys():  # not in values => it must be a key
+            self._cache_type = self._possible_types[cache_type]
+        else:
             raise ValueError("Cache type '{}' is not possible.".format(cache_type))
-        self._cache_type = cache_type
 
     @property
     @lazy_loaded
@@ -257,9 +259,12 @@ def size(self):
     @size.setter
     def size(self, size):
         size = size.strip().lower()
-        if size not in self._possible_sizes:
+        if size in self._possible_sizes.values():  # try to search in values
+            self._size = size
+        elif size in self._possible_sizes.keys():  # not in values => it must be a key
+            self._size = self._possible_sizes[size]
+        else:
             raise ValueError("Size '{}' is not possible.".format(size))
-        self._size = size
 
     @property
     @lazy_loaded

pycaching/geocaching.py

@@ -34,7 +34,7 @@ class Geocaching(object):
 
     _urls = {
         "login_page":       _baseurl + "login/default.aspx",
-        "cache_details":    _baseurl + "seek/cache_details.aspx",
+        "cache_details":    _baseurl + "geocache/{wp}",
         "caches_nearest":   _baseurl + "seek/nearest.aspx",
         "geocode":          _baseurl + "api/geocode",
         "map":              _tile_url + "map.details",
@@ -223,11 +223,12 @@ def _search_parse_cache(self, root):
         c = Cache(wp, self)
 
         # prettify data
-        c.cache_type = typeLink.find("img").get("alt")
+        c.cache_type = typeLink.find("img").get(
+            "src").split("/")[-1].rsplit(".", 1)[0]  # filename of img[src]
         c.name = nameLink.span.text.strip()
         c.found = found
         c.state = "Strike" not in nameLink.get("class")
-        c.size = " ".join(size.get("alt").split()[1:])
+        c.size = size.get("src").split("/")[-1].rsplit(".", 1)[0]  # filename of img[src]
         c.difficulty, c.terrain = list(map(float, D_T.text.split("/")))
         c.hidden = Util.parse_date(placed.text)
         c.author = author[3:]  # delete "by "
@@ -454,10 +455,7 @@ def load_cache(self, wp, destination=None):
         assert type(wp) is str and wp.startswith("GC")
         logging.info("Loading details about %s...", wp)
 
-        # assemble request
-        params = urlencode({"wp": wp})
-        url = self._urls["cache_details"] + "?" + params
-
+        url = self._urls["cache_details"].format(wp=wp)
         try:
             root = self._browser.get(url).soup
         except requests.exceptions.ConnectionError as e:
@@ -472,7 +470,7 @@ def load_cache(self, wp, destination=None):
 
         # parse raw data
         name = cache_details.find("h2")
-        cache_type = cache_details.find("img").get("alt")
+        cache_type = cache_details.find("img").get("src")
         author = cache_details("a")[1]
         hidden = cache_details.find("div", "minorCacheDetails").find_all("div")[1]
         location = root.find(id="uxLatLon")
@@ -491,14 +489,14 @@ def load_cache(self, wp, destination=None):
 
         # prettify data
         c.name = name.text
-        c.cache_type = cache_type
+        c.cache_type = cache_type.split("/")[-1].rsplit(".", 1)[0]
         c.author = author.text
-        c.hidden = Util.parse_date(hidden.text.split()[2])
+        c.hidden = Util.parse_date(hidden.text.split(":")[-1])
         c.location = Point.from_string(location.text)
         c.state = state is None
         c.found = found and "Found It!" in found.text or False
         c.difficulty, c.terrain = [float(_.get("alt").split()[0]) for _ in D_T]
-        c.size = " ".join(size.get("alt").split()[1:])
+        c.size = size.get("src").split("/")[-1].rsplit(".", 1)[0]  # filename of img[src]
         attributes_raw = [_.get("src").split('/')[-1].rsplit("-", 1) for _ in attributes_raw]
         c.attributes = {attribute_name: appendix.startswith("yes")
                         for attribute_name, appendix in attributes_raw if not appendix.startswith("blank")}

pycaching/util.py

@@ -33,6 +33,7 @@ def to_mindec(decimal):
     @staticmethod
     def parse_date(raw):
         """Returns parsed date."""
+        raw = raw.strip()
         patterns = ("%Y-%m-%d", "%Y/%m/%d", "%m/%d/%Y", "%d/%m/%Y",
                     "%d.%m.%Y", "%d/%b/%Y", "%d.%b.%Y", "%b/%d/%Y", "%d %b %y")
 
@@ -42,7 +43,7 @@ def parse_date(raw):
             except ValueError:
                 pass
 
-        raise errors.ValueError("Unknown date format.")
+        raise errors.ValueError("Unknown date format - '{}'.".format(raw))
 
     @classmethod
     def get_possible_attributes(cls):