Fix formatting

BudaPortaXmlConvert.py

@@ -11,7 +11,7 @@ import xml.etree.ElementTree as ET
 import csv
 import datetime
 import os
-from bs4 import BeautifulSoup
+import xmlformatter
 
 
 # ---------------------------------------------------------------------------- #
@@ -71,11 +71,11 @@ def getXmlData(data):
 
 def checkData(xmlData):
     print()
-    missingData = False
+    missingData = []
-    for mérő in xmlData:
+    for i, mérő in enumerate(xmlData):
         for adat in mérő:
-            if len(mérő[adat]) == 0:
+            if len(mérő[adat]) == 0 or mérő[adat] == "diktalos":
-                missingData = True
+                missingData.append(i)
                 print(f'Adat hiányzik: "{adat}" a következő sorból:')
                 print(mérő)
     return missingData
@@ -148,16 +148,22 @@ for i, table in enumerate(csvArrs):
 xmlReqData = []
 for i, table in enumerate(reqData):
     print(f'Fájl ellenőrzése: {csvFileNames[i]}')
+
+    # unwrap data
     currXmlData = getXmlData(table)
-    if not checkData(currXmlData):
+
+    # check for missing data
+    wrongLines = checkData(currXmlData)
+    if len(wrongLines) == 0:
         print('Fájl hibátlan')
+    else:
+        # remove bad lines
+        print(wrongLines)
+        for ele in sorted(wrongLines, reverse=True):
+            del currXmlData[ele]
     print()
     xmlReqData.append(currXmlData)
 
-# print(xmlReqData)
-# for i in xmlReqData:
-#     print(i)
-
 
 # ------------------------------- Merge arrays ------------------------------- #
 
@@ -183,11 +189,10 @@ while fileNameNotFound:
     if not os.path.exists(fileName):
         fileNameNotFound = False
 
-print()
 print(f'Fájl mentése ide: {fileName}')
 print()
 
-# ------------------------------- Generate xml ------------------------------- #
+# --------------------------------- Write xml -------------------------------- #
 
 data = ET.Element('Leolvasasok')
 for mérő in allXmlData:
@@ -196,18 +201,24 @@ for mérő in allXmlData:
         a = ET.SubElement(currSub, adat)
         a.text = mérő[adat]
 
-xmlString = ET.tostring(data)
+xmlString = ET.tostring(data, encoding="utf-8", xml_declaration=True)
 
-# ------------------------------- Prettify xml ------------------------------- #
+# -------------------------------- Format xml -------------------------------- #
 
-bs_data = BeautifulSoup(xmlString, 'xml')
+formatter = xmlformatter.Formatter(indent="2", indent_char=" ")
-prettyXml = bs_data.prettify()
+formattedXml = formatter.format_string(xmlString)
 
-print(prettyXml)
+# print(formattedXml)
-print()
+
+# ----------------------------- Fix line endings ----------------------------- #
+
+WINDOWS_LINE_ENDING = b'\r\n'
+UNIX_LINE_ENDING = b'\n'
+
+formattedXml = formattedXml.replace(UNIX_LINE_ENDING, WINDOWS_LINE_ENDING)
 
 # --------------------------------- Save file -------------------------------- #
 
-f = open(fileName, "x")
+f = open(fileName, "xb")
-f.write(prettyXml)
+f.write(formattedXml)
-f.close
+f.close

README.md

@@ -27,3 +27,8 @@ A file nevében ne legyen ékezetes karakter.
 Egy sor sem lehet 50 karakternél hosszabb!
 
 
+## Telepítés
+
+```shell
+pip install -r requirements.txt
+```

requirements.txt

@@ -1,2 +1 @@
-beautifulsoup4
+xmlformatter
-lxml