X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/737255678cb96a8296348fb62603afdd28133ec5..f2c88494b6978bee502f4c856ba9dc7e3b7c3954:/src/common/filesys.cpp?ds=sidebyside diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index d5a3bf6454..405598e9c2 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -1,34 +1,32 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filesys.cpp +// Name: src/common/filesys.cpp // Purpose: wxFileSystem class - interface for opening files // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// CVS-ID: $Id$ +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - #include "wx/wxprec.h" -#ifdef __BORDLANDC__ -#pragma hdrstop +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#if !wxUSE_SOCKETS - #undef wxUSE_FS_INET - #define wxUSE_FS_INET 0 -#endif -#if (wxUSE_HTML || 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" +#ifndef WX_PRECOMP + #include "wx/log.h" +#endif +#include "wx/wfstream.h" +#include "wx/module.h" +#include "wx/mimetype.h" +#include "wx/filename.h" +#include "wx/tokenzr.h" //-------------------------------------------------------------------------------- @@ -40,66 +38,86 @@ IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) 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; + wxChar c; + int l = loc.length(), l2; 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 ( c == wxT('#') ) + l2 = i + 1; + if ( c == wxT('.') ) + { + ext = loc.Right(l2-i-1); + break; + } + if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) ) + return wxEmptyString; } - static bool s_MinimalMimeEnsured = FALSE; - if (!s_MinimalMimeEnsured) { +#if wxUSE_MIMETYPE + 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), - + wxFileTypeInfo(_T("image/jpeg"), + wxEmptyString, + wxEmptyString, + _T("JPEG image (from fallback)"), + _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL), + wxFileTypeInfo(_T("image/gif"), + wxEmptyString, + wxEmptyString, + _T("GIF image (from fallback)"), + _T("gif"), _T("GIF"), NULL), + wxFileTypeInfo(_T("image/png"), + wxEmptyString, + wxEmptyString, + _T("PNG image (from fallback)"), + _T("png"), _T("PNG"), NULL), + wxFileTypeInfo(_T("image/bmp"), + wxEmptyString, + wxEmptyString, + _T("windows bitmap image (from fallback)"), + _T("bmp"), _T("BMP"), NULL), + wxFileTypeInfo(_T("text/html"), + wxEmptyString, + wxEmptyString, + _T("HTML document (from fallback)"), + _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL), // must terminate the table with this! wxFileTypeInfo() }; - - wxTheMimeTypesManager -> AddFallbacks(fallbacks); + wxTheMimeTypesManager->AddFallbacks(fallbacks); + s_MinimalMimeEnsured = true; } - ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext); - if (ft && (ft -> GetMimeType(&mime))) { - delete ft; - return mime; - } - 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 } @@ -107,12 +125,11 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) wxString wxFileSystemHandler::GetProtocol(const wxString& location) const { wxString s = wxEmptyString; - int i, l = location.Length(); - bool fnd; + int i, l = location.length(); + bool fnd = false; - fnd = FALSE; for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) { - if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE; + if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true; } if (!fnd) return wxT("file"); for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i]; @@ -123,11 +140,10 @@ wxString wxFileSystemHandler::GetProtocol(const wxString& location) const wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const { int i; - bool fnd; + bool fnd = false; - fnd = FALSE; - for (i = location.Length()-1; i >= 0; i--) { - if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE; + for (i = location.length()-1; i >= 0; i--) { + if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true; else if (fnd && (location[i] == wxT('#'))) return location.Left(i); } return wxEmptyString; @@ -135,17 +151,24 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const { - int i, l = location.Length(); + int i, l = location.length(); int l2 = l + 1; - for (i = l-1; (i >= 0) && ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':'))); i--) {if (location[i] == wxT('#')) 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); } wxString wxFileSystemHandler::GetAnchor(const wxString& location) const { - char c; - int l = location.Length(); + wxChar c; + int l = location.length(); for (int i = l-1; i >= 0; i--) { c = location[i]; @@ -171,15 +194,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) { @@ -188,20 +204,37 @@ bool wxLocalFSHandler::CanOpen(const wxString& location) wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { + // location has Unix path separators wxString right = GetRightLocation(location); - if (wxFileExists(right)) - return new wxFSFile(new wxFileInputStream(right), - right, - GetMimeTypeFromExt(location), - GetAnchor(location), - wxDateTime(wxFileModificationTime(right))); - else return (wxFSFile*) NULL; + wxFileName fn = wxFileSystem::URLToFileName(right); + wxString fullpath = ms_root + fn.GetFullPath(); + + if (!wxFileExists(fullpath)) + return (wxFSFile*) NULL; + + // we need to check whether we can really read from this file, otherwise + // wxFSFile is not going to work + wxFFileInputStream *is = new wxFFileInputStream(fullpath); + if ( !is->Ok() ) + { + delete is; + return (wxFSFile*) NULL; + } + + return new wxFSFile(is, + right, + GetMimeTypeFromExt(location), + GetAnchor(location) +#if wxUSE_DATETIME + ,wxDateTime(wxFileModificationTime(fullpath)) +#endif // wxUSE_DATETIME + ); } wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) { - wxString right = GetRightLocation(spec); - return wxFindFirstFile(right, flags); + wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec)); + return wxFindFirstFile(ms_root + fn.GetFullPath(), flags); } wxString wxLocalFSHandler::FindNext() @@ -216,39 +249,77 @@ 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('/'); + 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--) - { + 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; break; } @@ -259,20 +330,20 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) } } if (pathpos == -1) - { - for (i = 0; i < (int) m_Path.Length(); i++) - { + { + 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 - { + { m_Path.Remove(pathpos+1); } } @@ -282,22 +353,23 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) wxFSFile* wxFileSystem::OpenFile(const wxString& location) { - wxString loc = location; - int i, ln; - char meta; + wxString loc = MakeCorrectPath(location); + unsigned i, ln; + wxChar meta; wxFSFile *s = NULL; - wxNode *node; + wxList::compatibility_iterator node; - ln = loc.Length(); + ln = loc.length(); 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; @@ -306,10 +378,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) { node = m_Handlers.GetFirst(); while (node) - { + { wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData(); if (h->CanOpen(m_Path + loc)) - { + { s = h->OpenFile(*this, m_Path + loc); if (s) { m_LastName = m_Path + loc; break; } } @@ -322,10 +394,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) { node = m_Handlers.GetFirst(); while (node) - { + { wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); if (h->CanOpen(loc)) - { + { s = h->OpenFile(*this, loc); if (s) { m_LastName = loc; break; } } @@ -339,22 +411,22 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) wxString wxFileSystem::FindFirst(const wxString& spec, int flags) { - wxNode *node; + wxList::compatibility_iterator 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 + 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)) + if (m_FindFileHandler -> CanOpen(m_Path + spec2)) return m_FindFileHandler -> FindFirst(m_Path + spec2, flags); node = node->GetNext(); - } + } node = m_Handlers.GetFirst(); while (node) @@ -363,9 +435,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; } @@ -376,21 +448,138 @@ wxString wxFileSystem::FindNext() else return m_FindFileHandler -> FindNext(); } +bool wxFileSystem::FindFileInPath(wxString *pStr, + const wxChar *path, + const wxChar *basename) +{ + // we assume that it's not empty + wxCHECK_MSG( !wxIsEmpty(basename), false, + _T("empty file name in wxFileSystem::FindFileInPath")); + + // skip path separator in the beginning of the file name if present + if ( wxIsPathSeparator(*basename) ) + basename++; + + wxStringTokenizer tokenizer(path, wxPATH_SEP); + while ( tokenizer.HasMoreTokens() ) + { + wxString strFile = tokenizer.GetNextToken(); + if ( !wxEndsWithPathSeparator(strFile) ) + strFile += wxFILE_SEP_PATH; + strFile += basename; + + wxFSFile *file = OpenFile(strFile); + if ( file ) + { + delete file; + *pStr = strFile; + return true; + } + } + return false; +} void wxFileSystem::AddHandler(wxFileSystemHandler *handler) { - m_Handlers.Append(handler); + // prepend the handler to the beginning of the list because handlers added + // last should have the highest priority to allow overriding them + m_Handlers.Insert((size_t)0, handler); } +bool wxFileSystem::HasHandlerForPath(const wxString &location) +{ + for ( wxList::compatibility_iterator node = m_Handlers.GetFirst(); + node; node = node->GetNext() ) + { + wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); + if (h->CanOpen(location)) + return true; + } + + return false; +} void wxFileSystem::CleanUpHandlers() { - m_Handlers.DeleteContents(TRUE); - m_Handlers.Clear(); + WX_CLEAR_LIST(wxList, m_Handlers); +} + +static const wxString g_unixPathString(wxT("/")); +static const wxString g_nativePathString(wxFILE_SEP_PATH); + +// Returns the native path for a file URL +wxFileName wxFileSystem::URLToFileName(const wxString& url) +{ + wxString path = url; + + if ( path.Find(wxT("file://")) == 0 ) + { + path = path.Mid(7); + } + else if ( path.Find(wxT("file:")) == 0 ) + { + path = path.Mid(5); + } + // Remove preceding double slash on Mac Classic +#if defined(__WXMAC__) && !defined(__UNIX__) + else if ( path.Find(wxT("//")) == 0 ) + path = path.Mid(2); +#endif + + path.Replace(wxT("%25"), wxT("%")); + path.Replace(wxT("%3A"), wxT(":")); + +#ifdef __WXMSW__ + // file urls either start with a forward slash (local harddisk), + // otherwise they have a servername/sharename notation, + // which only exists on msw and corresponds to a unc + if ( path[0u] == wxT('/') && path [1u] != wxT('/')) + { + path = path.Mid(1); + } + else if ( (url.Find(wxT("file://")) == 0) && + (path.Find(wxT('/')) != wxNOT_FOUND) && + (path.length() > 1) && (path[1u] != wxT(':')) ) + { + path = wxT("//") + path; + } +#endif + + path.Replace(g_unixPathString, g_nativePathString); + + return wxFileName(path, wxPATH_NATIVE); } +// Returns the file URL for a native path +wxString wxFileSystem::FileNameToURL(const wxFileName& filename) +{ + wxFileName fn = filename; + fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE); + wxString url = fn.GetFullPath(wxPATH_NATIVE); + +#ifndef __UNIX__ + // unc notation, wxMSW + if ( url.Find(wxT("\\\\")) == 0 ) + { + url = wxT("//") + url.Mid(2); + } + else + { + url = wxT("/") + url; +#ifdef __WXMAC__ + url = wxT("/") + url; +#endif + + } +#endif + url.Replace(g_nativePathString, g_unixPathString); + url.Replace(wxT("%"), wxT("%25")); + url.Replace(wxT(":"), wxT("%3A")); + url = wxT("file:") + url; + return url; +} ///// Module: @@ -403,18 +592,15 @@ class wxFileSystemModule : public wxModule virtual bool OnInit() { wxFileSystem::AddHandler(new wxLocalFSHandler); - return TRUE; + return true; } virtual void OnExit() - { + { wxFileSystem::CleanUpHandlers(); - } + } }; IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule) #endif - // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS - - - + // wxUSE_FILESYSTEM