X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a5d3f57380366d69fd368b568ed7306145fe61c..878711c01c1b9ad5b97d35f379a048b8ce1bfb49:/src/common/filesys.cpp?ds=inline diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 781dc5c909..4213f32dc4 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -25,6 +25,7 @@ #include "wx/filesys.h" #include "wx/mimetype.h" #include "wx/filename.h" +#include "wx/log.h" @@ -127,7 +128,14 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const { 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); } @@ -172,25 +180,27 @@ bool wxLocalFSHandler::CanOpen(const wxString& location) wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { // location has Unix path separators - wxString right = ms_root + GetRightLocation(location); + wxString right = GetRightLocation(location); wxFileName fn = wxFileSystem::URLToFileName(right); + wxString fullpath = ms_root + fn.GetFullPath(); - if (!wxFileExists(fn.GetFullPath())) + if (!wxFileExists(fullpath)) return (wxFSFile*) NULL; - return new wxFSFile(new wxFFileInputStream(fn.GetFullPath()), + return new wxFSFile(new wxFFileInputStream(fullpath), right, GetMimeTypeFromExt(location), - GetAnchor(location), - wxDateTime(wxFileModificationTime(fn.GetFullPath()))); - + GetAnchor(location) +#if wxUSE_DATETIME + ,wxDateTime(wxFileModificationTime(fullpath)) +#endif // wxUSE_DATETIME + ); } wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) { - wxString right = ms_root + GetRightLocation(spec); - return wxFindFirstFile(wxFileSystem::URLToFileName(right).GetFullPath(), - flags); + wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec)); + return wxFindFirstFile(ms_root + fn.GetFullPath(), flags); } wxString wxLocalFSHandler::FindNext() @@ -430,6 +440,18 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url) { 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), @@ -468,11 +490,17 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename) else { url = wxT("/") + url; +#ifdef __WXMAC__ + url = wxT("/") + url; +#endif + } #endif url.Replace(g_nativePathString, g_unixPathString); - url = wxT("file://") + url; + url.Replace(wxT("%"), wxT("%25")); + url.Replace(wxT(":"), wxT("%3A")); + url = wxT("file:") + url; return url; }