X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..db434467a143a2c847c4bcfe987f0202c2d02bf2:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 54c8cc86e3..e7b83b9b21 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -21,7 +21,7 @@ #define wxUSE_FS_INET 0 #endif -#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS +#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS #include "wx/wfstream.h" #include "wx/module.h" @@ -53,9 +53,9 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) l2 = l; for (int i = l-1; i >= 0; i--) { 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;} + 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) { @@ -97,8 +97,14 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) } ft = m_MimeMng -> GetFileTypeFromExtension(ext); - if (ft && (ft -> GetMimeType(&mime))) return mime; - else return wxEmptyString; + if (ft && (ft -> GetMimeType(&mime))) { + delete ft; + return mime; + } + else { + delete ft; + return wxEmptyString; + } } @@ -110,11 +116,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; } @@ -126,8 +132,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; } @@ -136,7 +142,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); } @@ -148,12 +154,24 @@ 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 //-------------------------------------------------------------------------------- @@ -163,12 +181,14 @@ 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(); }; 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) @@ -182,6 +202,19 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& else return (wxFSFile*) NULL; } +wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) +{ + wxString right = GetRightLocation(spec); + return wxFindFirstFile(right, flags); +} + +wxString wxLocalFSHandler::FindNext() +{ + return wxFindNextFile(); +} + + + //----------------------------------------------------------------------------- // wxFileSystem //----------------------------------------------------------------------------- @@ -199,48 +232,51 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) m_Path = location; for (i = m_Path.Length()-1; i >= 0; i--) - if (m_Path[(unsigned int) i] == T('\\')) m_Path.GetWritableChar(i) = T('/'); // wanna be windows-safe + if (m_Path[(unsigned int) i] == wxT('\\')) m_Path.GetWritableChar(i) = wxT('/'); // wanna be windows-safe - if (is_dir == FALSE) + 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--) - { - if (m_Path[(unsigned int) i] == T('/')) - { - if ((i > 1) && (m_Path[(unsigned int) (i-1)] == T('/')) && (m_Path[(unsigned int) (i-2)] == T(':'))) - { + { + 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; break; } } - else if (m_Path[(unsigned int) 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[(unsigned int) i] == T(':')) - { - //m_Path << T('/'); + { + if (m_Path[(unsigned int) i] == wxT(':')) + { m_Path.Remove(i+1); break; } } if (i == (int) m_Path.Length()) - m_Path = wxEmptyString; + m_Path = wxEmptyString; } else - { - if (m_Path[m_Path.Length()-1] != T('/')) - m_Path << T('/'); + { m_Path.Remove(pathpos+1); } } @@ -260,25 +296,26 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) meta = 0; 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]; - } + 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]; + } } 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(); } @@ -289,12 +326,12 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) { 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(); } @@ -303,6 +340,48 @@ 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('/'); // wanna 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); @@ -316,6 +395,8 @@ void wxFileSystem::CleanUpHandlers() } + + ///// Module: class wxFileSystemModule : public wxModule @@ -329,10 +410,10 @@ class wxFileSystemModule : public wxModule return TRUE; } virtual void OnExit() - { - wxFileSystemHandler::CleanUpStatics(); + { + wxFileSystemHandler::CleanUpStatics(); wxFileSystem::CleanUpHandlers(); - } + } }; IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)