X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/107b52ed174279e09b0bb79fe474ae90dcfdb206..8626e0b73de21463908bf855700c31e41c661b30:/src/common/filesys.cpp?ds=sidebyside diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 1e6cf4880a..ad395361ce 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -89,54 +89,54 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) { static const wxFileTypeInfo fallbacks[] = { - wxFileTypeInfo(_T("image/jpeg"), + wxFileTypeInfo(wxT("image/jpeg"), wxEmptyString, wxEmptyString, - _T("JPEG image (from fallback)"), - _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), wxNullPtr), - wxFileTypeInfo(_T("image/gif"), + wxT("JPEG image (from fallback)"), + wxT("jpg"), wxT("jpeg"), wxT("JPG"), wxT("JPEG"), wxNullPtr), + wxFileTypeInfo(wxT("image/gif"), wxEmptyString, wxEmptyString, - _T("GIF image (from fallback)"), - _T("gif"), _T("GIF"), wxNullPtr), - wxFileTypeInfo(_T("image/png"), + wxT("GIF image (from fallback)"), + wxT("gif"), wxT("GIF"), wxNullPtr), + wxFileTypeInfo(wxT("image/png"), wxEmptyString, wxEmptyString, - _T("PNG image (from fallback)"), - _T("png"), _T("PNG"), wxNullPtr), - wxFileTypeInfo(_T("image/bmp"), + wxT("PNG image (from fallback)"), + wxT("png"), wxT("PNG"), wxNullPtr), + wxFileTypeInfo(wxT("image/bmp"), wxEmptyString, wxEmptyString, - _T("windows bitmap image (from fallback)"), - _T("bmp"), _T("BMP"), wxNullPtr), - wxFileTypeInfo(_T("text/html"), + wxT("windows bitmap image (from fallback)"), + wxT("bmp"), wxT("BMP"), wxNullPtr), + wxFileTypeInfo(wxT("text/html"), wxEmptyString, wxEmptyString, - _T("HTML document (from fallback)"), - _T("htm"), _T("html"), _T("HTM"), _T("HTML"), wxNullPtr), + wxT("HTML document (from fallback)"), + wxT("htm"), wxT("html"), wxT("HTM"), wxT("HTML"), wxNullPtr), // must terminate the table with this! wxFileTypeInfo() }; wxTheMimeTypesManager->AddFallbacks(fallbacks); s_MinimalMimeEnsured = true; } - + wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); if ( !ft || !ft -> GetMimeType(&mime) ) { mime = wxEmptyString; } - + delete ft; - + return mime; } else #endif { - if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) ) + if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) ) return wxT("text/html"); - if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) ) + if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) ) return wxT("image/jpeg"); if ( ext.IsSameAs(wxT("gif"), false) ) return wxT("image/gif"); @@ -244,7 +244,7 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& wxString fullpath = ms_root + fn.GetFullPath(); if (!wxFileExists(fullpath)) - return (wxFSFile*) NULL; + return NULL; // we need to check whether we can really read from this file, otherwise // wxFSFile is not going to work @@ -255,14 +255,14 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& #else #error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work #endif - if ( !is->Ok() ) + if ( !is->IsOk() ) { delete is; - return (wxFSFile*) NULL; + return NULL; } return new wxFSFile(is, - right, + location, wxEmptyString, GetAnchor(location) #if wxUSE_DATETIME @@ -274,12 +274,18 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) { wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec)); - return wxFindFirstFile(ms_root + fn.GetFullPath(), flags); + const wxString found = wxFindFirstFile(ms_root + fn.GetFullPath(), flags); + if ( found.empty() ) + return found; + return wxFileSystem::FileNameToURL(found); } wxString wxLocalFSHandler::FindNext() { - return wxFindNextFile(); + const wxString found = wxFindNextFile(); + if ( found.empty() ) + return found; + return wxFileSystem::FileNameToURL(found); } @@ -349,7 +355,7 @@ 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(':')) + if (!m_Path.empty() && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':')) m_Path << wxT('/'); } @@ -537,7 +543,7 @@ bool wxFileSystem::FindFileInPath(wxString *pStr, { // we assume that it's not empty wxCHECK_MSG( !basename.empty(), false, - _T("empty file name in wxFileSystem::FindFileInPath")); + wxT("empty file name in wxFileSystem::FindFileInPath")); wxString name; // skip path separator in the beginning of the file name if present @@ -629,11 +635,11 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url) path = wxURI::Unescape(path); -#ifdef __WXMSW__ +#ifdef __WINDOWS__ // 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('/')) + if ( path.length() > 1 && (path[0u] == wxT('/') && path [1u] != wxT('/')) ) { path = path.Mid(1); } @@ -650,6 +656,42 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url) return wxFileName(path, wxPATH_NATIVE); } +// Escapes non-ASCII and others characters in file: URL to be valid URLs +static wxString EscapeFileNameCharsInURL(const char *in) +{ + wxString s; + + for ( const unsigned char *p = (const unsigned char*)in; *p; ++p ) + { + const unsigned char c = *p; + + // notice that all colons *must* be encoded in the paths used by + // wxFileSystem even though this makes URLs produced by this method + // unusable with IE under Windows as it requires "file:///c:/foo.bar" + // and doesn't accept "file:///c%3a/foo.bar" -- but then we never made + // any guarantees about general suitability of the strings returned by + // this method, they must work with wxFileSystem only and not encoding + // the colon breaks handling of + // "http://wherever/whatever.zip#zip:filename.ext" URLs so we really + // can't do this without heavy changes to the parsing code here, in + // particular in GetRightLocation() + + if ( c == '/' || c == '-' || c == '.' || c == '_' || c == '~' || + (c >= '0' && c <= '9') || + (c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') ) + { + s << c; + } + else + { + s << wxString::Format("%%%02x", c); + } + } + + return s; +} + // Returns the file URL for a native path wxString wxFileSystem::FileNameToURL(const wxFileName& filename) { @@ -674,21 +716,10 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename) #endif url.Replace(g_nativePathString, g_unixPathString); - url.Replace(wxT("%"), wxT("%25")); // '%'s must be replaced first! - url.Replace(wxT("#"), wxT("%23")); - - // notice that all colons *must* be encoded in the paths used by - // wxFileSystem even though this makes URLs produced by this method - // unusable with IE under Windows as it requires "file:///c:/foo.bar" and - // doesn't accept "file:///c%3a/foo.bar" -- but then we never made any - // guarantees about general suitability of the strings returned by this - // method, they must work with wxFileSystem only and not encoding the colon - // breaks handling of "http://wherever/whatever.zip#zip:filename.ext" URLs - // so we really can't do this without heavy changes to the parsing code - // here, in particular in GetRightLocation() - url.Replace(wxT(":"), wxT("%3A")); - url = wxT("file:") + url; - return url; + + // Do wxURI- and common practice-compatible escaping: encode the string + // into UTF-8, then escape anything non-ASCII: + return wxT("file:") + EscapeFileNameCharsInURL(url.utf8_str()); } @@ -725,5 +756,29 @@ class wxFileSystemModule : public wxModule IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule) +//// wxFSInputStream + +wxFSInputStream::wxFSInputStream(const wxString& filename, int flags) +{ + wxFileSystem fs; + m_file = fs.OpenFile(filename, flags | wxFS_READ); + + if ( m_file ) + { + wxInputStream* const stream = m_file->GetStream(); + if ( stream ) + { + // Notice that we pass the stream by reference: it shouldn't be + // deleted by us as it's owned by m_file already. + InitParentStream(*stream); + } + } +} + +wxFSInputStream::~wxFSInputStream() +{ + delete m_file; +} + #endif // wxUSE_FILESYSTEM