Check-in [da276907c6]
Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | dingonyms 0.5: minor fixes to params handlind, and method names |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
da276907c61464d467b8af20ba7cdc5c |
User & Date: | mario 2021-03-04 15:08:58 |
Context
2021-05-12
| ||
04:58 | Fix html.unescape (overwritten with local var). Also might not be present across all Python versions, so add fallback. check-in: 4622c0cf56 user: mario tags: trunk | |
2021-03-04
| ||
15:08 | dingonyms 0.5: minor fixes to params handlind, and method names check-in: da276907c6 user: mario tags: trunk | |
2021-03-03
| ||
21:30 | Add --dictcc mode, rewritten parameter handling check-in: 0a323cc8e7 user: mario tags: trunk | |
Changes
Changes to dingonyms/dingonyms.py.
︙ | ︙ | |||
157 158 159 160 161 162 163 | def set_async(self, *a): """ async | a?io | thread\w* | parallel\w* """ # Just redefines self.run() to utilize asyncio threads (not real async taskโresult schemes) threads = asyncio.get_event_loop() def run(callback, *a, **kw): threads.run_in_executor(None, lambda: callback(*a, **kw)) self.run = run | | | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | def set_async(self, *a): """ async | a?io | thread\w* | parallel\w* """ # Just redefines self.run() to utilize asyncio threads (not real async taskโresult schemes) threads = asyncio.get_event_loop() def run(callback, *a, **kw): threads.run_in_executor(None, lambda: callback(*a, **kw)) self.run = run return threads # not even needed def thesaurus_raw(self, word, lang=None, html=""): """ thesaurus-?(raw|htm) | raw | htm """ if not html: html = http_get(f"https://www.thesaurus.com/browse/{word}") ls = [] |
︙ | ︙ | |||
198 199 200 201 202 203 204 | if grp in d and len(d[grp]): out.alternatives( "%s {%s} (%s)" % (d["entry"], d["pos"], d["definition"]), [word["term"] for word in d[grp]] ) except: out.group("failed JSON extraction") | | | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | if grp in d and len(d[grp]): out.alternatives( "%s {%s} (%s)" % (d["entry"], d["pos"], d["definition"]), [word["term"] for word in d[grp]] ) except: out.group("failed JSON extraction") self.thesaurus_raw(word, html=html) def openthesaurus(self, word): """ openthesaurus | open | ot | ope?nt\w* """ # there's a proper API here j = json.loads( http_get(f"https://www.openthesaurus.de/synonyme/search?q={word}&format=application/json&supersynsets=true") |
︙ | ︙ | |||
379 380 381 382 383 384 385 | lang = "www" html = http_get(f"https://{lang}.dict.cc/?s={word}") out.site("dict.cc") rx = """ <td[^>]*> (<(?:a|dfn).+?) </td>\s* <td[^>]*> (<(?:a|dfn|div).+?) </td></tr> | ^var\dc\dArr = new Array\((.+)\) # json list just contains raw words however | | | < | > | > | > | | > | > | | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 | lang = "www" html = http_get(f"https://{lang}.dict.cc/?s={word}") out.site("dict.cc") rx = """ <td[^>]*> (<(?:a|dfn).+?) </td>\s* <td[^>]*> (<(?:a|dfn|div).+?) </td></tr> | ^var\dc\dArr = new Array\((.+)\) # json list just contains raw words however | (<div\sclass="aftertable">|</script><table) """ for left,right,json,endhtml in re.findall(rx, html, re.X|re.M): if endhtml: break out.alternatives( "| ".join(textwrap.wrap(out.unhtml(left), 50)), textwrap.wrap(out.unhtml(right), 50) ) def all(self, word): """ all | a | Run through all available services """ for method in (self.thesaurus, self.merriamwebster, self.synonym_com, self.reverso, self.openthesaurus, self.woxikon, self.urban): self.run(method, word) def en(self, w): """ en | english """ self.run(self.thesaurus, w) self.run(self.merriamwebster, w) self.run(self.synonym_com, w) self.run(self.reverso, w) def de(self, w): """ de | german """ self.run(self.openthesaurus, w) self.run(self.woxikon, w) self.run(self.reverso, w, "de") self.run(self.synonyme_de, w) # instantiate right away lookup = lookup() # entry_points for console_scripts def __main__(): if len(sys.argv) == 1: return print("Syntax :: dingonyms --site word") word = "search" methods = [] # separate --params from search word for arg in sys.argv[1:]: if not arg or arg == "--": continue elif not re.match("[/+\โ\-]+", arg): word = arg else: for name, method in vars(lookup.__class__).items(): # match according to method name or regex in docstring rx = method.__doc__ or method.__name__ m = re.match(f"^ [/+\โ\-]+ ({rx}) $", arg, re.X|re.I|re.U) if m: methods.append((name, m.group(1).lower())) # list of method names and --param if not methods: methods = [("thesaurus","-t")] # invoke method names, potentially after --async got enabled (this is actually # a workaround to prevent --all from doubly running in the thread pool) def run_methods(name_and_param, word): is_async=False for name, param in name_and_param: callback = getattr(lookup, name) args = [word] if callback.__code__.co_argcount == 3: # pass --lang param where supported args.append(param) if is_async and name not in ("all", "de", "en"): args.insert(0, callback) callback = lookup.run if callback: callback(*args) if name == "set_async": is_async = True run_methods(methods, word.lower()) def dictcc(): bin, lang, *word = sys.argv # syntax: dictcc en-fr -- "word" if word: word = [w for w in word if not w.startswith("-")][0] else: word, lang = lang, "www" lookup.set_no_headers() lookup.dictcc(word, lang) if __name__ == "__init__": __main__() |