/////////////////////////////////////////////////////////////////////////////
-// Name: filesys.cpp
+// Name: src/common/filesys.cpp
// Purpose: wxFileSystem class - interface for opening files
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
// CVS-ID: $Id$
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "filesys.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_FILESYSTEM
+#include "wx/filesys.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+#endif
+
#include "wx/wfstream.h"
#include "wx/module.h"
-#include "wx/filesys.h"
#include "wx/mimetype.h"
#include "wx/filename.h"
-
//--------------------------------------------------------------------------------
// wxFileSystemHandler
//--------------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
-#if wxUSE_MIMETYPE
-static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
-#endif
-
wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
{
wxString ext, mime;
wxString loc = GetRightLocation(location);
- char c;
- int l = loc.Length(), l2;
+ wxChar c;
+ int l = loc.length(), l2;
l2 = l;
for (int i = l-1; i >= 0; i--)
}
#if wxUSE_MIMETYPE
- static bool s_MinimalMimeEnsured = FALSE;
- if (!s_MinimalMimeEnsured) {
- wxTheMimeTypesManager->AddFallbacks(gs_FSMimeFallbacks);
- s_MinimalMimeEnsured = TRUE;
+ static bool s_MinimalMimeEnsured = false;
+ if (!s_MinimalMimeEnsured)
+ {
+ static const wxFileTypeInfo fallbacks[] =
+ {
+ wxFileTypeInfo(_T("image/jpeg"),
+ wxEmptyString,
+ wxEmptyString,
+ _T("JPEG image (from fallback)"),
+ _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
+ wxFileTypeInfo(_T("image/gif"),
+ wxEmptyString,
+ wxEmptyString,
+ _T("GIF image (from fallback)"),
+ _T("gif"), _T("GIF"), NULL),
+ wxFileTypeInfo(_T("image/png"),
+ wxEmptyString,
+ wxEmptyString,
+ _T("PNG image (from fallback)"),
+ _T("png"), _T("PNG"), NULL),
+ wxFileTypeInfo(_T("image/bmp"),
+ wxEmptyString,
+ wxEmptyString,
+ _T("windows bitmap image (from fallback)"),
+ _T("bmp"), _T("BMP"), NULL),
+ wxFileTypeInfo(_T("text/html"),
+ wxEmptyString,
+ wxEmptyString,
+ _T("HTML document (from fallback)"),
+ _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
+ // must terminate the table with this!
+ wxFileTypeInfo()
+ };
+ wxTheMimeTypesManager->AddFallbacks(fallbacks);
+ s_MinimalMimeEnsured = true;
}
wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
return mime;
#else
- if ( ext.IsSameAs(wxT("htm"), FALSE) || ext.IsSameAs(_T("html"), FALSE) )
+ if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("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(_T("jpeg"), false) )
return wxT("image/jpeg");
- if ( ext.IsSameAs(wxT("gif"), FALSE) )
+ if ( ext.IsSameAs(wxT("gif"), false) )
return wxT("image/gif");
- if ( ext.IsSameAs(wxT("png"), FALSE) )
+ if ( ext.IsSameAs(wxT("png"), false) )
return wxT("image/png");
- if ( ext.IsSameAs(wxT("bmp"), FALSE) )
+ if ( ext.IsSameAs(wxT("bmp"), false) )
return wxT("image/bmp");
return wxEmptyString;
#endif
wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
{
wxString s = wxEmptyString;
- int i, l = location.Length();
- bool fnd;
+ int i, l = location.length();
+ bool fnd = false;
- fnd = FALSE;
for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
- if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+ if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
}
if (!fnd) return wxT("file");
for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];
wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
{
int i;
- bool fnd;
+ bool fnd = false;
- fnd = FALSE;
- for (i = location.Length()-1; i >= 0; i--) {
- if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+ for (i = location.length()-1; i >= 0; i--) {
+ if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
}
return wxEmptyString;
wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
{
- int i, l = location.Length();
+ 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);
}
wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
{
- char c;
- int l = location.Length();
+ wxChar c;
+ int l = location.length();
for (int i = l-1; i >= 0; i--) {
c = location[i];
wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
{
// location has Unix path separators
- wxString right = ms_root + GetRightLocation(location);
- wxString nativePath = wxFileSystem::URLToNativePath(right);
- wxFileName fn(nativePath, wxPATH_UNIX);
+ wxString right = GetRightLocation(location);
+ wxFileName fn = wxFileSystem::URLToFileName(right);
+ wxString fullpath = ms_root + fn.GetFullPath();
+
+ if (!wxFileExists(fullpath))
+ return (wxFSFile*) NULL;
- if (!wxFileExists(fn.GetFullPath()))
+ // we need to check whether we can really read from this file, otherwise
+ // wxFSFile is not going to work
+ wxFFileInputStream *is = new wxFFileInputStream(fullpath);
+ if ( !is->Ok() )
+ {
+ delete is;
return (wxFSFile*) NULL;
+ }
- return new wxFSFile(new wxFFileInputStream(fn.GetFullPath()),
+ return new wxFSFile(is,
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()
wxString r;
int i, j, cnt;
- cnt = p.Length();
+ cnt = p.length();
for (i = 0; i < cnt; i++)
if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
r << p.GetChar(i);
if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
{
- for (j = r.Length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+ for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
if (j >= 0 && r.GetChar(j) != wxT(':'))
{
for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
if (is_dir)
{
- if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
+ 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--)
+ for (i = m_Path.length()-1; i >= 0; i--)
{
if (m_Path[(unsigned int) i] == wxT('/'))
{
}
if (pathpos == -1)
{
- for (i = 0; i < (int) m_Path.Length(); i++)
+ for (i = 0; i < (int) m_Path.length(); i++)
{
if (m_Path[(unsigned int) i] == wxT(':'))
{
break;
}
}
- if (i == (int) m_Path.Length())
+ if (i == (int) m_Path.length())
m_Path = wxEmptyString;
}
else
{
wxString loc = MakeCorrectPath(location);
unsigned i, ln;
- char meta;
+ wxChar meta;
wxFSFile *s = NULL;
- wxNode *node;
+ wxList::compatibility_iterator node;
- ln = loc.Length();
+ ln = loc.length();
meta = 0;
for (i = 0; i < ln; i++)
{
wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
{
- wxNode *node;
+ wxList::compatibility_iterator node;
wxString spec2(spec);
m_FindFileHandler = NULL;
- for (int i = spec2.Length()-1; i >= 0; i--)
+ for (int i = spec2.length()-1; i >= 0; i--)
if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
node = m_Handlers.GetFirst();
void wxFileSystem::CleanUpHandlers()
{
- m_Handlers.DeleteContents(TRUE);
- m_Handlers.Clear();
+ WX_CLEAR_LIST(wxList, m_Handlers);
}
-const static wxString g_unixPathString(wxT("/"));
-const static wxString g_nativePathString(wxFILE_SEP_PATH);
+static const wxString g_unixPathString(wxT("/"));
+static const wxString g_nativePathString(wxFILE_SEP_PATH);
// 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 )
+ {
+ 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
- if ( path.Find(wxT("file://")) == 0 )
- {
- path = path.Mid(7) ;
- }
+ path.Replace(wxT("%25"), wxT("%"));
+ path.Replace(wxT("%3A"), wxT(":"));
-/*
- // file urls either start with a forward slash (local harddisk),
+#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) ;
- }
-#ifdef __WXMSW__
- else if ( (url.Find(wxT("file://")) == 0) &&
+ 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 ;
- }
+ (path.length() > 1) && (path[1u] != wxT(':')) )
+ {
+ path = wxT("//") + path;
+ }
#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
-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__
- // unc notation
- if ( url.Find(wxT("\\\\")) == 0 )
- {
- url = url.Mid(2) ;
- }
- else
+#ifndef __UNIX__
+ // unc notation, wxMSW
+ if ( url.Find(wxT("\\\\")) == 0 )
+ {
+ url = wxT("//") + url.Mid(2);
+ }
+ else
+ {
+ url = wxT("/") + url;
+#ifdef __WXMAC__
+ url = wxT("/") + url;
+#endif
+
+ }
#endif
- {
- url = wxT("/") + url ;
- }
-*/
-
- url.Replace(g_nativePathString, g_unixPathString) ;
- url = wxT("file://") + url ;
- return url ;
+
+ url.Replace(g_nativePathString, g_unixPathString);
+ url.Replace(wxT("%"), wxT("%25"));
+ url.Replace(wxT(":"), wxT("%3A"));
+ url = wxT("file:") + url;
+ return url;
}
virtual bool OnInit()
{
wxFileSystem::AddHandler(new wxLocalFSHandler);
-
- #if wxUSE_MIMETYPE
- gs_FSMimeFallbacks = new wxFileTypeInfo[6];
- gs_FSMimeFallbacks[0] =
- wxFileTypeInfo(_T("image/jpeg"),
- _T(""),
- _T(""),
- _T("JPEG image (from fallback)"),
- _T("jpg"), _T("jpeg"), NULL);
- gs_FSMimeFallbacks[1] =
- wxFileTypeInfo(_T("image/gif"),
- _T(""),
- _T(""),
- _T("GIF image (from fallback)"),
- _T("gif"), NULL);
- gs_FSMimeFallbacks[2] =
- wxFileTypeInfo(_T("image/png"),
- _T(""),
- _T(""),
- _T("PNG image (from fallback)"),
- _T("png"), NULL);
- gs_FSMimeFallbacks[3] =
- wxFileTypeInfo(_T("image/bmp"),
- _T(""),
- _T(""),
- _T("windows bitmap image (from fallback)"),
- _T("bmp"), NULL);
- gs_FSMimeFallbacks[4] =
- 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();
- #endif
- return TRUE;
+ return true;
}
virtual void OnExit()
{
- #if wxUSE_MIMETYPE
- delete [] gs_FSMimeFallbacks;
- #endif
wxFileSystem::CleanUpHandlers();
}
};
#endif
// wxUSE_FILESYSTEM
-
-
-
projects / wxWidgets.git / blobdiff