solderpunk
/
AV-98
9
21
Fork 15
Code Issues 4 Pull Requests 4 Releases Wiki Activity

starting to remove self.path from GeminiItem

This commit is contained in:
Lionel Dricot 2022-02-17 12:35:50 +01:00
parent 136c8cfce7
commit 78e428d3a7
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
offpunk.py
View File

@ -863,6 +863,7 @@ class GeminiItem():
self.path = parsed.path self.path = parsed.path
else: else:
self.path = self.url self.path = self.url
self._cache_path = self.path
else: else:
if self.scheme == "gopher": if self.scheme == "gopher":
if parsed.path and parsed.path[0] == "/" and len(parsed.path) > 1: if parsed.path and parsed.path[0] == "/" and len(parsed.path) > 1:
@ -898,36 +899,39 @@ class GeminiItem():
if len(self.path+parsed.query) < 258: if len(self.path+parsed.query) < 258:
self.path += "/" + parsed.query self.path += "/" + parsed.query
#if not local, we create a local cache path. #if not local, we create a local cache path.
self._cache_path = os.path.expanduser(_CACHE_PATH + self.scheme +\ if self.local:
"/" + self.host + self.path) self._cache_path = self.path
#There’s an OS limitation of 260 characters per path.
#We will thus cut the path enough to add the index afterward
self._cache_path = self._cache_path[:249]
# FIXME : this is a gross hack to give a name to
# index files. This will break if the index is not
# index.gmi. I don’t know how to know the real name
# of the file. But first, we need to ensure that the domain name
# finish by "/". Else, the cache will create a file, not a folder.
if self.scheme.startswith("http"):
index = "index.html"
elif self.scheme == "gopher":
index = "index.txt"
else: else:
index = "index.gmi" self._cache_path = os.path.expanduser(_CACHE_PATH + self.scheme +\
if self.path == "" or os.path.isdir(self._cache_path): "/" + self.host + self.path)
if not self._cache_path.endswith("/"): #There’s an OS limitation of 260 characters per path.
self._cache_path += "/" #We will thus cut the path enough to add the index afterward
if not self.url.endswith("/"): self._cache_path = self._cache_path[:249]
self.url += "/" # FIXME : this is a gross hack to give a name to
if self._cache_path.endswith("/"): # index files. This will break if the index is not
self._cache_path += index # index.gmi. I don’t know how to know the real name
# of the file. But first, we need to ensure that the domain name
# finish by "/". Else, the cache will create a file, not a folder.
if self.scheme.startswith("http"):
index = "index.html"
elif self.scheme == "gopher":
index = "index.txt"
else:
index = "index.gmi"
if self.path == "" or os.path.isdir(self._cache_path):
if not self._cache_path.endswith("/"):
self._cache_path += "/"
if not self.url.endswith("/"):
self.url += "/"
if self._cache_path.endswith("/"):
self._cache_path += index
return self._cache_path return self._cache_path
def get_capsule_title(self): def get_capsule_title(self):
#small intelligence to try to find a good name for a capsule #small intelligence to try to find a good name for a capsule
#we try to find eithe ~username or /users/username #we try to find eithe ~username or /users/username
#else we fallback to hostname #else we fallback to hostname
if self.scheme == "file": if self.local:
if self.name != "": if self.name != "":
red_title = self.name red_title = self.name
else: else:
@ -990,9 +994,7 @@ class GeminiItem():
def get_body(self,as_file=False): def get_body(self,as_file=False):
if self.body and not as_file: if self.body and not as_file:
return self.body return self.body
if self.local: if self.is_cache_valid():
path = self.path
elif self.is_cache_valid():
path = self.get_cache_path() path = self.get_cache_path()
else: else:
path = None path = None
@ -1065,8 +1067,8 @@ class GeminiItem():
return wrapped + "\n" return wrapped + "\n"
def _set_renderer(self,mime=None): def _set_renderer(self,mime=None):
if self.local and os.path.isdir(self.path): if self.local and os.path.isdir(self.get_cache_path()):
self.renderer = FolderRenderer("",self.path) self.renderer = FolderRenderer("",self.get_cache_path())
return return
if not mime: if not mime:
mime = self.get_mime() mime = self.get_mime()
@ -1144,10 +1146,7 @@ class GeminiItem():
if self.mime: if self.mime:
return self.mime return self.mime
elif self.is_cache_valid(): elif self.is_cache_valid():
if self.local: path = self.get_cache_path()
path = self.path
else:
path = self.get_cache_path()
if path.endswith(".gmi"): if path.endswith(".gmi"):
mime = "text/gemini" mime = "text/gemini"
elif _HAS_MAGIC : elif _HAS_MAGIC :