Commit cf99650

committed

minor refactoring to make it easier to call shorten()

1 parent ec03da7 commit cf99650Copy full SHA for cf99650

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,9 @@ def gen_unused_short(redirects: dict) -> Iterator[str]:`
`60`	`60`	`yield short`
`61`	`61`
`62`	`62`
`63`		`-def shorten(urls: list[str], redirects: dict, targets: dict) -> list[tuple[str, str]]:`
	`63`	`+def shorten(urls: list[str]) -> list[tuple[str, str]]:`
`64`	`64`	`"""Return (short, long) pairs, appending directives to HTACCESS_SHORT as needed."""`
	`65`	`+ redirects, targets = load_redirects()`
`65`	`66`	`iter_short = gen_unused_short(redirects)`
`66`	`67`	`pairs = []`
`67`	`68`	`timestamp = strftime('%Y-%m-%d %H:%M:%S')`
`@@ -86,8 +87,7 @@ def shorten(urls: list[str], redirects: dict, targets: dict) -> list[tuple[str,`
`86`	`87`	`def main() -> None:`
`87`	`88`	`"""read URLS from filename arguments or stdin"""`
`88`	`89`	`urls = [line.strip() for line in fileinput.input(encoding='utf-8')]`
`89`		`- redirects, targets = load_redirects()`
`90`		`- for short, long in shorten(urls, redirects, targets):`
	`90`	`+ for short, long in shorten(urls):`
`91`	`91`	`print(f'{BASE_DOMAIN}/{short}\t{long}')`
`92`	`92`
`93`	`93`

Comments

(0)