- Make library scriptable.

- Fix UPTIME reply parsing.

diff --git a/aniplayer.pro b/aniplayer.pro
index be5b0e6..a1c4ef5 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 630f2bc..91587a3 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 98ed3e1..f688439 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 8af8ec6..10bcec5 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 e0c60af..8e1b8c1 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 b842d47..67d4ec1 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 096aa34..7e2aa73 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 98fbd2b..6b1f07b 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