norohind/EDMC_SpanshRouter
1
0
Fork 0
mirror of https://github.com/norohind/EDMC_SpanshRouter.git synced 2025-04-19 18:47:36 +03:00
Code Issues Projects Releases Wiki Activity

Fix saving and loading previous route

Browse Source 
`csv` expects to handle its own newlines. Opening a csv file without `newline=''` leads to duplicate, inconsistent line newlines in the resultant file.

`save_route` always saves the Jumps header, even when there was no data imported. On reload, `row.get` returns an empty string instead of `None`, throwing a ValueError on the first line.
This commit is contained in:
caboose684 2020-08-23 23:46:39 -04:00 committed by GitHub
parent f9ab59d9a2
commit c698cf859e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SpanshRouter/SpanshRouter.py
View File

@ -229,7 +229,7 @@ class SpanshRouter():
def open_last_route(self):
try:
has_headers = False
with open(self.save_route_path, 'r') as csvfile:
with open(self.save_route_path, 'r', newline='') as csvfile:
# Check if the file has a header for compatibility with previous versions
dict_route_reader = csv.DictReader(csvfile)
if dict_route_reader.fieldnames[0] == self.system_header:
@ -238,7 +238,7 @@ class SpanshRouter():
if has_headers:
self.plot_csv(self.save_route_path, clear_previous_route=False)
else:
with open(self.save_route_path, 'r') as csvfile:
with open(self.save_route_path, 'r', newline='') as csvfile:
route_reader = csv.reader(csvfile)
for row in route_reader:
@ -344,7 +344,7 @@ class SpanshRouter():
self.show_error("An error occured while reading the file.")
def plot_csv(self, filename, clear_previous_route=True):
with io.open(filename, 'r', encoding='utf-8-sig') as csvfile:
with io.open(filename, 'r', encoding='utf-8-sig', newline='') as csvfile:
route_reader = csv.DictReader(csvfile)
if clear_previous_route:
@ -358,7 +358,7 @@ class SpanshRouter():
row[self.system_header],
row.get(self.jumps_header, "") # Jumps column is optional
])
if row.get(self.jumps_header) != None:
if row.get(self.jumps_header): # Jumps column is optional
self.jumps_left += int(row[self.jumps_header])
def plot_route(self):
@ -509,7 +509,7 @@ class SpanshRouter():
def save_route(self):
if self.route.__len__() != 0:
with open(self.save_route_path, 'w') as csvfile:
with open(self.save_route_path, 'w', newline='') as csvfile:
fieldnames = [self.system_header, self.jumps_header]
writer = csv.writer(csvfile)
writer.writerow(fieldnames)