Commit 542b4701 by heffnercj

csv logging working in python3.

parent d657f452
...@@ -63,7 +63,7 @@ class PrettyPrint: ...@@ -63,7 +63,7 @@ class PrettyPrint:
self.enable_formatting(True) self.enable_formatting(True)
if self.log is not None: if self.log is not None:
self.fp = io.FileIO(log, "w") self.fp = open(log, "w")
if self.log_csv: if self.log_csv:
self.enable_csv() self.enable_csv()
...@@ -82,12 +82,20 @@ class PrettyPrint: ...@@ -82,12 +82,20 @@ class PrettyPrint:
Clean up any open file descriptors. Clean up any open file descriptors.
''' '''
try: try:
print("Closing fp.")
self.fp.close() self.fp.close()
except: except:
pass pass
self.fp = None self.fp = None
def _csv_writerow(self, rows):
'''
Write data to csv file and flush.
'''
self.csv.writerow(rows)
self.fp.flush()
def _log(self, data, raw=False): def _log(self, data, raw=False):
''' '''
Log data to the log file. Log data to the log file.
...@@ -106,9 +114,9 @@ class PrettyPrint: ...@@ -106,9 +114,9 @@ class PrettyPrint:
for i in range(0, len(data_parts)): for i in range(0, len(data_parts)):
data_parts[i] = data_parts[i].strip() data_parts[i] = data_parts[i].strip()
self.csv.writerow(data_parts) self._csv_writerow(data_parts)
else: else:
self.fp.write(str2bytes(data)) self.fp.write(data)
def _pprint(self, data, nolog=False, noprint=False): def _pprint(self, data, nolog=False, noprint=False):
''' '''
...@@ -223,8 +231,8 @@ class PrettyPrint: ...@@ -223,8 +231,8 @@ class PrettyPrint:
if self.csv: if self.csv:
nolog = True nolog = True
self.csv.writerow([b"FILE", b"MD5SUM", b"TIMESTAMP"]) self._csv_writerow(["FILE", "MD5SUM", "TIMESTAMP"])
self.csv.writerow([file_name, md5sum, timestamp]) self._csv_writerow([file_name, md5sum, timestamp])
self._pprint("\n") self._pprint("\n")
self._pprint("Scan Time: %s\n" % timestamp, nolog=nolog) self._pprint("Scan Time: %s\n" % timestamp, nolog=nolog)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment