Allow an app to cut down start time by not doing unnecessary mime types initialisation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,6 +23,7 @@
|
|||||||
#include "wx/module.h"
|
#include "wx/module.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "wx/sysopt.h"
|
||||||
#include "wx/wfstream.h"
|
#include "wx/wfstream.h"
|
||||||
#include "wx/mimetype.h"
|
#include "wx/mimetype.h"
|
||||||
#include "wx/filename.h"
|
#include "wx/filename.h"
|
||||||
@@ -77,64 +78,77 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
|
|||||||
|
|
||||||
#if wxUSE_MIMETYPE
|
#if wxUSE_MIMETYPE
|
||||||
static bool s_MinimalMimeEnsured = false;
|
static bool s_MinimalMimeEnsured = false;
|
||||||
if (!s_MinimalMimeEnsured)
|
|
||||||
{
|
|
||||||
static const wxFileTypeInfo fallbacks[] =
|
|
||||||
{
|
|
||||||
wxFileTypeInfo(_T("image/jpeg"),
|
|
||||||
wxEmptyString,
|
|
||||||
wxEmptyString,
|
|
||||||
_T("JPEG image (from fallback)"),
|
|
||||||
_T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), wxNullPtr),
|
|
||||||
wxFileTypeInfo(_T("image/gif"),
|
|
||||||
wxEmptyString,
|
|
||||||
wxEmptyString,
|
|
||||||
_T("GIF image (from fallback)"),
|
|
||||||
_T("gif"), _T("GIF"), wxNullPtr),
|
|
||||||
wxFileTypeInfo(_T("image/png"),
|
|
||||||
wxEmptyString,
|
|
||||||
wxEmptyString,
|
|
||||||
_T("PNG image (from fallback)"),
|
|
||||||
_T("png"), _T("PNG"), wxNullPtr),
|
|
||||||
wxFileTypeInfo(_T("image/bmp"),
|
|
||||||
wxEmptyString,
|
|
||||||
wxEmptyString,
|
|
||||||
_T("windows bitmap image (from fallback)"),
|
|
||||||
_T("bmp"), _T("BMP"), wxNullPtr),
|
|
||||||
wxFileTypeInfo(_T("text/html"),
|
|
||||||
wxEmptyString,
|
|
||||||
wxEmptyString,
|
|
||||||
_T("HTML document (from fallback)"),
|
|
||||||
_T("htm"), _T("html"), _T("HTM"), _T("HTML"), wxNullPtr),
|
|
||||||
// must terminate the table with this!
|
|
||||||
wxFileTypeInfo()
|
|
||||||
};
|
|
||||||
wxTheMimeTypesManager->AddFallbacks(fallbacks);
|
|
||||||
s_MinimalMimeEnsured = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
|
// Don't use mime types manager if the application doesn't need it and it would be
|
||||||
if ( !ft || !ft -> GetMimeType(&mime) )
|
// cause an unacceptable delay, especially on startup.
|
||||||
{
|
bool useMimeTypesManager = true;
|
||||||
mime = wxEmptyString;
|
#if wxUSE_SYSTEM_OPTIONS
|
||||||
}
|
useMimeTypesManager = (wxSystemOptions::GetOptionInt(wxT("filesys.no-mimetypesmanager")) == 0);
|
||||||
|
|
||||||
delete ft;
|
|
||||||
|
|
||||||
return mime;
|
|
||||||
#else
|
|
||||||
if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) )
|
|
||||||
return wxT("text/html");
|
|
||||||
if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) )
|
|
||||||
return wxT("image/jpeg");
|
|
||||||
if ( ext.IsSameAs(wxT("gif"), false) )
|
|
||||||
return wxT("image/gif");
|
|
||||||
if ( ext.IsSameAs(wxT("png"), false) )
|
|
||||||
return wxT("image/png");
|
|
||||||
if ( ext.IsSameAs(wxT("bmp"), false) )
|
|
||||||
return wxT("image/bmp");
|
|
||||||
return wxEmptyString;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (useMimeTypesManager)
|
||||||
|
{
|
||||||
|
if (!s_MinimalMimeEnsured)
|
||||||
|
{
|
||||||
|
static const wxFileTypeInfo fallbacks[] =
|
||||||
|
{
|
||||||
|
wxFileTypeInfo(_T("image/jpeg"),
|
||||||
|
wxEmptyString,
|
||||||
|
wxEmptyString,
|
||||||
|
_T("JPEG image (from fallback)"),
|
||||||
|
_T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), wxNullPtr),
|
||||||
|
wxFileTypeInfo(_T("image/gif"),
|
||||||
|
wxEmptyString,
|
||||||
|
wxEmptyString,
|
||||||
|
_T("GIF image (from fallback)"),
|
||||||
|
_T("gif"), _T("GIF"), wxNullPtr),
|
||||||
|
wxFileTypeInfo(_T("image/png"),
|
||||||
|
wxEmptyString,
|
||||||
|
wxEmptyString,
|
||||||
|
_T("PNG image (from fallback)"),
|
||||||
|
_T("png"), _T("PNG"), wxNullPtr),
|
||||||
|
wxFileTypeInfo(_T("image/bmp"),
|
||||||
|
wxEmptyString,
|
||||||
|
wxEmptyString,
|
||||||
|
_T("windows bitmap image (from fallback)"),
|
||||||
|
_T("bmp"), _T("BMP"), wxNullPtr),
|
||||||
|
wxFileTypeInfo(_T("text/html"),
|
||||||
|
wxEmptyString,
|
||||||
|
wxEmptyString,
|
||||||
|
_T("HTML document (from fallback)"),
|
||||||
|
_T("htm"), _T("html"), _T("HTM"), _T("HTML"), wxNullPtr),
|
||||||
|
// must terminate the table with this!
|
||||||
|
wxFileTypeInfo()
|
||||||
|
};
|
||||||
|
wxTheMimeTypesManager->AddFallbacks(fallbacks);
|
||||||
|
s_MinimalMimeEnsured = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
|
||||||
|
if ( !ft || !ft -> GetMimeType(&mime) )
|
||||||
|
{
|
||||||
|
mime = wxEmptyString;
|
||||||
|
}
|
||||||
|
|
||||||
|
delete ft;
|
||||||
|
|
||||||
|
return mime;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) )
|
||||||
|
return wxT("text/html");
|
||||||
|
if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) )
|
||||||
|
return wxT("image/jpeg");
|
||||||
|
if ( ext.IsSameAs(wxT("gif"), false) )
|
||||||
|
return wxT("image/gif");
|
||||||
|
if ( ext.IsSameAs(wxT("png"), false) )
|
||||||
|
return wxT("image/png");
|
||||||
|
if ( ext.IsSameAs(wxT("bmp"), false) )
|
||||||
|
return wxT("image/bmp");
|
||||||
|
return wxEmptyString;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user