X-Git-Url: http://dolda2000.com/gitweb/?p=utils.git;a=blobdiff_plain;f=ann.py;h=0b583ffba69d5bff800cb9dd2ef374fe28c80f75;hp=ee3d4726188dcad0683cbbb123c53dd264c0f9d9;hb=bdd30f1b303e15ad3e4c655a0f20f69bc374b10f;hpb=307f4e9308c8c11069f48e3bd88fbedddf4f6de3 diff --git a/ann.py b/ann.py index ee3d472..0b583ff 100644 --- a/ann.py +++ b/ann.py @@ -157,7 +157,7 @@ class anime(object): linkpat = re.compile("^/encyclopedia/anime\\.php\\?id=(\d+)$") def getlist(name): - name = s(name, "^the\s+", "") + name = s(name, "^(the|a)\s+", "") if len(name) < 1: raise error("list() needs a prefix of at least one character") fc = name[0] @@ -169,15 +169,19 @@ def getlist(name): ret = [] ldiv = afind(afind(d, "div", id="maincontent"), "div", "lst") for link in ldiv("a", "HOVERLINE"): - mn = "" + rawname = "" for el in link.font: if isinstance(el, str): - mn += el.strip() + rawname += el.strip() + mn = rawname.lower() + mn = s(mn, "^a\s+", "") + mn = mn.replace("\u014d", "ou") + mn = mn.replace("\u016b", "uu") if mn.lower().startswith(name.lower()): m = linkpat.match(link["href"]) if not m: raise incompatible() found = anime.byid(int(m.groups()[0])) - found.rawname = mn + found.rawname = rawname ret.append(found) return ret