Merge lp:~nikwen/account-polld/more-flexible-plugin-initialization into lp:~ubuntu-push-hackers/account-polld/trunk

[Niklas Wenzel]

Make plugin initialization more flexible, easing the addition of new plugins in the future

Make plugin initialization more flexible, easing the addition of new plugins in the future

Required for IMAP support

[lp:~nikwen/account-polld/more-flexible-plugin-initialization]

158. By Niklas Wenzel on 2016-02-28

Fix cut-off comment

Unmerged revisions

158. By Niklas Wenzel on 2016-02-28

Fix cut-off comment

157. By Niklas Wenzel on 2016-02-28

Remove old general TODO that I accidentally copied over from the imap-mails branch

156. By Niklas Wenzel on 2016-02-28

Make plugin initialization more flexible, easing the addition of new plugins in the future

155. By Niklas Wenzel on 2016-02-28

Fix build errors

154. By Niklas Wenzel on 2016-02-28

Improve error messages

153. By Niklas Wenzel on 2016-02-28

Formatting fix

152. By Niklas Wenzel on 2016-02-28

Make account authentication more flexible, easing the addition of new auth methods

=== modified file 'cmd/account-polld/main.go'
--- cmd/account-polld/main.go	2016-02-28 22:41:25 +0000
+++ cmd/account-polld/main.go	2016-02-28 22:41:25 +0000
@@ -93,60 +93,20 @@
 }
 
 func monitorAccounts(postWatch chan *PostWatch, pollBus *pollbus.PollBus) {
-	// Note: the accounts monitored are all linked to webapps right now
-	watcher := accounts.NewWatcher(SERVICETYPE_WEBAPPS)
+	// register account watchers
+	webappWatcher := accounts.NewWatcher(SERVICETYPE_WEBAPPS)
+
+	// map: account id -> account manager
 	mgr := make(map[uint]*AccountManager)
 
 	var wg sync.WaitGroup
 
-L:
 	for {
 		select {
-		case data := <-watcher.C:
-			if account, ok := mgr[data.AccountId]; ok {
-				if data.Enabled {
-					log.Println("New account data for existing account with id", data.AccountId)
-					account.penaltyCount = 0
-					account.updateAuthData(data)
-					wg.Add(1)
-					go func() {
-						defer wg.Done()
-						// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
-						// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
-						account.Poll(false)
-					}()
-					// No wg.Wait() here as it would break GetAvatar() again.
-					// Instead we have a wg.Wait() before the PollChan polling below.
-				} else {
-					account.Delete()
-					delete(mgr, data.AccountId)
-				}
-			} else if data.Enabled {
-				var plugin plugins.Plugin
-				switch data.ServiceName {
-				case SERVICENAME_GMAIL:
-					log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
-					plugin = gmail.New(data.AccountId)
-				case SERVICENAME_TWITTER:
-					// This is just stubbed until the plugin exists.
-					log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
-					plugin = twitter.New(data.AccountId)
-				default:
-					log.Println("Unhandled account with id", data.AccountId, "for", data.ServiceName)
-					continue L
-				}
-				mgr[data.AccountId] = NewAccountManager(watcher, postWatch, plugin)
-				mgr[data.AccountId].updateAuthData(data)
-				wg.Add(1)
-				go func() {
-					defer wg.Done()
-					// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
-					// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
-					mgr[data.AccountId].Poll(true)
-				}()
-				// No wg.Wait() here as it would break GetAvatar() again.
-				// Instead we have a wg.Wait() before the PollChan polling below.
-			}
+		// Handle account creation, new account data and account deletion
+		case data := <-webappWatcher.C:
+			handleWatcherData(&wg, webappWatcher, postWatch, mgr, data, SERVICETYPE_WEBAPPS)
+		// Respond to dbus poll requests
 		case <-pollBus.PollChan:
 			wg.Wait() // Finish all running Poll() calls before potentially polling the same accounts again
 			for _, v := range mgr {
@@ -166,6 +126,55 @@
 	}
 }
 
+func handleWatcherData(wg *sync.WaitGroup, watcher *accounts.Watcher, postWatch chan *PostWatch, mgr map[uint]*AccountManager, data accounts.AuthData, serviceType string) {
+	if account, ok := mgr[data.AccountId]; ok {
+		if data.Enabled {
+			log.Println("New account data for existing account with id", data.AccountId)
+			account.penaltyCount = 0
+			account.updateAuthData(data)
+			wg.Add(1)
+			go func() {
+				defer wg.Done()
+				// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
+				// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
+				account.Poll(false)
+			}()
+			// No wg.Wait() here as it would break GetAvatar() again.
+			// Instead we have a wg.Wait() before the PollChan polling below.
+		} else {
+			account.Delete()
+			delete(mgr, data.AccountId)
+		}
+	} else if data.Enabled {
+		var plugin plugins.Plugin = nil
+		if serviceType == SERVICETYPE_WEBAPPS { // Allows other service types to be added here in the future
+			switch data.ServiceName {
+			case SERVICENAME_GMAIL:
+				log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
+				plugin = gmail.New(data.AccountId)
+			case SERVICENAME_TWITTER:
+				log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
+				plugin = twitter.New(data.AccountId)
+			default:
+				log.Println("Unhandled account with id", data.AccountId, "for", data.ServiceName)
+			}
+		}
+		if plugin != nil {
+			mgr[data.AccountId] = NewAccountManager(watcher, postWatch, plugin)
+			mgr[data.AccountId].updateAuthData(data)
+			wg.Add(1)
+			go func() {
+				defer wg.Done()
+				// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
+				// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
+				mgr[data.AccountId].Poll(true)
+			}()
+			// No wg.Wait() here as it would break GetAvatar() again.
+			// Instead we have a wg.Wait() before the PollChan polling below.
+		}
+	}
+}
+
 func postOffice(bus *dbus.Connection, postWatch chan *PostWatch) {
 	for post := range postWatch {
 		obj := bus.Object(POSTAL_SERVICE, pushObjectPath(post.appId))