Skip to content

Commit

Permalink
use jpg or png files for all video library artwork when exporting to …
Browse files Browse the repository at this point in the history 
…separate files
  • Loading branch information
Jonathan Marshall committed Oct 10, 2012
1 parent 6322fcd commit 41b0430
Showing 1 changed file with 29 additions and 40 deletions.
69 changes: 29 additions & 40 deletions xbmc/video/VideoDatabase.cpp
View file
Expand Up @@ -8139,8 +8139,6 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f
}

CFileItem item(movie.m_strFileNameAndPath,false);
CFileItem saveItem(item);
saveItem.SetArt(artwork);
if (singleFiles && CUtil::SupportsFileOperations(movie.m_strFileNameAndPath))
{
if (!item.Exists(false))
Expand Down Expand Up @@ -8183,14 +8181,11 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f

if (singleFiles && images && !bSkip)
{
CStdString savedThumb(saveItem.GetTBNFile());
if (saveItem.HasArt("thumb") && (overwrite || !CFile::Exists(savedThumb, false)))
CTextureCache::Get().Export(saveItem.GetArt("thumb"), savedThumb);

CStdString savedFanart(URIUtils::ReplaceExtension(savedThumb, "-fanart.jpg"));
if (saveItem.HasArt("fanart") && (overwrite || !CFile::Exists(savedFanart, false)))
CTextureCache::Get().Export(saveItem.GetArt("fanart"), savedFanart);

for (map<string, string>::const_iterator i = artwork.begin(); i != artwork.end(); ++i)
{
CStdString savedThumb = item.GetLocalArt(i->first, false);
CTextureCache::Get().Export(i->second, savedThumb, overwrite);
}
if (actorThumbs)
ExportActorThumbs(actorsDir, movie, singleFiles, overwrite);
}
Expand Down Expand Up @@ -8238,8 +8233,6 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f
}

CFileItem item(movie.m_strFileNameAndPath,false);
CFileItem saveItem(item);
saveItem.SetArt(artwork);
if (CUtil::SupportsFileOperations(movie.m_strFileNameAndPath) && singleFiles)
{
if (!item.Exists(false))
Expand Down Expand Up @@ -8276,9 +8269,11 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f
}
if (singleFiles && images && !bSkip)
{
CStdString savedThumb(saveItem.GetTBNFile());
if (saveItem.HasArt("thumb") && (overwrite || !CFile::Exists(savedThumb, false)))
CTextureCache::Get().Export(saveItem.GetArt("thumb"), savedThumb);
for (map<string, string>::const_iterator i = artwork.begin(); i != artwork.end(); ++i)
{
CStdString savedThumb = item.GetLocalArt(i->first, false);
CTextureCache::Get().Export(i->second, savedThumb, overwrite);
}
}
m_pDS->next();
current++;
Expand Down Expand Up @@ -8335,8 +8330,6 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f


CFileItem item(tvshow.m_strPath, true);
CFileItem saveItem(item);
saveItem.SetArt(artwork);
if (singleFiles && CUtil::SupportsFileOperations(tvshow.m_strPath))
{
if (!item.Exists(false))
Expand Down Expand Up @@ -8374,13 +8367,11 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f
}
if (singleFiles && images && !bSkip)
{
CStdString savedThumb(saveItem.GetFolderThumb());
if (saveItem.HasArt("thumb") && (overwrite || !CFile::Exists(savedThumb, false)))
CTextureCache::Get().Export(saveItem.GetArt("thumb"), savedThumb);

CStdString savedFanart(saveItem.GetFolderThumb("fanart.jpg"));
if (saveItem.HasArt("fanart") && (overwrite || !CFile::Exists(savedFanart, false)))
CTextureCache::Get().Export(saveItem.GetArt("fanart"), savedFanart);
for (map<string, string>::const_iterator i = artwork.begin(); i != artwork.end(); ++i)
{
CStdString savedThumb = item.GetLocalArt(i->first, true);
CTextureCache::Get().Export(i->second, savedThumb, overwrite);
}

if (actorThumbs)
ExportActorThumbs(actorsDir, tvshow, singleFiles, overwrite);
Expand All @@ -8390,21 +8381,21 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f
{
CStdString seasonThumb;
if (i->first == -1)
seasonThumb = "season-all.tbn";
seasonThumb = "season-all";
else if (i->first == 0)
seasonThumb = "season-specials.tbn";
seasonThumb = "season-specials";
else
seasonThumb.Format("season%02i.tbn", i->first);
CStdString savedThumb(saveItem.GetFolderThumb(seasonThumb));
if (!i->second.empty() && (overwrite || !CFile::Exists(savedThumb, false)))
CTextureCache::Get().Export(i->second, savedThumb);
seasonThumb.Format("season%02i", i->first);
CStdString savedThumb(item.GetLocalArt(seasonThumb, true));
if (!i->second.empty())
CTextureCache::Get().Export(i->second, savedThumb, overwrite);
}
}

// now save the episodes from this show
sql = PrepareSQL("select * from episodeview where idShow=%i order by strFileName, idEpisode",tvshow.m_iDbId);
pDS->query(sql.c_str());
CStdString showDir(saveItem.GetPath());
CStdString showDir(item.GetPath());

while (!pDS->eof())
{
Expand Down Expand Up @@ -8435,8 +8426,6 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f
bool bSkip = false;

CFileItem item(episode.m_strFileNameAndPath, false);
CFileItem saveItem(item);
saveItem.SetArt(artwork);
if (singleFiles)
{
if (!item.Exists(false))
Expand Down Expand Up @@ -8474,10 +8463,11 @@ void CVideoDatabase::ExportToXML(const CStdString &path, bool singleFiles /* = f

if (singleFiles && images && !bSkip)
{
CStdString savedThumb(saveItem.GetTBNFile());
if (saveItem.HasArt("thumb") && (overwrite || !CFile::Exists(savedThumb, false)))
CTextureCache::Get().Export(saveItem.GetArt("thumb"), savedThumb);

for (map<string, string>::const_iterator i = artwork.begin(); i != artwork.end(); ++i)
{
CStdString savedThumb = item.GetLocalArt(i->first, false);
CTextureCache::Get().Export(i->second, savedThumb, overwrite);
}
if (actorThumbs)
ExportActorThumbs(actorsDir, episode, singleFiles, overwrite);
}
Expand Down Expand Up @@ -8548,9 +8538,8 @@ void CVideoDatabase::ExportActorThumbs(const CStdString &strDir, const CVideoInf
item.SetLabel(iter->strName);
if (!iter->thumb.IsEmpty())
{
CStdString thumbFile(GetSafeFile(strPath, iter->strName) + ".tbn");
if (overwrite || !CFile::Exists(thumbFile))
CTextureCache::Get().Export(iter->thumb, thumbFile);
CStdString thumbFile(GetSafeFile(strPath, iter->strName));
CTextureCache::Get().Export(iter->thumb, thumbFile, overwrite);
}
}
}
Expand Down

0 comments on commit 41b0430

Please sign in to comment.