- Make library scriptable.

- Fix UPTIME reply parsing.

diff --git a/aniplayer.pro b/aniplayer.pro
index be5b0e652909633559b268512841a0b99d261a5c..a1c4ef5333637d93519a91896bd753be4c5f34c4 100644 (file)
--- a/aniplayer.pro
+++ b/aniplayer.pro
@@ -7,4 +7,4 @@ TEMPLATE = subdirs
 
 
 SUBDIRS +=  lib \
-            src
+                       src

diff --git a/lib/anidbudpclient/abstractcommand.h b/lib/anidbudpclient/abstractcommand.h
index 630f2bc0c2b90363f5ffc23c4dc09ae2b0ebba37..91587a3e1906140aed7f3c20f39f07b1efd2ac1a 100644 (file)
--- a/lib/anidbudpclient/abstractcommand.h
+++ b/lib/anidbudpclient/abstractcommand.h
@@ -196,4 +196,7 @@ protected:
        ReplyCode m_replyCode;
 };
 
+#include <QScriptEngine>
+Q_SCRIPT_DECLARE_QMETAOBJECT(AbstractCommand, QObject*);
+
 #endif // ABSTRACTCOMMAND_H

diff --git a/lib/anidbudpclient/anidbudpclient.h b/lib/anidbudpclient/anidbudpclient.h
index 98ed3e11ee0efff3841ac824604a8f506c7684e3..f688439acbf83bcc99f815e5e5f6954501ab0f34 100644 (file)
--- a/lib/anidbudpclient/anidbudpclient.h
+++ b/lib/anidbudpclient/anidbudpclient.h
@@ -226,8 +226,6 @@ private:
        QtState *connectingState;
        QtState *connectedState;
        QtState *authenticatingState;
-       QtState *logoutState;
-       QtState *loggedOutState;
 
        QtState *idleState;
        QtState *idleTimeoutState;
@@ -258,4 +256,7 @@ private slots:
        void timerTimeout();
 };
 
+#include <QScriptEngine>
+Q_SCRIPT_DECLARE_QMETAOBJECT(AniDBUdpClient, QObject*);
+
 #endif // ANIDBUDPCLIENT_H

diff --git a/lib/anidbudpclient/anidbudpclient.pri b/lib/anidbudpclient/anidbudpclient.pri
index 8af8ec69768ca8ce42014f44ae255d964a06b931..10bcec536735fe1cc8c3404b19ff093e4105c3ae 100644 (file)
--- a/lib/anidbudpclient/anidbudpclient.pri
+++ b/lib/anidbudpclient/anidbudpclient.pri
@@ -1,4 +1,4 @@
-QT *= network
+QT *= network script
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 LIBS += -lanidbudpclient

diff --git a/lib/anidbudpclient/anidbudpclient.pro b/lib/anidbudpclient/anidbudpclient.pro
index e0c60afa52a0565f38a5e19c477c0b19f07b74f5..8e1b8c156b50dc907c5dba96ac55c56831ef1462 100644 (file)
--- a/lib/anidbudpclient/anidbudpclient.pro
+++ b/lib/anidbudpclient/anidbudpclient.pro
@@ -1,7 +1,7 @@
 # -------------------------------------------------
 # Project created by QtCreator 2009-03-22T14:53:52
 # -------------------------------------------------
-QT += network
+QT += network script
 QT -= gui
 TEMPLATE = lib
 TARGET = anidbudpclient

diff --git a/lib/anidbudpclient/mylistcommand.h b/lib/anidbudpclient/mylistcommand.h
index b842d4706ccc3800dc0eab23db52df0e706e4c12..67d4ec1b4a0eb1047e646f25b2cf8f9651626738 100644 (file)
--- a/lib/anidbudpclient/mylistcommand.h
+++ b/lib/anidbudpclient/mylistcommand.h
@@ -111,4 +111,8 @@ private:
 
 };
 
+
+#include <QScriptEngine>
+Q_SCRIPT_DECLARE_QMETAOBJECT(MyListCommand, QObject*);
+
 #endif // MYLISTCOMMAND_H

diff --git a/lib/anidbudpclient/uptimecommand.cpp b/lib/anidbudpclient/uptimecommand.cpp
index 096aa34e1b868737fc3463a6c7b651825095987b..7e2aa737bc7d85b50cfdebbf5069151852de4184 100644 (file)
--- a/lib/anidbudpclient/uptimecommand.cpp
+++ b/lib/anidbudpclient/uptimecommand.cpp
@@ -25,7 +25,7 @@ void UptimeCommand::setRawReply(ReplyCode replyCode, const QString &reply, AniDB
        {
                case UPTIME:
                {
-                       QString uptimeText = reply.mid(reply.indexOf(' '));
+                       QString uptimeText = reply.mid(reply.indexOf('\n'));
                        bool ok = false;
                        m_uptime = uptimeText.toInt(&ok, 10);
                        if (!ok)

diff --git a/lib/anidbudpclient/uptimecommand.h b/lib/anidbudpclient/uptimecommand.h
index 98fbd2bf5aa69e41f1a37832d16efd378087efc4..6b1f07b7d27535b43cd048a7ce2effdef58fb0d1 100644 (file)
--- a/lib/anidbudpclient/uptimecommand.h
+++ b/lib/anidbudpclient/uptimecommand.h
@@ -20,4 +20,7 @@ private:
        int m_uptime;
 };
 
+#include <QScriptEngine>
+Q_SCRIPT_DECLARE_QMETAOBJECT(UptimeCommand, QObject*);
+
 #endif // UPTIMECOMMAND_H