Update of /cvsroot/mahogany/M/src/modules/viewflt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15910/src/modules/viewflt
Modified Files:
QuoteURL.cpp
Log Message:
extracted CountQuoteLevel() function to a separate file as it's going to be
used from elsewhere than QuoteURL view filter
Index: QuoteURL.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/viewflt/QuoteURL.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -b -u -2 -r1.27 -r1.28
--- QuoteURL.cpp 20 Jan 2006 06:52:31 -0000 1.27
+++ QuoteURL.cpp 8 Apr 2006 20:56:02 -0000 1.28
@@ -42,4 +42,6 @@
#include "MTextStyle.h"
+#include "QuotedText.h"
+
#include "ColourNames.h"
@@ -70,79 +72,4 @@
// ----------------------------------------------------------------------------
-// local classes
-// ----------------------------------------------------------------------------
-
-// this struct is used by CountQuoteLevel() to store global information about
-// the message
-class QuoteData
-{
-public:
- QuoteData() { levelWrapped = 0; linePrev = NULL; }
-
- // functions for querying/setting quote prefix for the given (0-based) level
- bool HasQuoteAtLevel(size_t level) const
- {
- return m_quoteAtLevel.size() > level;
- }
-
- void SetQuoteAtLevel(size_t level, const String& s)
- {
- if ( level >= m_quoteAtLevel.size() )
- {
- ASSERT_MSG( level == m_quoteAtLevel.size(),
- _T("should set quote prefixes in order") );
-
- m_quoteAtLevel.push_back(s);
- }
- else // modify existing quote
- {
- m_quoteAtLevel[level] = s;
- }
- }
-
- const String& GetQuoteAtLevel(size_t level) const
- {
- return m_quoteAtLevel[level];
- }
-
-
- // pointer to previous line we examined
- const char *linePrev;
-
- // set to > 0 if the next line is wrapped tail of this one
- int levelWrapped;
-
-private:
- // array of quote markers for all quoting levels we have seen so far
- wxArrayString m_quoteAtLevel;
-};
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-/** Count levels of quoting on the first line of passed string.
-
- It understands standard e-mail quoting methods such as ">" and "XY>".
-
- @param string the string to check
- @param max_white max number of white characters before quotation mark
- @param max_alpha max number of A-Z characters before quotation mark
- @param quoteData global quoting data, should be saved between function
- calls
- @return number of quoting levels (0 for unquoted text)
- */
-static int
-CountQuoteLevel(const char *string,
- int max_white,
- int max_alpha,
- QuoteData& quoteData);
-
-/**
- Check if there is only whitespace until the end of line.
- */
-static bool IsBlankLine(const char *p);
-
-// ----------------------------------------------------------------------------
// QuoteURLFilter declaration
// ----------------------------------------------------------------------------
@@ -228,246 +155,4 @@
// ============================================================================
-// CountQuoteLevel implementation
-// ============================================================================
-
-bool IsBlankLine(const char *p)
-{
- for ( ;; )
- {
- switch ( *p++ )
- {
- case ' ':
- case '\t':
- case '\r':
- break;
-
- case '\n':
- case '\0':
- return true;
-
- default:
- return false;
- }
- }
-}
-
-enum LineResult
-{
- Line_Blank = -2,
- Line_Unknown = -1,
- Line_Different,
- Line_Same
-};
-
-// advance the *pp pointer if it points to the same thing as c
-static void
-UpdateLineStatus(const char *c, const char **pp, LineResult *pSameAs)
-{
- if ( *pSameAs == Line_Unknown || *pSameAs == Line_Same )
- {
- if ( **pp != *c )
- {
- *pSameAs = IsBlankLine(*pp) ? Line_Blank : Line_Different;
- }
- else
- {
- *pSameAs = Line_Same; // could have been Line_Unknown
-
- (*pp)++;
- }
- }
-}
-
-int
-CountQuoteLevel(const char *string,
- int max_white,
- int max_alpha,
- QuoteData& quoteData)
-{
- // update the previous line pointer for the next call
- const char *prev = quoteData.linePrev;
- quoteData.linePrev = string;
-
- // check if this line had been already detected as a quoted tail of the
- // previous one
- int level = quoteData.levelWrapped;
- if ( level )
- {
- quoteData.levelWrapped = 0;
- return level;
- }
-
-
- // find the beginning of the and next line
- const char *nextStart = strchr(string, '\n');
-
- // it's simpler to pretend that the next line is the same as this one
- // instead of checking for it all the time below
- const char *next = nextStart ? nextStart + 1 /* skip '\n' */ : string;
-
- if ( !prev )
- {
- // same as above for next
- prev = string;
- }
-
-
- // look at the beginning of this string and count (nested) quoting levels
- LineResult sameAsNext = Line_Unknown,
- sameAsPrev = Line_Unknown;
- const char *lastQuote = string;
- for ( const char *c = string; *c != 0 && *c != '\n'; c++, lastQuote = c )
- {
- // skip leading white space
- for ( int num_white = 0; *c == '\t' || *c == ' '; c++ )
- {
- if ( ++num_white > max_white )
- {
- // too much whitespace for this to be a quoted string
- return level;
- }
-
- UpdateLineStatus(c, &prev, &sameAsPrev);
- UpdateLineStatus(c, &next, &sameAsNext);
- }
-
- // skip optional alphanumeric prefix
- for ( int num_alpha = 0; isalpha((unsigned char)*c); c++ )
- {
- if ( ++num_alpha > max_alpha )
- {
- // prefix too long, not start of the quote
- return level;
- }
-
- UpdateLineStatus(c, &prev, &sameAsPrev);
- UpdateLineStatus(c, &next, &sameAsNext);
- }
-
- // check if we have a quoted line or not now: we consider the line to be
- // quoted if it starts with a special quoting character and if the
- // next lines starts with the same prefix as well or is blank and if the
- // previous line is similar to but not the same as this one
-
- // first check if we have a quote prefix for this level at all
- if ( !quoteData.HasQuoteAtLevel(level) )
- {
- // detect the quoting character used, and remember it for the rest of
- // the message
-
- // TODO: make the string of "quoting characters" configurable
- static const char *QUOTE_CHARS = ">|})*";
-
- // strchr would find NUL in the string so test for it separately
- if ( *c == '\0' || !strchr(QUOTE_CHARS, *c) )
- break;
-
- // '*' and '}' are too often used for other purposes, check that we
- // really have something like a whole paragraph quoted with it before
- // deciding that we really should accept it as a quoting character
- if ( (*c == '*' || *c == '}') && *next != *c )
- break;
-
- quoteData.SetQuoteAtLevel(level, String(lastQuote, c + 1));
- }
- else // we have already seen this quoting prefix
- {
- // check that we have the same prefix
- if ( wxStrncmp(lastQuote, quoteData.GetQuoteAtLevel(level),
- c - lastQuote + 1) != 0 )
- {
- // consider that '>' is always a "true" quote character...
- // otherwise we fail to recognize too many strange messages where
- // different quoting styles are used
- if ( *c != '>' )
- break;
-
- quoteData.SetQuoteAtLevel(level, String(lastQuote, c + 1));
- }
- }
-
-
- // look at what we really have in the previous/next lines
- UpdateLineStatus(c, &prev, &sameAsPrev);
- UpdateLineStatus(c, &next, &sameAsNext);
-
- // if this line has the same prefix as the previous one, it surely must
- // be a continuation of a quoted paragraph
- bool isQuoted = sameAsPrev == Line_Same;
-
- switch ( sameAsNext )
- {
- default:
- case Line_Unknown:
- FAIL_MSG( _T("logical error: unexpected sameAsNext value") );
-
- case Line_Different:
- // check for wrapped quoted lines
-
- // as this has a lot of potential for false positives, only do it
- // for the most common quoting character
- if ( !isQuoted && (!nextStart || *c != '>') )
- break;
-
- // empty or very short lines shouldn't be wrapped: this catches a
- // not uncommon case of
- //
- // > 111
- // >
- // 333
- //
- // where "333" would otherwise have been recognized as wrapped
- // quotation
- if ( next - string > 50 )
- {
- // we also check "wrapped" line is short enough
- const char *nextnext = strchr(nextStart + 1 /* skip \n */,
'\n');
- if ( !nextnext ||
- (nextnext - next > 25) ||
- (!IsBlankLine(nextnext + 1) &&
- strncmp(string, nextnext + 1, next - nextStart) != 0) )
- {
- // the line after next doesn't start with the same prefix as
- // this one so it's improbable that the next line was garbled
- // because of quoting -- chances are this line is simply not
- // quoted at all unless we had already recognized it such
- if ( !isQuoted )
- {
- // last chance: we suppose that a quoted line preceded by
- // a blank line is really quoted
- if ( sameAsPrev == Line_Blank )
- isQuoted = true;
- }
- }
- else // looks like the next line is indeed our wrapped tail
- {
- quoteData.levelWrapped = level + 1;
-
- isQuoted = true;
- }
- }
- break;
-
- case Line_Blank:
- // we probably should check here that either the previous line is
- // empty or it seems to be an attribution line (easier said than
- // done)
-
- // fall through
-
- case Line_Same:
- isQuoted = true;
- }
-
- if ( !isQuoted )
- break;
-
- level++;
- }
-
- return level;
-}
-
-// ============================================================================
// QuoteURLFilter implementation
// ============================================================================
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
