def __init__(self):
self.exclude_folders = []
self.all_extensions = []
self.picture_extensions = []
self.video_extensions = []
self.lists_separator = "||"
self.picsdeleted = 0
self.picsupdated = 0
self.picsadded = 0
self.picsscanned = 0
self.current_root_entry = 0
self.total_root_entries = 0
self.totalfiles = 0
for path,recursive,update,exclude in mpdb.RootFolders():
if exclude:
self.exclude_folders.append(smart_unicode(path))
for ext in Addon.getSetting("picsext").split("|"):
self.picture_extensions.append("." + ext.replace(".","").upper())
for ext in Addon.getSetting("vidsext").split("|"):
self.video_extensions.append("." + ext.replace(".","").upper())
self.use_videos = Addon.getSetting("usevids")
self.all_extensions.extend(self.picture_extensions)
self.all_extensions.extend(self.video_extensions)
self.filescanner = Scanner()
def __init__(self):
self.exclude_folders = []
self.all_extensions = []
self.picture_extensions = []
self.video_extensions = []
self.lists_separator = "||"
self.scan_is_cancelled = False
self.picsdeleted = 0
self.picsupdated = 0
self.picsadded = 0
self.picsscanned = 0
self.current_root_entry = 0
self.total_root_entries = 0
self.totalfiles = 0
self.mpdb = MypicsDB.MyPictureDB()
for path, _, _, exclude in self.mpdb.get_all_root_folders():
if exclude:
common.log(
"", 'Exclude path "%s" found ' %
common.smart_unicode(path[:len(path) - 1]))
self.exclude_folders.append(
common.smart_unicode(path[:len(path) - 1]))
for ext in common.getaddon_setting("picsext").split("|"):
self.picture_extensions.append("." + ext.replace(".", "").upper())
for ext in common.getaddon_setting("vidsext").split("|"):
self.video_extensions.append("." + ext.replace(".", "").upper())
self.use_videos = common.getaddon_setting("usevids")
self.all_extensions.extend(self.picture_extensions)
self.all_extensions.extend(self.video_extensions)
self.filescanner = Scanner()
def __init__(self):
self.exclude_folders = []
self.all_extensions = []
self.picture_extensions = []
self.video_extensions = []
self.lists_separator = "||"
self.scan_is_cancelled = False
self.picsdeleted = 0
self.picsupdated = 0
self.picsadded = 0
self.picsscanned = 0
self.current_root_entry = 0
self.total_root_entries = 0
self.totalfiles = 0
self.mpdb = MypicsDB.MyPictureDB()
for path,_,_,exclude in self.mpdb.get_all_root_folders():
if exclude:
common.log("", 'Exclude path "%s" found '%common.smart_unicode(path[:len(path)-1]))
self.exclude_folders.append(common.smart_unicode(path[:len(path)-1]))
for ext in common.getaddon_setting("picsext").split("|"):
self.picture_extensions.append("." + ext.replace(".","").upper())
for ext in common.getaddon_setting("vidsext").split("|"):
self.video_extensions.append("." + ext.replace(".","").upper())
self.use_videos = common.getaddon_setting("usevids")
self.all_extensions.extend(self.picture_extensions)
self.all_extensions.extend(self.video_extensions)
self.filescanner = Scanner()
class VFSScanner:
def __init__(self):
self.exclude_folders = []
self.all_extensions = []
self.picture_extensions = []
self.video_extensions = []
self.lists_separator = "||"
self.scan_is_cancelled = False
self.picsdeleted = 0
self.picsupdated = 0
self.picsadded = 0
self.picsscanned = 0
self.current_root_entry = 0
self.total_root_entries = 0
self.totalfiles = 0
self.mpdb = MypicsDB.MyPictureDB()
for path, _, _, exclude in self.mpdb.get_all_root_folders():
if exclude:
common.log(
"", 'Exclude path "%s" found ' %
common.smart_unicode(path[:len(path) - 1]))
self.exclude_folders.append(
common.smart_unicode(path[:len(path) - 1]))
for ext in common.getaddon_setting("picsext").split("|"):
self.picture_extensions.append("." + ext.replace(".", "").upper())
for ext in common.getaddon_setting("vidsext").split("|"):
self.video_extensions.append("." + ext.replace(".", "").upper())
self.use_videos = common.getaddon_setting("usevids")
self.all_extensions.extend(self.picture_extensions)
self.all_extensions.extend(self.video_extensions)
self.filescanner = Scanner()
def dispatcher(self, options):
self.options = options
if self.options.rootpath:
self.options.rootpath = common.smart_utf8(
unquote_plus(self.options.rootpath)).replace(
"\\\\", "\\").replace("\\\\", "\\").replace("\\'", "\'")
common.log("VFSScanner.dispatcher",
'Adding path "%s"' % self.options.rootpath,
xbmc.LOGNOTICE)
self.scan = AddonScan()
self.action = common.getstring(30244) #adding
self.scan.create(common.getstring(30000))
self.current_root_entry = 1
self.total_root_entries = 1
self.scan.update(
0,
0,
common.getstring(30000) + " [" + common.getstring(30241) +
"]", #MyPicture Database [preparing]
common.getstring(30247)) #please wait...
self._countfiles(self.options.rootpath)
self.total_root_entries = 1
self._addpath(self.options.rootpath, None, self.options.recursive,
True)
self.scan.close()
elif self.options.database or self.options.refresh:
paths = self.mpdb.get_all_root_folders()
common.log("VFSScanner.dispatcher", "Database refresh started",
xbmc.LOGNOTICE)
self.action = common.getstring(30242) #Updating
if paths:
self.scan = AddonScan()
self.scan.create(common.getstring(30000))
self.current_root_entry = 0
self.total_root_entries = 0
self.scan.update(
0,
0,
common.getstring(30000) + " [" + common.getstring(30241) +
"]", #MyPicture Database [preparing]
common.getstring(30247)) #please wait...
for path, recursive, update, exclude in paths:
if exclude == 0:
self.total_root_entries += 1
self._countfiles(path, False)
for path, recursive, update, exclude in paths:
if exclude == 0:
try:
self.current_root_entry += 1
self._addpath(path, None, recursive, update)
except:
print_exc()
self.scan.close()
# Set default translation for tag types
self.mpdb.default_tagtypes_translation()
self.mpdb.cleanup_keywords()
# delete all entries with "sha is null"
self.picsdeleted += self.mpdb.del_pics_wo_sha(self.scan_is_cancelled)
common.show_notification(
common.getstring(30000),
common.getstring(30248) % (self.picsscanned, self.picsadded,
self.picsdeleted, self.picsupdated))
def _countfiles(self, path, reset=True, recursive=True):
if reset:
self.totalfiles = 0
common.log("VFSScanner._countfiles", 'path "%s"' % path)
(_, files) = self.filescanner.walk(
path, recursive, self.picture_extensions
if self.use_videos == "false" else self.all_extensions)
self.totalfiles += len(files)
return self.totalfiles
def _check_excluded_files(self, filename):
for ext in common.getaddon_setting("picsexcl").lower().split("|"):
if ext in filename.lower() and len(ext) > 0:
common.log(
"VFSScanner._check_excluded_files",
'Picture "%s" excluded due to exclude condition "%s"' %
(filename, common.getaddon_setting("picsexcl")))
return False
return True
def _addpath(self, path, parentfolderid, recursive, update):
"""
try:
"""
path = common.smart_unicode(path)
common.log("VFSScanner._addpath", '"%s"' % common.smart_utf8(path))
# Check excluded paths
if path in self.exclude_folders:
common.log(
"VFSScanner._addpath",
'Path in exclude folder: "%s"' % common.smart_utf8(path))
self.picsdeleted = self.picsdeleted + self.mpdb.delete_paths_from_root(
path)
return
(dirnames, filenames) = self.filescanner.walk(
path, False, self.picture_extensions
if self.use_videos == "false" else self.all_extensions)
# insert the new path into database
foldername = common.smart_unicode(os.path.basename(path))
if len(foldername) == 0:
foldername = os.path.split(os.path.dirname(path))[1]
folderid = self.mpdb.folder_insert(foldername, path, parentfolderid,
1 if len(filenames) > 0 else 0)
# get currently stored files for 'path' from database.
# needed for 'added', 'updated' or 'deleted' decision
filesfromdb = self.mpdb.listdir(common.smart_unicode(path))
# scan pictures and insert them into database
if filenames:
for pic in filenames:
if self.scan.iscanceled():
self.scan_is_cancelled = True
common.log("VFSScanner._addpath", "Scanning canncelled",
xbmc.LOGNOTICE)
return
if self._check_excluded_files(pic) == False:
continue
self.picsscanned += 1
filename = os.path.basename(pic)
extension = os.path.splitext(pic)[1].upper()
picentry = {
"idFolder":
folderid,
"strPath":
path,
"strFilename":
filename,
"ftype":
extension in self.picture_extensions and "picture"
or extension in self.video_extensions and "video" or "",
"DateAdded":
strftime("%Y-%m-%d %H:%M:%S"),
"Thumb":
"",
"Image Rating":
None
}
sqlupdate = False
filesha = 0
# get the meta tags. but only for pictures and only if they are new or modified.
if extension in self.picture_extensions:
common.log(
"VFSScanner._addpath",
'Scanning picture "%s"' % common.smart_utf8(pic))
if pic in filesfromdb: # then it's an update
filesfromdb.pop(filesfromdb.index(pic))
if self.options.refresh == True: # this means that we only want to get new pictures.
if self.scan and self.totalfiles != 0 and self.total_root_entries != 0:
self.scan.update(
int(100 * float(self.picsscanned) /
float(self.totalfiles)),
int(100 * float(self.current_root_entry) /
float(self.total_root_entries)),
common.smart_utf8(
common.getstring(30000) +
" [%s] (%0.2f%%)" %
(self.action,
100 * float(self.picsscanned) /
float(self.totalfiles))
), #"MyPicture Database [%s] (%0.2f%%)"
common.smart_utf8(filename))
continue
else:
(localfile,
isremote) = self.filescanner.getlocalfile(pic)
filesha = self.mpdb.sha_of_file(localfile)
sqlupdate = True
if self.mpdb.stored_sha(
path, filename
) != filesha: # picture was modified
self.picsupdated += 1
common.log(
"VFSScanner._addpath",
"Picture already exists and must be updated"
)
tags = self._get_metas(
common.smart_unicode(localfile))
picentry.update(tags)
# if isremote == True then the file was copied to cache directory.
if isremote:
self.filescanner.delete(localfile)
else:
common.log(
"VFSScanner._addpath",
"Picture already exists but not modified")
if self.scan and self.totalfiles != 0 and self.total_root_entries != 0:
self.scan.update(
int(100 * float(self.picsscanned) /
float(self.totalfiles)),
int(100 *
float(self.current_root_entry) /
float(self.total_root_entries)),
common.smart_utf8(
common.getstring(30000) +
" [%s] (%0.2f%%)" %
(self.action,
100 * float(self.picsscanned) /
float(self.totalfiles))
), #"MyPicture Database [%s] (%0.2f%%)"
common.smart_utf8(filename))
if isremote:
self.filescanner.delete(localfile)
continue
else: # it's a new picture
(localfile,
isremote) = self.filescanner.getlocalfile(pic)
filesha = self.mpdb.sha_of_file(localfile)
sqlupdate = False
common.log("VFSScanner._addpath",
"New picture will be inserted into dB")
self.picsadded += 1
tags = self._get_metas(common.smart_unicode(localfile))
picentry.update(tags)
if isremote:
self.filescanner.delete(localfile)
# videos aren't scanned and therefore never updated
elif extension in self.video_extensions:
common.log(
"VFSScanner._addpath",
'Adding video file "%s"' % common.smart_utf8(pic))
if pic in filesfromdb: # then it's an update
sqlupdate = True
filesfromdb.pop(filesfromdb.index(pic))
continue
else:
sqlupdate = False
self.picsadded += 1
moddate = self.filescanner.getfiledatetime(pic)
if moddate != "0000-00-00 00:00:00":
picentry["EXIF DateTimeOriginal"] = moddate
else:
continue
try:
self.mpdb.file_insert(path, filename, picentry, sqlupdate,
filesha)
except Exception, msg:
common.log("VFSScanner._addpath",
'Unable to insert picture "%s"' % pic,
xbmc.LOGERROR)
common.log("VFSScanner._addpath",
'"%s" - "%s"' % (Exception, msg), xbmc.LOGERROR)
continue
if sqlupdate:
common.log("VFSScanner._addpath",
'Picture "%s" updated' % common.smart_utf8(pic))
else:
common.log(
"VFSScanner._addpath",
'Picture "%s" inserted' % common.smart_utf8(pic))
if self.scan and self.totalfiles != 0 and self.total_root_entries != 0:
self.scan.update(
int(100 * float(self.picsscanned) /
float(self.totalfiles)),
int(100 * float(self.current_root_entry) /
float(self.total_root_entries)),
common.smart_utf8(
common.getstring(30000) + " [%s] (%0.2f%%)" %
(self.action, 100 * float(self.picsscanned) /
float(self.totalfiles))
), #"MyPicture Database [%s] (%0.2f%%)"
common.smart_utf8(filename))
if self.scan.iscanceled():
common.log("VFSScanner._addpath", "Scanning canncelled",
xbmc.LOGNOTICE)
self.scan_is_cancelled = True
return
# all pics left in list filesfromdb weren't found in file system.
# therefore delete them from db
if filesfromdb and self.options.refresh != True:
for pic in filesfromdb:
self.mpdb.del_pic(os.path.dirname(pic), os.path.basename(pic))
common.log(
"VFSScanner._addpath",
'Picture dir: "%s" file: "%s" deleted from DB' %
(os.path.dirname(pic), os.path.basename(pic)))
self.picsdeleted += 1
if recursive:
for dirname in dirnames:
if self.scan.iscanceled():
common.log("VFSScanner._addpath", "Scanning canncelled",
xbmc.LOGNOTICE)
self.scan_is_cancelled = True
return
self._addpath(dirname, folderid, True, update)
"""
class VFSScanner:
def __init__(self):
self.exclude_folders = []
self.all_extensions = []
self.picture_extensions = []
self.video_extensions = []
self.lists_separator = "||"
self.scan_is_cancelled = False
self.picsdeleted = 0
self.picsupdated = 0
self.picsadded = 0
self.picsscanned = 0
self.current_root_entry = 0
self.total_root_entries = 0
self.totalfiles = 0
self.mpdb = MypicsDB.MyPictureDB()
for path,_,_,exclude in self.mpdb.get_all_root_folders():
if exclude:
common.log("", 'Exclude path "%s" found '%common.smart_unicode(path[:len(path)-1]))
self.exclude_folders.append(common.smart_unicode(path[:len(path)-1]))
for ext in common.getaddon_setting("picsext").split("|"):
self.picture_extensions.append("." + ext.replace(".","").upper())
for ext in common.getaddon_setting("vidsext").split("|"):
self.video_extensions.append("." + ext.replace(".","").upper())
self.use_videos = common.getaddon_setting("usevids")
self.all_extensions.extend(self.picture_extensions)
self.all_extensions.extend(self.video_extensions)
self.filescanner = Scanner()
def dispatcher(self, options):
self.options = options
if self.options.rootpath:
self.options.rootpath = common.smart_utf8(unquote_plus( self.options.rootpath)).replace("\\\\", "\\").replace("\\\\", "\\").replace("\\'", "\'")
common.log("VFSScanner.dispatcher", 'Adding path "%s"'%self.options.rootpath, xbmc.LOGNOTICE)
self.scan = AddonScan()
self.action = common.getstring(30244)#adding
self.scan.create( common.getstring(30000) )
self.current_root_entry = 1
self.total_root_entries = 1
self.scan.update(0,0,
common.getstring(30000)+" ["+common.getstring(30241)+"]",#MyPicture Database [preparing]
common.getstring(30247))#please wait...
self._countfiles(self.options.rootpath)
self.total_root_entries = 1
self._addpath(self.options.rootpath, None, self.options.recursive, True)
self.scan.close()
elif self.options.database or self.options.refresh:
paths = self.mpdb.get_all_root_folders()
common.log("VFSScanner.dispatcher", "Database refresh started", xbmc.LOGNOTICE)
self.action = common.getstring(30242)#Updating
if paths:
self.scan = AddonScan()
self.scan.create( common.getstring(30000) )
self.current_root_entry = 0
self.total_root_entries = 0
self.scan.update(0,0,
common.getstring(30000)+" ["+common.getstring(30241)+"]",#MyPicture Database [preparing]
common.getstring(30247))#please wait...
for path,recursive,update,exclude in paths:
if exclude==0:
self.total_root_entries += 1
self._countfiles(path,False)
for path,recursive,update,exclude in paths:
if exclude==0:
try:
self.current_root_entry += 1
self._addpath(path, None, recursive, update)
except:
print_exc()
self.scan.close()
# Set default translation for tag types
self.mpdb.default_tagtypes_translation()
self.mpdb.cleanup_keywords()
# delete all entries with "sha is null"
self.picsdeleted += self.mpdb.del_pics_wo_sha(self.scan_is_cancelled)
common.show_notification(common.getstring(30000), common.getstring(30248)%(self.picsscanned,self.picsadded,self.picsdeleted,self.picsupdated) )
def _countfiles(self, path, reset = True, recursive = True):
if reset:
self.totalfiles = 0
common.log("VFSScanner._countfiles", 'path "%s"'%path)
(_, files) = self.filescanner.walk(path, recursive, self.picture_extensions if self.use_videos == "false" else self.all_extensions)
self.totalfiles += len(files)
return self.totalfiles
def _check_excluded_files(self, filename):
for ext in common.getaddon_setting("picsexcl").lower().split("|"):
if ext in filename.lower() and len(ext)>0:
common.log("VFSScanner._check_excluded_files", 'Picture "%s" excluded due to exclude condition "%s"'%(filename , common.getaddon_setting("picsexcl")) )
return False
return True
def _addpath(self, path, parentfolderid, recursive, update):
"""
try:
"""
path = common.smart_unicode(path)
common.log("VFSScanner._addpath", '"%s"'%common.smart_utf8(path) )
# Check excluded paths
if path in self.exclude_folders:
common.log("VFSScanner._addpath", 'Path in exclude folder: "%s"'%common.smart_utf8(path) )
self.picsdeleted = self.picsdeleted + self.mpdb.delete_paths_from_root(path)
return
(dirnames, filenames) = self.filescanner.walk(path, False, self.picture_extensions if self.use_videos == "false" else self.all_extensions)
# insert the new path into database
foldername = common.smart_unicode(os.path.basename(path))
if len(foldername)==0:
foldername = os.path.split(os.path.dirname(path))[1]
folderid = self.mpdb.folder_insert(foldername, path, parentfolderid, 1 if len(filenames)>0 else 0 )
# get currently stored files for 'path' from database.
# needed for 'added', 'updated' or 'deleted' decision
filesfromdb = self.mpdb.listdir(common.smart_unicode(path))
# scan pictures and insert them into database
if filenames:
for pic in filenames:
if self.scan.iscanceled():
self.scan_is_cancelled = True
common.log( "VFSScanner._addpath", "Scanning canncelled", xbmc.LOGNOTICE)
return
if self._check_excluded_files(pic) == False:
continue
self.picsscanned += 1
filename = os.path.basename(pic)
extension = os.path.splitext(pic)[1].upper()
picentry = { "idFolder": folderid,
"strPath": path,
"strFilename": filename,
"ftype": extension in self.picture_extensions and "picture" or extension in self.video_extensions and "video" or "",
"DateAdded": strftime("%Y-%m-%d %H:%M:%S"),
"Thumb": "",
"Image Rating": "0"
}
sqlupdate = False
filesha = 0
# get the meta tags. but only for pictures and only if they are new or modified.
if extension in self.picture_extensions:
common.log( "VFSScanner._addpath", 'Scanning picture "%s"'%common.smart_utf8(pic))
if pic in filesfromdb: # then it's an update
filesfromdb.pop(filesfromdb.index(pic))
if self.options.refresh == True: # this means that we only want to get new pictures.
if self.scan and self.totalfiles!=0 and self.total_root_entries!=0:
self.scan.update(int(100*float(self.picsscanned)/float(self.totalfiles)),
int(100*float(self.current_root_entry)/float(self.total_root_entries)),
common.smart_utf8(common.getstring(30000)+" [%s] (%0.2f%%)"%(self.action,100*float(self.picsscanned)/float(self.totalfiles))),#"MyPicture Database [%s] (%0.2f%%)"
common.smart_utf8(filename))
continue
else:
(localfile, isremote) = self.filescanner.getlocalfile(pic)
filesha = self.mpdb.sha_of_file(localfile)
sqlupdate = True
if self.mpdb.stored_sha(path,filename) != filesha: # picture was modified
self.picsupdated += 1
common.log( "VFSScanner._addpath", "Picture already exists and must be updated")
tags = self._get_metas(common.smart_unicode(localfile))
picentry.update(tags)
# if isremote == True then the file was copied to cache directory.
if isremote:
self.filescanner.delete(localfile)
else:
common.log( "VFSScanner._addpath", "Picture already exists but not modified")
if self.scan and self.totalfiles!=0 and self.total_root_entries!=0:
self.scan.update(int(100*float(self.picsscanned)/float(self.totalfiles)),
int(100*float(self.current_root_entry)/float(self.total_root_entries)),
common.smart_utf8(common.getstring(30000)+" [%s] (%0.2f%%)"%(self.action,100*float(self.picsscanned)/float(self.totalfiles))),#"MyPicture Database [%s] (%0.2f%%)"
common.smart_utf8(filename))
if isremote:
self.filescanner.delete(localfile)
continue
else: # it's a new picture
(localfile, isremote) = self.filescanner.getlocalfile(pic)
filesha = self.mpdb.sha_of_file(localfile)
sqlupdate = False
common.log( "VFSScanner._addpath", "New picture will be inserted into dB")
self.picsadded += 1
tags = self._get_metas(common.smart_unicode(localfile))
picentry.update(tags)
if isremote:
self.filescanner.delete(localfile)
# videos aren't scanned and therefore never updated
elif extension in self.video_extensions:
common.log( "VFSScanner._addpath", 'Adding video file "%s"'%common.smart_utf8(pic))
if pic in filesfromdb: # then it's an update
sqlupdate = True
filesfromdb.pop(filesfromdb.index(pic))
continue
else:
sqlupdate = False
self.picsadded += 1
picentry["Image Rating"] = 5
moddate = self.filescanner.getfiledatetime(pic)
if moddate != "0000-00-00 00:00:00":
picentry["EXIF DateTimeOriginal"] = moddate
else:
continue
try:
self.mpdb.file_insert(path, filename, picentry, sqlupdate, filesha)
except Exception, msg:
common.log("VFSScanner._addpath", 'Unable to insert picture "%s"'%pic, xbmc.LOGERROR)
common.log("VFSScanner._addpath", '"%s" - "%s"'%(Exception, msg), xbmc.LOGERROR)
continue
if sqlupdate:
common.log( "VFSScanner._addpath", 'Picture "%s" updated'%common.smart_utf8(pic))
else:
common.log( "VFSScanner._addpath", 'Picture "%s" inserted'%common.smart_utf8(pic))
if self.scan and self.totalfiles!=0 and self.total_root_entries!=0:
self.scan.update(int(100*float(self.picsscanned)/float(self.totalfiles)),
int(100*float(self.current_root_entry)/float(self.total_root_entries)),
common.smart_utf8(common.getstring(30000)+" [%s] (%0.2f%%)"%(self.action,100*float(self.picsscanned)/float(self.totalfiles))),#"MyPicture Database [%s] (%0.2f%%)"
common.smart_utf8(filename))
if self.scan.iscanceled():
common.log( "VFSScanner._addpath", "Scanning canncelled", xbmc.LOGNOTICE)
self.scan_is_cancelled = True
return
# all pics left in list filesfromdb weren't found in file system.
# therefore delete them from db
if filesfromdb and self.options.refresh != True:
for pic in filesfromdb:
self.mpdb.del_pic(os.path.dirname(pic), os.path.basename(pic))
common.log( "VFSScanner._addpath", 'Picture dir: "%s" file: "%s" deleted from DB'%(os.path.dirname(pic), os.path.basename(pic)))
self.picsdeleted += 1
if recursive:
for dirname in dirnames:
if self.scan.iscanceled():
common.log( "VFSScanner._addpath", "Scanning canncelled", xbmc.LOGNOTICE)
self.scan_is_cancelled = True
return
self._addpath(dirname, folderid, True, update)
"""
class VFSScanner:
def __init__(self):
self.exclude_folders = []
self.all_extensions = []
self.picture_extensions = []
self.video_extensions = []
self.lists_separator = "||"
self.scan_is_cancelled = False
self.picsdeleted = 0
self.picsupdated = 0
self.picsadded = 0
self.picsscanned = 0
self.current_root_entry = 0
self.total_root_entries = 0
self.totalfiles = 0
self.mpdb = MypicsDB.MyPictureDB()
for path, _, _, exclude in self.mpdb.get_all_root_folders():
if exclude:
common.log("",
'Exclude path "%s" found ' % path[:len(path) - 1])
self.exclude_folders.append(path[:len(path) - 1])
for ext in common.getaddon_setting("picsext").split("|"):
self.picture_extensions.append("." + ext.replace(".", "").upper())
for ext in common.getaddon_setting("vidsext").split("|"):
self.video_extensions.append("." + ext.replace(".", "").upper())
self.use_videos = common.getaddon_setting("usevids")
self.all_extensions.extend(self.picture_extensions)
self.all_extensions.extend(self.video_extensions)
self.filescanner = Scanner()
def dispatcher(self, options):
try:
if common.getaddon_setting('scanning') == 'false':
common.setaddon_setting("scanning", "true")
self.options = options
common.log("VFSScanner.dispatcher", "dispatcher started",
xbmc.LOGINFO)
if self.options.rootpath:
self.options.rootpath = common.smart_utf8(
unquote_plus(self.options.rootpath)).replace(
"\\\\", "\\").replace("\\\\",
"\\").replace("\\'", "\'")
common.log("VFSScanner.dispatcher",
'Adding path "%s"' % self.options.rootpath,
xbmc.LOGINFO)
self.scan = AddonScan()
self.action = common.getstring(30244) #adding
self.scan.create(common.getstring(30000))
self.current_root_entry = 1
self.total_root_entries = 1
self.scan.update(
0,
0,
common.getstring(30000) + " [" +
common.getstring(30241) +
"]", #MyPicture Database [preparing]
common.getstring(30247)) #please wait...
self._countfiles(self.options.rootpath)
self.total_root_entries = 1
self._addpath(self.options.rootpath, None,
self.options.recursive, True)
self.scan.close()
elif self.options.database or self.options.refresh:
paths = self.mpdb.get_all_root_folders()
common.log("VFSScanner.dispatcher",
"Database refresh started", xbmc.LOGINFO)
self.action = common.getstring(30242) #Updating
if paths:
self.scan = AddonScan()
self.scan.create(common.getstring(30000))
self.current_root_entry = 0
self.total_root_entries = 0
self.scan.update(
0,
0,
common.getstring(30000) + " [" +
common.getstring(30241) +
"]", #MyPicture Database [preparing]
common.getstring(30247)) #please wait...
for path, recursive, update, exclude in paths:
if exclude == 0:
self.total_root_entries += 1
self._countfiles(path, False)
for path, recursive, update, exclude in paths:
if exclude == 0:
try:
self.current_root_entry += 1
self._addpath(path, None, recursive,
update)
except:
print_exc()
self.scan.close()
# Set default translation for tag types
self.mpdb.default_tagtypes_translation()
self.mpdb.cleanup_keywords()
# delete all entries with "sha is null"
self.picsdeleted += self.mpdb.del_pics_wo_sha(
self.scan_is_cancelled)
common.log(
"VFSScanner.dispatcher",
common.getstring(30248) %
(self.picsscanned, self.picsadded, self.picsdeleted,
self.picsupdated), xbmc.LOGINFO)
if common.getaddon_setting('popupEndOfScan') == 'true':
common.show_notification(
common.getstring(30000),
common.getstring(30248) %
(self.picsscanned, self.picsadded, self.picsdeleted,
self.picsupdated))
common.setaddon_setting("scanning", "false")
else:
common.log("VFSScanner.dispatcher",
"dispatcher already running", xbmc.LOGINFO)
except Exception as msg:
common.log("Main.add_directory", "%s - %s" % (Exception, str(msg)),
xbmc.LOGERROR)
common.setaddon_setting("scanning", "false")
def _countfiles(self, path, reset=True, recursive=True):
if reset:
self.totalfiles = 0
common.log("VFSScanner._countfiles", 'path "%s"' % path)
(_, files) = self.filescanner.walk(
path, recursive, self.picture_extensions
if self.use_videos == "false" else self.all_extensions)
self.totalfiles += len(files)
return self.totalfiles
def _check_excluded_files(self, filename):
for ext in common.getaddon_setting("picsexcl").lower().split("|"):
if ext in filename.lower() and len(ext) > 0:
common.log(
"VFSScanner._check_excluded_files",
'Picture "%s" excluded due to exclude condition "%s"' %
(filename, common.getaddon_setting("picsexcl")))
return False
return True
def _addpath(self, path, parentfolderid, recursive, update):
common.log("VFSScanner._addpath", '"%s"' % path)
# Check excluded paths
if path in self.exclude_folders:
common.log("VFSScanner._addpath",
'Path in exclude folder: "%s"' % path)
self.picsdeleted = self.picsdeleted + self.mpdb.delete_paths_from_root(
path)
return
(dirnames, filenames) = self.filescanner.walk(
path, False, self.picture_extensions
if self.use_videos == "false" else self.all_extensions)
# insert the new path into database
foldername = os.path.basename(path)
if len(foldername) == 0:
foldername = os.path.split(os.path.dirname(path))[1]
folderid = self.mpdb.folder_insert(foldername, path, parentfolderid,
1 if len(filenames) > 0 else 0)
# get currently stored files for 'path' from database.
# needed for 'added', 'updated' or 'deleted' decision
filesfromdb = self.mpdb.listdir(common.smart_unicode(path))
# scan pictures and insert them into database
if filenames:
for pic in filenames:
if self.scan.iscanceled():
self.scan_is_cancelled = True
common.log("VFSScanner._addpath", "Scanning canncelled",
xbmc.LOGINFO)
return
if self._check_excluded_files(pic) == False:
continue
self.picsscanned += 1
filename = os.path.basename(pic)
extension = os.path.splitext(pic)[1].upper()
# Use partial paths (sub directory names) as tags
partialPath = ''
check_path = os.path.dirname(path)
while 1:
check_path, folder = os.path.split(check_path)
if folder != "":
if len(partialPath) == 0:
partialPath = folder
else:
partialPath = partialPath + '||' + folder
else:
if check_path != "":
if len(partialPath) == 0:
partialPath = check_path
else:
partialPath = partialPath + '||' + check_path
break
picentry = {
"idFolder":
folderid,
"strPath":
path,
"strFilename":
filename,
'partialPath':
partialPath,
"ftype":
extension in self.picture_extensions and "picture"
or extension in self.video_extensions and "video" or "",
"DateAdded":
strftime("%Y-%m-%d %H:%M:%S"),
"Thumb":
"",
"Image Rating":
"0"
}
sqlupdate = False
filesha = 0
# get the meta tags. but only for pictures and only if they are new or modified.
if extension in self.picture_extensions:
common.log(
"VFSScanner._addpath",
'Scanning picture "%s"' % common.smart_utf8(pic))
if pic in filesfromdb: # then it's an update
filesfromdb.pop(filesfromdb.index(pic))
if self.options.refresh == True: # this means that we only want to get new pictures.
if self.scan and self.totalfiles != 0 and self.total_root_entries != 0:
self.scan.update(
int(100 * float(self.picsscanned) /
float(self.totalfiles)),
int(100 * float(self.current_root_entry) /
float(self.total_root_entries)),
common.smart_utf8(
common.getstring(30000) +
" [%s] (%0.2f%%)" %
(self.action,
100 * float(self.picsscanned) /
float(self.totalfiles))
), #"MyPicture Database [%s] (%0.2f%%)"
common.smart_utf8(filename))
continue
else:
(localfile,
isremote) = self.filescanner.getlocalfile(pic)
filesha = self.mpdb.sha_of_file(localfile)
sqlupdate = True
if self.mpdb.stored_sha(
path, filename
) != filesha: # picture was modified
self.picsupdated += 1
common.log(
"VFSScanner._addpath",
"Picture already exists and must be updated"
)
tags = self._get_metas(localfile)
picentry.update(tags)
# if isremote == True then the file was copied to cache directory.
if isremote:
self.filescanner.delete(localfile)
else:
common.log(
"VFSScanner._addpath",
"Picture already exists but not modified")
if self.scan and self.totalfiles != 0 and self.total_root_entries != 0:
self.scan.update(
int(100 * float(self.picsscanned) /
float(self.totalfiles)),
int(100 *
float(self.current_root_entry) /
float(self.total_root_entries)),
common.smart_utf8(
common.getstring(30000) +
" [%s] (%0.2f%%)" %
(self.action,
100 * float(self.picsscanned) /
float(self.totalfiles))
), #"MyPicture Database [%s] (%0.2f%%)"
filename)
if isremote:
self.filescanner.delete(localfile)
continue
else: # it's a new picture
(localfile,
isremote) = self.filescanner.getlocalfile(pic)
filesha = self.mpdb.sha_of_file(localfile)
sqlupdate = False
common.log("VFSScanner._addpath",
"New picture will be inserted into dB")
self.picsadded += 1
tags = self._get_metas(localfile)
picentry.update(tags)
if isremote:
self.filescanner.delete(localfile)
# videos aren't scanned and therefore never updated
elif extension in self.video_extensions:
common.log("VFSScanner._addpath",
'Adding video file "%s"' % pic)
if pic in filesfromdb: # then it's an update
sqlupdate = True
filesfromdb.pop(filesfromdb.index(pic))
continue
else:
sqlupdate = False
self.picsadded += 1
picentry["Image Rating"] = 5
moddate = self.filescanner.getfiledatetime(pic)
if moddate != "0000-00-00 00:00:00":
picentry["EXIF DateTimeOriginal"] = moddate
else:
continue
try:
self.mpdb.file_insert(path, filename, picentry, sqlupdate,
filesha)
except Exception as msg:
common.log("VFSScanner._addpath",
'Unable to insert picture "%s"' % pic,
xbmc.LOGERROR)
common.log("VFSScanner._addpath",
'"%s" - "%s"' % (Exception, msg), xbmc.LOGERROR)
continue
if sqlupdate:
common.log("VFSScanner._addpath",
'Picture "%s" updated' % pic)
else:
common.log("VFSScanner._addpath",
'Picture "%s" inserted' % pic)
if self.scan and self.totalfiles != 0 and self.total_root_entries != 0:
self.scan.update(
int(100 * float(self.picsscanned) /
float(self.totalfiles)),
int(100 * float(self.current_root_entry) /
float(self.total_root_entries)),
common.getstring(30000) + " [%s] (%0.2f%%)" %
(self.action,
100 * float(self.picsscanned) / float(self.totalfiles)
), #"MyPicture Database [%s] (%0.2f%%)"
filename)
if self.scan.iscanceled():
common.log("VFSScanner._addpath", "Scanning canncelled",
xbmc.LOGINFO)
self.scan_is_cancelled = True
return
# all pics left in list filesfromdb weren't found in file system.
# therefore delete them from db
if filesfromdb and self.options.refresh != True:
for pic in filesfromdb:
self.mpdb.del_pic(os.path.dirname(pic), os.path.basename(pic))
common.log(
"VFSScanner._addpath",
'Picture dir: "%s" file: "%s" deleted from DB' %
(os.path.dirname(pic), os.path.basename(pic)))
self.picsdeleted += 1
if recursive:
for dirname in dirnames:
if self.scan.iscanceled():
common.log("VFSScanner._addpath", "Scanning canncelled",
xbmc.LOGINFO)
self.scan_is_cancelled = True
return
self._addpath(dirname, folderid, True, update)
def _get_metas(self, fullpath):
picentry = {}
common.log("VFSScanner._get_metas()",
'Reading tags from "%s"' % fullpath, xbmc.LOGDEBUG)
extension = os.path.splitext(fullpath)[1].upper()
if extension in self.picture_extensions:
###############################
# getting EXIF infos #
###############################
try:
common.log("VFSScanner._get_metas()._get_exif()",
'Reading EXIF tags from "%s"' % fullpath)
exif = self._get_exif(fullpath)
picentry.update(exif)
common.log("VFSScanner._get_metas()._get_exif()",
"Finished reading EXIF tags")
except Exception as msg:
common.log("VFSScanner._get_metas()._get_exif()", "Exception",
xbmc.LOGERROR)
common.log("VFSScanner._get_metas()._get_exif()", msg,
xbmc.LOGERROR)
###############################
# getting IPTC infos #
###############################
try:
common.log("VFSScanner._get_metas()._get_iptc()",
'Reading IPTC tags from "%s"' % fullpath)
iptc = self._get_iptc(fullpath)
picentry.update(iptc)
common.log("VFSScanner._get_metas()._get_iptc()",
"Finished reading IPTC tags")
except Exception as msg:
common.log("VFSScanner._get_metas()_get_iptc()", "Exception",
xbmc.LOGERROR)
common.log("VFSScanner._get_metas()._get_iptc()", msg,
xbmc.LOGERROR)
###############################
# getting XMP infos #
###############################
try:
common.log("VFSScanner._get_metas()._get_xmp()",
'Reading XMP tags from "%s"' % fullpath)
xmp = self._get_xmp(fullpath)
picentry.update(xmp)
common.log("VFSScanner._get_metas()._get_xmp()",
"Finished reading XMP tags")
except Exception as msg:
common.log("VFSScanner._get_metas()._get_xmp()", "Exception",
xbmc.LOGERROR)
common.log("VFSScanner._get_metas()._get_xmp()", msg,
xbmc.LOGERROR)
if 'Image Rating' not in picentry or picentry[
'Image Rating'] is None or picentry[
'Image Rating'] == '' or picentry['Image Rating'] < '1':
if 'xmp:Rating' in picentry and (
picentry['xmp:Rating'] is not None
or picentry['xmp:Rating'] != ''):
picentry['Image Rating'] = picentry['xmp:Rating']
elif 'xap:Rating' in picentry and (
picentry['xap:Rating'] is not None
or picentry['xap:Rating'] != ''):
picentry['Image Rating'] = picentry['xap:Rating']
elif 'Image RatingPercent' in picentry and (
picentry['Image RatingPercent'] is not None
or picentry['Image RatingPercent'] != ''):
a = int(picentry['Image RatingPercent'])
if a >= 95:
new_rating = 5
elif a >= 75:
new_rating = 4
elif a >= 50:
new_rating = 3
elif a >= 25:
new_rating = 2
elif a >= 1:
new_rating = 1
else:
new_rating = 0
picentry['Image Rating'] = str(new_rating)
if 'Image Rating' not in picentry or picentry[
'Image Rating'] is None or len(
picentry['Image Rating']) == 0:
picentry['Image Rating'] = "0"
return picentry
def _get_exif(self, picfile):
EXIF_fields = [
"Image Model", "Image Orientation", "Image Rating",
"Image RatingPercent", "Image Artist", "GPS GPSLatitude",
"GPS GPSLatitudeRef", "GPS GPSLongitude", "GPS GPSLongitudeRef",
"Image DateTime", "EXIF DateTimeOriginal",
"EXIF DateTimeDigitized", "EXIF ExifImageWidth",
"EXIF ExifImageLength", "EXIF Flash", "Image ResolutionUnit",
"Image XResolution", "Image YResolution", "Image Make",
"EXIF FileSource", "EXIF SceneCaptureType",
"EXIF DigitalZoomRatio", "EXIF ExifVersion"
]
# try to open picfile in modify/write mode. Windows needs this for memory mapped file support.
f = open(picfile, "rb")
common.log("VFSScanner._get_exif()",
'Calling function EXIF_file for "%s"' % picfile)
tags = EXIF_file(f, details=False)
if not tags:
common.log("VFSScanner._get_exif()",
'No tags found in "%s"' % picfile)
f.close()
picentry = {}
for tag in EXIF_fields:
if tag in tags.keys():
if tag in [
"EXIF DateTimeOriginal", "EXIF DateTimeDigitized",
"Image DateTime"
]:
tagvalue = None
for datetimeformat in [
"%Y:%m:%d %H:%M:%S", "%Y.%m.%d %H.%M.%S",
"%Y-%m-%d %H:%M:%S"
]:
try:
tagvalue = strftime(
"%Y-%m-%d %H:%M:%S",
strptime(tags[tag].__str__(), datetimeformat))
break
except:
pass
#common.log("VFSScanner._get_exif", "Datetime (%s) did not match for '%s' format... trying an other one..."%(tags[tag].__str__(),datetimeformat), xbmc.LOGERROR )
if not tagvalue:
common.log(
"VFSScanner._get_exif",
"ERROR : the datetime format is not recognize (%s)"
% tags[tag].__str__(), xbmc.LOGERROR)
else:
tagvalue = tags[tag].__str__()
try:
picentry[tag] = tagvalue
common.log("VFSScanner._get_exif()", tag + ' ' + tagvalue)
except Exception as msg:
common.log("VFSScanner._get_exif", picfile, xbmc.LOGERROR)
common.log("VFSScanner._get_exif",
"%s - %s" % (Exception, msg), xbmc.LOGERROR)
if "Image Rating" not in picentry:
picentry["Image Rating"] = ""
return picentry
def _get_xmp(self, fullpath):
###############################
# get XMP infos #
###############################
tags = {}
#try:
xmpclass = XMP_Tags()
tags = xmpclass.get_xmp(os.path.dirname(fullpath),
os.path.basename(fullpath))
#except Exception as msg:
# common.log("VFSScanner._get_xmp", 'Error reading XMP tags for "%s"'%(fullpath), xbmc.LOGERROR)
# common.log("VFSScanner._get_xmp", "%s - %s"%(Exception,msg), xbmc.LOGERROR )
return tags
def _get_iptc(self, fullpath):
try:
info = IPTCInfo(fullpath)
except Exception as msg:
if not type(msg.args[0]) == type(int()):
if msg.args[0].startswith("No IPTC data found."):
return {}
else:
common.log("VFSScanner._get_iptc", "%s" % fullpath,
xbmc.LOGERROR)
common.log("VFSScanner._get_iptc",
"%s - %s" % (Exception, msg), xbmc.LOGERROR)
return {}
else:
common.log("VFSScanner._get_iptc", "%s" % fullpath)
common.log("VFSScanner._get_iptc",
"%s - %s" % (Exception, msg), xbmc.LOGERROR)
return {}
iptc = {}
#if len(info) < 2:
# return iptc
try:
for k in info._data.keys():
#
common.log("VFSScanner._get_iptc", k)
if k in IPTC_FIELDS:
try:
if isinstance(info._data[k], str):
iptc[IPTC_FIELDS[k]] = info._data[k]
if isinstance(info._data[k], bytes):
iptc[IPTC_FIELDS[k]] = str(info._data[k], "utf-8")
elif isinstance(info._data[k], list):
iptc[IPTC_FIELDS[k]] = self.lists_separator.join(
[str(i, 'utf-8') for i in info._data[k]])
else:
common.log("VFSScanner._get_iptc", "%s" % fullpath)
common.log(
"VFSScanner._get_iptc",
"WARNING : type returned by iptc field is not handled :"
)
common.log("VFSScanner._get_iptc",
repr(type(info._data.k)))
except:
common.log("VFSScanner._get_iptc", "failure",
xbmc.LOGERROR)
pass
except:
common.log("VFSScanner._get_iptc", "failure", xbmc.LOGERROR)
pass
return iptc
class VFSScanner:
def __init__(self):
self.exclude_folders = []
self.all_extensions = []
self.picture_extensions = []
self.video_extensions = []
self.lists_separator = "||"
self.picsdeleted = 0
self.picsupdated = 0
self.picsadded = 0
self.picsscanned = 0
self.current_root_entry = 0
self.total_root_entries = 0
self.totalfiles = 0
for path,recursive,update,exclude in mpdb.RootFolders():
if exclude:
self.exclude_folders.append(smart_unicode(path))
for ext in Addon.getSetting("picsext").split("|"):
self.picture_extensions.append("." + ext.replace(".","").upper())
for ext in Addon.getSetting("vidsext").split("|"):
self.video_extensions.append("." + ext.replace(".","").upper())
self.use_videos = Addon.getSetting("usevids")
self.all_extensions.extend(self.picture_extensions)
self.all_extensions.extend(self.video_extensions)
self.filescanner = Scanner()
LOGDEBUG = 0
LOGINFO = 1
LOGNOTICE = 2
LOGWARNING = 3
LOGERROR = 4
LOGSEVERE = 5
LOGFATAL = 6
LOGNONE = 7
def log(self, msg, level=LOGDEBUG):
if type(msg).__name__=='unicode':
msg = msg.encode('utf-8')
xbmc.log(str("MyPicsDB >> %s"%msg.__str__()), level)
def dispatcher(self, options):
self.options = options
if self.options.rootpath:
self.scan = AddonScan()
self.scan.create( __language__(30000) )
self.current_root_entry = 1
self.total_root_entries = 1
self.scan.update(0,0,
__language__(30000)+" ["+__language__(30241)+"]",#MyPicture Database [preparing]
__language__(30247))#please wait...
self.options.rootpath = smart_utf8(unquote_plus( self.options.rootpath)).replace("\\\\", "\\").replace("\\\\", "\\").replace("\\'", "\'")
self._countfiles(self.options.rootpath)
self.total_root_entries = 1
self._addpath(self.options.rootpath, None, self.options.recursive, True)
self.scan.close()
elif self.options.database:
paths = mpdb.RootFolders()
if paths:
self.scan = AddonScan()
self.scan.create( __language__(30000) )
self.current_root_entry = 0
self.total_root_entries = 0
self.scan.update(0,0,
__language__(30000)+" ["+__language__(30241)+"]",#MyPicture Database [preparing]
__language__(30247))#please wait...
for path,recursive,update,exclude in paths:
if exclude==0:
self.total_root_entries += 1
self._countfiles(path,False)
for path,recursive,update,exclude in paths:
if exclude==0:
try:
self.current_root_entry += 1
self._addpath(path, None, recursive, update)
except:
print_exc()
self.scan.close()
xbmc.executebuiltin( "Notification(%s,%s)"%(__language__(30000).encode("utf8"),
__language__(30248).encode("utf8")%(self.picsscanned,self.picsadded,self.picsdeleted,self.picsupdated)
)
)
def _countfiles(self, path, reset = True, recursive = True):
if reset:
self.totalfiles = 0
(dirs, files) = self.filescanner.walk(path, recursive, self.picture_extensions if self.use_videos == "false" else self.all_extensions)
self.totalfiles += len(files)
return self.totalfiles
def _addpath(self, path, parentfolderid, recursive, update):
dirnames = []
filenames = []
fullpath = []
uniquedirnames = []
olddir = ''
path = smart_unicode(path)
# Check excluded paths
if path in self.exclude_folders:
self.picsdeleted = self.picsdeleted + mpdb.RemovePath(path)
return
(dirnames, filenames) = self.filescanner.walk(path, False, self.picture_extensions if self.use_videos == "false" else self.all_extensions)
# insert the new path into database
foldername = smart_unicode(os.path.basename(path))
if len(foldername)==0:
foldername = os.path.split(os.path.dirname(path))[1]
folderid = mpdb.DB_folder_insert(foldername, path, parentfolderid, 1 if len(filenames)>0 else 0 )
# get currently stored files for 'path' from database.
# needed for 'added', 'updated' or 'deleted' decision
filesfromdb = mpdb.DB_listdir(smart_unicode(path))
# scan pictures and insert them into database
if filenames:
for pic in filenames:
self.picsscanned += 1
filename = smart_unicode(os.path.basename(pic))
extension = os.path.splitext(pic)[1].upper()
if filename in filesfromdb:
if update:
sqlupdate = True
self.picsupdated += 1
filesfromdb.pop(filesfromdb.index(filename))
else:
filesfromdb.pop(filesfromdb.index(filename))
continue
else:
sqlupdate = False
self.picsadded += 1
picentry = { "idFolder": folderid,
"strPath": path,
"strFilename": filename,
"ftype": extension in self.picture_extensions and "picture" or extension in self.video_extensions and "video" or "",
"DateAdded": strftime("%Y-%m-%d %H:%M:%S"),
"Thumb": "",
"ImageRating": None
}
# get the meta tags. but only for pictures
try:
if extension in self.picture_extensions:
(file, isremote) = self.filescanner.getlocalfile(pic)
self.log("Scanning file %s"%smart_utf8(file))
tags = self._get_metas(smart_unicode(file))
picentry.update(tags)
# if isremote == True then the file was copied to cache directory.
if isremote:
self.filescanner.delete(file)
except Exception,msg:
print msg
pass
mpdb.DB_file_insert(path, filename, picentry, sqlupdate)
straction = __language__(30242)#Updating
if self.scan and self.totalfiles!=0 and self.total_root_entries!=0:
self.scan.update(int(100*float(self.picsscanned)/float(self.totalfiles)),#cptscanned-(cptscanned/100)*100,
#cptscanned/100,
int(100*float(self.current_root_entry)/float(self.total_root_entries)),
__language__(30000)+"[%s] (%0.2f%%)"%(straction,100*float(self.picsscanned)/float(self.totalfiles)),#"MyPicture Database [%s] (%0.2f%%)"
filename)
# all pics left in list filesfromdb weren't found in file system.
# therefore delete them from db
if filesfromdb:
for pic in filesfromdb:
mpdb.DB_del_pic(path, pic)
self.picsdeleted += 1
if recursive:
for dir in dirnames:
self._addpath(dir, folderid, True, update)