From 12587685d437cd2e6e1a819cc048e1c46258687d Mon Sep 17 00:00:00 2001 From: lel Date: Sat, 28 Sep 2019 02:04:45 -0400 Subject: [PATCH 1/5] Add newline to string formatting --- av98.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/av98.py b/av98.py index 2960b97..f98d15a 100755 --- a/av98.py +++ b/av98.py @@ -153,9 +153,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): From 3d8eecd346c34712e31924f2e8715f61b216f41b Mon Sep 17 00:00:00 2001 From: lel Date: Sat, 28 Sep 2019 02:39:42 -0400 Subject: [PATCH 2/5] Fix crash when going up from root --- av98.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/av98.py b/av98.py index f98d15a..8081f20 100755 --- a/av98.py +++ b/av98.py @@ -112,7 +112,7 @@ class GeminiItem(): def up(self): pathbits = list(os.path.split(self.path)) # Get rid of empty string from trailing / - while not pathbits[-1]: + if not pathbits[-1]: pathbits.pop() # Don't try to go higher than root if len(pathbits) == 1: From 620800c9da4dfc2f810cbcfb4bc6da191361978e Mon Sep 17 00:00:00 2001 From: lel Date: Sat, 28 Sep 2019 02:40:18 -0400 Subject: [PATCH 3/5] Fix separate unrelated crash when going up from root --- av98.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/av98.py b/av98.py index 8081f20..a320913 100755 --- a/av98.py +++ b/av98.py @@ -116,7 +116,7 @@ class GeminiItem(): pathbits.pop() # Don't try to go higher than root if len(pathbits) == 1: - return self.url + return GeminiItem(self.url) # Get rid of bottom component pathbits.pop() new_path = os.path.join(*pathbits) From 7997c40e94f54b1947a5a01acaff34e9c153da62 Mon Sep 17 00:00:00 2001 From: lel Date: Sat, 28 Sep 2019 03:22:01 -0400 Subject: [PATCH 4/5] Simplify handling of going up from root --- av98.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/av98.py b/av98.py index a320913..0d7c047 100755 --- a/av98.py +++ b/av98.py @@ -116,7 +116,7 @@ class GeminiItem(): pathbits.pop() # Don't try to go higher than root if len(pathbits) == 1: - return GeminiItem(self.url) + return self # Get rid of bottom component pathbits.pop() new_path = os.path.join(*pathbits) From 210d0459eb185c87fc954e4aae4e90809d171945 Mon Sep 17 00:00:00 2001 From: lel Date: Sat, 28 Sep 2019 03:28:01 -0400 Subject: [PATCH 5/5] Simplify trailing slash handling to make going up work --- av98.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/av98.py b/av98.py index 0d7c047..e6274de 100755 --- a/av98.py +++ b/av98.py @@ -110,10 +110,7 @@ class GeminiItem(): return GeminiItem(self._derive_url("/")) def up(self): - pathbits = list(os.path.split(self.path)) - # Get rid of empty string from trailing / - if 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