/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation
+#pragma implementation "filesys.h"
#endif
#include "wx/wxprec.h"
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/filesys.h"
#include "wx/mimetype.h"
#include "wx/filename.h"
+#include "wx/log.h"
{
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);
}
wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
{
// location has Unix path separators
- wxString right = ms_root + GetRightLocation(location);
- wxFileName fn(right, wxPATH_UNIX);
+ 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 wxFileInputStream(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(right, flags);
+ wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
+ return wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
}
wxString wxLocalFSHandler::FindNext()
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;
}
}
}
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);
}
}
{
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; }
}
{
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; }
}
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);
+ }
+ 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),
+ // 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;
+#ifdef __WXMAC__
+ url = wxT("/") + url;
+#endif
+
+ }
+#endif
+
+ url.Replace(g_nativePathString, g_unixPathString);
+ url.Replace(wxT("%"), wxT("%25"));
+ url.Replace(wxT(":"), wxT("%3A"));
+ url = wxT("file:") + url;
+ return url;
+}
///// Module:
#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();
return TRUE;
}
virtual void OnExit()
- {
+ {
#if wxUSE_MIMETYPE
delete [] gs_FSMimeFallbacks;
#endif
wxFileSystem::CleanUpHandlers();
- }
+ }
};
IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
projects / wxWidgets.git / blobdiff