Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-05-13 08:57:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 323211 convert mailnews/import to nsIFile Part 1. r=bienvenu,sr=mscott

Browse Source
This commit is contained in:
bugzilla%standard8.demon.co.uk 2006-04-23 09:16:17 +00:00
parent a48bde01fe
commit b80a031b38
8 changed files with 273 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailnews/import/eudora/src/nsEudoraImport.cpp
View File

@ -164,7 +164,7 @@ public:
NS_IMETHOD FindAddressBooks(nsIFileSpec *location, nsISupportsArray **_retval);
/* nsISupports GetFieldMap (in nsIImportABDescriptor source); */
NS_IMETHOD InitFieldMap(nsIFileSpec *location, nsIImportFieldMap *fieldMap)
NS_IMETHOD InitFieldMap(nsIImportFieldMap *fieldMap)
{ return( NS_ERROR_FAILURE); }
/* void ImportAddressBook (in nsIImportABDescriptor source, in nsIAddrDatabase destination, in nsIImportFieldMap fieldMap, in boolean isAddrLocHome, out wstring errorLog, out wstring successLog, out boolean fatalError); */

2
mailnews/import/oexpress/nsOEImport.cpp
View File

@ -151,7 +151,7 @@ public:
NS_IMETHOD FindAddressBooks(nsIFileSpec *location, nsISupportsArray **_retval);
/* nsISupports InitFieldMap(nsIFileSpec *location, nsIImportFieldMap *fieldMap); */
NS_IMETHOD InitFieldMap(nsIFileSpec *location, nsIImportFieldMap *fieldMap)
NS_IMETHOD InitFieldMap(nsIImportFieldMap *fieldMap)
{ return( NS_ERROR_FAILURE); }
/* void ImportAddressBook (in nsIImportABDescriptor source, in nsIAddrDatabase destination, in nsIImportFieldMap fieldMap, in boolean isAddrLocHome, out wstring errorLog, out wstring successLog, out boolean fatalError); */

2
mailnews/import/outlook/src/nsOutlookImport.cpp
View File

@ -151,7 +151,7 @@ public:
NS_IMETHOD FindAddressBooks(nsIFileSpec *location, nsISupportsArray **_retval);
/* nsISupports GetFieldMap (in nsIImportABDescriptor source); */
NS_IMETHOD InitFieldMap(nsIFileSpec *location, nsIImportFieldMap *fieldMap)
NS_IMETHOD InitFieldMap(nsIImportFieldMap *fieldMap)
{ return( NS_ERROR_FAILURE); }
/* void ImportAddressBook (in nsIImportABDescriptor source, in nsIAddrDatabase destination, in nsIImportFieldMap fieldMap, in boolean isAddrLocHome, out wstring errorLog, out wstring successLog, out boolean fatalError); */

4
mailnews/import/public/nsIImportAddressBooks.idl
View File

@ -82,7 +82,7 @@ interface nsIOutputStream;
interface nsIAddrDatabase;
interface nsIImportFieldMap;
[scriptable, uuid(3fe29be0-3539-11d3-a206-00a0cc26da63)]
[scriptable, uuid(a246918c-f209-4da0-9cf7-3a2f2eab8342)]
interface nsIImportAddressBooks : nsISupports
{
@ -131,7 +131,7 @@ interface nsIImportAddressBooks : nsISupports
Fill in defaults (if any) for a field map for importing address
books from this location.
*/
void InitFieldMap( in nsIFileSpec location, in nsIImportFieldMap fieldMap);
void InitFieldMap(in nsIImportFieldMap fieldMap);
/*
Import a specific mailbox into the destination file supplied. If an error

4
mailnews/import/src/nsImportAddressBooks.cpp
View File

@ -483,8 +483,8 @@ void nsImportGenericAddressBooks::GetDefaultFieldMap( void)
rv = m_pFieldMap->GetNumMozFields( &sz);
if (NS_SUCCEEDED( rv))
rv = m_pFieldMap->DefaultFieldMap( sz);
if (NS_SUCCEEDED( rv))
rv = m_pInterface->InitFieldMap( m_pLocation, m_pFieldMap);
if (NS_SUCCEEDED( rv))
rv = m_pInterface->InitFieldMap(m_pFieldMap);
if (NS_FAILED( rv)) {
IMPORT_LOG0( "*** Error: Unable to initialize field map\n");
NS_IF_RELEASE( m_pFieldMap);

397
mailnews/import/text/src/nsTextAddress.cpp
View File

@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
@ -21,6 +21,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Mark Banner <bugzilla@standard8.demon.co.uk>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
@ -39,8 +40,13 @@
#include "nsTextAddress.h"
#include "nsIAddrDatabase.h"
#include "nsNativeCharsetUtils.h"
#include "nsIFile.h"
#include "nsIInputStream.h"
#include "nsILineInputStream.h"
#include "nsNetUtil.h"
#include "TextDebugLog.h"
#include "plstr.h"
#define kWhitespace " \t\b\r\n"
@ -57,164 +63,156 @@ nsTextAddress::nsTextAddress()
nsTextAddress::~nsTextAddress()
{
NS_IF_RELEASE( m_database);
NS_IF_RELEASE( m_fieldMap);
NS_IF_RELEASE(m_database);
NS_IF_RELEASE(m_fieldMap);
}
nsresult nsTextAddress::ImportAddresses( PRBool *pAbort, const PRUnichar *pName, nsIFileSpec *pSrc, nsIAddrDatabase *pDb, nsIImportFieldMap *fieldMap, nsString& errors, PRUint32 *pProgress)
nsresult nsTextAddress::ImportAddresses(PRBool *pAbort, const PRUnichar *pName, nsIFile *pSrc, nsIAddrDatabase *pDb, nsIImportFieldMap *fieldMap, nsString& errors, PRUint32 *pProgress)
{
// Open the source file for reading, read each line and process it!
NS_IF_RELEASE( m_database);
NS_IF_RELEASE( m_fieldMap);
m_database = pDb;
m_fieldMap = fieldMap;
NS_ADDREF( m_fieldMap);
NS_ADDREF( m_database);
// Open the source file for reading, read each line and process it!
NS_IF_RELEASE(m_database);
NS_IF_RELEASE(m_fieldMap);
m_database = pDb;
m_fieldMap = fieldMap;
NS_ADDREF(m_fieldMap);
NS_ADDREF(m_database);
nsresult rv = pSrc->OpenStreamForReading();
if (NS_FAILED( rv)) {
IMPORT_LOG0( "*** Error opening address file for reading\n");
return( rv);
}
char *pLine = new char[kTextAddressBufferSz];
PRBool eof = PR_FALSE;
rv = pSrc->Eof( &eof);
if (NS_FAILED( rv)) {
IMPORT_LOG0( "*** Error checking address file for eof\n");
pSrc->CloseStream();
return( rv);
}
PRInt32 loc;
PRInt32 lineLen = 0;
PRBool skipRecord = PR_FALSE;
nsCOMPtr<nsIInputStream> inputStream;
nsresult rv = NS_NewLocalFileInputStream(getter_AddRefs(inputStream), pSrc);
if (NS_FAILED(rv)) {
IMPORT_LOG0( "*** Error opening address file for reading\n");
return rv;
}
rv = m_fieldMap->GetSkipFirstRecord(&skipRecord);
// Here we use this to work out the size of the file, so we can update
// an integer as we go through the file which will update a progress
// bar if required by the caller.
PRUint32 bytesLeft = 0;
rv = inputStream->Available(&bytesLeft);
if (NS_FAILED(rv)) {
IMPORT_LOG0( "*** Error checking address file for size\n");
inputStream->Close();
return rv;
}
PRUint32 totalBytes = bytesLeft;
PRBool skipRecord = PR_FALSE;
rv = m_fieldMap->GetSkipFirstRecord(&skipRecord);
if (NS_FAILED(rv)) {
IMPORT_LOG0("*** Error checking to see if we should skip the first record\n");
return rv;
}
nsCOMPtr<nsILineInputStream> lineStream(do_QueryInterface(inputStream, &rv));
NS_ENSURE_SUCCESS(rv, rv);
PRBool more = PR_TRUE;
nsXPIDLCString line;
// Skip the first record if the user has requested it.
if (skipRecord)
rv = ReadRecord(lineStream, line, m_delim, &more);
while (!(*pAbort) && more && NS_SUCCEEDED( rv)) {
// Read the line in
rv = ReadRecord(lineStream, line, m_delim, &more);
if (NS_SUCCEEDED(rv)) {
// Now proces it to add it to the database
rv = ProcessLine(line.get(), line.Length(), errors);
if (NS_FAILED(rv)) {
IMPORT_LOG0( "*** Error processing text record.\n");
}
}
if (NS_SUCCEEDED(rv) && pProgress) {
// This won't be totally accurate, but its the best we can do
// considering that lineStream won't give us how many bytes
// are actually left.
bytesLeft -= line.Length();
*pProgress = totalBytes - bytesLeft;
}
}
inputStream->Close();
if (NS_FAILED(rv)) {
IMPORT_LOG0( "*** Error reading the address book - probably incorrect ending\n");
return NS_ERROR_FAILURE;
}
return pDb->Commit(nsAddrDBCommitType::kLargeCommit);
}
nsresult nsTextAddress::ReadRecord(nsILineInputStream *aLineStream, nsCString &aLine, char delim, PRBool *aMore)
{
PRBool more = PR_TRUE;
PRUint32 numQuotes = 0;
nsresult rv;
nsXPIDLCString line;
// ensure aLine is empty
aLine.Truncate();
do {
if (!more) {
// No more, so we must have an incorrect file.
rv = NS_ERROR_FAILURE;
}
else {
// Read the line and append it
rv = aLineStream->ReadLine(line, &more);
if (NS_SUCCEEDED(rv)) {
aLine += line;
numQuotes += line.CountChar('"');
}
}
// Continue whilst everything is ok, and we have an odd number of quotes.
} while (NS_SUCCEEDED(rv) && (numQuotes % 2 != 0));
*aMore = more;
return rv;
}
nsresult nsTextAddress::ReadRecordNumber(nsIFile *aSrc, nsCString &aLine, char delim, PRInt32 rNum)
{
nsCOMPtr<nsIInputStream> inputStream;
nsresult rv = NS_NewLocalFileInputStream(getter_AddRefs(inputStream), aSrc);
if (NS_FAILED(rv)) {
IMPORT_LOG0( "*** Error opening address file for reading\n");
return rv;
}
PRInt32 rIndex = 0;
PRUint32 bytesLeft = 0;
rv = inputStream->Available(&bytesLeft);
if (NS_FAILED(rv)) {
IMPORT_LOG0( "*** Error checking address file for eof\n");
inputStream->Close();
return rv;
}
nsCOMPtr<nsILineInputStream> lineStream(do_QueryInterface(inputStream, &rv));
NS_ENSURE_SUCCESS(rv, rv);
PRBool more = PR_TRUE;
while (more && (rIndex <= rNum)) {
rv = ReadRecord(lineStream, aLine, delim, &more);
if (NS_FAILED(rv)) {
IMPORT_LOG0("*** Error checking to see if we should skip the first record\n");
inputStream->Close();
return rv;
}
// Skip the first record if the user has requested it.
if (skipRecord)
rv = ReadRecord( pSrc, pLine, kTextAddressBufferSz, m_delim, &lineLen);
while (!(*pAbort) && !eof && NS_SUCCEEDED( rv)) {
rv = pSrc->Tell( &loc);
if (NS_SUCCEEDED( rv) && pProgress)
*pProgress = (PRUint32)loc;
rv = ReadRecord( pSrc, pLine, kTextAddressBufferSz, m_delim, &lineLen);
if (NS_SUCCEEDED( rv)) {
rv = ProcessLine( pLine, strlen( pLine), errors);
if (NS_FAILED( rv)) {
IMPORT_LOG0( "*** Error processing text record.\n");
}
else
rv = pSrc->Eof( &eof);
}
}
rv = pSrc->CloseStream();
delete [] pLine;
if (!eof) {
IMPORT_LOG0( "*** Error reading the address book, didn't reach the end\n");
return( NS_ERROR_FAILURE);
}
rv = pDb->Commit(nsAddrDBCommitType::kLargeCommit);
return rv;
}
nsresult nsTextAddress::ReadRecord( nsIFileSpec *pSrc, char *pLine, PRInt32 bufferSz, char delim, PRInt32 *pLineLen)
{
PRBool wasTruncated;
PRBool isEof;
char * pRead;
PRInt32 lineLen = 0;
nsresult rv;
do {
if (lineLen) {
if ((lineLen + 2) < bufferSz) {
memcpy( pLine + lineLen, "\x0D\x0A", 2);
lineLen += 2;
pLine[lineLen] = 0;
}
}
wasTruncated = PR_FALSE;
pRead = pLine;
pRead += lineLen;
pSrc->Eof(&isEof);
if (isEof)
// If we get an EOF here, then the line isn't complete
// so we must have an incorrect file.
rv = NS_ERROR_FAILURE;
else
{
rv = pSrc->ReadLine( &pRead, bufferSz - lineLen, &wasTruncated);
if (wasTruncated) {
pLine[bufferSz - 1] = 0;
IMPORT_LOG0( "Unable to read line from file, buffer too small\n");
rv = NS_ERROR_FAILURE;
}
else if (NS_SUCCEEDED( rv)) {
lineLen = strlen( pLine);
}
}
} while (NS_SUCCEEDED( rv) && !IsLineComplete( pLine, lineLen));
*pLineLen = lineLen;
return( rv);
}
nsresult nsTextAddress::ReadRecordNumber( nsIFileSpec *pSrc, char *pLine, PRInt32 bufferSz, char delim, PRInt32 *pLineLen, PRInt32 rNum)
{
PRInt32 rIndex = 0;
nsresult rv = pSrc->Seek( 0);
if (NS_FAILED( rv))
return( rv);
PRBool eof = PR_FALSE;
while (!eof && (rIndex <= rNum)) {
if (NS_FAILED( rv = ReadRecord( pSrc, pLine, bufferSz, delim, pLineLen)))
return( rv);
if (rIndex == rNum)
return( NS_OK);
rIndex++;
rv = pSrc->Eof( &eof);
if (NS_FAILED( rv))
return( rv);
if (rIndex == rNum) {
inputStream->Close();
return NS_OK;
}
return( NS_ERROR_FAILURE);
}
rIndex++;
}
/*
Find out if the given line appears to be a complete record or
if it needs more data because the line ends with a quoted value non-terminated
*/
PRBool nsTextAddress::IsLineComplete( const char *pLine, PRInt32 len)
{
PRBool quoted = PR_FALSE;
while (len) {
if ((*pLine == '"')) {
quoted = !quoted;
}
pLine++;
len--;
}
return !quoted;
return NS_ERROR_FAILURE;
}
PRInt32 nsTextAddress::CountFields( const char *pLine, PRInt32 maxLen, char delim)
@ -362,7 +360,6 @@ PRBool nsTextAddress::GetField( const char *pLine, PRInt32 maxLen, PRInt32 index
return( result);
}
void nsTextAddress::SanitizeSingleLine( nsCString& val)
{
val.ReplaceSubstring( "\x0D\x0A", ", ");
@ -370,63 +367,63 @@ void nsTextAddress::SanitizeSingleLine( nsCString& val)
val.ReplaceChar( 10, ' ');
}
nsresult nsTextAddress::DetermineDelim( nsIFileSpec *pSrc)
nsresult nsTextAddress::DetermineDelim(nsIFile *aSrc)
{
nsresult rv = pSrc->OpenStreamForReading();
if (NS_FAILED( rv)) {
IMPORT_LOG0( "*** Error opening address file for reading\n");
return( rv);
}
char *pLine = new char[kTextAddressBufferSz];
PRBool eof = PR_FALSE;
rv = pSrc->Eof( &eof);
if (NS_FAILED( rv)) {
IMPORT_LOG0( "*** Error checking address file for eof\n");
pSrc->CloseStream();
return( rv);
}
PRBool wasTruncated = PR_FALSE;
PRInt32 lineLen = 0;
PRInt32 lineCount = 0;
PRInt32 tabCount = 0;
PRInt32 commaCount = 0;
PRInt32 tabLines = 0;
PRInt32 commaLines = 0;
nsCOMPtr<nsIInputStream> inputStream;
nsresult rv = NS_NewLocalFileInputStream(getter_AddRefs(inputStream), aSrc);
if (NS_FAILED(rv)) {
IMPORT_LOG0( "*** Error opening address file for reading\n");
return rv;
}
while (!eof && NS_SUCCEEDED( rv) && (lineCount < 100)) {
wasTruncated = PR_FALSE;
rv = pSrc->ReadLine( &pLine, kTextAddressBufferSz, &wasTruncated);
if (wasTruncated)
pLine[kTextAddressBufferSz - 1] = 0;
if (NS_SUCCEEDED( rv)) {
lineLen = strlen( pLine);
tabCount = CountFields( pLine, lineLen, 9);
commaCount = CountFields( pLine, lineLen, ',');
if (tabCount > commaCount)
tabLines++;
else if (commaCount)
commaLines++;
rv = pSrc->Eof( &eof);
}
lineCount++;
}
char *pLine = new char[kTextAddressBufferSz];
PRUint32 bytesLeft = 0;
rv = inputStream->Available(&bytesLeft);
if (NS_FAILED( rv)) {
IMPORT_LOG0( "*** Error checking address file for eof\n");
inputStream->Close();
return rv;
}
rv = pSrc->CloseStream();
delete [] pLine;
if (tabLines > commaLines)
m_delim = 9;
else
m_delim = ',';
PRUint32 left;
PRInt32 lineLen = 0;
PRInt32 lineCount = 0;
PRInt32 tabCount = 0;
PRInt32 commaCount = 0;
PRInt32 tabLines = 0;
PRInt32 commaLines = 0;
return( NS_OK);
while (bytesLeft && NS_SUCCEEDED(rv) && (lineCount < 100)) {
left = 0;
rv = inputStream->Read(pLine, kTextAddressBufferSz, &left);
if (left)
pLine[kTextAddressBufferSz - 1] = 0;
if (NS_SUCCEEDED(rv)) {
lineLen = strlen(pLine);
tabCount = CountFields(pLine, lineLen, 9);
commaCount = CountFields(pLine, lineLen, ',');
if (tabCount > commaCount)
tabLines++;
else if (commaCount)
commaLines++;
rv = inputStream->Available(&bytesLeft);
}
lineCount++;
}
rv = inputStream->Close();
delete [] pLine;
if (tabLines > commaLines)
m_delim = 9;
else
m_delim = ',';
return rv;
}
/*
This is where the real work happens!
Go through the field map and set the data in a new database row

35
mailnews/import/text/src/nsTextAddress.h
View File

@ -21,6 +21,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Mark Banner <bugzilla@standard8.demon.co.uk>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
@ -41,11 +42,13 @@
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsIFileSpec.h"
#include "nsIImportFieldMap.h"
#include "nsIImportService.h"
class nsIAddrDatabase;
class nsIFile;
class nsIInputStream;
class nsILineInputStream;
/////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////
@ -56,28 +59,26 @@ public:
nsTextAddress();
virtual ~nsTextAddress();
nsresult ImportAddresses( PRBool *pAbort, const PRUnichar *pName, nsIFileSpec *pSrc, nsIAddrDatabase *pDb, nsIImportFieldMap *fieldMap, nsString& errors, PRUint32 *pProgress);
nsresult ImportAddresses(PRBool *pAbort, const PRUnichar *pName, nsIFile *pSrc, nsIAddrDatabase *pDb, nsIImportFieldMap *fieldMap, nsString& errors, PRUint32 *pProgress);
nsresult DetermineDelim( nsIFileSpec *pSrc);
char GetDelim( void) { return( m_delim);}
nsresult DetermineDelim(nsIFile *pSrc);
char GetDelim( void) { return( m_delim);}
static nsresult ReadRecordNumber( nsIFileSpec *pSrc, char *pLine, PRInt32 bufferSz, char delim, PRInt32 *pLineLen, PRInt32 rNum);
static nsresult ReadRecord( nsIFileSpec *pSrc, char *pLine, PRInt32 bufferSz, char delim, PRInt32 *pLineLen);
static PRBool GetField( const char *pLine, PRInt32 maxLen, PRInt32 index, nsCString& field, char delim);
static nsresult ReadRecordNumber(nsIFile *pSrc, nsCString &aLine, char delim, PRInt32 rNum);
static PRBool GetField(const char *pLine, PRInt32 maxLen, PRInt32 index, nsCString& field, char delim);
private:
nsresult ProcessLine( const char *pLine, PRInt32 len, nsString& errors);
nsresult ProcessLine(const char *pLine, PRInt32 len, nsString& errors);
static PRBool IsLineComplete( const char *pLine, PRInt32 len);
static PRInt32 CountFields( const char *pLine, PRInt32 maxLen, char delim);
static void SanitizeSingleLine( nsCString& val);
static PRInt32 CountFields(const char *pLine, PRInt32 maxLen, char delim);
static void SanitizeSingleLine( nsCString& val);
static nsresult ReadRecord(nsILineInputStream *pSrc, nsCString &aLine, char delim, PRBool *aMore);
private:
char m_delim;
PRInt32 m_LFCount;
PRInt32 m_CRCount;
nsIAddrDatabase * m_database;
nsIImportFieldMap * m_fieldMap;
char m_delim;
PRInt32 m_LFCount;
PRInt32 m_CRCount;
nsIAddrDatabase *m_database;
nsIImportFieldMap *m_fieldMap;
nsCOMPtr<nsIImportService> m_pService;
};

123
mailnews/import/text/src/nsTextImport.cpp
View File

@ -75,6 +75,8 @@
#include "nsXPIDLString.h"
#include "nsProxiedService.h"
#include "TextDebugLog.h"
#include "nsIFileSpec.h"
#include "nsNetUtil.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
PRLogModuleInfo* TEXTIMPORTLOGMODULE;
@ -83,7 +85,6 @@ class ImportAddressImpl : public nsIImportAddressBooks
{
public:
ImportAddressImpl();
virtual ~ImportAddressImpl();
static nsresult Create(nsIImportAddressBooks** aImport);
@ -107,8 +108,8 @@ public:
/* nsISupportsArray FindAddressBooks (in nsIFileSpec location); */
NS_IMETHOD FindAddressBooks(nsIFileSpec *location, nsISupportsArray **_retval);
/* nsISupports InitFieldMap(nsIFileSpec location, nsIImportFieldMap fieldMap); */
NS_IMETHOD InitFieldMap(nsIFileSpec *location, nsIImportFieldMap *fieldMap);
/* nsISupports InitFieldMap(nsIImportFieldMap fieldMap); */
NS_IMETHOD InitFieldMap(nsIImportFieldMap *fieldMap);
/* void ImportAddressBook (in nsIImportABDescriptor source, in nsIAddrDatabase destination, in nsIImportFieldMap fieldMap, in boolean isAddrLocHome, out wstring errorLog, out wstring successLog, out boolean fatalError); */
NS_IMETHOD ImportAddressBook( nsIImportABDescriptor *source,
@ -136,11 +137,11 @@ private:
static void SanitizeSampleData( nsCString& val);
private:
nsTextAddress m_text;
PRBool m_haveDelim;
nsIFileSpec * m_fileLoc;
char m_delim;
PRUint32 m_bytesImported;
nsTextAddress m_text;
PRBool m_haveDelim;
nsCOMPtr<nsILocalFile> m_fileLoc;
char m_delim;
PRUint32 m_bytesImported;
};
@ -270,24 +271,9 @@ nsresult ImportAddressImpl::Create(nsIImportAddressBooks** aImport)
ImportAddressImpl::ImportAddressImpl()
{
m_fileLoc = nsnull;
m_haveDelim = PR_FALSE;
}
ImportAddressImpl::~ImportAddressImpl()
{
if (m_fileLoc) {
PRBool open = PR_FALSE;
m_fileLoc->IsStreamOpen( &open);
if (open)
m_fileLoc->CloseStream();
NS_RELEASE( m_fileLoc);
}
}
NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
@ -344,7 +330,16 @@ NS_IMETHODIMP ImportAddressImpl::FindAddressBooks(nsIFileSpec *pLoc, nsISupports
if (NS_FAILED( rv) || !isFile)
return( NS_ERROR_FAILURE);
rv = m_text.DetermineDelim( pLoc);
// XXX this should just be passed in as an nsIFile.
nsFileSpec spec;
rv = pLoc->GetFileSpec(&spec);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsILocalFile> fileLocation;
rv = NS_FileSpecToIFile(&spec, getter_AddRefs(fileLocation));
NS_ENSURE_SUCCESS(rv, rv);
rv = m_text.DetermineDelim(fileLocation);
if (NS_FAILED( rv)) {
IMPORT_LOG0( "*** Error determining delimitter\n");
@ -353,8 +348,7 @@ NS_IMETHODIMP ImportAddressImpl::FindAddressBooks(nsIFileSpec *pLoc, nsISupports
m_haveDelim = PR_TRUE;
m_delim = m_text.GetDelim();
m_fileLoc = pLoc;
NS_ADDREF( m_fileLoc);
m_fileLoc = fileLocation;
/* Build an address book descriptor based on the file passed in! */
nsCOMPtr<nsISupportsArray> array;
@ -550,7 +544,7 @@ NS_IMETHODIMP ImportAddressImpl::ImportAddressBook( nsIImportABDescriptor *pSour
return NS_ERROR_FAILURE;
}
else {
rv = m_text.ImportAddresses( &addrAbort, name.get(), inFileSpec, pDestination, fieldMap, error, &m_bytesImported);
rv = m_text.ImportAddresses( &addrAbort, name.get(), inFile, pDestination, fieldMap, error, &m_bytesImported);
SaveFieldMap( fieldMap);
}
@ -638,47 +632,36 @@ NS_IMETHODIMP ImportAddressImpl::GetSampleData( PRInt32 index, PRBool *pFound, P
nsresult rv;
*pStr = nsnull;
PRBool open = PR_FALSE;
PRUnichar term = 0;
if (!m_haveDelim) {
rv = m_fileLoc->IsStreamOpen( &open);
if (open) {
m_fileLoc->CloseStream();
open = PR_FALSE;
}
rv = m_text.DetermineDelim( m_fileLoc);
if (NS_FAILED( rv))
return( rv);
rv = m_text.DetermineDelim(m_fileLoc);
NS_ENSURE_SUCCESS(rv, rv);
m_haveDelim = PR_TRUE;
m_delim = m_text.GetDelim();
}
else {
rv = m_fileLoc->IsStreamOpen( &open);
}
if (!open) {
rv = m_fileLoc->OpenStreamForReading();
if (NS_FAILED( rv)) {
*pFound = PR_FALSE;
*pStr = nsCRT::strdup( &term);
return( NS_OK);
}
}
PRBool fileExists;
rv = m_fileLoc->Exists(&fileExists);
NS_ENSURE_SUCCESS(rv, rv);
if (!fileExists) {
*pFound = PR_FALSE;
*pStr = nsCRT::strdup(&term);
return NS_OK;
}
PRInt32 lineLen;
PRInt32 bufSz = 10240;
char *pLine = new char[bufSz];
nsXPIDLCString line;
nsCOMPtr<nsIImportService> impSvc(do_GetService(NS_IMPORTSERVICE_CONTRACTID, &rv));
rv = nsTextAddress::ReadRecordNumber( m_fileLoc, pLine, bufSz, m_delim, &lineLen, index);
rv = nsTextAddress::ReadRecordNumber(m_fileLoc, line, m_delim, index);
if (NS_SUCCEEDED( rv)) {
nsString str;
nsCString field;
nsString uField;
PRInt32 fNum = 0;
while (nsTextAddress::GetField( pLine, lineLen, fNum, field, m_delim)) {
while (nsTextAddress::GetField(line.get(), line.Length(), fNum, field, m_delim)) {
if (fNum)
str.AppendLiteral("\n");
SanitizeSampleData( field);
@ -702,37 +685,33 @@ NS_IMETHODIMP ImportAddressImpl::GetSampleData( PRInt32 index, PRBool *pFound, P
*pStr = nsCRT::strdup( &term);
}
delete [] pLine;
return( NS_OK);
return NS_OK;
}
NS_IMETHODIMP ImportAddressImpl::SetSampleLocation( nsIFileSpec *pLocation)
NS_IMETHODIMP ImportAddressImpl::SetSampleLocation(nsIFileSpec *pLocation)
{
NS_IF_RELEASE( m_fileLoc);
NS_ENSURE_ARG_POINTER(pLocation);
// XXX this should just be passed in as an nsIFile.
nsFileSpec spec;
nsresult rv = pLocation->GetFileSpec(&spec);
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_FileSpecToIFile(&spec, getter_AddRefs(m_fileLoc));
NS_ENSURE_SUCCESS(rv, rv);
m_haveDelim = PR_FALSE;
m_fileLoc = pLocation;
NS_IF_ADDREF( m_fileLoc);
return( NS_OK);
return NS_OK;
}
void ImportAddressImpl::ClearSampleFile( void)
{
if (m_fileLoc) {
PRBool open = PR_FALSE;
m_fileLoc->IsStreamOpen( &open);
if (open)
m_fileLoc->CloseStream();
NS_RELEASE( m_fileLoc);
m_fileLoc = nsnull;
m_haveDelim = PR_FALSE;
}
m_fileLoc = nsnull;
m_haveDelim = PR_FALSE;
}
NS_IMETHODIMP ImportAddressImpl::InitFieldMap(nsIFileSpec *location, nsIImportFieldMap *fieldMap)
NS_IMETHODIMP ImportAddressImpl::InitFieldMap(nsIImportFieldMap *fieldMap)
{
// Let's remember the last one the user used!
// This should be normal for someone importing multiple times, it's usually