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

Add newline to bookmark formatting + fix crashes when going up from root + make going up work in an index w/ a trailing slash #2

Manually merged
solderpunk merged 5 commits from lel/AV-98:master into master 2019-10-06 14:36:08 +00:00
Conversation 2 Commits 5 Files Changed 1 +4 -7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
av98.py
View File

@ -110,13 +110,10 @@ class GeminiItem():
return GeminiItem(self._derive_url("/"))
def up(self):
pathbits = list(os.path.split(self.path))
# Get rid of empty string from trailing /
while not pathbits[-1]:
pathbits.pop()
pathbits = list(os.path.split(self.path.rstrip('/')))
# Don't try to go higher than root
if len(pathbits) == 1:
return self.url
return self
# Get rid of bottom component
pathbits.pop()
new_path = os.path.join(*pathbits)
@ -153,9 +150,9 @@ class GeminiItem():
def to_map_line(self, name=None):
if name or self.name:
return "=> {} {}".format(self.url, name or self.name)
return "=> {} {}\n".format(self.url, name or self.name)
else:
return "=> {}".format(self.url)
return "=> {}\n".format(self.url)
@classmethod
def from_map_line(cls, line, origin_gi):