rinominata variabile

This commit is contained in:
2020-03-25 12:03:55 +01:00
parent 4351e10984
commit f65fa21400

View File

@@ -20,7 +20,7 @@ class bananaSPLITTER(QThread):
self.log = logger self.log = logger
self.rawFile = None self.rawFile = None
self.status = "first" self.status = "first"
self.fileList = list() self.contentList = list()
self.bodyCounter=0 self.bodyCounter=0
self.duplicateNumber=0 self.duplicateNumber=0
if fileParams is not None: if fileParams is not None:
@@ -47,9 +47,9 @@ class bananaSPLITTER(QThread):
self.log.info("Controllo se ci sono dei duplicati..") self.log.info("Controllo se ci sono dei duplicati..")
self.removeDuplicates() self.removeDuplicates()
else: else:
for idx, ff in enumerate(self.fileList): for idx, ff in enumerate(self.contentList):
ff['duplicate']=False ff['duplicate']=False
self.fileList[idx]=ff self.contentList[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
@@ -203,7 +203,7 @@ class bananaSPLITTER(QThread):
if self.settings['delWordBreak']: if self.settings['delWordBreak']:
tempContent=[ll.replace('-\n', '') for ll in tempContent] tempContent=[ll.replace('-\n', '') for ll in tempContent]
newDoc['content']=copy.deepcopy(''.join(tempBody)) newDoc['content']=copy.deepcopy(''.join(tempBody))
self.fileList.append(copy.deepcopy(newDoc)) self.contentList.append(copy.deepcopy(newDoc))
tempBody=list() tempBody=list()
self.bodyCounter +=1 self.bodyCounter +=1
pass pass
@@ -221,11 +221,11 @@ class bananaSPLITTER(QThread):
def removeDuplicates(self): def removeDuplicates(self):
titleList=[] titleList=[]
duplicateList=[] duplicateList=[]
for idx, ff in enumerate(self.fileList): for idx, ff in enumerate(self.contentList):
if ff['title'] not in titleList: if ff['title'] not in titleList:
titleList.append(ff['title']) titleList.append(ff['title'])
ff['duplicate']=False ff['duplicate']=False
self.fileList[idx]=ff self.contentList[idx]=ff
pass pass
else: else:
if ff['title'] not in duplicateList: if ff['title'] not in duplicateList:
@@ -233,7 +233,7 @@ class bananaSPLITTER(QThread):
if self.settings['showRemovedDuplicates']: if self.settings['showRemovedDuplicates']:
self.log.info("Duplicato: {}".format(ff['title'].strip())) self.log.info("Duplicato: {}".format(ff['title'].strip()))
ff['duplicate'] = True ff['duplicate'] = True
self.fileList[idx]=ff self.contentList[idx]=ff
self.duplicateNumber+=1 self.duplicateNumber+=1
self.log.info("Ho rimosso {} duplicati di {} articoli..". format(self.duplicateNumber, len(duplicateList))) self.log.info("Ho rimosso {} duplicati di {} articoli..". format(self.duplicateNumber, len(duplicateList)))
pass pass
@@ -243,7 +243,7 @@ class bananaSPLITTER(QThread):
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...")
self.log.debug("Persorso: {0}".format(self.paths['OUTworkPath'].format('nomeFile'))) self.log.debug("Persorso: {0}".format(self.paths['OUTworkPath'].format('nomeFile')))
for ff in self.fileList: for ff in self.contentList:
try: try:
if ff['duplicate'] == False: if ff['duplicate'] == False:
fName=self.paths['OUTnameFormat'].format(title=slugify(ff['title'][:self.settings['maxTitleLen']]),\ fName=self.paths['OUTnameFormat'].format(title=slugify(ff['title'][:self.settings['maxTitleLen']]),\
@@ -271,7 +271,7 @@ class bananaSPLITTER(QThread):
try: try:
fName=slugify(self.fileName) fName=slugify(self.fileName)
fName='BODYFILE_{0}.txt'.format(fName[:self.settings['maxTitleLen']]) fName='BODYFILE_{0}.txt'.format(fName[:self.settings['maxTitleLen']])
fileContent = os.linesep.join([cc['content'] for cc in self.fileList]) fileContent = os.linesep.join([cc['content'] for cc in self.contentList])
out=open('{0}'.format(fName),'wb') out=open('{0}'.format(fName),'wb')
out.write(fileContent.encode(self.settings['encoding'])) out.write(fileContent.encode(self.settings['encoding']))
out.close() out.close()