55abb0c resgate do .htaccess em prod

Author: ramalho

links/FPY.LI.htaccess

@@ -1070,17 +1070,6 @@ RedirectTemp /24-27 https://docs.python.org/3/library/functools.html#functools.t
 RedirectTemp /24-28 https://www.python.org/download/releases/2.2.3/descrintro/
 RedirectTemp /24-29 https://github.com/lihaoyi/macropy
 RedirectTemp /24-30 https://people.eecs.berkeley.edu/~bh/ss-toc2.html
-# content of short.htaccess file created and managed by short.py
 
-# appended: 2025-05-23 15:12:13
-RedirectTemp /22 https://pythonfluente.com/2/#pattern_matching_case_study_sec
-RedirectTemp /23 https://pythonfluente.com/2/#how_slicing_works
-RedirectTemp /24 https://pythonfluente.com/2/#sliceable_sequence
-RedirectTemp /25 https://pythonfluente.com/2/#virtual_subclass_sec
-RedirectTemp /26 https://pythonfluente.com/2/#environment_class_ex
-RedirectTemp /27 https://pythonfluente.com/2/#subclass_builtin_woes
-RedirectTemp /28 https://pythonfluente.com/2/#slots_section
-RedirectTemp /29 https://pythonfluente.com/2/#typeddict_sec
-RedirectTemp /2a https://pythonfluente.com/2/#problems_annot_runtime_sec
-RedirectTemp /2b https://pythonfluente.com/2/#legacy_deprecated_typing_box
-RedirectTemp /2c https://pythonfluente.com/2/#positional_pattern_implement_sec
+####################### end of custom URLs
+

links/FPY.LI.short.htaccess

@@ -18,15 +18,3 @@ RedirectTemp /2c https://pythonfluente.com/2/#positional_pattern_implement_sec
 RedirectTemp /2d https://mitpress.mit.edu/9780262111584/the-art-of-the-metaobject-protocol/
 RedirectTemp /2e https://dabeaz.com/per.html
 RedirectTemp /2f https://pythonfluente.com/2/#iter_closer_look
-# appended: 2025-06-04 21:42:54
-RedirectTemp /2g https://docs.python.org/pt-br/3/reference/lexical_analysis.html#reserved-classes-of-identifiers
-RedirectTemp /2h https://docs.python.org/pt-br/3/library/doctest.html
-RedirectTemp /2j https://docs.python.org/pt-br/3.10/library/string.html#format-string-syntax
-RedirectTemp /2k https://docs.python.org/pt-br/3/library/stdtypes.html#truth
-RedirectTemp /2m https://docs.python.org/pt-br/3/tutorial/controlflow.html#unpacking-argument-lists
-RedirectTemp /2n https://docs.python.org/pt-br/3/reference/datamodel.html
-RedirectTemp /2p https://docs.python.org/pt-br/3/reference/datamodel.html
-RedirectTemp /2q https://dabeaz.com/per.html
-RedirectTemp /2r https://mitpress.mit.edu/books/art-metaobject-protocol
-RedirectTemp /2s https://docs.python.org/pt-br/3/reference/datamodel.html
-RedirectTemp /2t https://plone.org.br/

links/shorten.py

@@ -17,15 +17,14 @@
 from collections.abc import Iterator
 from time import strftime
 from typing import NamedTuple
-from urllib.parse import urlparse, urlunparse
-from urllib.parse import ParseResult as Url
 
-HTACCESS_CUSTOM = 'FPY.LI.custom.htaccess'
+HTACCESS_MAIN = 'FPY.LI.htaccess'
 HTACCESS_SHORT = 'FPY.LI.short.htaccess'
-HTACCESS_FILES = (HTACCESS_CUSTOM, HTACCESS_SHORT)
+HTACCESS_FILES = (HTACCESS_MAIN, HTACCESS_SHORT)
 BASE_DOMAIN = 'fpy.li'
 
-type ShortCode = str
+type ShortCode = bytes
+type Url = str
 type RedirMap = dict[ShortCode, Url]
 type TargetMap = dict[Url, ShortCode]
 
@@ -40,32 +39,33 @@ def load_redirects() -> tuple[RedirMap, TargetMap]:
         with open(filename) as fp:
             for line in fp:
                 if line.startswith('RedirectTemp'):
-                    _, short, field2, *_ = line.split()
-                    short = short[1:]  # Remove leading slash
-                    long = urlparse(field2)
+                    _, field1, long, *_ = line.split()
+                    short = field1.encode('ascii')[1:]  # Remove leading slash
                     assert short not in redirects, f'{filename}: duplicate redirect from {short}'
                     # htaccess.custom is live since 2022, I can't change it to remove duplicate targets
-                    if filename != HTACCESS_CUSTOM:
-                        assert long not in targets, f'{filename}: duplicate redirect to {long}'
+                    #if filename != HTACCESS_MAIN:
+                    #assert long not in targets, f'{filename}: duplicate redirect to {long}'
+                    if long in targets:
+                        print(f'{filename}: duplicate redirect to {long}')
                     redirects[short] = long
                     targets[long] = short
 
     return redirects, targets
 
 
-SDIGITS = '23456789abcdefghjkmnpqrstvwxyz'
+SDIGITS = b'23456789abcdefghjkmnpqrstvwxyz'
 
 
-def gen_short(start_len=1) -> Iterator[str]:
+def gen_short(start_len=1) -> Iterator[ShortCode]:
     """Generate every possible sequence of SDIGITS, starting with start_len"""
     length = start_len
     while True:
         for short in itertools.product(SDIGITS, repeat=length):
-            yield ''.join(short)
+            yield bytes(short)
         length += 1
 
 
-def gen_unused_short(redirects: dict) -> Iterator[str]:
+def gen_unused_short(redirects: dict) -> Iterator[ShortCode]:
     """Generate next available short URL of len >= 2."""
     for short in gen_short(2):
         if short not in redirects:
@@ -80,29 +80,30 @@ def shorten(urls: list[str]) -> list[ShortPair]:
     timestamp = strftime('%Y-%m-%d %H:%M:%S')
     with open(HTACCESS_SHORT, 'a') as fp:
         for long in urls:
-            url = urlparse(long)
             assert BASE_DOMAIN not in long, f'{long} is a {BASE_DOMAIN} URL'
-            if url in targets:
-                short = targets[url]
+            if long in targets:
+                short = targets[long]
             else:
                 short = next(iter_short)
-                redirects[short] = url
-                targets[url] = short
+                redirects[short] = long
+                targets[long] = short
                 if timestamp:
                     fp.write(f'\n# appended: {timestamp}\n')
                     timestamp = None
-                fp.write(f'RedirectTemp /{short} {urlunparse(url)}\n')
-            pairs.append((short, url))
+                fp.write(f'RedirectTemp /{short.decode('ascii')} {long}\n')
+            pairs.append((short, long))
 
     return pairs
 
 
 def main() -> None:
     """read URLS from filename arguments or stdin"""
     urls = [line.strip() for line in fileinput.input(encoding='utf-8')]
-    for short, long in shorten(urls):
-        print(f'{BASE_DOMAIN}/{short}\t{urlunparse(long)}')
+    for pair in shorten(urls):
+        short = pair.code.decode('ascii')
+        print(f'{BASE_DOMAIN}/{short}\t{pair.url}')
 
 
 if __name__ == '__main__':
-    main()
+    #main()
+    load_redirects()