X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f76dbc4d52c005b63745cf924efe30eece4c6f79..0472ece753aa3c018dd2cc9816d3cd755f28efe8:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index b0f1c67a4c..5fe6703021 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -3,6 +3,7 @@ // Purpose: wxFileSystem class - interface for opening files // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik +// CVS-ID: $Id$ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -16,16 +17,16 @@ #pragma hdrstop #endif -#if !wxUSE_SOCKETS - #undef wxUSE_FS_INET - #define wxUSE_FS_INET 0 -#endif -#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS +#if wxUSE_FILESYSTEM #include "wx/wfstream.h" #include "wx/module.h" #include "wx/filesys.h" +#include "wx/mimetype.h" +#include "wx/filename.h" + + //-------------------------------------------------------------------------------- // wxFileSystemHandler @@ -33,78 +34,62 @@ IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) -wxMimeTypesManager *wxFileSystemHandler::m_MimeMng = NULL; - -void wxFileSystemHandler::CleanUpStatics() -{ - if (m_MimeMng) delete m_MimeMng; - m_MimeMng = NULL; -} +#if wxUSE_MIMETYPE +static wxFileTypeInfo *gs_FSMimeFallbacks = NULL; +#endif wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) { - wxString ext = wxEmptyString, mime = wxEmptyString; + wxString ext, mime; wxString loc = GetRightLocation(location); char c; int l = loc.Length(), l2; - wxFileType *ft; l2 = l; - for (int i = l-1; i >= 0; i--) { + for (int i = l-1; i >= 0; i--) + { c = loc[(unsigned int) i]; - if (c == wxT('#')) l2 = i + 1; - if (c == wxT('.')) {ext = loc.Right(l2-i-1); break;} - if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;} - } - - if (m_MimeMng == NULL) { - m_MimeMng = new wxMimeTypesManager; - - static const wxFileTypeInfo fallbacks[] = + if ( c == wxT('#') ) + l2 = i + 1; + if ( c == wxT('.') ) { - 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() - }; - - m_MimeMng -> AddFallbacks(fallbacks); + ext = loc.Right(l2-i-1); + break; + } + if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) ) + return wxEmptyString; } - ft = m_MimeMng -> GetFileTypeFromExtension(ext); - if (ft && (ft -> GetMimeType(&mime))) { - delete ft; - return mime; +#if wxUSE_MIMETYPE + static bool s_MinimalMimeEnsured = FALSE; + if (!s_MinimalMimeEnsured) { + wxTheMimeTypesManager->AddFallbacks(gs_FSMimeFallbacks); + s_MinimalMimeEnsured = TRUE; } - else { - delete ft; - return wxEmptyString; + + wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); + if ( !ft || !ft -> GetMimeType(&mime) ) + { + mime = wxEmptyString; } + + 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 } @@ -176,15 +161,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) { @@ -193,18 +171,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location) wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { - wxString right = GetRightLocation(location); - if (wxFileExists(right)) - return new wxFSFile(new wxFileInputStream(right), - right, - GetMimeTypeFromExt(location), - GetAnchor(location)); - else return (wxFSFile*) NULL; + // 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(fn.GetFullPath()), + right, + GetMimeTypeFromExt(location), + GetAnchor(location), + 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); } @@ -220,26 +204,64 @@ wxString wxLocalFSHandler::FindNext() //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject) wxList wxFileSystem::m_Handlers; +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++) + { + r << p.GetChar(i); + if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.')) + { + for (j = r.Length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {} + if (j >= 0 && r.GetChar(j) != wxT(':')) + { + for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {} + r.Remove(j + 1); + } + } + } + + for (; i < cnt; i++) r << p.GetChar(i); + + return r; +} + void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) { int i, pathpos = -1; - m_Path = location; - for (i = m_Path.Length()-1; i >= 0; i--) - if (m_Path[(unsigned int) i] == wxT('\\')) m_Path.GetWritableChar(i) = wxT('/'); // wanna be windows-safe + m_Path = MakeCorrectPath(location); if (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--) @@ -286,8 +308,8 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) wxFSFile* wxFileSystem::OpenFile(const wxString& location) { - wxString loc = location; - int i, ln; + wxString loc = MakeCorrectPath(location); + unsigned i, ln; char meta; wxFSFile *s = NULL; wxNode *node; @@ -296,12 +318,13 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) meta = 0; for (i = 0; i < ln; i++) { - if (loc[(unsigned int) i] == wxT('\\')) loc.GetWritableChar(i) = wxT('/'); // wanna be windows-safe - if (!meta) - switch (loc[(unsigned int) i]) - { - case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[(unsigned int) i]; - } + switch (loc[i]) + { + case wxT('/') : case wxT(':') : case wxT('#') : + meta = loc[i]; + break; + } + if (meta != 0) break; } m_LastName = wxEmptyString; @@ -312,10 +335,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) while (node) { wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData(); - if (h->CanOpen(m_Path + location)) + if (h->CanOpen(m_Path + loc)) { - s = h->OpenFile(*this, m_Path + location); - if (s) { m_LastName = m_Path + location; break; } + s = h->OpenFile(*this, m_Path + loc); + if (s) { m_LastName = m_Path + loc; break; } } node = node->GetNext(); } @@ -328,10 +351,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) while (node) { wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); - if (h->CanOpen(location)) + if (h->CanOpen(loc)) { - s = h->OpenFile(*this, location); - if (s) { m_LastName = location; break; } + s = h->OpenFile(*this, loc); + if (s) { m_LastName = loc; break; } } node = node->GetNext(); } @@ -345,20 +368,20 @@ 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--) - if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // wanna be windows-safe + if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe node = m_Handlers.GetFirst(); 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) @@ -367,9 +390,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; } @@ -407,11 +430,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() { - wxFileSystemHandler::CleanUpStatics(); + #if wxUSE_MIMETYPE + delete [] gs_FSMimeFallbacks; + #endif wxFileSystem::CleanUpHandlers(); } }; @@ -419,7 +481,7 @@ class wxFileSystemModule : public wxModule IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule) #endif - // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS + // wxUSE_FILESYSTEM