Cleanup

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index eb9bae9f39a5b037afb79ea83cc1dc4c92068157..28593b36f56ccaf63747891ffea36435c7e12106 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -1,239 +1,213 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        textfile.cpp
+// Name:        src/common/textfile.cpp

 // Purpose:     implementation of wxTextFile class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     implementation of wxTextFile class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // headers
 // ============================================================================
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // headers
 // ============================================================================
 

-#ifdef __GNUG__
-#pragma implementation "textfile.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "textfile.h"

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

-  #pragma hdrstop
+    #pragma hdrstop

 #endif  //__BORLANDC__
 
 #endif  //__BORLANDC__
 

-#include  <wx/string.h>
-#include  <wx/intl.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-#include  <wx/textfile.h>
+#if !wxUSE_FILE || !wxUSE_TEXTBUFFER
+    #undef wxUSE_TEXTFILE
+    #define wxUSE_TEXTFILE 0
+#endif // wxUSE_FILE

 
 

-// ============================================================================
-// wxTextFile class implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// static variables
-// ----------------------------------------------------------------------------
+#if wxUSE_TEXTFILE

 
 

-// default type is the native one
-const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
-#if   defined(__WXMSW__)
-  Type_Dos;
-#elif defined(__UNIX__)
-  Type_Unix;
-#elif defined(__MAC__)
-  Type_Mac;
-  // if you feel brave, remove the next line
-  #error  "wxTextFile: code for Mac files is untested."
-#else
-  Type_None;
-  #error  "wxTextFile: unsupported platform."
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/file.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

+#include "wx/textfile.h"
+#include "wx/filename.h"

 
 

-// ----------------------------------------------------------------------------
-// ctors & dtor
-// ----------------------------------------------------------------------------
+// ============================================================================
+// wxTextFile class implementation
+// ============================================================================

 
 

-wxTextFile::wxTextFile(const wxString& strFile) : m_strFile(strFile)
+wxTextFile::wxTextFile(const wxString& strFileName)
+          : wxTextBuffer(strFileName)

 {
 }
 
 {
 }
 

-wxTextFile::~wxTextFile()
-{
-  // m_file dtor called automatically
-}

 
 // ----------------------------------------------------------------------------
 // file operations
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // file operations
 // ----------------------------------------------------------------------------
 

-bool wxTextFile::Open(const wxString& strFile)
+bool wxTextFile::OnExists() const

 {
 {

-  m_strFile = strFile;
-  return Open();
+    return wxFile::Exists(m_strBufferName);

 }
 
 }
 

-bool wxTextFile::Open()
+
+bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode OpenMode)

 {
 {

-  // file name must be either given in ctor or in Open(const wxString&)
-  wxASSERT( !m_strFile.IsEmpty() );
+    wxFile::OpenMode FileOpenMode;

 
 

-  // open file in read-only mode
-  if ( !m_file.Open(m_strFile) )
-    return FALSE;
+    switch ( OpenMode )
+    {
+        default:
+            wxFAIL_MSG( _T("unknown open mode in wxTextFile::Open") );
+            // fall through

 
 

-  // read file into memory
-  bool bRet = Read();
+        case ReadAccess :
+            FileOpenMode = wxFile::read;
+            break;

 
 

-  m_file.Close();
+        case WriteAccess :
+            FileOpenMode = wxFile::write;
+            break;
+    }

 
 

-  return bRet;
+    return m_file.Open(strBufferName.c_str(), FileOpenMode);

 }
 
 }
 

-// analyse some lines of the file trying to guess it's type.
-// if it fails, it assumes the native type for our platform.
-wxTextFile::Type wxTextFile::GuessType() const
+
+bool wxTextFile::OnClose()

 {
 {

-  // file should be opened and we must be in it's beginning
-  wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
-
-  // scan the file lines
-  uint nUnix = 0,     // number of '\n's alone
-       nDos  = 0,     // number of '\r\n'
-       nMac  = 0;     // number of '\r's
-
-  // we take MAX_LINES_SCAN in the beginning, middle and the end of file
-  #define MAX_LINES_SCAN    (10)
-  uint nCount = m_aLines.Count() / 3,
-       nScan =  nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3;
-
-  #define   AnalyseLine(n)              \
-    switch ( m_aTypes[n] ) {            \
-      case Type_Unix: nUnix++; break;   \
-      case Type_Dos:  nDos++;  break;   \
-      case Type_Mac:  nMac++;  break;   \
-      default: wxFAIL_MSG("unknown line terminator"); \
-    }
+    return m_file.Close();
+}

 
 

-  uint n;
-  for ( n = 0; n < nScan; n++ )     // the beginning
-    AnalyseLine(n);
-  for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )
-    AnalyseLine(n);
-  for ( n = nCount - nScan; n < nCount; n++ )
-    AnalyseLine(n);
-
-  #undef   AnalyseLine
-
-  // interpret the results (@@ far from being even 50% fool proof)
-  if ( nDos + nUnix + nMac == 0 ) {
-    // no newlines at all
-    wxLogWarning("'%s' is probably a binary file.", m_strFile.c_str());
-  }
-  else {
-    #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
-                                                : n##t1 > n##t2 ? Type_##t1 \
-                                                                : Type_##t2
-
-    if ( nDos > nUnix )
-      return GREATER_OF(Dos, Mac);
-    else if ( nDos < nUnix )
-      return GREATER_OF(Unix, Mac);
-    else {
-      // nDos == nUnix
-      return nMac > nDos ? Type_Mac : typeDefault;
-    }

 
 

-    #undef    GREATER_OF
-  }
+bool wxTextFile::OnRead(wxMBConv& conv)
+{
+    // file should be opened and we must be in it's beginning
+    wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
+
+    char *strBuf, *strPtr, *strEnd;
+    char ch, chLast = '\0';
+    char buf[1024];
+    int n, nRead;
+
+    strPtr = strBuf = new char[1024];
+    strEnd = strBuf + 1024;
+
+    do 
+    {
+        nRead = m_file.Read(buf, WXSIZEOF(buf));
+        if ( nRead == wxInvalidOffset ) 
+        {
+            // read error (error message already given in wxFile::Read)
+            delete[] strBuf;
+            return FALSE;
+        }
+
+        for (n = 0; n < nRead; n++)
+        {
+            ch = buf[n];
+            switch ( ch ) 
+            {
+                case '\n':
+                    // Dos/Unix line termination
+                    *strPtr = '\0';
+                    AddLine(wxString(strBuf, conv), 
+                            chLast == '\r' ? wxTextFileType_Dos
+                                           : wxTextFileType_Unix);
+                    strPtr = strBuf;
+                    chLast = '\n';
+                    break;
+
+                case '\r':
+                    if ( chLast == '\r' ) 
+                    {
+                        // Mac empty line
+                        AddLine(wxEmptyString, wxTextFileType_Mac);
+                    }
+                    else
+                        chLast = '\r';
+                    break;
+
+                default:
+                    if ( chLast == '\r' )
+                    {
+                        // Mac line termination
+                        *strPtr = '\0';
+                        AddLine(wxString(strBuf, conv), wxTextFileType_Mac);
+                        chLast = ch;
+                        strPtr = strBuf;
+                        *(strPtr++) = ch;
+                    }
+                    else 
+                    {
+                        // add to the current line
+                        *(strPtr++) = ch;
+                        if ( strPtr == strEnd )
+                        {
+                            // we must allocate more memory
+                            size_t size = strEnd - strBuf;
+                            char *newBuf = new char[size + 1024];
+                            memcpy(newBuf, strBuf, size);
+                            delete[] strBuf;
+                            strBuf = newBuf;
+                            strEnd = strBuf + size + 1024;
+                            strPtr = strBuf + size;
+                        }
+                    }
+            }
+        }
+    } while ( nRead == WXSIZEOF(buf) );
+
+    // anything in the last line?
+    if ( strPtr != strBuf ) 
+    {
+        *strPtr = '\0';
+        AddLine(wxString(strBuf, conv), 
+                wxTextFileType_None); // no line terminator
+    }

 
 

-  return typeDefault;
+    delete[] strBuf;
+    return TRUE;

 }
 
 }
 

-bool wxTextFile::Read()
+
+bool wxTextFile::OnWrite(wxTextFileType typeNew, wxMBConv& conv)

 {
 {

-  // file should be opened and we must be in it's beginning
-  wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
-
-  wxString str;
-  char ch, chLast = '\0';
-  char buf[1024];
-  int n, nRead;
-  while ( !m_file.Eof() ) {
-    nRead = m_file.Read(buf, WXSIZEOF(buf));
-    if ( nRead == ofsInvalid ) {
-      // read error (error message already given in wxFile::Read)
-      m_file.Close();
-      return FALSE;
-    }
+    wxFileName fn = m_strBufferName;

 
 

-    #ifdef  __MAC__
-      #pragma message("wxTextFile::Read() hasn't been tested with Mac files.")
-    #endif
-
-    for ( n = 0; n < nRead; n++ ) {
-      ch = buf[n];
-      switch ( ch ) {
-        case '\n':
-          // Dos/Unix line termination
-          m_aLines.Add(str);
-          m_aTypes.Add(chLast == '\r' ? Type_Dos : Type_Unix);
-          str.Empty();
-          chLast = '\n';
-          break;
-
-        case '\r':
-          if ( chLast == '\r' ) {
-            // Mac empty line
-            m_aLines.Add("");
-            m_aTypes.Add(Type_Mac);
-          }
-          else
-            chLast = '\r';
-          break;
+    // We do NOT want wxPATH_NORM_CASE here, or the case will not
+    // be preserved.
+    if ( !fn.IsAbsolute() )
+        fn.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE |
+                     wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG);

 
 

-        default:
-          if ( chLast == '\r' ) {
-            // Mac line termination
-            m_aLines.Add(str);
-            m_aTypes.Add(Type_Mac);
-            str = ch;
-          }
-          else {
-            // add to the current line
-            str += ch;
-          }
-      }
+    wxTempFile fileTmp(fn.GetFullPath());
+
+    if ( !fileTmp.IsOpened() ) {
+        wxLogError(_("can't write buffer '%s' to disk."), m_strBufferName.c_str());
+        return FALSE;

     }
     }

-  }

 
 

-  // anything in the last line?
-  if ( !str.IsEmpty() ) {
-    m_aTypes.Add(Type_None);  // no line terminator
-    m_aLines.Add(str);
-  }
+    size_t nCount = GetLineCount();
+    for ( size_t n = 0; n < nCount; n++ ) {
+        fileTmp.Write(GetLine(n) +
+                      GetEOL(typeNew == wxTextFileType_None ? GetLineType(n)
+                                                            : typeNew),
+                      conv);
+    }

 
 

-  return TRUE;
+    // replace the old file with this one
+    return fileTmp.Commit();

 }
 
 }
 

-bool wxTextFile::Write(Type typeNew)
-{
-  wxTempFile fileTmp(m_strFile);
+#endif // wxUSE_TEXTFILE

 
 

-  if ( !fileTmp.IsOpened() ) {
-    wxLogError("can't write file '%s' to disk.", m_strFile.c_str());
-    return FALSE;
-  }
-
-  uint nCount = m_aLines.Count();
-  for ( uint n = 0; n < nCount; n++ ) {
-    fileTmp.Write(m_aLines[n] +
-                  GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew));
-  }
-
-  // replace the old file with this one
-  return fileTmp.Commit();
-}