From 72ea43a59cc248e7d1e437f89e357192ba57f9b3 Mon Sep 17 00:00:00 2001 From: Lionel Dricot Date: Fri, 21 Jul 2023 18:02:05 +0200 Subject: [PATCH] debugging offpunk --- offpunk.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/offpunk.py b/offpunk.py index a09a078..02f5deb 100755 --- a/offpunk.py +++ b/offpunk.py @@ -1,4 +1,6 @@ #TODO: migrate go_to_gi to netcache +#TODO: separate ansirenderer into ansicat and ansiless +#TODO: migrate displaying into ansirenderer #!/usr/bin/env python3 # Offpunk Offline Gemini client # Derived from AV-98 by Solderpunk, @@ -163,6 +165,7 @@ class GeminiItem(): def __init__(self, url, name=""): self.last_mode = None + url = netcache.normalize_url(url) findmode = url.split("##offpunk_mode=") if len(findmode) > 1: self.url = findmode[0] @@ -171,14 +174,16 @@ class GeminiItem(): else: self.url = url self.url = fix_ipv6_url(self.url).strip() - self._cache_path = self.get_cache_path() self.name = name self.mime = None - self.renderer = ansirenderer.renderer_from_file(self._cache_path,self.url) + self.renderer = ansirenderer.renderer_from_file(self.get_cache_path(),self.url) #TODO : stuff have been migrated to netcache. What are we missing here ? self.scheme = "https" self.local = False + def get_mime(self): + return ansirenderer.get_mime(self.get_cache_path()) + def get_cache_path(self): # if we already have a _cache_path, we returns it. # Except if it became a folder! (which happens for index.html/index.gmi) @@ -192,10 +197,11 @@ class GeminiItem(): title = "" if self.renderer: title = self.renderer.get_title() - if not title or len(title) == 0: - title = self.renderer.get_url_title() - else: - title += " (%s)" %self.renderer.get_url_title() + if not title or len(title) == 0: + title = self.renderer.get_url_title() + else: + title += " (%s)" %self.renderer.get_url_title() + #TODO: handle title for gi without renderer? return title def is_cache_valid(self,validity=0):