X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6081a0462089eaa1da4d38b260af032b349a041..e7e1b01eb55e59e555860c7ce181f176b8bbf4e2:/src/common/filesys.cpp?ds=sidebyside diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 1f9cbc486f..f350965e66 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -17,18 +17,14 @@ #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" - +#include "wx/filename.h" @@ -39,6 +35,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) +static wxFileTypeInfo *gs_FSMimeFallbacks = NULL; + wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) { wxString ext = wxEmptyString, mime = wxEmptyString; @@ -57,50 +55,18 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) 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), - - // must terminate the table with this! - wxFileTypeInfo() - }; - - wxTheMimeTypesManager -> AddFallbacks(fallbacks); + wxTheMimeTypesManager -> AddFallbacks(gs_FSMimeFallbacks); + s_MinimalMimeEnsured = TRUE; } ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext); - if (ft && (ft -> GetMimeType(&mime))) { - delete ft; - return mime; - } - else { - delete ft; - return wxEmptyString; + if ( !ft || !ft -> GetMimeType(&mime) ) { + mime = wxEmptyString; } + + delete ft; + + return mime; } @@ -172,15 +138,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) { @@ -189,19 +148,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location) wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { - 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; + // location has Unix path separators + wxString right = ms_root + GetRightLocation(location); + wxFileName fn(right, wxPATH_UNIX); + + if (!wxFileExists(fn.GetFullPath())) + return (wxFSFile*) NULL; + + return new wxFSFile(new wxFileInputStream(fn.GetFullPath()), + right, + GetMimeTypeFromExt(location), + GetAnchor(location), + wxDateTime(wxFileModificationTime(fn.GetFullPath()))); + } wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) { - wxString right = GetRightLocation(spec); + wxString right = ms_root + GetRightLocation(spec); return wxFindFirstFile(right, flags); } @@ -227,20 +191,20 @@ 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++) { @@ -255,9 +219,9 @@ static wxString MakeCorrectPath(const wxString& path) } } } - + for (; i < cnt; i++) r << p.GetChar(i); - + return r; } @@ -273,7 +237,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool 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--) @@ -330,11 +294,13 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) meta = 0; for (i = 0; i < ln; i++) { - if (!meta) - switch (loc[i]) - { - case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[i]; - } + switch (loc[i]) + { + case wxT('/') : case wxT(':') : case wxT('#') : + meta = loc[i]; + break; + } + if (meta != 0) break; } m_LastName = wxEmptyString; @@ -378,7 +344,7 @@ 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--) @@ -388,10 +354,10 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags) 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) @@ -400,9 +366,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; } @@ -440,10 +406,47 @@ class wxFileSystemModule : public wxModule virtual bool OnInit() { wxFileSystem::AddHandler(new wxLocalFSHandler); + + gs_FSMimeFallbacks = new wxFileTypeInfo[6]; + gs_FSMimeFallbacks[0] = + wxFileTypeInfo("image/jpeg", + "", + "", + "JPEG image (from fallback)", + "jpg", "jpeg", NULL); + gs_FSMimeFallbacks[1] = + wxFileTypeInfo("image/gif", + "", + "", + "GIF image (from fallback)", + "gif", NULL); + gs_FSMimeFallbacks[2] = + wxFileTypeInfo("image/png", + "", + "", + "PNG image (from fallback)", + "png", NULL); + gs_FSMimeFallbacks[3] = + wxFileTypeInfo("image/bmp", + "", + "", + "windows bitmap image (from fallback)", + "bmp", NULL); + gs_FSMimeFallbacks[4] = + wxFileTypeInfo("text/html", + "", + "", + "HTML document (from fallback)", + "htm", "html", NULL); + gs_FSMimeFallbacks[5] = + // must terminate the table with this! + wxFileTypeInfo(); + return TRUE; } virtual void OnExit() { + delete [] gs_FSMimeFallbacks; wxFileSystem::CleanUpHandlers(); } }; @@ -451,7 +454,7 @@ class wxFileSystemModule : public wxModule IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule) #endif - // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS + // wxUSE_FILESYSTEM