Report hashing progress. Do not allow to mark a file more than once.

diff --git a/src/videowindow.cpp b/src/videowindow.cpp
index 9e0ff5f4a174706e1c852e6c68e02bffa1d37e16..8c5d7a76e8bae52feaadd95f502e523670d3df3a 100644 (file)
--- a/src/videowindow.cpp
+++ b/src/videowindow.cpp
@@ -427,7 +427,6 @@ void VideoWindow::tick(qint64 time)
                return;
 
        markWatched();
-       m_marked = true;
 #endif
 }
 
@@ -540,12 +539,15 @@ void VideoWindow::markWatched()
 
        AniDBUdpClient::File *file = new AniDBUdpClient::File(videoPlayer->currentFile());
        file->markWatched();
-       connect(file, SIGNAL(statusUpdate(AniDBUdpClient::File::Action,AniDBUdpClient::File::ActionState)), this, SLOT(markingStatus(AniDBUdpClient::File::Action,AniDBUdpClient::File::ActionState)));
+       connect(file, SIGNAL(statusUpdate(AniDBUdpClient::File::Action,AniDBUdpClient::File::ActionState,int)), this, SLOT(markingStatus(AniDBUdpClient::File::Action,AniDBUdpClient::File::ActionState,int)));
        connect(file, SIGNAL(finished()), file, SLOT(deleteLater()));
+
+       m_marked = true;
 }
 
-void VideoWindow::markingStatus(AniDBUdpClient::File::Action action, AniDBUdpClient::File::ActionState actionState)
+void VideoWindow::markingStatus(AniDBUdpClient::File::Action action, AniDBUdpClient::File::ActionState actionState, int percent)
 {
+       qDebug() << "markingStatus called";
        AniDBUdpClient::File *file = (AniDBUdpClient::File *) sender();
        switch (action)
        {
@@ -553,7 +555,10 @@ void VideoWindow::markingStatus(AniDBUdpClient::File::Action action, AniDBUdpCli
                        switch (actionState)
                        {
                                case AniDBUdpClient::File::InProgress:
-                                       menu->showMessage(tr("Hashing File"));
+                                       menu->showMessage(tr("Hashing File... %1%").arg(percent));
+                               break;
+                               case AniDBUdpClient::File::Success:
+                                       menu->showMessage(tr("Hashing File complete!").arg(percent));
                                break;
                                default: ;
                        }

diff --git a/src/videowindow.h b/src/videowindow.h
index 4a494a88de8524a3e1c18bb0b16b37e63c421cdf..be9623e1878aabac8f39d5c3a44ce4840d89a274 100644 (file)
--- a/src/videowindow.h
+++ b/src/videowindow.h
@@ -99,7 +99,7 @@ private slots:
 
 #ifndef NO_ANIDBUDPCLIENT
        void markWatched();
-       void markingStatus(AniDBUdpClient::File::Action action, AniDBUdpClient::File::ActionState actionState);
+       void markingStatus(AniDBUdpClient::File::Action action, AniDBUdpClient::File::ActionState actionState, int percent);
 
        void anidbSettings();
        void updateAutomarkable();