X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d30e0edda826c92918de02fade41f05d2c4417ca..038072e2f1eaf2bf32d748a71234d767ebba8919:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 2d4a8690dd..f350965e66 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,11 +17,16 @@ #pragma hdrstop #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 @@ -28,8 +34,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) -wxMimeTypesManager wxFileSystemHandler::m_MimeMng; +static wxFileTypeInfo *gs_FSMimeFallbacks = NULL; wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) { @@ -41,14 +47,26 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) l2 = l; for (int i = l-1; i >= 0; i--) { - c = loc[i]; - if (c == _T('#')) l2 = i + 1; - if (c == _T('.')) {ext = loc.Right(l2-i-1); break;} - if ((c == _T('/')) || (c == _T('\\')) || (c == _T(':'))) {return wxEmptyString;} + 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;} } - ft = m_MimeMng.GetFileTypeFromExtension(ext); - if (ft && (ft -> GetMimeType(&mime))) return mime; - else return wxEmptyString; + + static bool s_MinimalMimeEnsured = FALSE; + if (!s_MinimalMimeEnsured) { + wxTheMimeTypesManager -> AddFallbacks(gs_FSMimeFallbacks); + s_MinimalMimeEnsured = TRUE; + } + + ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext); + if ( !ft || !ft -> GetMimeType(&mime) ) { + mime = wxEmptyString; + } + + delete ft; + + return mime; } @@ -60,11 +78,11 @@ wxString wxFileSystemHandler::GetProtocol(const wxString& location) const bool fnd; fnd = FALSE; - for (i = l-1; (i >= 0) && ((location[i] != _T('#')) || (!fnd)); i--) { - if ((location[i] == _T(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE; + for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) { + if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE; } - if (!fnd) return _T("file"); - for (++i; (i < l) && (location[i] != _T(':')); i++) s << location[i]; + if (!fnd) return wxT("file"); + for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i]; return s; } @@ -76,8 +94,8 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const fnd = FALSE; for (i = location.Length()-1; i >= 0; i--) { - if ((location[i] == _T(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE; - else if (fnd && (location[i] == _T('#'))) return location.Left(i); + if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE; + else if (fnd && (location[i] == wxT('#'))) return location.Left(i); } return wxEmptyString; } @@ -86,7 +104,7 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const { int i, l = location.Length(); int l2 = l + 1; - for (i = l-1; (i >= 0) && ((location[i] != _T(':')) || (i == 1) || (location[i-2] == _T(':'))); i--) {if (location[i] == _T('#')) l2 = i + 1;} + for (i = l-1; (i >= 0) && ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':'))); i--) {if (location[i] == wxT('#')) l2 = i + 1;} if (i == 0) return wxEmptyString; else return location.Mid(i + 1, l2 - i - 2); } @@ -98,40 +116,66 @@ wxString wxFileSystemHandler::GetAnchor(const wxString& location) const for (int i = l-1; i >= 0; i--) { c = location[i]; - if (c == _T('#')) return location.Right(l-i-1); - else if ((c == _T('.')) || (c == _T('/')) || (c == _T('\\')) || (c == _T(':'))) return wxEmptyString; + if (c == wxT('#')) return location.Right(l-i-1); + else if ((c == wxT('.')) || (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) return wxEmptyString; } return wxEmptyString; } + +wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec), + int WXUNUSED(flags)) +{ + return wxEmptyString; +} + +wxString wxFileSystemHandler::FindNext() +{ + return wxEmptyString; +} + //-------------------------------------------------------------------------------- // wxLocalFSHandler //-------------------------------------------------------------------------------- -class wxLocalFSHandler : public wxFileSystemHandler -{ - public: - virtual bool CanOpen(const wxString& location); - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); -}; +wxString wxLocalFSHandler::ms_root; bool wxLocalFSHandler::CanOpen(const wxString& location) { - return GetProtocol(location) == _T("file"); + return GetProtocol(location) == wxT("file"); } 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 = ms_root + GetRightLocation(spec); + return wxFindFirstFile(right, flags); } +wxString wxLocalFSHandler::FindNext() +{ + return wxFindNextFile(); +} + + + //----------------------------------------------------------------------------- // wxFileSystem //----------------------------------------------------------------------------- @@ -142,55 +186,95 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, 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[i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/'); // wanna be windows-safe + m_Path = MakeCorrectPath(location); - if (is_dir == FALSE) + if (is_dir) { - for (i = m_Path.Length()-1; i >= 0; i--) - { - if (m_Path[i] == _T('/')) - { - if ((i > 1) && (m_Path[i-1] == _T('/')) && (m_Path[i-2] == _T(':'))) - { + 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--) + { + if (m_Path[(unsigned int) i] == wxT('/')) + { + if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':'))) + { i -= 2; continue; } - else - { - pathpos = i; + else + { + pathpos = i; break; } } - else if (m_Path[i] == _T(':')) { - pathpos = i; - break; + else if (m_Path[(unsigned int) i] == wxT(':')) { + pathpos = i; + break; + } } - } - if (pathpos == -1) - { - for (i = 0; i < (int) m_Path.Length(); i++) - { - if (m_Path[i] == _T(':')) - { - //m_Path << _T('/'); + if (pathpos == -1) + { + for (i = 0; i < (int) m_Path.Length(); i++) + { + if (m_Path[(unsigned int) i] == wxT(':')) + { m_Path.Remove(i+1); break; } } - if (i == (int) m_Path.Length()) - m_Path = wxEmptyString; + if (i == (int) m_Path.Length()) + m_Path = wxEmptyString; } - else - { - if (m_Path[m_Path.Length()-1] != _T('/')) - m_Path << _T('/'); + else + { m_Path.Remove(pathpos+1); } } @@ -200,51 +284,53 @@ 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; ln = loc.Length(); meta = 0; - for (i = 0; i < ln; i++) + for (i = 0; i < ln; i++) { - if (loc[i] == _T('\\')) loc.GetWritableChar(i) = _T('/'); // wanna be windows-safe - if (!meta) switch (loc[i]) - { - case _T('/') : case _T(':') : case _T('#') : meta = loc[i]; + switch (loc[i]) + { + case wxT('/') : case wxT(':') : case wxT('#') : + meta = loc[i]; + break; } + if (meta != 0) break; } m_LastName = wxEmptyString; // try relative paths first : - if (meta != _T(':')) + if (meta != wxT(':')) { node = m_Handlers.GetFirst(); while (node) - { + { wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData(); - if (h->CanOpen(m_Path + location)) - { - s = h->OpenFile(*this, m_Path + location); - if (s) { m_LastName = m_Path + location; break; } + if (h->CanOpen(m_Path + loc)) + { + s = h->OpenFile(*this, m_Path + loc); + if (s) { m_LastName = m_Path + loc; break; } } node = node->GetNext(); } } // if failed, try absolute paths : - if (s == NULL) + if (s == NULL) { node = m_Handlers.GetFirst(); while (node) - { + { wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); - if (h->CanOpen(location)) - { - s = h->OpenFile(*this, location); - if (s) { m_LastName = location; break; } + if (h->CanOpen(loc)) + { + s = h->OpenFile(*this, loc); + if (s) { m_LastName = loc; break; } } node = node->GetNext(); } @@ -253,12 +339,62 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) } + +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('/'); // Want to be windows-safe + + node = m_Handlers.GetFirst(); + while (node) + { + m_FindFileHandler = (wxFileSystemHandler*) node -> GetData(); + if (m_FindFileHandler -> CanOpen(m_Path + spec2)) + return m_FindFileHandler -> FindFirst(m_Path + spec2, flags); + node = node->GetNext(); + } + + node = m_Handlers.GetFirst(); + while (node) + { + m_FindFileHandler = (wxFileSystemHandler*) node -> GetData(); + if (m_FindFileHandler -> CanOpen(spec2)) + return m_FindFileHandler -> FindFirst(spec2, flags); + node = node->GetNext(); + } + + return wxEmptyString; +} + + + +wxString wxFileSystem::FindNext() +{ + if (m_FindFileHandler == NULL) return wxEmptyString; + else return m_FindFileHandler -> FindNext(); +} + + + void wxFileSystem::AddHandler(wxFileSystemHandler *handler) { m_Handlers.Append(handler); } +void wxFileSystem::CleanUpHandlers() +{ + m_Handlers.DeleteContents(TRUE); + m_Handlers.Clear(); +} + + + ///// Module: @@ -270,13 +406,55 @@ class wxFileSystemModule : public wxModule virtual bool OnInit() { wxFileSystem::AddHandler(new wxLocalFSHandler); + + 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(); + return TRUE; } - virtual void OnExit() {} + virtual void OnExit() + { + delete [] gs_FSMimeFallbacks; + wxFileSystem::CleanUpHandlers(); + } }; IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule) -#endif - // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS +#endif + // wxUSE_FILESYSTEM + +