_really_ fixed translation messages

[wxWidgets.git] / src / common / filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 85a55e95b890c687ca4d2a7c9ef90ee9138dc1e8..ceb2810018702e17941cca945c5f17470f3abca1 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -8,12 +8,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "filesys.h"

 #endif
 
 #include "wx/wxprec.h"
 
 #endif
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 


@@ -24,7 +24,8 @@
 #include "wx/module.h"
 #include "wx/filesys.h"
 #include "wx/mimetype.h"
 #include "wx/module.h"
 #include "wx/filesys.h"
 #include "wx/mimetype.h"

-
+#include "wx/filename.h"
+#include "wx/log.h"

 
 
 
 
 
 


@@ -35,67 +36,61 @@
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 

+#if wxUSE_MIMETYPE
+static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
+#endif
+

 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {

-    wxString ext = wxEmptyString, mime = wxEmptyString;
+    wxString ext, mime;

     wxString loc = GetRightLocation(location);
     char c;
     int l = loc.Length(), l2;
     wxString loc = GetRightLocation(location);
     char c;
     int l = loc.Length(), l2;

-    wxFileType *ft;

 
     l2 = l;
 
     l2 = l;

-    for (int i = l-1; i >= 0; i--) {
+    for (int i = l-1; i >= 0; i--)
+    {

         c = loc[(unsigned int) i];
         c = loc[(unsigned int) i];

-        if (c == wxT('#')) l2 = i + 1;
-        if (c == wxT('.')) {ext = loc.Right(l2-i-1); break;}
-        if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;}
+        if ( c == wxT('#') )
+            l2 = i + 1;
+        if ( c == wxT('.') )
+        {
+            ext = loc.Right(l2-i-1);
+            break;
+        }
+        if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) )
+            return wxEmptyString;

     }
 
     }
 

+#if wxUSE_MIMETYPE

     static bool s_MinimalMimeEnsured = FALSE;
     if (!s_MinimalMimeEnsured) {
     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) ) {
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+    if ( !ft || !ft -> GetMimeType(&mime) )
+    {

         mime = wxEmptyString;
     }
 
     delete ft;
 
     return mime;
         mime = wxEmptyString;
     }
 
     delete ft;
 
     return mime;

+#else
+    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) )
+        return wxT("image/jpeg");
+    if ( ext.IsSameAs(wxT("gif"), FALSE) )
+        return wxT("image/gif");
+    if ( ext.IsSameAs(wxT("png"), FALSE) )
+        return wxT("image/png");
+    if ( ext.IsSameAs(wxT("bmp"), FALSE) )
+        return wxT("image/bmp");
+    return wxEmptyString;
+#endif

 }
 
 
 }
 
 


@@ -133,7 +128,14 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {
     int i, l = location.Length();
     int l2 = l + 1;
 {
     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);
 }
     if (i == 0) return wxEmptyString;
     else return location.Mid(i + 1, l2 - i - 2);
 }


@@ -167,15 +169,8 @@ wxString wxFileSystemHandler::FindNext()
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 
 // 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)
 {
 
 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {


@@ -184,22 +179,25 @@ 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

     wxString right = GetRightLocation(location);
     wxString right = GetRightLocation(location);

-    if (!wxFileExists(right))
+    wxFileName fn = wxFileSystem::URLToFileName(right);
+    wxString fullpath = ms_root + fn.GetFullPath();
+
+    if (!wxFileExists(fullpath))

         return (wxFSFile*) NULL;
 
         return (wxFSFile*) NULL;
 

-    return new wxFSFile(new wxFileInputStream(right),
+    return new wxFSFile(new wxFFileInputStream(fullpath),

                         right,
                         GetMimeTypeFromExt(location),
                         GetAnchor(location),
                         right,
                         GetMimeTypeFromExt(location),
                         GetAnchor(location),

-                        wxDateTime(wxFileModificationTime(right)));
-
+                        wxDateTime(wxFileModificationTime(fullpath)));

 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {
 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {

-    wxString right = GetRightLocation(spec);
-    return wxFindFirstFile(right, flags);
+    wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
+    return wxFindFirstFile(ms_root + fn.GetFullPath(), flags);

 }
 
 wxString wxLocalFSHandler::FindNext()
 }
 
 wxString wxLocalFSHandler::FindNext()


@@ -214,6 +212,7 @@ wxString wxLocalFSHandler::FindNext()
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)

+IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)

 
 
 wxList wxFileSystem::m_Handlers;
 
 
 wxList wxFileSystem::m_Handlers;


@@ -224,20 +223,20 @@ static wxString MakeCorrectPath(const wxString& path)
     wxString p(path);
     wxString r;
     int i, j, cnt;
     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
     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 (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }

-    
+

     if (cnt < 3) return p;
     if (cnt < 3) return p;

-    
+

     r << p.GetChar(0) << p.GetChar(1);
     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);
     // 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++)
     {
     // remove back references: translate dir1/../dir2 to dir2
     for (; i < cnt; i++)
     {


@@ -252,9 +251,9 @@ static wxString MakeCorrectPath(const wxString& path)
             }
         }
     }
             }
         }
     }

-        
+

     for (; i < cnt; i++) r << p.GetChar(i);
     for (; i < cnt; i++) r << p.GetChar(i);

-        
+

     return r;
 }
 
     return r;
 }
 


@@ -268,22 +267,22 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
     if (is_dir)
     {
         if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
     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--)
     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)

-       {
+        {

             if (m_Path[(unsigned int) i] == wxT('/'))
             if (m_Path[(unsigned int) i] == wxT('/'))

-               {
+            {

                 if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
                 if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))

-                       {
+                {

                     i -= 2;
                     continue;
                 }
                 else
                     i -= 2;
                     continue;
                 }
                 else

-                       {
+                {

                     pathpos = i;
                     break;
                 }
                     pathpos = i;
                     break;
                 }


@@ -294,20 +293,20 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
             }
         }
         if (pathpos == -1)
             }
         }
         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(':'))
                 if (m_Path[(unsigned int) i] == wxT(':'))

-                       {
+                {

                     m_Path.Remove(i+1);
                     break;
                 }
             }
             if (i == (int) m_Path.Length())
                     m_Path.Remove(i+1);
                     break;
                 }
             }
             if (i == (int) m_Path.Length())

-               m_Path = wxEmptyString;
+                m_Path = wxEmptyString;

         }
         else
         }
         else

-       {
+        {

             m_Path.Remove(pathpos+1);
         }
     }
             m_Path.Remove(pathpos+1);
         }
     }


@@ -329,7 +328,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         switch (loc[i])
         {
     {
         switch (loc[i])
         {

-            case wxT('/') : case wxT(':') : case wxT('#') : 
+            case wxT('/') : case wxT(':') : case wxT('#') :

                 meta = loc[i];
                 break;
         }
                 meta = loc[i];
                 break;
         }


@@ -342,10 +341,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
     {
         node = m_Handlers.GetFirst();
         while (node)

-       {
+        {

             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
             if (h->CanOpen(m_Path + loc))
             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; }
             }
                 s = h->OpenFile(*this, m_Path + loc);
                 if (s) { m_LastName = m_Path + loc; break; }
             }


@@ -358,10 +357,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
     {
         node = m_Handlers.GetFirst();
         while (node)

-       {
+        {

             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
             if (h->CanOpen(loc))
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
             if (h->CanOpen(loc))

-           {
+            {

                 s = h->OpenFile(*this, loc);
                 if (s) { m_LastName = loc; break; }
             }
                 s = h->OpenFile(*this, loc);
                 if (s) { m_LastName = loc; break; }
             }


@@ -377,7 +376,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {
     wxNode *node;
     wxString spec2(spec);
 {
     wxNode *node;
     wxString spec2(spec);

-    
+

     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)
     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)


@@ -387,10 +386,10 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
     while (node)
     {
         m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
     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();
             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
         node = node->GetNext();

-    } 
+    }

 
     node = m_Handlers.GetFirst();
     while (node)
 
     node = m_Handlers.GetFirst();
     while (node)


@@ -399,9 +398,9 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();

-    } 
-    
-    return wxEmptyString;   
+    }
+
+    return wxEmptyString;

 }
 
 
 }
 
 


@@ -426,7 +425,72 @@ void wxFileSystem::CleanUpHandlers()
     m_Handlers.Clear();
 }
 
     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);
+       }
+    
+    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;
+    }
+#endif
+
+    url.Replace(g_nativePathString, g_unixPathString);
+    url.Replace(wxT("%"), wxT("%25"));
+    url.Replace(wxT(":"), wxT("%3A"));
+    url = wxT("file:") + url;
+    return url;
+}

 
 
 ///// Module:
 
 
 ///// Module:


@@ -439,12 +503,52 @@ class wxFileSystemModule : public wxModule
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);
         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;
         }
         virtual void OnExit()
             return TRUE;
         }
         virtual void OnExit()

-       {
+        {
+        #if wxUSE_MIMETYPE
+            delete [] gs_FSMimeFallbacks;
+        #endif

             wxFileSystem::CleanUpHandlers();
             wxFileSystem::CleanUpHandlers();

-       }
+        }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)