X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3e717ecc5add075cd53a04cf24fe27e24170944..275abf24e140159f2ac19b64b76737a6903b1319:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 6adf75e2df..e166f1b2bf 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -10,24 +10,22 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #ifdef __BORDLANDC__ #pragma hdrstop #endif -#if wxUSE_FS_INET || wxUSE_FS_ZIP - -#ifndef WXPRECOMP -#include +#if !wxUSE_SOCKETS + #undef wxUSE_FS_INET + #define wxUSE_FS_INET 0 #endif -#include -#include -#include -#include - +#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS +#include "wx/wfstream.h" +#include "wx/module.h" +#include "wx/filesys.h" //-------------------------------------------------------------------------------- // wxFileSystemHandler @@ -35,7 +33,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) -wxMimeTypesManager wxFileSystemHandler::m_MimeMng; +wxMimeTypesManager *wxFileSystemHandler::m_MimeMng = NULL; + +void wxFileSystemHandler::CleanUpStatics() +{ + if (m_MimeMng) delete m_MimeMng; + m_MimeMng = NULL; +} wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) @@ -48,12 +52,51 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) l2 = l; for (int i = l-1; i >= 0; i--) { - c = loc[i]; - if (c == '#') l2 = i + 1; - if (c == '.') {ext = loc.Right(l2-i-1); break;} - if ((c == '/') || (c == '\\') || (c == ':')) {return wxEmptyString;} + c = loc[(unsigned int) 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;} } - ft = m_MimeMng.GetFileTypeFromExtension(ext); + + if (m_MimeMng == NULL) { + m_MimeMng = new wxMimeTypesManager; + + 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() + }; + + m_MimeMng -> AddFallbacks(fallbacks); + } + + ft = m_MimeMng -> GetFileTypeFromExtension(ext); if (ft && (ft -> GetMimeType(&mime))) return mime; else return wxEmptyString; } @@ -67,16 +110,15 @@ wxString wxFileSystemHandler::GetProtocol(const wxString& location) const bool fnd; fnd = FALSE; - for (i = l-1; (i >= 0) && ((location[i] != '#') || (!fnd)); i--) { - if ((location[i] == ':') && (i != 1 /*win: C:\path*/)) fnd = TRUE; + for (i = l-1; (i >= 0) && ((location[i] != _T('#')) || (!fnd)); i--) { + if ((location[i] == _T(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE; } - if (!fnd) return "file"; - for (++i; (i < l) && (location[i] != ':'); i++) s << location[i]; + if (!fnd) return _T("file"); + for (++i; (i < l) && (location[i] != _T(':')); i++) s << location[i]; return s; } - wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const { int i; @@ -84,25 +126,21 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const fnd = FALSE; for (i = location.Length()-1; i >= 0; i--) { - if ((location[i] == ':') && (i != 1 /*win: C:\path*/)) fnd = TRUE; - else if (fnd && (location[i] == '#')) return location.Left(i); + if ((location[i] == _T(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE; + else if (fnd && (location[i] == _T('#'))) return location.Left(i); } return wxEmptyString; } - - wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const { int i, l = location.Length(); int l2 = l + 1; - for (i = l-1; (i >= 0) && ((location[i] != ':') || (i == 1) || (location[i-2] == ':')); i--) {if (location[i] == '#') l2 = i + 1;} + for (i = l-1; (i >= 0) && ((location[i] != _T(':')) || (i == 1) || (location[i-2] == _T(':'))); i--) {if (location[i] == _T('#')) l2 = i + 1;} if (i == 0) return wxEmptyString; else return location.Mid(i + 1, l2 - i - 2); } - - wxString wxFileSystemHandler::GetAnchor(const wxString& location) const { char c; @@ -110,16 +148,12 @@ wxString wxFileSystemHandler::GetAnchor(const wxString& location) const for (int i = l-1; i >= 0; i--) { c = location[i]; - if (c == '#') return location.Right(l-i-1); - else if ((c == '.') || (c == '/') || (c == '\\') || (c == ':')) return wxEmptyString; + if (c == _T('#')) return location.Right(l-i-1); + else if ((c == _T('.')) || (c == _T('/')) || (c == _T('\\')) || (c == _T(':'))) return wxEmptyString; } return wxEmptyString; } - - - - //-------------------------------------------------------------------------------- // wxLocalFSHandler //-------------------------------------------------------------------------------- @@ -132,14 +166,11 @@ class wxLocalFSHandler : public wxFileSystemHandler }; - bool wxLocalFSHandler::CanOpen(const wxString& location) { - return GetProtocol(location) == "file"; + return GetProtocol(location) == _T("file"); } - - wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { wxString right = GetRightLocation(location); @@ -148,14 +179,9 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& right, GetMimeTypeFromExt(location), GetAnchor(location)); - else return NULL; + else return (wxFSFile*) NULL; } - - - - - //----------------------------------------------------------------------------- // wxFileSystem //----------------------------------------------------------------------------- @@ -173,37 +199,48 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) m_Path = location; for (i = m_Path.Length()-1; i >= 0; i--) - if (m_Path[i] == '\\') m_Path.GetWritableChar(i) = '/'; // wanna be windows-safe - - if (is_dir == FALSE) { - for (i = m_Path.Length()-1; i >= 0; i--) { - if (m_Path[i] == '/') { - if ((i > 1) && (m_Path[i-1] == '/') && (m_Path[i-2] == ':')) { + if (m_Path[(unsigned int) i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/'); // wanna be windows-safe + + if (is_dir == FALSE) + { + for (i = m_Path.Length()-1; i >= 0; i--) + { + if (m_Path[(unsigned int) i] == _T('/')) + { + if ((i > 1) && (m_Path[(unsigned int) (i-1)] == _T('/')) && (m_Path[(unsigned int) (i-2)] == _T(':'))) + { i -= 2; continue; } - else { - pathpos = i; + else + { + pathpos = i; break; } } - else if (m_Path[i] == ':') { + else if (m_Path[(unsigned int) i] == _T(':')) { pathpos = i; break; } } - if (pathpos == -1) { - for (i = 0; i < (int) m_Path.Length(); i++) { - if (m_Path[i] == ':') { - //m_Path << '/'; + if (pathpos == -1) + { + for (i = 0; i < (int) m_Path.Length(); i++) + { + if (m_Path[(unsigned int) i] == _T(':')) + { + //m_Path << _T('/'); 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] != '/') m_Path << '/'; + else + { + if (m_Path[m_Path.Length()-1] != _T('/')) + m_Path << _T('/'); m_Path.Remove(pathpos+1); } } @@ -221,57 +258,62 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) ln = loc.Length(); meta = 0; - for (i = 0; i < ln; i++) { - if (loc[i] == '\\') loc.GetWritableChar(i) = '/'; // wanna be windows-safe - if (!meta) switch (loc[i]) { - case '/' : case ':' : case '#' : meta = loc[i]; + for (i = 0; i < ln; i++) + { + if (loc[(unsigned int) i] == _T('\\')) loc.GetWritableChar(i) = _T('/'); // wanna be windows-safe + if (!meta) switch (loc[(unsigned int) i]) + { + case _T('/') : case _T(':') : case _T('#') : meta = loc[(unsigned int) i]; } } m_LastName = wxEmptyString; // try relative paths first : - if (meta != ':') { + if (meta != _T(':')) + { node = m_Handlers.GetFirst(); - while (node){ + 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 + location)) + { + s = h->OpenFile(*this, m_Path + location); + if (s) { m_LastName = m_Path + location; break; } } - node = node -> GetNext(); + 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; } + while (node) + { + wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); + if (h->CanOpen(location)) + { + s = h->OpenFile(*this, location); + if (s) { m_LastName = location; break; } } - node = node -> GetNext(); + node = node->GetNext(); } } return (s); } - void wxFileSystem::AddHandler(wxFileSystemHandler *handler) { m_Handlers.Append(handler); } - - - - - - - +void wxFileSystem::CleanUpHandlers() +{ + m_Handlers.DeleteContents(TRUE); + m_Handlers.Clear(); +} ///// Module: @@ -286,12 +328,17 @@ class wxFileSystemModule : public wxModule wxFileSystem::AddHandler(new wxLocalFSHandler); return TRUE; } - virtual void OnExit() {} + virtual void OnExit() + { + wxFileSystemHandler::CleanUpStatics(); + wxFileSystem::CleanUpHandlers(); + } }; IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule) +#endif + // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS -#endif // wxUSE_FS_INET || wxUSE_FS_ZIP