evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug: incorrect use of set function to remove duplicates

Browse Source 
Now detects new tables without issues
This commit is contained in:
Worros 2008-10-13 23:34:18 +08:00
parent 9a60cf84c8
commit 3e9ef61fc8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pyfpdb/fpdb_import.py
View File

@ -104,9 +104,8 @@ class Importer:
def addImportFile(self, filename): def addImportFile(self, filename):
#todo: test it is a valid file #todo: test it is a valid file
self.filelist = self.filelist + [filename] self.filelist = self.filelist + [filename]
print "Filelist in addImportFile: ", self.filelist
#Remove duplicates #Remove duplicates
set(filelist) self.filelist = list(set(self.filelist))
#Add a directory of files to filelist #Add a directory of files to filelist
def addImportDirectory(self,dir,monitor = False): def addImportDirectory(self,dir,monitor = False):
@ -121,12 +120,11 @@ class Importer:
else: else:
self.filelist = self.filelist + [os.path.join(dir, file)] self.filelist = self.filelist + [os.path.join(dir, file)]
#Remove duplicates #Remove duplicates
set(self.filelist) self.filelist = list(set(self.filelist))
#Run full import on filelist #Run full import on filelist
def runImport(self): def runImport(self):
for file in self.filelist: for file in self.filelist:
print "Importing file: ", file
self.import_file_dict(file) self.import_file_dict(file)
#Run import on updated files, then store latest update time. #Run import on updated files, then store latest update time.
@ -137,12 +135,12 @@ class Importer:
for dir in self.dirlist: for dir in self.dirlist:
for file in os.listdir(dir): for file in os.listdir(dir):
self.filelist = self.filelist + [dir+os.sep+file] self.filelist = self.filelist + [dir+os.sep+file]
set(filelist)
self.filelist = list(set(self.filelist))
for file in self.filelist: for file in self.filelist:
stat_info = os.stat(file) stat_info = os.stat(file)
if stat_info.st_mtime > self.updated: if stat_info.st_mtime > self.updated:
# print "File: " + str(file) + " mtime: " + str(stat_info.st_mtime) + " update: " + str(self.updated)
self.import_file_dict(file) self.import_file_dict(file)
self.updated = time() self.updated = time()