From 3b00121a3552a507f867e6bf553ceeb56ba41f02 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Sun, 15 May 2016 16:13:30 +1000
Subject: [PATCH] Updated csv_writer

---
 KiBOM/csv_writer.py | 69 ++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 39 deletions(-)

diff --git a/KiBOM/csv_writer.py b/KiBOM/csv_writer.py
index c2f4b82a..7e9cb037 100644
--- a/KiBOM/csv_writer.py
+++ b/KiBOM/csv_writer.py
@@ -24,53 +24,44 @@ def WriteCSV(filename, groups, net, headings, prefs):
         delimiter = "\t"
     else:
         return False
+        
+    with open(filename, "w") as f:
     
-    try:
+        writer = csv.writer(f, delimiter=delimiter, lineterminator="\n")
         
-        with open(filename, "w") as f:
+        if prefs.numberRows:
+            writer.writerow(["Component"] + headings)
+        else:
+            writer.writerow(headings)
+            
+        count = 0
+        rowCount = 1
         
-            writer = csv.writer(f, delimiter=delimiter, lineterminator="\n")
+        for i, group in enumerate(groups):
+            if prefs.ignoreDNF and not group.isFitted(): continue
+            
+            row = group.getRow(headings)
             
             if prefs.numberRows:
-                writer.writerow(["Component"] + headings)
-            else:
-                writer.writerow(headings)
+                row = [rowCount] + row
                 
-            count = 0
-            rowCount = 1
+            writer.writerow(row)
             
-            for i, group in enumerate(groups):
-                if prefs.ignoreDNF and not group.isFitted(): continue
+            try:
+                count += group.getCount()
+            except:
+                pass
                 
-                row = group.getRow(headings)
-                
-                if prefs.numberRows:
-                    row = [rowCount] + row
-                    
-                writer.writerow(row)
-                
-                try:
-                    count += group.getCount()
-                except:
-                    pass
-                    
-                rowCount += 1
-                
-            #blank rows
-            for i in range(5):
-                writer.writerow([])
-                
-            writer.writerow(["Component Count:",sum([g.getCount() for g in groups])])
-            writer.writerow(["Component Groups:",len(groups)])
-            writer.writerow(["Source:",net.getSource()])
-            writer.writerow(["Version:",net.getVersion()])
-            writer.writerow(["Date:",net.getDate()])
+            rowCount += 1
             
-        return True
- 
- 
-    except BaseException as e:
-        print(str(e))
-        return False
+        #blank rows
+        for i in range(5):
+            writer.writerow([])
+            
+        writer.writerow(["Component Count:",sum([g.getCount() for g in groups])])
+        writer.writerow(["Component Groups:",len(groups)])
+        writer.writerow(["Source:",net.getSource()])
+        writer.writerow(["Version:",net.getVersion()])
+        writer.writerow(["Date:",net.getDate()])
         
     return True
\ No newline at end of file