comparison data/fileio/FileSource.cpp @ 690:1424aa29ae95

Seems to be a bad idea to use plain DEBUG symbol on OS/X (system wants it)

     if (m_url.toString() == "") {
         m_url = QUrl(fileOrUrl, QUrl::TolerantMode);
     }
  
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::FileSource(" << fileOrUrl << "): url <" << m_url.toString() << ">" << endl;
+    SVDEBUG << "FileSource::FileSource(" << fileOrUrl << "): url <" << m_url.toString() << ">" << endl;
     incCount(m_url.toString());
 #endif
 
     if (!canHandleScheme(m_url)) {
-        DEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl;
+        SVDEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl;
         m_errorString = tr("Unsupported scheme in URL");
         return;
     }
 
     init();

         emit statusAvailable();
         emit ready();
     }
 
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::FileSource(string) exiting" << endl;
+    SVDEBUG << "FileSource::FileSource(string) exiting" << endl;
 #endif
 }
 
 FileSource::FileSource(QUrl url, ProgressReporter *reporter) :
     m_url(url),

     m_leaveLocalFile(false),
     m_reporter(reporter),
     m_refCounted(false)
 {
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::FileSource(" << url.toString() << ") [as url]" << endl;
+    SVDEBUG << "FileSource::FileSource(" << url.toString() << ") [as url]" << endl;
     incCount(m_url.toString());
 #endif
 
     if (!canHandleScheme(m_url)) {
-        DEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl;
+        SVDEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl;
         m_errorString = tr("Unsupported scheme in URL");
         return;
     }
 
     init();
 
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::FileSource(url) exiting" << endl;
+    SVDEBUG << "FileSource::FileSource(url) exiting" << endl;
 #endif
 }
 
 FileSource::FileSource(const FileSource &rf) :
     QObject(),

     m_leaveLocalFile(false),
     m_reporter(rf.m_reporter),
     m_refCounted(false)
 {
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]" << endl;
+    SVDEBUG << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]" << endl;
     incCount(m_url.toString());
 #endif
 
     if (!canHandleScheme(m_url)) {
-        DEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl;
+        SVDEBUG << "FileSource::FileSource: ERROR: Unsupported scheme in URL \"" << m_url.toString() << "\"" << endl;
         m_errorString = tr("Unsupported scheme in URL");
         return;
     }
 
     if (!isRemote()) {
         m_localFilename = rf.m_localFilename;
     } else {
         QMutexLocker locker(&m_mapMutex);
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::FileSource(copy ctor): ref count is "
+        SVDEBUG << "FileSource::FileSource(copy ctor): ref count is "
                   << m_refCountMap[m_url] << endl;
 #endif
         if (m_refCountMap[m_url] > 0) {
             m_refCountMap[m_url]++;
 #ifdef DEBUG_FILE_SOURCE

     }
 
     m_done = true;
 
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]: note: local filename is \"" << m_localFilename << "\"" << endl;
-#endif
-
-#ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::FileSource(copy ctor) exiting" << endl;
+    SVDEBUG << "FileSource::FileSource(" << m_url.toString() << ") [copy ctor]: note: local filename is \"" << m_localFilename << "\"" << endl;
+#endif
+
+#ifdef DEBUG_FILE_SOURCE
+    SVDEBUG << "FileSource::FileSource(copy ctor) exiting" << endl;
 #endif
 }
 
 FileSource::~FileSource()
 {

 void
 FileSource::init()
 {
     if (!isRemote()) {
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::init: Not a remote URL" << endl;
+        SVDEBUG << "FileSource::init: Not a remote URL" << endl;
 #endif
         bool literal = false;
         m_localFilename = m_url.toLocalFile();
         if (m_localFilename == "") {
             // QUrl may have mishandled the scheme (e.g. in a DOS path)

             literal = true;
         }
         m_localFilename = QFileInfo(m_localFilename).absoluteFilePath();
 
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::init: URL translates to local filename \""
+        SVDEBUG << "FileSource::init: URL translates to local filename \""
                   << m_localFilename << "\" (with literal=" << literal << ")" << endl;
 #endif
         m_ok = true;
         m_lastStatus = 200;
 
         if (!QFileInfo(m_localFilename).exists()) {
             if (literal) {
                 m_lastStatus = 404;
             } else {
 #ifdef DEBUG_FILE_SOURCE
-                DEBUG << "FileSource::init: Local file of this name does not exist, trying URL as a literal filename" << endl;
+                SVDEBUG << "FileSource::init: Local file of this name does not exist, trying URL as a literal filename" << endl;
 #endif
                 // Again, QUrl may have been mistreating us --
                 // e.g. dropping a part that looks like query data
                 m_localFilename = m_url.toString();
                 literal = true;

         return;
     }
 
     if (createCacheFile()) {
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::init: Already have this one" << endl;
+        SVDEBUG << "FileSource::init: Already have this one" << endl;
 #endif
         m_ok = true;
         if (!QFileInfo(m_localFilename).exists()) {
             m_lastStatus = 404;
         } else {

     m_localFile->open(QFile::WriteOnly);
 
     QString scheme = m_url.scheme().toLower();
 
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::init: Don't have local copy of \""
+    SVDEBUG << "FileSource::init: Don't have local copy of \""
               << m_url.toString() << "\", retrieving" << endl;
 #endif
 
     if (scheme == "http") {
         initHttp();

             // someone else has been doing the same thing at the same time,
             // but has got there first
             cleanup();
             m_refCountMap[m_url]++;
 #ifdef DEBUG_FILE_SOURCE
-            DEBUG << "FileSource::init: Another FileSource has got there first, abandoning our download and using theirs" << endl;
+            SVDEBUG << "FileSource::init: Another FileSource has got there first, abandoning our download and using theirs" << endl;
 #endif
             m_localFilename = m_remoteLocalMap[m_url];
             m_refCounted = true;
             m_ok = true;
             if (!QFileInfo(m_localFilename).exists()) {

     // appropriate...
         
     QString path = "/" + QString(m_url.toEncoded()).section('/', 3);
 
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource: path is \""
+    SVDEBUG << "FileSource: path is \""
               << path << "\"" << endl;
 #endif
         
     if (m_preferredContentType == "") {
         m_http->get(path, m_localFile);

     waitForStatus();
     bool available = true;
     if (!m_ok) available = false;
     else available = (m_lastStatus / 100 == 2);
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::isAvailable: " << (available ? "yes" : "no")
+    SVDEBUG << "FileSource::isAvailable: " << (available ? "yes" : "no")
               << endl;
 #endif
     return available;
 }
 

 
 void
 FileSource::waitForData()
 {
     while (m_ok && !m_done) {
-//        DEBUG << "FileSource::waitForData: calling QApplication::processEvents" << endl;
+//        SVDEBUG << "FileSource::waitForData: calling QApplication::processEvents" << endl;
         QCoreApplication::processEvents();
         usleep(10000);
     }
 }
 

 
 void
 FileSource::httpResponseHeaderReceived(const QHttpResponseHeader &resp)
 {
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::httpResponseHeaderReceived" << endl;
+    SVDEBUG << "FileSource::httpResponseHeaderReceived" << endl;
 #endif
 
     if (resp.statusCode() / 100 == 3) {
         QString location = resp.value("Location");
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::responseHeaderReceived: redirect to \""
+        SVDEBUG << "FileSource::responseHeaderReceived: redirect to \""
                   << location << "\" received" << endl;
 #endif
         if (location != "") {
             QUrl newUrl(location);
             if (newUrl != m_url) {

     m_lastStatus = resp.statusCode();
     if (m_lastStatus / 100 >= 4) {
         m_errorString = QString("%1 %2")
             .arg(resp.statusCode()).arg(resp.reasonPhrase());
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::responseHeaderReceived: "
+        SVDEBUG << "FileSource::responseHeaderReceived: "
                   << m_errorString << endl;
 #endif
     } else {
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::responseHeaderReceived: "
+        SVDEBUG << "FileSource::responseHeaderReceived: "
                   << m_lastStatus << endl;
 #endif
         if (resp.hasContentType()) m_contentType = resp.contentType();
     }
     emit statusAvailable();

 
     QFtp::Command command = m_ftp->currentCommand();
 
     if (!error) {
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::ftpCommandFinished: success for command "
+        SVDEBUG << "FileSource::ftpCommandFinished: success for command "
                   << command << endl;
 #endif
         return;
     }
 

 
 void
 FileSource::deleteCacheFile()
 {
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::deleteCacheFile(\"" << m_localFilename << "\")" << endl;
+    SVDEBUG << "FileSource::deleteCacheFile(\"" << m_localFilename << "\")" << endl;
 #endif
 
     cleanup();
 
     if (m_localFilename == "") {

 #ifdef DEBUG_FILE_SOURCE
         std::cerr << "FileSource::deleteCacheFile: ERROR: Failed to delete file \"" << m_localFilename << "\"" << std::endl;
 #endif
     } else {
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::deleteCacheFile: Deleted cache file \"" << m_localFilename << "\"" << endl;
+        SVDEBUG << "FileSource::deleteCacheFile: Deleted cache file \"" << m_localFilename << "\"" << endl;
 #endif
         m_localFilename = "";
     }
 
     m_fileCreationMutex.unlock();

 {
     {
         QMutexLocker locker(&m_mapMutex);
 
 #ifdef DEBUG_FILE_SOURCE
-        DEBUG << "FileSource::createCacheFile: refcount is " << m_refCountMap[m_url] << endl;
+        SVDEBUG << "FileSource::createCacheFile: refcount is " << m_refCountMap[m_url] << endl;
 #endif
 
         if (m_refCountMap[m_url] > 0) {
             m_refCountMap[m_url]++;
             m_localFilename = m_remoteLocalMap[m_url];

     }
 
     QString filepath(dir.filePath(filename));
 
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::createCacheFile: URL is \"" << m_url.toString() << "\", dir is \"" << dir.path() << "\", base \"" << base << "\", extension \"" << extension << "\", filebase \"" << filename << "\", filename \"" << filepath << "\"" << endl;
+    SVDEBUG << "FileSource::createCacheFile: URL is \"" << m_url.toString() << "\", dir is \"" << dir.path() << "\", base \"" << base << "\", extension \"" << extension << "\", filebase \"" << filename << "\", filename \"" << filepath << "\"" << endl;
 #endif
 
     QMutexLocker fcLocker(&m_fileCreationMutex);
 
     ++m_count;

             return "";
         }
     }
 
 #ifdef DEBUG_FILE_SOURCE
-    DEBUG << "FileSource::createCacheFile: url "
+    SVDEBUG << "FileSource::createCacheFile: url "
               << m_url.toString() << " -> local filename "
               << filepath << endl;
 #endif
     
     m_localFilename = filepath;