Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backported wxFileSystem changes to 2.4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-12-16 00:10:27 +00:00
parent e2bc35e0b3
commit 44aca7b8ad
1 changed files with 60 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/common/filesys.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/filesys.h" #include "wx/filesys.h"
#include "wx/mimetype.h" #include "wx/mimetype.h"
#include "wx/filename.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 i, l = location.Length();
int l2 = l + 1; 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; if (i == 0) return wxEmptyString;
else return location.Mid(i + 1, l2 - i - 2); else return location.Mid(i + 1, l2 - i - 2);
} }
@@ -172,25 +180,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
{ {
// location has Unix path separators // location has Unix path separators
wxString right = ms_root + GetRightLocation(location); wxString right = GetRightLocation(location);
wxString nativePath = wxFileSystem::URLToNativePath(right); wxFileName fn = wxFileSystem::URLToFileName(right);
wxFileName fn(nativePath, wxPATH_UNIX); wxString fullpath = ms_root + fn.GetFullPath();
if (!wxFileExists(fn.GetFullPath())) if (!wxFileExists(fullpath))
return (wxFSFile*) NULL; return (wxFSFile*) NULL;
return new wxFSFile(new wxFFileInputStream(fn.GetFullPath()), return new wxFSFile(new wxFFileInputStream(fullpath),
right, right,
GetMimeTypeFromExt(location), GetMimeTypeFromExt(location),
GetAnchor(location), GetAnchor(location),
wxDateTime(wxFileModificationTime(fn.GetFullPath()))); wxDateTime(wxFileModificationTime(fullpath)));
} }
wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
{ {
wxString right = ms_root + GetRightLocation(spec); wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
return wxFindFirstFile(right, flags); return wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
} }
wxString wxLocalFSHandler::FindNext() wxString wxLocalFSHandler::FindNext()
@@ -422,56 +429,76 @@ const static wxString g_unixPathString(wxT("/"));
const static wxString g_nativePathString(wxFILE_SEP_PATH); const static wxString g_nativePathString(wxFILE_SEP_PATH);
// Returns the native path for a file URL // Returns the native path for a file URL
wxString wxFileSystem::URLToNativePath( const wxString& url ) wxFileName wxFileSystem::URLToFileName(const wxString& url)
{ {
wxString path = url ; wxString path = url;
if ( path.Find(wxT("file://")) == 0 ) if ( path.Find(wxT("file://")) == 0 )
{ {
path = path.Mid(7) ; 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
#ifndef __UNIX__ path.Replace(wxT("%25"), wxT("%"));
path.Replace(wxT("%3A"), wxT(":"));
#ifdef __WXMSW__
// file urls either start with a forward slash (local harddisk), // file urls either start with a forward slash (local harddisk),
// otherwise they have a servername/sharename notation, // otherwise they have a servername/sharename notation,
// which only exists on msw and corresponds to a unc // which only exists on msw and corresponds to a unc
if ( path[0u] == wxT('/') && path [1u] != wxT('/')) if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
{ {
path = path.Mid(1) ; path = path.Mid(1);
} }
else if ( (url.Find(wxT("file://")) == 0) && else if ( (url.Find(wxT("file://")) == 0) &&
(path.Find(wxT('/')) != wxNOT_FOUND) && (path.Find(wxT('/')) != wxNOT_FOUND) &&
(path.Length() > 1) && (path[1u] != wxT(':')) ) (path.Length() > 1) && (path[1u] != wxT(':')) )
{ {
path = wxT("//") + path ; path = wxT("//") + path;
} }
#endif #endif
path.Replace(g_unixPathString, g_nativePathString) ; path.Replace(g_unixPathString, g_nativePathString);
return path ; return wxFileName(path, wxPATH_NATIVE);
} }
// Returns the file URL for a native path // Returns the file URL for a native path
wxString wxFileSystem::NativePathToURL( const wxString& path ) wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
{ {
wxString url = path ; wxFileName fn = filename;
fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE);
wxString url = fn.GetFullPath(wxPATH_NATIVE);
#ifdef __WXMSW__ #ifndef __UNIX__
// unc notation // unc notation, wxMSW
if ( url.Find(wxT("\\\\")) == 0 ) if ( url.Find(wxT("\\\\")) == 0 )
{ {
url = url.Mid(2) ; url = url.Mid(2);
} }
else else
{
url = wxT("/") + url;
#ifdef __WXMAC__
url = wxT("/") + url;
#endif #endif
{
url = wxT("/") + url ;
}
url.Replace(g_nativePathString, g_unixPathString) ; }
url = wxT("file://") + url ; #endif
return url ;
url.Replace(g_nativePathString, g_unixPathString);
url.Replace(wxT("%"), wxT("%25"));
url.Replace(wxT(":"), wxT("%3A"));
url = wxT("file:") + url;
return url;
} }