X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45681cd72dafb9d2dd45eaa44ad28e14e49b32e4..07243717e26bda497d5a8b325c2e6acf4ee033cf:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 95ddd9871b..781dc5c909 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -8,12 +8,12 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation +#pragma implementation "filesys.h" #endif #include "wx/wxprec.h" -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -47,14 +47,14 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) 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); + ext = loc.Right(l2-i-1); break; } if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) ) @@ -173,12 +173,12 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& { // location has Unix path separators wxString right = ms_root + GetRightLocation(location); - wxFileName fn(right, wxPATH_UNIX); - + wxFileName fn = wxFileSystem::URLToFileName(right); + if (!wxFileExists(fn.GetFullPath())) return (wxFSFile*) NULL; - - return new wxFSFile(new wxFileInputStream(fn.GetFullPath()), + + return new wxFSFile(new wxFFileInputStream(fn.GetFullPath()), right, GetMimeTypeFromExt(location), GetAnchor(location), @@ -189,7 +189,8 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) { wxString right = ms_root + GetRightLocation(spec); - return wxFindFirstFile(right, flags); + return wxFindFirstFile(wxFileSystem::URLToFileName(right).GetFullPath(), + flags); } wxString wxLocalFSHandler::FindNext() @@ -204,6 +205,7 @@ wxString wxLocalFSHandler::FindNext() //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject) wxList wxFileSystem::m_Handlers; @@ -258,22 +260,22 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) if (is_dir) { if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':')) - m_Path << 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; break; } @@ -284,20 +286,20 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir) } } 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; + m_Path = wxEmptyString; } else - { + { m_Path.Remove(pathpos+1); } } @@ -332,10 +334,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; } } @@ -348,10 +350,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; } } @@ -416,7 +418,63 @@ void wxFileSystem::CleanUpHandlers() m_Handlers.Clear(); } +const static wxString g_unixPathString(wxT("/")); +const static 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); + } + +#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 = url.Mid(2); + } + else + { + url = wxT("/") + url; + } +#endif + + url.Replace(g_nativePathString, g_unixPathString); + url = wxT("file://") + url; + return url; +} ///// Module: @@ -433,35 +491,35 @@ class wxFileSystemModule : public wxModule #if wxUSE_MIMETYPE gs_FSMimeFallbacks = new wxFileTypeInfo[6]; gs_FSMimeFallbacks[0] = - wxFileTypeInfo("image/jpeg", - "", - "", - "JPEG image (from fallback)", - "jpg", "jpeg", NULL); + wxFileTypeInfo(_T("image/jpeg"), + _T(""), + _T(""), + _T("JPEG image (from fallback)"), + _T("jpg"), _T("jpeg"), NULL); gs_FSMimeFallbacks[1] = - wxFileTypeInfo("image/gif", - "", - "", - "GIF image (from fallback)", - "gif", NULL); + wxFileTypeInfo(_T("image/gif"), + _T(""), + _T(""), + _T("GIF image (from fallback)"), + _T("gif"), NULL); gs_FSMimeFallbacks[2] = - wxFileTypeInfo("image/png", - "", - "", - "PNG image (from fallback)", - "png", NULL); + wxFileTypeInfo(_T("image/png"), + _T(""), + _T(""), + _T("PNG image (from fallback)"), + _T("png"), NULL); gs_FSMimeFallbacks[3] = - wxFileTypeInfo("image/bmp", - "", - "", - "windows bitmap image (from fallback)", - "bmp", NULL); + wxFileTypeInfo(_T("image/bmp"), + _T(""), + _T(""), + _T("windows bitmap image (from fallback)"), + _T("bmp"), NULL); gs_FSMimeFallbacks[4] = - wxFileTypeInfo("text/html", - "", - "", - "HTML document (from fallback)", - "htm", "html", NULL); + wxFileTypeInfo(_T("text/html"), + _T(""), + _T(""), + _T("HTML document (from fallback)"), + _T("htm"), _T("html"), NULL); gs_FSMimeFallbacks[5] = // must terminate the table with this! wxFileTypeInfo(); @@ -469,12 +527,12 @@ class wxFileSystemModule : public wxModule return TRUE; } virtual void OnExit() - { + { #if wxUSE_MIMETYPE delete [] gs_FSMimeFallbacks; #endif wxFileSystem::CleanUpHandlers(); - } + } }; IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)