Remove no longer useful debug messages. Hide most debug messages by default.

diff --git a/authcommand.cpp b/authcommand.cpp
index e36f7d1f12c14c18030cbd18c8ac564b05c2f6ec..580f66bd46b13bf46ae6fad21baba5971aafaf97 100644 (file)
--- a/authcommand.cpp
+++ b/authcommand.cpp
@@ -91,7 +91,6 @@ void AuthReply::clearError()
 
 void AuthReply::setRawReply(ReplyCode replyCode, const QString &reply)
 {
-qDebug() << replyCode;
        AbstractReply::setRawReply(replyCode, reply);
 
        switch(replyCode)
@@ -116,7 +115,7 @@ qDebug() << replyCode;
                        signalReplyReady(false);
                break;
                default:
-qDebug() << "ERROR CODE: " << replyCode;
+                       qDebug() << "ERROR CODE: " << replyCode;
                        m_errorString = tr("Unknown errorString (CODE: %1)").arg(m_replyCode);
                        signalReplyReady(false);
        }

diff --git a/client.cpp b/client.cpp
index e9e6473b1ba83b63c1fcec5978bc2d9f424ba9f3..8083ca80d97c58b9c886e0d40ac6a5f9425ea995 100644 (file)
--- a/client.cpp
+++ b/client.cpp
@@ -24,8 +24,9 @@ const int Client::protocolVersion = PROTOCOL_VERSION;
 
 Client::Client(QObject *parent) : ClientInterface(parent)
 {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Api instance init!";
-
+#endif
        authReply = 0;
        uptimeReply = 0;
 
@@ -241,14 +242,16 @@ qDebug() << "Entering Connecting State";
        {
                if (socket->bind(QHostAddress::Any, m_localPort))
                {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Successful connection";
+#endif
                        emit connected();
                        return;
                }
 
                m_error = BindError;
                m_errorString = socket->errorString();
-qDebug() << QString("Bind on Address: %1 port: %2 failed").arg(m_hostAddress.toString()).arg(m_localPort);
+               qWarning() << QString("Bind on Address: %1 port: %2 failed").arg(m_hostAddress.toString()).arg(m_localPort);
                emit connectionError();
                return;
        }
@@ -257,7 +260,9 @@ qDebug() << QString("Bind on Address: %1 port: %2 failed").arg(m_hostAddress.toS
 
 void Client::lookedUp(QHostInfo hostInfo)
 {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Host lookup finished";
+#endif
        if (hostInfo.error() != QHostInfo::NoError)
        {
                qDebug() << "Lookup failed:" << hostInfo.errorString();
@@ -334,7 +339,9 @@ qDebug() << "Entering Send State";
        // Happens if sendState is entered from recv* states.
        if (commandTimer->isActive())
        {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "commandTimer activein sendState";
+#endif
                emit commandSent();
                return;
        }
@@ -342,7 +349,9 @@ qDebug() << "commandTimer activein sendState";
        // Control commands (auth and such) have priority over any other commands.
        if (!controlCommandQueue.isEmpty())
        {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Sending Control Command";
+#endif
                AbstractReply *cmd = controlCommandQueue.dequeue();
                emit model_queuedCommandRemoved(0);
                sendCommand(cmd, true);
@@ -378,7 +387,7 @@ void Client::enterIdleState()
 {
 #ifdef ANIDBUDPCLIENT_CLIENT_STATE_MACHINE_DEBUG
 qDebug() << "Entering Idle State";
-qDebug() << m_idlePolicy;
+qDebug() << "Idle policty=" << m_idlePolicy;
 #endif
 
        // If not loogged in, nothing has to be done in idle state.
@@ -443,7 +452,7 @@ qDebug() << "Entering Recieve State";
 
                if (sender != m_hostAddress)
                {
-                       qDebug() << QString("Recieved datagram from unknown host: %1 port: %2\nRaw datagram contents:%3\nDiscarding datagram.")
+                       qWarning() << QString("Recieved datagram from unknown host: %1 port: %2\nRaw datagram contents:%3\nDiscarding datagram.")
                                        .arg(sender.toString())
                                        .arg(senderPort)
                                        .arg(tmp.constData());
@@ -452,17 +461,20 @@ qDebug() << "Entering Recieve State";
 
                if (authCommand.compression() && tmp.mid(0, 2) == "00")
                {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "COMPRESSED DATAGRAM = " << tmp;
+#endif
                        tmp = qUncompress(tmp);
                }
 
                QString reply = QString::fromUtf8(tmp);
 
-               qDebug() << QString("Recieved datagram from [%1]:%2\nRaw datagram contents:%3")
-                               .arg(m_host)
-                               .arg(senderPort)
-                               .arg(reply);
-
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
+qDebug() << QString("Recieved datagram from [%1]:%2\nRaw datagram contents:%3")
+               .arg(m_host)
+               .arg(senderPort)
+               .arg(reply);
+#endif
 
                // Check if it is a 6xx error.
                {
@@ -510,13 +522,16 @@ qDebug() << "COMPRESSED DATAGRAM = " << tmp;
                // Do not parse reply for unknown commands.
                if (!sentCommands.contains(commandId))
                {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << QString("Unknown command with id: %1, discarding")
                .arg(commandId.constData());
+#endif
                        continue;
                }
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << QString("Sending reply to command with id: %1")
                .arg(commandId.constData());
-
+#endif
                // tag + space = 5 + 1
                QByteArray replyCodeText = tmp.mid(6, 3);
 
@@ -546,7 +561,9 @@ qDebug() << QString("Sending reply to command with id: %1")
                                int newTimeout = qBound(0,  Client::UDP_API_COMMAND_TIMEOUT - sentCommands[commandId]->timeSent().secsTo(QDateTime::currentDateTime()), Client::UDP_API_COMMAND_TIMEOUT);
                                newTimeout *= 1000;
                                replyTimeoutTimer->start(newTimeout);
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Starting replyTimeoutTimer" << newTimeout;
+#endif
                        }
                }
                else
@@ -569,7 +586,9 @@ qDebug() << "Starting replyTimeoutTimer" << newTimeout;
                {
                        case LOGIN_FIRST:
                        case INVALID_SESSION:
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "LOGIN FIRST required, authing";
+#endif
                                m_sessionId.clear();
                                if (controlCommand)
                                        enqueueControlCommand(cmd);
@@ -620,7 +639,7 @@ qDebug() << "LOGIN FIRST required, authing";
                        default:
                                if (replyCode > 601 && replyCode < 700)
                                {
-                                       qDebug() << QString("SERVER ERROR %1").arg(replyCode);
+                                       qWarning() << QString("SERVER ERROR %1").arg(replyCode);
                                        emit connectionError();
                                }
                        break;
@@ -710,13 +729,17 @@ void Client::destroy()
 
 void Client::connect()
 {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Connecting";
+#endif
        emit startConnecting();
 }
 
 void Client::disconnect(bool graceful)
 {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Disconnecting" << (graceful ? "gracefully" : "");
+#endif
        if (graceful)
        {
                disconnecting = true;
@@ -735,7 +758,9 @@ void Client::send(AbstractReply *command)
 
 void Client::sendRaw(QByteArray command)
 {
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << QString("Sending RAW command: %1").arg(command.constData());
+#endif
        enqueueCommand(createReply(RawCommand(command)));
 }
 
@@ -765,14 +790,17 @@ void Client::commandTimeout()
        QByteArray commandId = sentCommandOrder.dequeue();
        emit model_sentCommandRemoved(0);
 
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << commandId << "timed out";
-
+#endif
        if (!sentCommandOrder.isEmpty())
        {
                int newTimeout = qBound(0,  Client::UDP_API_COMMAND_TIMEOUT - sentCommands[commandId]->timeSent().secsTo(QDateTime::currentDateTime()), Client::UDP_API_COMMAND_TIMEOUT);
                newTimeout *= 1000;
                replyTimeoutTimer->start(newTimeout);
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Starting replyTimeoutTimer" << newTimeout;
+#endif
        }
        // If it's empty thereis no need to start replyTimeoutTimer again, as there are no commands waiting.
 
@@ -855,15 +883,18 @@ void Client::sendCommand(AbstractReply *command, bool controlCommand)
        if (!replyTimeoutTimer->isActive())
        {
                replyTimeoutTimer->start(Client::UDP_API_COMMAND_TIMEOUT * 1000);
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << "Starting replyTimeoutTimer" << replyTimeoutTimer->interval();
+#endif
        }
 
-
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << QString("SENDING datagram:\n\t%1\nto: %2 ([%3]:%4)")
                .arg(datagram.constData())
                .arg(m_host)
                .arg(m_hostAddress.toString())
                .arg(m_hostPort);
+#endif
 
        socket->writeDatagram(datagram, m_hostAddress, m_hostPort);
 }

diff --git a/clientinterface.cpp b/clientinterface.cpp
index 2db90ec4263e30670ebc0e1c0e7c25e950b33c23..f9ac10ded85ef1244e5043c6b5b9f46d5c4fe4cc 100644 (file)
--- a/clientinterface.cpp
+++ b/clientinterface.cpp
@@ -62,7 +62,9 @@ QByteArray ClientInterface::nextCommandId(int len)
        while (len--)
                result[len] = chars[qrand() % numChars];
 
+#ifdef ANIDBUDPCLIENT_CLIENT_MISC_DEBUG
 qDebug() << QString("Generated id %1").arg(result.constData());
+#endif
        return result;
 }
 

diff --git a/file.cpp b/file.cpp
index 279c1f5b8a655af702b3a13f309566d63d25c801..f63b9572d497cdaff0fce139d5787ce923473225 100644 (file)
--- a/file.cpp
+++ b/file.cpp
@@ -260,8 +260,9 @@ qDebug() << "finishRenaming";
        newFileName.replace('"', "'");
        newFileName.replace(QRegExp("[\\/]"), "-");
        newFileName.replace(QRegExp("[\\/:*?\"<>|]"), "");
+#ifdef ANIDBUDPCLIENT_FILE_DEBUG
 qDebug() << newFileName;
-
+#endif
 
        QFile file(m_file.absoluteFilePath());
 
@@ -274,12 +275,14 @@ qDebug() << newFileName;
        if (file.rename(m_file.absolutePath() + "/" + newFileName))
        {
                m_file.setFile(file);
+#ifdef ANIDBUDPCLIENT_FILE_DEBUG
 qDebug() << m_file.absoluteFilePath();
+#endif
                updateStatus(Renaming, Success);
        }
        else
        {
-qDebug() << file.errorString();
+               qWarning() << file.errorString();
                updateStatus(Renaming, Failure);
        }
 }

diff --git a/filecommand.cpp b/filecommand.cpp
index 11f8f4db2ff6fd9bbabaf0383432e60499cb257d..ac5ac952698ae514e3e671ea46799b5984495574 100644 (file)
--- a/filecommand.cpp
+++ b/filecommand.cpp
@@ -285,9 +285,7 @@ void FileReply::setRawReply(ReplyCode replyCode, const QString &reply)
 void FileReply::readReplyData(const QString &reply)
 {
        QString d = reply.mid(reply.indexOf('\n')).trimmed();
-qDebug() << d;
        QList<QString> parts = d.split('|', QString::KeepEmptyParts);
-qDebug() << parts;
        m_fid = parts[0].toInt();
 
        if (command().fmask() == 0 && command().amask() == 0)
@@ -309,7 +307,7 @@ qDebug() << parts;
                {
                        if (partNo >= parts.size())
                        {
-qDebug() << "Not enough parts in reply.";
+                               qWarning() << "Not enough parts in reply.";
                                continue;
                        }
                        fileFlagData.insert(FileFlags(flag), parts[partNo]);
@@ -323,7 +321,7 @@ qDebug() << "Not enough parts in reply.";
                {
                        if (partNo >= parts.size())
                        {
-qDebug() << "Not enough parts in reply.";
+                               qWarning() << "Not enough parts in reply.";
                                continue;
                        }
                        fileAnimeFlagData.insert(FileAnimeFlags(flag), parts[partNo]);

diff --git a/hash.cpp b/hash.cpp
index 97e6e9ddfa5778f93761fa3fb69bb02c8c062402..a4f2272ae30a2e53fca56d8589414c0039d7fdfd 100644 (file)
--- a/hash.cpp
+++ b/hash.cpp
@@ -36,8 +36,6 @@ void Hash::destroy()
 
 HashResult *Hash::hashFile(const HashRequest &file)
 {
-qDebug() << "Hash::hashFile";
-
        HashResult *result = new HashResult(file);
 
        fileQueue.enqueue(result);
@@ -53,13 +51,12 @@ qDebug() << "Hash::hashFile";
 
 void Hash::endHashing(const QByteArray &hash)
 {
-qDebug() << "Hash::endHashing";
        HashResult *r = fileQueue.dequeue();
 
+#ifdef ANIDBUDPCLIENT_HASH_DEBUG
        int fileElapsed = fileTime.elapsed();
-
-qDebug() << "File:" << r->fileInfo().fileName() << "Hash:" << hash << "Time:" << fileElapsed;
-
+       qDebug() << "File:" << r->fileInfo().fileName() << "Hash:" << hash << "Time:" << fileElapsed;
+#endif
        hashedFileSize += r->fileInfo().size();
 
        r->setHash(hash);
@@ -72,9 +69,11 @@ qDebug() << "File:" << r->fileInfo().fileName() << "Hash:" << hash << "Time:" <<
        else
        {
                hashing = false;
-               int totalElapsed = totalTime.elapsed();
                emit finished();
-qDebug() << "Total time:" << totalElapsed;
+#ifdef ANIDBUDPCLIENT_HASH_DEBUG
+               int totalElapsed = totalTime.elapsed();
+               qDebug() << "Total time:" << totalElapsed;
+#endif
                hashedFileSize = totalFileSize = 0;
        }
 
@@ -104,7 +103,7 @@ void Hash::setUp()
 {
        if (producer || consumer || buffer)
                return;
-qDebug() << "MAIN thread id is: " << QThread::currentThreadId();
+
        buffer = new HashPrivate::Buffer;
        producer = new HashPrivate::HashProducer(buffer, this);
        consumer = new HashPrivate::HashConsumer(buffer, this);
@@ -132,20 +131,16 @@ Hash *Hash::m_instance = 0;
 
 HashRequest::HashRequest(const QFileInfo &fileInfo)
 {
-qDebug() << "HashRequest::HashRequest(const QFileInfo &fileInfo)";
        m_fileInfo = fileInfo;
 }
 
 HashRequest::HashRequest(const HashRequest &other)
 {
-qDebug() << "HashRequest::HashRequest(const HashRequest &other)";
        m_fileInfo = other.m_fileInfo;
-qDebug() << m_fileInfo.absoluteFilePath();
 }
 
 HashRequest &HashRequest::operator=(const HashRequest &other)
 {
-qDebug() << "HashRequest &HashRequest::operator=(const HashRequest &other)";
        m_fileInfo = other.m_fileInfo;
        return *this;
 }

diff --git a/hashconsumer.cpp b/hashconsumer.cpp
index 9fcaaf908f13cc49e29d53fb4851faba63accc6e..ce383ec21d434c0a18c210d7646489f81e07d128 100644 (file)
--- a/hashconsumer.cpp
+++ b/hashconsumer.cpp
@@ -38,8 +38,10 @@ void HashConsumer::hashFile(const QString &file)
 
 void HashConsumer::run()
 {
+#ifdef ANIDBUDPCLIENT_HASH_DEBUG
 qDebug() << "Starting thread consumer";
 qDebug() << "Thread consumer id is: " << QThread::currentThreadId();
+#endif
 
        forever
        {
@@ -77,7 +79,9 @@ qDebug() << "Thread consumer id is: " << QThread::currentThreadId();
 
                hash.reset();
        }
+#ifdef ANIDBUDPCLIENT_HASH_DEBUG
 qDebug() << "Thread consumer is stopping";
+#endif
 }
 
 } // namespace HashPrivate

diff --git a/hashproducer.cpp b/hashproducer.cpp
index 3d78a0b40e2a22eab88d0371c48bb27975680094..c81869c08075fb244e25a054b6a1ba4e8a80998d 100644 (file)
--- a/hashproducer.cpp
+++ b/hashproducer.cpp
@@ -26,9 +26,6 @@ HashProducer::~HashProducer()
 
 void HashProducer::readFile(const QString &file)
 {
-qDebug() << "readFile";
-qDebug() << "Thread id is: " << QThread::currentThreadId();
-
        QMutexLocker locker(&mutex);
 
        fileName = file;
@@ -42,26 +39,31 @@ qDebug() << "Thread id is: " << QThread::currentThreadId();
 
 void HashProducer::run()
 {
+#ifdef ANIDBUDPCLIENT_HASH_DEBUG
 qDebug() << "Starting thread producer";
 qDebug() << "Thread producer id is: " << QThread::currentThreadId();
+#endif
 
        forever
        {
                mutex.lock();
+#ifdef ANIDBUDPCLIENT_HASH_DEBUG
 qDebug() << "Obtaining new file name";
+#endif
                QFile file(fileName);
                mutex.unlock();
 
                if (file.exists())
                {
-                       qDebug() << "File exists, opening";
+#ifdef ANIDBUDPCLIENT_HASH_DEBUG
+qDebug() << "File exists, opening";
+#endif
                        if (file.open(QIODevice::ReadOnly))
                        {
                                while (!file.atEnd())
                                {
                                        if (abort)
                                                return;
-//                                     qDebug() << "read->while(" << (!file.atEnd()) << ")";
                                        QByteArray data = file.read(ED2K_PART_SIZE);
                                        while (!(buffer->put(data, file.atEnd()) || abort));
                                }
@@ -78,7 +80,9 @@ qDebug() << "Obtaining new file name";
                restart = false;
                mutex.unlock();
        }
+#ifdef ANIDBUDPCLIENT_HASH_DEBUG
 qDebug() << "Thread producer is stopping";
+#endif
 }
 
 } // namespace HashPrivate