|
@@ -3,8 +3,10 @@ import os
|
|
|
import sys
|
|
import sys
|
|
|
import time
|
|
import time
|
|
|
import adi
|
|
import adi
|
|
|
|
|
+import config
|
|
|
|
|
|
|
|
baseDir = os.path.expanduser("~/qslKarten")
|
|
baseDir = os.path.expanduser("~/qslKarten")
|
|
|
|
|
+baseDir = config.baseDir
|
|
|
inDir = f"{baseDir}/Eingang"
|
|
inDir = f"{baseDir}/Eingang"
|
|
|
outDir = f"{baseDir}/Karten"
|
|
outDir = f"{baseDir}/Karten"
|
|
|
templateDir = f"{baseDir}/Vorlage"
|
|
templateDir = f"{baseDir}/Vorlage"
|
|
@@ -13,6 +15,7 @@ dpi = 300
|
|
|
|
|
|
|
|
verbose = False
|
|
verbose = False
|
|
|
|
|
|
|
|
|
|
+cfg = {}
|
|
|
|
|
|
|
|
|
|
|
|
|
def exec(cmd, logFile=None):
|
|
def exec(cmd, logFile=None):
|
|
@@ -52,7 +55,7 @@ def createQslCards(fileName, name):
|
|
|
data = adi.loadAdi(fileName)
|
|
data = adi.loadAdi(fileName)
|
|
|
numOfRows = len(data)
|
|
numOfRows = len(data)
|
|
|
for pos, row in enumerate(data):
|
|
for pos, row in enumerate(data):
|
|
|
- tCall = row.fileName()
|
|
|
|
|
|
|
+ tCall = row.fileName(cfg["card_name"])
|
|
|
if not verbose:
|
|
if not verbose:
|
|
|
progressBar(numOfRows, pos + 1, tCall)
|
|
progressBar(numOfRows, pos + 1, tCall)
|
|
|
|
|
|
|
@@ -123,6 +126,9 @@ def selectTemplate():
|
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
if __name__ == "__main__":
|
|
|
|
|
+ cfg = config.loadConfig(f"{baseDir}/config.cfg")
|
|
|
|
|
+ verbose = cfg["verbose"]
|
|
|
|
|
+
|
|
|
if "-v" in sys.argv or "--verbose" in sys.argv:
|
|
if "-v" in sys.argv or "--verbose" in sys.argv:
|
|
|
verbose = True
|
|
verbose = True
|
|
|
|
|
|