funziona la pulizia automatica delle cartelle prima del salvataggio,

credo sia pronto per il merge
This commit is contained in:
2019-12-13 15:27:31 +01:00
parent b5ee32e924
commit d8808ddf5b
2 changed files with 14 additions and 10 deletions

View File

@@ -44,26 +44,31 @@ class bananaSPLITTER(threading.Thread):
ff['duplicate']=False ff['duplicate']=False
self.fileList[idx]=ff self.fileList[idx]=ff
self.log.warn('Salto il controllo dei duplicati..') self.log.warn('Salto il controllo dei duplicati..')
# se il parse e la rimozione dei duplicati e' andata bene # se il parse e la rimozione dei duplicati e' andata bene
# preparo e inizio il salvataggio # preparo e inizio il salvataggio
if os.path.exists(self.outPath): if os.path.exists(self.outPath):
if self.settings['removeOldFiles']:
os.chdir(self.outPath)
for f in os.listdir(self.outPath):
os.remove(f)
else:
raise FileExistsError("Non posso sovrascrivere i vecchi file, eliminali manualmente!")
else:
os.mkdir(self.outPath)
os.chdir(self.outPath) os.chdir(self.outPath)
for f in os.listdir(self.outPath):
os.remove(f)
os.chdir("..")
os.rmdir(self.outPath)
if self.settings['saveSeparateFiles']: if self.settings['saveSeparateFiles']:
self.saveSeparate() self.saveSeparate()
if self.settings['saveBodyFile']: if self.settings['saveBodyFile']:
self.saveBody() self.saveBody()
self.log.info("L'elaborazione del file ha richiesto {:4.2f} sec".format(time.time()-self.beginTime))
except UnicodeDecodeError as ee: except UnicodeDecodeError as ee:
self.log.critical("Il file [{}] contiene caratteri non compatibili con la codifica scelta! [{}]" self.log.critical("Il file [{}] contiene caratteri non compatibili con la codifica scelta! [{}]"
.format(self.fileParams['name'],ee)) .format(self.fileParams['name'],ee))
os.rmdir(self.outPath) except FileExistsError as fe:
self.log.critical(fe)
except BaseException as ee: except BaseException as ee:
self.log.critical(ee) self.log.warning(ee)
pass pass
def openFile(self): def openFile(self):
@@ -227,7 +232,6 @@ class bananaSPLITTER(threading.Thread):
pass pass
def saveSeparate(self): def saveSeparate(self):
os.chdir(self.outPath)
outFileCounter = 0 outFileCounter = 0
self.paths['OUTworkPath']=self.paths['OUTworkPath']+slugify(self.fileName) self.paths['OUTworkPath']=self.paths['OUTworkPath']+slugify(self.fileName)
self.log.info("Salvo gli articoli in file separati...") self.log.info("Salvo gli articoli in file separati...")

View File

@@ -57,7 +57,7 @@
"getNewsPaperName": true, "getNewsPaperName": true,
"nameNotFoundStr": "ND", "nameNotFoundStr": "ND",
"includeTitle": true, "includeTitle": true,
"removeDuplicates": false, "removeDuplicates": true,
"showSkipped": true, "showSkipped": true,
"showRemovedDuplicates": false, "showRemovedDuplicates": false,
"maxTitleLen": 32, "maxTitleLen": 32,