From: APTX <marek321@gmail.com>
Date: Thu, 7 Jun 2012 00:45:15 +0000 (+0200)
Subject: Switch to RaiiTransaction in some places.
X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=1f3b18e9cb762eb23166965610456e3f1c98f982;p=localmylist.git

Switch to RaiiTransaction in some places.
---

diff --git a/localmylist/requesthandler.cpp b/localmylist/requesthandler.cpp
index 2119095..5b9900b 100644
--- a/localmylist/requesthandler.cpp
+++ b/localmylist/requesthandler.cpp
@@ -61,16 +61,11 @@ void RequestHandler::handleRequests()
 			FileAnimeFlag::GroupName
 			| FileAnimeFlag::GroupShortName;
 
-	db->transaction();
-	QList<PendingRequest> requests = db->getRequestBatch();
+	RaiiTransaction t(db);
 
-	qDebug() << "Got" << requests.count() << "requests";
+	QList<PendingRequest> requests = db->getRequestBatch();
 
-	if (!requests.count())
-	{
-		db->commit();
-		return;
-	}
+	qDebug() << "Got" << requests.count() << " data requests";
 
 	foreach (const PendingRequest &request, requests)
 	{
@@ -106,7 +101,8 @@ void RequestHandler::handleRequests()
 			Q_ASSERT_X(false, "requestHandler", "Unknown request");
 		}
 	}
-	db->commit();
+
+	t.commit();
 
 	emit batchFinished();
 }
@@ -117,10 +113,11 @@ void RequestHandler::handleMyListUpdates()
 
 	qDebug() << "handleMyListUpdates";
 
-	db->transaction();
+	RaiiTransaction t(db);
+
 	QList<PendingMyListUpdate> requests = db->getPendingMyListUpdateBatch();
 
-	qDebug() << "Got" << requests.count() << "requests";
+	qDebug() << "Got" << requests.count() << " mylist update requests";
 
 	foreach (const PendingMyListUpdate &request, requests)
 	{
@@ -151,6 +148,10 @@ void RequestHandler::handleMyListUpdates()
 		connect(reply, SIGNAL(replyReady(bool)), this, SLOT(myListEditReplyRecieved(bool)));
 		myListUpdateIdMap.insert(reply, request.updateId);
 	}
+
+	t.commit();
+
+	emit myListUpdateBatchFinished();
 }
 
 void RequestHandler::animeRequestComplete(bool success)