offpunk 2.3__tar.gz → 2.4__tar.gz

offpunk-2.4/.build.yml

@@ -0,0 +1,21 @@
+image: alpine/3.19
+oauth: pages.sr.ht/PAGES:RW
+packages:
+- hut
+environment:
+  site1: offpunk.net
+tasks:
+- package-gemini: |
+    cd offpunk/tutorial
+    tar -cvzh . > ../../capsule.tar.gz
+- deploy-gemini: |
+    hut pages publish capsule.tar.gz -p GEMINI -d $site1
+- package-html: |
+    mkdir public_html
+    cd offpunk/tutorial
+    python make_website.py
+    cd ../../public_html
+    ln -s ../offpunk/screenshots .
+    tar -cvzh . > ../site.tar.gz
+- deploy-html: |
+    hut pages publish site.tar.gz -d $site1

{offpunk-2.3 → offpunk-2.4}/CHANGELOG

@@ -1,5 +1,20 @@
 # Offpunk History
 
+## 2.4 - November 21st 2024
+NEW WEBSITE: Official homepage is now https://offpunk.net (or gemini://offpunk.net). Sources are in the /tutorial/ folder and contributions are welcome.
+NEW FEATURE: This release includes work by Bert Livens to add gemini client-side certificates (see "help certs"). This means you can browse gemini capsule while being identified (such as astrobotany)
+- Deprecation warning if using Chafa < 1.10
+- introducing the "tutorial" command (which is only a link to offpunk.net for now)
+- netcache: use client-certificate when going to a url like gemini://username@site.net (by Bert Livens)
+- offpunk/netcache: added the "cert" command to list and create client certificates (Bert Livens)
+- "open" now accept integer as parameters to open links (suggested by Matthieu Rakotojaona)
+- fix cache not being properly accessed when server redirect to same host with standard port (gemini.ucant.org)
+- fix crash when expired certificate due to not_valid_after deprecation
+- fix crash in netcache when a port cannot be parsed in the URL
+- fix parameter "interactive=False" not being sent to gemini redirections
+- fix problem with non-integer version of less (Patch by Peter Cock)
+- Gopher: hide lines starting with TAB (drkhsh.at), reported by Dylan D’Silva
+
 ## 2.3 - June 29th 2024
 - Wayland clipboard support through wl-clipboard (new suggested dependency)
 - Xclip clipboard support (in case xsel is missing)

{offpunk-2.3 → offpunk-2.4}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: offpunk
-Version: 2.3
+Version: 2.4
 Dynamic: Summary
-Project-URL: Homepage, https://sr.ht/~lioploum/offpunk/
+Project-URL: Homepage, https://offpunk.net/
 Project-URL: Source, https://git.sr.ht/~lioploum/offpunk
 Project-URL: Bug Tracker, https://todo.sr.ht/~lioploum/offpunk
 Author-email: Solderpunk <solderpunk@sdf.org>, "Lionel Dricot (Ploum)" <offpunk2@ploum.eu>
@@ -702,10 +702,11 @@ A command-line and offline-first smolnet browser/feed reader for Gemini, Gopher,
 
 The goal of Offpunk is to be able to synchronise your content once (a day, a week, a month) and then browse/organise it while staying disconnected.
 
-Official project page (repository/mailing lists) : https://sr.ht/~lioploum/offpunk/
+Official page : https://offpunk.net
+Development (repository/mailing lists) : https://sr.ht/~lioploum/offpunk/
 
-![Screenshot HTML page with picture](screenshot_offpunk1.png)
-![Screenshot Gemini page](screenshot_offpunk2.png)
+![Screenshot HTML page with picture](screenshots/1.png)
+![Screenshot Gemini page](screenshots/2.png)
 
 Offpunk is a fork of the original [AV-98](https://tildegit.org/solderpunk/AV-98) by Solderpunk and was originally called AV-98-offline as an experimental branch.
 

{offpunk-2.3 → offpunk-2.4}/README.md

@@ -4,10 +4,11 @@ A command-line and offline-first smolnet browser/feed reader for Gemini, Gopher,
 
 The goal of Offpunk is to be able to synchronise your content once (a day, a week, a month) and then browse/organise it while staying disconnected.
 
-Official project page (repository/mailing lists) : https://sr.ht/~lioploum/offpunk/
+Official page : https://offpunk.net
+Development (repository/mailing lists) : https://sr.ht/~lioploum/offpunk/
 
-![Screenshot HTML page with picture](screenshot_offpunk1.png)
-![Screenshot Gemini page](screenshot_offpunk2.png)
+![Screenshot HTML page with picture](screenshots/1.png)
+![Screenshot Gemini page](screenshots/2.png)
 
 Offpunk is a fork of the original [AV-98](https://tildegit.org/solderpunk/AV-98) by Solderpunk and was originally called AV-98-offline as an experimental branch.
 

{offpunk-2.3 → offpunk-2.4}/ansicat.py

@@ -118,6 +118,8 @@ def inline_image(img_file,width):
     if _HAS_CHAFA:
         if _HAS_PIL and not _NEW_CHAFA:
             # this code is a hack to remove frames from animated gif
+            print("WARNING: support for chafa < 1.10 will soon be removed")
+            print("If you can’t upgrade chafa or timg, please contact offpunk developers")
             img_obj = Image.open(img_file)
             if hasattr(img_obj,"n_frames") and img_obj.n_frames > 1:
                 # we remove all frames but the first one
@@ -784,22 +786,25 @@ class GopherRenderer(AbstractRenderer):
                     parts = parts[:-1]
                 if len(parts) == 4:
                     name,path,host,port = parts
-                    itemtype = name[0]
-                    name = name[1:]
-                    if port == "70":
-                        port = ""
-                    else:
-                        port = ":%s"%port
-                    if itemtype == "h" and path.startswith("URL:"):
-                        url = path[4:]
-                    else:
-                        url = "gopher://%s%s/%s%s" %(host,port,itemtype,path)
-                    url = url.replace(" ","%20")
-                    linkline = url + " " + name
-                    links.append(linkline)
-                    number = len(links) + startlinks
-                    towrap = "[%s] "%str(number)+ name
-                    r.add_text(towrap)
+                    #If line starts with TAB, there’s no name.
+                    #We thus hide this line
+                    if name:
+                        itemtype = name[0]
+                        name = name[1:]
+                        if port == "70":
+                            port = ""
+                        else:
+                            port = ":%s"%port
+                        if itemtype == "h" and path.startswith("URL:"):
+                            url = path[4:]
+                        else:
+                            url = "gopher://%s%s/%s%s" %(host,port,itemtype,path)
+                        url = url.replace(" ","%20")
+                        linkline = url + " " + name
+                        links.append(linkline)
+                        number = len(links) + startlinks
+                        towrap = "[%s] "%str(number)+ name
+                        r.add_text(towrap)
                 else:
                     r.add_text(line)
         return r.get_final(),links
@@ -1359,7 +1364,7 @@ def get_mime(path,url=None):
         mime = "mailto"
     elif os.path.isdir(path):
         mime = "Local Folder"
-    elif path.endswith(".gmi"):
+    elif path.endswith(".gmi") or path.endswith(".gemini"):
         mime = "text/gemini"
     elif path.endswith("gophermap"):
         mime = "text/gopher"

{offpunk-2.3 → offpunk-2.4}/man/ansicat.1

@@ -68,7 +68,7 @@ original URL of the content.
 .Xr netcache 1 ,
 .Xr offpunk 1 ,
 .Xr opnk 1 ,
-.Lk https://sr.ht/~lioploum/offpunk/
+.Lk https://offpunk.net/
 .
 .Sh AUTHORS
 .An Lionel Dricot (Ploum) Aq Mt offpunk2 at ploum.eu

{offpunk-2.3 → offpunk-2.4}/man/netcache.1

@@ -68,7 +68,7 @@ Maximum age (in second) of the cached version before redownloading a new version
 .Xr migrate-offpunk-cache 1 ,
 .Xr offpunk 1 ,
 .Xr opnk 1 ,
-.Lk https://sr.ht/~lioploum/offpunk/
+.Lk https://offpunk.net/
 .
 .Sh AUTHORS
 .An Lionel Dricot (Ploum) Aq Mt offpunk2 at ploum.eu

{offpunk-2.3 → offpunk-2.4}/man/offpunk.1

@@ -81,7 +81,7 @@ display available features and dependancies then quit
 .Xr migrate-offpunk-cache 1 ,
 .Xr netcache 1 ,
 .Xr opnk 1 ,
-.Lk https://sr.ht/~lioploum/offpunk/
+.Lk https://offpunk.net/
 .
 .Sh HISTORY
 .Nm

{offpunk-2.3 → offpunk-2.4}/man/opnk.1

@@ -51,7 +51,7 @@ Maximum age (in second) of the cached version before redownloading a new version
 .Xr migrate-offpunk-cache 1 ,
 .Xr netcache 1 ,
 .Xr offpunk 1 ,
-.Lk https://sr.ht/~lioploum/offpunk/
+.Lk https://offpunk.net/
 .
 .Sh AUTHORS
 .An Lionel Dricot (Ploum) Aq Mt offpunk2 at ploum.eu

{offpunk-2.3 → offpunk-2.4}/netcache.py

@@ -24,6 +24,9 @@ except ModuleNotFoundError:
 try:
     from cryptography import x509
     from cryptography.hazmat.backends import default_backend
+    from cryptography.hazmat.primitives import hashes
+    from cryptography.hazmat.primitives.asymmetric import rsa
+    from cryptography.hazmat.primitives import serialization
     _HAS_CRYPTOGRAPHY = True
     _BACKEND = default_backend()
 except(ModuleNotFoundError,ImportError):
@@ -158,7 +161,10 @@ def get_cache_path(url,add_index=True):
         local = False
         # Convert unicode hostname to punycode using idna RFC3490
         host = parsed.netloc #.encode("idna").decode()
-        port = parsed.port or standard_ports.get(scheme, 0)
+        try:
+            port = parsed.port or standard_ports.get(scheme, 0)
+        except ValueError:
+           port = standard_ports.get(scheme,0) 
         # special gopher selector case
         if scheme == "gopher":
             if len(parsed.path) >= 2:
@@ -462,7 +468,7 @@ def _validate_cert(address, host, cert,accept_bad_ssl=False,automatic_choice=Non
     previously encountered a different certificate for this IP address and
     hostname.
     """
-    now = datetime.datetime.utcnow()
+    now = datetime.datetime.now(datetime.UTC)
     if _HAS_CRYPTOGRAPHY:
         # Using the cryptography module we can get detailed access
         # to the properties of even self-signed certs, unlike in
@@ -544,7 +550,7 @@ def _validate_cert(address, host, cert,accept_bad_ssl=False,automatic_choice=Non
             # Load the most frequently seen certificate to see if it has
             # expired
             previous_cert = x509.load_der_x509_certificate(previous_cert, _BACKEND)
-            previous_ttl = previous_cert.not_valid_after - now
+            previous_ttl = previous_cert.not_valid_after_utc - now
             print(previous_ttl)
 
         print("****************************************")
@@ -589,12 +595,101 @@ def _validate_cert(address, host, cert,accept_bad_ssl=False,automatic_choice=Non
         with open(os.path.join(certcache, fingerprint+".crt"), "wb") as fp:
             fp.write(cert)
 
+def _get_client_certkey(site_id: str, host: str):
+    # returns {cert: str, key: str}
+    certdir = os.path.join(xdg("data"), "certs", host)
+    certf = os.path.join(certdir, "%s.cert" % site_id)
+    keyf = os.path.join(certdir, "%s.key" % site_id)
+    if not os.path.exists(certf) or not os.path.exists(keyf):
+        if host != "":
+            split = host.split(".")
+            #if len(split) > 2:  # Why not allow a global identity? Maybe I want
+                                 # to login to all sites with the same
+                                 # certificate.
+            return _get_client_certkey(site_id, ".".join(split[1:]))
+        return None
+    certkey = dict(cert=certf, key=keyf)
+    return certkey
+
+def _get_site_ids(url: str):
+    newurl = normalize_url(url)
+    u = urllib.parse.urlparse(newurl)
+    if u.scheme == "gemini" and u.username == None:
+        certdir = os.path.join(xdg("data"), "certs")
+        netloc_parts = u.netloc.split(".")
+        site_ids = []
+
+        for i in range(len(netloc_parts), 0, -1):
+            lasti = ".".join(netloc_parts[-i:])
+            direc = os.path.join(certdir, lasti)
+
+            for certfile in glob.glob(os.path.join(direc, "*.cert")):
+                site_id = certfile.split('/')[-1].split(".")[-2]
+                site_ids.append(site_id)
+        return site_ids
+    else:
+        return []
+
+def create_certificate(name: str, days: int, hostname: str):
+    key = rsa.generate_private_key(
+            public_exponent  = 65537,
+            key_size = 2048)
+    sitecertdir = os.path.join(xdg("data"), "certs", hostname)
+    keyfile = os.path.join(sitecertdir, name+".key")
+    # create the directory of it doesn't exist
+    os.makedirs(sitecertdir, exist_ok=True)
+    with open(keyfile, "wb") as f:
+        f.write(key.private_bytes(
+            encoding=serialization.Encoding.PEM,
+            format=serialization.PrivateFormat.TraditionalOpenSSL,
+            encryption_algorithm=serialization.NoEncryption()
+        ))
+    xname = x509.Name([
+        x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, name),
+        ])
+    # generate the cert, valid a week ago (timekeeping is hard, let's give it a
+    # little margin). issuer and subject are your name
+    cert = (x509.CertificateBuilder()
+            .subject_name(xname)
+            .issuer_name(xname)
+            .public_key(key.public_key())
+            .serial_number(x509.random_serial_number())
+            .not_valid_before(datetime.datetime.utcnow() -
+                              datetime.timedelta(days=7))
+            .not_valid_after(datetime.datetime.utcnow() +
+                             datetime.timedelta(days=days))
+            .sign(key, hashes.SHA256())
+            )
+    certfile = os.path.join(sitecertdir, name + ".cert")
+    with open(certfile, "wb") as f:
+        f.write(cert.public_bytes(serialization.Encoding.PEM))
+
+def get_certs(url: str):
+    u = urllib.parse.urlparse(normalize_url(url))
+    if u.scheme == "gemini":
+        certdir = os.path.join(xdg("data"), "certs")
+        netloc_parts = u.netloc.split(".")
+        site_ids = []
+        if '@' in netloc_parts[0]:
+            netloc_parts[0] = netloc_parts[0].split('@')[1]
+
+        for i in range(len(netloc_parts), 0, -1):
+            lasti = ".".join(netloc_parts[-i:])
+            direc = os.path.join(certdir, lasti)
+            for certfile in glob.glob(os.path.join(direc, "*.cert")):
+                site_id = certfile.split('/')[-1].split(".")[-2]
+                site_ids.append(site_id)
+        return site_ids
+    else:
+        return []
+
 def _fetch_gemini(url,timeout=DEFAULT_TIMEOUT,interactive=True,accept_bad_ssl_certificates=False,\
                     **kwargs):
     cache = None
     newurl = url
     url_parts = urllib.parse.urlparse(url)
     host = url_parts.hostname
+    site_id = url_parts.username
     port = url_parts.port or standard_ports["gemini"]
     path = url_parts.path or "/"
     query = url_parts.query
@@ -622,8 +717,16 @@ def _fetch_gemini(url,timeout=DEFAULT_TIMEOUT,interactive=True,accept_bad_ssl_ce
     # Prepare TLS context
     protocol = ssl.PROTOCOL_TLS_CLIENT if sys.version_info.minor >=6 else ssl.PROTOCOL_TLSv1_2
     context = ssl.SSLContext(protocol)
-    context.check_hostname=False
+    context.check_hostname = False
     context.verify_mode = ssl.CERT_NONE
+
+    # When using an identity, use the certificate and key
+    if site_id:
+        certkey = _get_client_certkey(site_id, host)
+        if certkey:
+            context.load_cert_chain(certkey["cert"], certkey["key"])
+        else:
+            print("This identity doesn't exist for this site (or is disabled).")
     # Impose minimum TLS version
     ## In 3.7 and above, this is easy...
     if sys.version_info.minor >= 7:
@@ -665,15 +768,21 @@ def _fetch_gemini(url,timeout=DEFAULT_TIMEOUT,interactive=True,accept_bad_ssl_ce
     _validate_cert(address[4][0], host, cert,automatic_choice="y")
     # Send request and wrap response in a file descriptor
     url = urllib.parse.urlparse(url)
-    new_netloc = host
+    new_host = host
     #Handle IPV6 hostname
-    if ":" in new_netloc:
-        new_netloc = "[" + new_netloc + "]"
+    if ":" in new_host:
+        new_host = "[" + new_host + "]"
     if port != standard_ports["gemini"]:
-        new_netloc += ":" + str(port)
-    url = urllib.parse.urlunparse(url._replace(netloc=new_netloc))
-    s.sendall((url + CRLF).encode("UTF-8"))
-    f= s.makefile(mode = "rb")
+        new_host += ":" + str(port)
+    url_no_username = urllib.parse.urlunparse(url._replace(netloc=new_host))
+
+    if site_id:
+        url = urllib.parse.urlunparse(url._replace(netloc=site_id+"@"+new_host))
+    else:
+        url = url_no_username
+
+    s.sendall((url_no_username + CRLF).encode("UTF-8"))
+    f = s.makefile(mode = "rb")
     ## end of send_request in AV98
     # Spec dictates <META> should not exceed 1024 bytes,
     # so maximum valid header length is 1027 bytes.
@@ -702,7 +811,6 @@ def _fetch_gemini(url,timeout=DEFAULT_TIMEOUT,interactive=True,accept_bad_ssl_ce
             if status == "11":
                 user_input = getpass.getpass("> ")
             else:
-                #TODO:FIXME we should not ask for user input while non-interactive
                 user_input = input("> ")
             newurl = url.split("?")[0]
             return _fetch_gemini(newurl+"?"+user_input)
@@ -738,14 +846,13 @@ def _fetch_gemini(url,timeout=DEFAULT_TIMEOUT,interactive=True,accept_bad_ssl_ce
 #        if status == "31":
 #            # Permanent redirect
 #            self.permanent_redirects[gi.url] = new_gi.url
-        return _fetch_gemini(newurl)
+        return _fetch_gemini(newurl,interactive=interactive)
     # Errors
     elif status.startswith("4") or status.startswith("5"):
         raise RuntimeError(meta)
     # Client cert
     elif status.startswith("6"):
-        error = "Handling certificates for status 6X are not supported by offpunk\n"
-        error += "See bug #31 for discussion about the problem"
+        error = "You need to provide a client-certificate to access this page."
         raise RuntimeError(error)
     # Invalid status
     elif not status.startswith("2"):
@@ -777,7 +884,7 @@ def _fetch_gemini(url,timeout=DEFAULT_TIMEOUT,interactive=True,accept_bad_ssl_ce
     else:
         body = fbody
     cache = write_body(url,body,mime)
-    return cache,newurl
+    return cache,url
 
 
 def fetch(url,offline=False,download_image_first=True,images_mode="readable",validity=0,**kwargs):
@@ -785,7 +892,7 @@ def fetch(url,offline=False,download_image_first=True,images_mode="readable",val
     newurl = url
     path=None
     print_error = "print_error" in kwargs.keys() and kwargs["print_error"]
-    #Firt, we look if we have a valid cache, even if offline
+    #First, we look if we have a valid cache, even if offline
     #If we are offline, any cache is better than nothing
     if is_cache_valid(url,validity=validity) or (offline and is_cache_valid(url,validity=0)):
         path = get_cache_path(url)
@@ -803,13 +910,13 @@ def fetch(url,offline=False,download_image_first=True,images_mode="readable",val
                 path = None
             elif scheme in ("http","https"):
                 if _DO_HTTP:
-                    path=_fetch_http(url,**kwargs)
+                    path=_fetch_http(newurl,**kwargs)
                 else:
                     print("HTTP requires python-requests")
             elif scheme == "gopher":
-                path=_fetch_gopher(url,**kwargs)
+                path=_fetch_gopher(newurl,**kwargs)
             elif scheme == "finger":
-                path=_fetch_finger(url,**kwargs)
+                path=_fetch_finger(newurl,**kwargs)
             elif scheme == "gemini":
                 path,newurl=_fetch_gemini(url,**kwargs)
             elif scheme == "spartan":
@@ -819,7 +926,7 @@ def fetch(url,offline=False,download_image_first=True,images_mode="readable",val
         except UserAbortException:
             return None, newurl
         except Exception as err:
-            cache = set_error(url, err)
+            cache = set_error(newurl, err)
             # Print an error message
             # we fail silently when sync_only
             if isinstance(err, socket.gaierror):
@@ -881,12 +988,14 @@ def main():
     
     descri="Netcache is a command-line tool to retrieve, cache and access networked content.\n\
             By default, netcache will returns a cached version of a given URL, downloading it \
-            only if not existing. A validity duration, in seconds, can also be given so that \
-            netcache downloads the content only if the existing cache is older than the validity."
+            only if a cache version doesn't exist. A validity duration, in seconds, can also \
+            be given so netcache downloads the content only if the existing cache is older than the validity."
     # Parse arguments
     parser = argparse.ArgumentParser(prog="netcache",description=descri)
     parser.add_argument("--path", action="store_true",
                         help="return path to the cache instead of the content of the cache")
+    parser.add_argument("--ids", action="store_true",
+                        help="return a list of id's for the gemini-site instead of the content of the cache")
     parser.add_argument("--offline", action="store_true",
                         help="Do not attempt to download, return cached version or error")
     parser.add_argument("--max-size", type=int,
@@ -902,17 +1011,20 @@ def main():
     # --validity : returns the date of the cached version, Null if no version
     # --force-download : download and replace cache, even if valid
     args = parser.parse_args()
-
     param = {}
-    
+
     for u in args.url:
         if args.offline:
             path = get_cache_path(u)
+        elif args.ids:
+            ids = _get_site_ids(u)
         else:
             path,url = fetch(u,max_size=args.max_size,timeout=args.timeout,\
                                 validity=args.cache_validity)
         if args.path:
             print(path)
+        elif args.ids:
+            print(ids)
         else:
             with open(path,"r") as f:
                 print(f.read())

{offpunk-2.3 → offpunk-2.4}/offpunk.py

@@ -4,7 +4,7 @@
 Offline-First Gemini/Web/Gopher/RSS reader and browser
 """
 
-__version__ = "2.3"
+__version__ = "2.4"
 
 ## Initial imports and conditional imports {{{
 import argparse
@@ -89,6 +89,7 @@ _ABBREVS = {
     "bb":   "blackbox",
     "bm":   "bookmarks",
     "book": "bookmarks",
+    "cert": "certs",
     "cp":   "copy",
     "f":   "forward",
     "g":    "go",
@@ -635,6 +636,7 @@ Use with "link" to copy a link in the gemtext format to that page with the title
         else:
             print("No content to copy, visit a page first")
 
+    
     ### Stuff for getting around
     def do_go(self, line):
         """Go to a gemini URL or marked item."""
@@ -815,6 +817,42 @@ Current tour can be listed with `tour ls` and scrubbed with `tour clear`."""
                 except IndexError:
                     print("Invalid index %d, skipping." % n)
 
+    @needs_gi
+    def do_certs(self, line) -> None:
+        """Manage your client certificates (identities) for a site.
+        `certs` will display all valid certificates for the current site
+        `certs new <name> <days-valid> <url[optional]>` will create a new certificate, if no url is specified, the current open site will be used.
+        """
+        line = line.strip()
+        if not line:
+            certs = netcache.get_certs(self.current_url)
+            if len(certs) == 0:
+                print("There are no certificates available for this site.")
+            else:
+                if len(certs) == 1:
+                    print("The one available certificate for this site is:")
+                else:
+                    print("The", len(certs) ,"available certificates for this site are:")
+
+                print(*certs)
+                print("Use the 'id@site.net' notation to activate a certificate.")
+        else:
+            lineparts = line.split(' ')
+            if lineparts[0] == 'new':
+                if len(lineparts) == 4:
+                    name = lineparts[1]
+                    days = lineparts[2]
+                    site = lineparts[3]
+                    netcache.create_certificate(name, int(days), site)
+                elif len(lineparts) == 3:
+                    name = lineparts[1]
+                    days = lineparts[2]
+                    site = urllib.parse.urlparse(self.current_url)
+                    netcache.create_certificate(name, int(days), site.hostname)
+
+                else:
+                    print("usage")
+
     @needs_gi
     def do_mark(self, line):
         """Mark the current item with a single letter.  This letter can then
@@ -1037,13 +1075,38 @@ Use "view XX" where XX is a number to view information about link XX.
     @needs_gi
     def do_open(self, *args):
         """Open current item with the configured handler or xdg-open.
-Uses "open url" to open current URL in a browser.
+Use "open url" to open current URL in a browser.
+Use "open 2 4" to open links 2 and 4
+You can combine with "open url 2 4" to open URL of links
 see "handler" command to set your handler."""
-        u, m = unmode_url(self.current_url)
-        if args[0] == "url":
-            run("xdg-open %s", parameter=u, direct_output=True)
+        #do we open the URL (true) or the cached file (false)
+        url_list = []
+        urlmode = False
+        arglist = args[0].split()
+        if len(arglist) > 0 and arglist[0] == "url":
+            arglist.pop(0)
+            urlmode = True
+        if len(arglist) > 0:
+            #we try to match each argument with a link
+            for a in arglist:
+                try:
+                    n = int(a)
+                    u = self.get_renderer().get_link(n)
+                    url_list.append(u)
+                except ValueError:
+                    print("Non-numeric index %s, skipping." % a)
+                except IndexError:
+                    print("Invalid index %d, skipping." % n)
+
         else:
-            self.opencache.opnk(u,terminal=False)
+            #if no argument, we use current url
+            u, m = unmode_url(self.current_url)
+            url_list.append(u)
+        for u in url_list:
+            if urlmode:
+                run("xdg-open %s", parameter=u, direct_output=True)
+            else:
+                self.opencache.opnk(u,terminal=False)
 
     @needs_gi
     def do_shell(self, line):
@@ -1643,6 +1706,10 @@ The following lists cannot be removed or frozen but can be edited with "list edi
         else:
             cmd.Cmd.do_help(self, arg)
 
+    def do_tutorial(self,arg):
+        """Access the offpunk.net tutorial (online)"""
+        self._go_to_url("gemini://offpunk.net/firststeps.gmi")
+
     def do_sync(self, line):
         """Synchronize all bookmarks lists and URLs from the to_fetch list.
 - New elements in pages in subscribed lists will be added to tour

{offpunk-2.3 → offpunk-2.4}/opnk.py

@@ -29,8 +29,9 @@ output = run("less --version")
 words = output.split("\n")[0].split()
 less_version = 0
 for w in words:
-    if w.isdigit():
-        less_version = int(w)
+    # On macOS the version can be something like 581.2 not just an int:
+    if all(_.isdigit() for _ in w.split(".")):
+        less_version = int(w.split(".", 1)[0])
 # restoring position only works for version of less > 572
 if less_version >= 572:
     _LESS_RESTORE_POSITION = True

{offpunk-2.3 → offpunk-2.4}/pyproject.toml

@@ -37,7 +37,7 @@ process-title = ["setproctitle"]
 rss = ["feedparser"]
 
 [project.urls]
-Homepage = "https://sr.ht/~lioploum/offpunk/"
+Homepage = "https://offpunk.net/"
 Source = "https://git.sr.ht/~lioploum/offpunk"
 "Bug Tracker" = "https://todo.sr.ht/~lioploum/offpunk"