// Purpose: wxFileSystem class - interface for opening files
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
+// CVS-ID: $Id$
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
#pragma hdrstop
#endif
-#if !wxUSE_SOCKETS
- #undef wxUSE_FS_INET
- #define wxUSE_FS_INET 0
-#endif
-#if (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"
+
+
+
//--------------------------------------------------------------------------------
// wxFileSystemHandler
IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
-wxMimeTypesManager *wxFileSystemHandler::m_MimeMng = NULL;
-
-void wxFileSystemHandler::CleanUpStatics()
-{
- if (m_MimeMng) delete m_MimeMng;
- m_MimeMng = NULL;
-}
-
wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
{
if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;}
}
- if (m_MimeMng == NULL) {
- m_MimeMng = new wxMimeTypesManager;
-
+ static bool s_MinimalMimeEnsured = FALSE;
+ if (!s_MinimalMimeEnsured) {
static const wxFileTypeInfo fallbacks[] =
{
wxFileTypeInfo("image/jpeg",
wxFileTypeInfo()
};
- m_MimeMng -> AddFallbacks(fallbacks);
+ wxTheMimeTypesManager -> AddFallbacks(fallbacks);
}
- ft = m_MimeMng -> GetFileTypeFromExtension(ext);
- if (ft && (ft -> GetMimeType(&mime))) {
- delete ft;
- return mime;
- }
- else {
- delete ft;
- return wxEmptyString;
+ ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);
+ if ( !ft || !ft -> GetMimeType(&mime) ) {
+ mime = wxEmptyString;
}
+
+ delete ft;
+
+ return mime;
}
}
-wxString wxFileSystemHandler::FindFirst(const wxString& spec, int flags) { return wxEmptyString; }
-
-wxString wxFileSystemHandler::FindNext() { return wxEmptyString; }
-
+wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
+ int WXUNUSED(flags))
+{
+ return wxEmptyString;
+}
+wxString wxFileSystemHandler::FindNext()
+{
+ return wxEmptyString;
+}
//--------------------------------------------------------------------------------
// wxLocalFSHandler
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));
- else return (wxFSFile*) NULL;
+ if (!wxFileExists(right))
+ return (wxFSFile*) NULL;
+
+ return new wxFSFile(new wxFileInputStream(right),
+ right,
+ GetMimeTypeFromExt(location),
+ GetAnchor(location),
+ wxDateTime(wxFileModificationTime(right)));
+
}
wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
wxList wxFileSystem::m_Handlers;
+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++)
+ {
+ 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--) {}
+ if (j >= 0 && r.GetChar(j) != wxT(':'))
+ {
+ for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+ r.Remove(j + 1);
+ }
+ }
+ }
+
+ for (; i < cnt; i++) r << p.GetChar(i);
+
+ return r;
+}
+
void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
{
int i, pathpos = -1;
- m_Path = location;
- for (i = m_Path.Length()-1; i >= 0; i--)
- if (m_Path[(unsigned int) i] == wxT('\\')) m_Path.GetWritableChar(i) = wxT('/'); // wanna be windows-safe
+ m_Path = MakeCorrectPath(location);
if (is_dir)
{
wxFSFile* wxFileSystem::OpenFile(const wxString& location)
{
- wxString loc = location;
- int i, ln;
+ wxString loc = MakeCorrectPath(location);
+ unsigned i, ln;
char meta;
wxFSFile *s = NULL;
wxNode *node;
meta = 0;
for (i = 0; i < ln; i++)
{
- if (loc[(unsigned int) i] == wxT('\\')) loc.GetWritableChar(i) = wxT('/'); // wanna be windows-safe
if (!meta)
- switch (loc[(unsigned int) i])
+ switch (loc[i])
{
- case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[(unsigned int) i];
+ case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[i];
}
}
m_LastName = wxEmptyString;
while (node)
{
wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
- if (h->CanOpen(m_Path + location))
+ if (h->CanOpen(m_Path + loc))
{
- s = h->OpenFile(*this, m_Path + location);
- if (s) { m_LastName = m_Path + location; break; }
+ s = h->OpenFile(*this, m_Path + loc);
+ if (s) { m_LastName = m_Path + loc; break; }
}
node = node->GetNext();
}
while (node)
{
wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
- if (h->CanOpen(location))
+ if (h->CanOpen(loc))
{
- s = h->OpenFile(*this, location);
- if (s) { m_LastName = location; break; }
+ s = h->OpenFile(*this, loc);
+ if (s) { m_LastName = loc; break; }
}
node = node->GetNext();
}
m_FindFileHandler = NULL;
for (int i = spec2.Length()-1; i >= 0; i--)
- if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // wanna be windows-safe
+ if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
node = m_Handlers.GetFirst();
while (node)
}
virtual void OnExit()
{
- wxFileSystemHandler::CleanUpStatics();
wxFileSystem::CleanUpHandlers();
}
};
IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
#endif
- // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+ // wxUSE_FILESYSTEM