X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2148cce296fd904e7f307bcc948e9c87cb8186bb..a92b0cfd2bd0bef75b43c071df0b0e028f360d8e:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 85a55e95b8..e83909d847 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -24,7 +24,7 @@ #include "wx/module.h" #include "wx/filesys.h" #include "wx/mimetype.h" - +#include "wx/filename.h" @@ -35,8 +35,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) +#if wxUSE_MIMETYPE +static wxFileTypeInfo *gs_FSMimeFallbacks = NULL; +#endif + wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) { +#if wxUSE_MIMETYPE wxString ext = wxEmptyString, mime = wxEmptyString; wxString loc = GetRightLocation(location); char c; @@ -53,39 +58,8 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) static bool s_MinimalMimeEnsured = FALSE; if (!s_MinimalMimeEnsured) { - static const wxFileTypeInfo fallbacks[] = - { - wxFileTypeInfo("image/jpeg", - "", - "", - "JPEG image (from fallback)", - "jpg", "jpeg", NULL), - wxFileTypeInfo("image/gif", - "", - "", - "GIF image (from fallback)", - "gif", NULL), - wxFileTypeInfo("image/png", - "", - "", - "PNG image (from fallback)", - "png", NULL), - wxFileTypeInfo("image/bmp", - "", - "", - "windows bitmap image (from fallback)", - "bmp", NULL), - wxFileTypeInfo("text/html", - "", - "", - "HTML document (from fallback)", - "htm", "html", NULL), - - // must terminate the table with this! - wxFileTypeInfo() - }; - - wxTheMimeTypesManager -> AddFallbacks(fallbacks); + wxTheMimeTypesManager -> AddFallbacks(gs_FSMimeFallbacks); + s_MinimalMimeEnsured = TRUE; } ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext); @@ -96,6 +70,9 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) delete ft; return mime; +#else + return wxEmptyString; +#endif } @@ -167,15 +144,8 @@ wxString wxFileSystemHandler::FindNext() // wxLocalFSHandler //-------------------------------------------------------------------------------- -class wxLocalFSHandler : public wxFileSystemHandler -{ - public: - virtual bool CanOpen(const wxString& location); - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); - virtual wxString FindFirst(const wxString& spec, int flags = 0); - virtual wxString FindNext(); -}; +wxString wxLocalFSHandler::ms_root; bool wxLocalFSHandler::CanOpen(const wxString& location) { @@ -184,21 +154,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location) wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { - wxString right = GetRightLocation(location); - if (!wxFileExists(right)) + // location has Unix path separators + wxString right = ms_root + GetRightLocation(location); + wxFileName fn(right, wxPATH_UNIX); + + if (!wxFileExists(fn.GetFullPath())) return (wxFSFile*) NULL; - - return new wxFSFile(new wxFileInputStream(right), + + return new wxFSFile(new wxFileInputStream(fn.GetFullPath()), right, GetMimeTypeFromExt(location), GetAnchor(location), - wxDateTime(wxFileModificationTime(right))); + wxDateTime(wxFileModificationTime(fn.GetFullPath()))); } wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) { - wxString right = GetRightLocation(spec); + wxString right = ms_root + GetRightLocation(spec); return wxFindFirstFile(right, flags); } @@ -224,20 +197,20 @@ static wxString MakeCorrectPath(const wxString& path) wxString p(path); wxString r; int i, j, cnt; - + cnt = p.Length(); for (i = 0; i < cnt; i++) if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe - + if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; } - + if (cnt < 3) return p; - + r << p.GetChar(0) << p.GetChar(1); - + // skip trailing ../.., if any for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i); - + // remove back references: translate dir1/../dir2 to dir2 for (; i < cnt; i++) { @@ -252,9 +225,9 @@ static wxString MakeCorrectPath(const wxString& path) } } } - + for (; i < cnt; i++) r << p.GetChar(i); - + return r; } @@ -270,7 +243,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':')) m_Path << wxT('/'); } - + else { for (i = m_Path.Length()-1; i >= 0; i--) @@ -329,7 +302,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) { switch (loc[i]) { - case wxT('/') : case wxT(':') : case wxT('#') : + case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[i]; break; } @@ -377,7 +350,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags) { wxNode *node; wxString spec2(spec); - + m_FindFileHandler = NULL; for (int i = spec2.Length()-1; i >= 0; i--) @@ -387,10 +360,10 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags) while (node) { m_FindFileHandler = (wxFileSystemHandler*) node -> GetData(); - if (m_FindFileHandler -> CanOpen(m_Path + spec2)) + if (m_FindFileHandler -> CanOpen(m_Path + spec2)) return m_FindFileHandler -> FindFirst(m_Path + spec2, flags); node = node->GetNext(); - } + } node = m_Handlers.GetFirst(); while (node) @@ -399,9 +372,9 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags) if (m_FindFileHandler -> CanOpen(spec2)) return m_FindFileHandler -> FindFirst(spec2, flags); node = node->GetNext(); - } - - return wxEmptyString; + } + + return wxEmptyString; } @@ -439,10 +412,50 @@ class wxFileSystemModule : public wxModule virtual bool OnInit() { wxFileSystem::AddHandler(new wxLocalFSHandler); + + #if wxUSE_MIMETYPE + gs_FSMimeFallbacks = new wxFileTypeInfo[6]; + gs_FSMimeFallbacks[0] = + wxFileTypeInfo("image/jpeg", + "", + "", + "JPEG image (from fallback)", + "jpg", "jpeg", NULL); + gs_FSMimeFallbacks[1] = + wxFileTypeInfo("image/gif", + "", + "", + "GIF image (from fallback)", + "gif", NULL); + gs_FSMimeFallbacks[2] = + wxFileTypeInfo("image/png", + "", + "", + "PNG image (from fallback)", + "png", NULL); + gs_FSMimeFallbacks[3] = + wxFileTypeInfo("image/bmp", + "", + "", + "windows bitmap image (from fallback)", + "bmp", NULL); + gs_FSMimeFallbacks[4] = + wxFileTypeInfo("text/html", + "", + "", + "HTML document (from fallback)", + "htm", "html", NULL); + gs_FSMimeFallbacks[5] = + // must terminate the table with this! + wxFileTypeInfo(); + #endif return TRUE; } virtual void OnExit() { + #if wxUSE_MIMETYPE + delete [] gs_FSMimeFallbacks; + #endif wxFileSystem::CleanUpHandlers(); } };