Merge lp:~mardy/account-polld-plugins-go/manifests into lp:account-polld-plugins-go

[Alberto Mardegan]

Add all plugin binaries and manifest files

Add all plugin binaries and manifest files

[lp:~mardy/account-polld-plugins-go/manifests]

191. By Alberto Mardegan on 2016-09-08

depend on dbus-go

192. By Alberto Mardegan on 2016-09-08

Depend on pkg-config

193. By Alberto Mardegan on 2016-09-09

Add g++ dep

194. By Alberto Mardegan on 2016-09-09

Try fixing gccgo builds

195. By Alberto Mardegan on 2016-09-14

rename script

196. By Alberto Mardegan on 2016-09-14

fix manifest of dekko plugin

197. By Alberto Mardegan on 2016-09-14

Fix case in auth data

198. By Alberto Mardegan on 2016-09-15

Save data in the same old location

199. By Alberto Mardegan on 2016-09-15

Twitter: remember last IDs

200. By Alberto Mardegan on 2016-09-16

Twitter plugin: properly load/save state

201. By Alberto Mardegan on 2016-10-10

Do not install qtcontact-test app

[Alexandre Abreu (abreu-alexandre)]

inline comments

review: Needs Information

[Alberto Mardegan (mardy)]

Replied to comments, MP updated.

[lp:~mardy/account-polld-plugins-go/manifests]

202. By Alberto Mardegan on 2016-10-12

copyright date

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

Unmerged revisions

202. By Alberto Mardegan on 2016-10-12

copyright date

201. By Alberto Mardegan on 2016-10-10

Do not install qtcontact-test app

200. By Alberto Mardegan on 2016-09-16

Twitter plugin: properly load/save state

199. By Alberto Mardegan on 2016-09-15

Twitter: remember last IDs

198. By Alberto Mardegan on 2016-09-15

Save data in the same old location

197. By Alberto Mardegan on 2016-09-14

Fix case in auth data

196. By Alberto Mardegan on 2016-09-14

fix manifest of dekko plugin

195. By Alberto Mardegan on 2016-09-14

rename script

194. By Alberto Mardegan on 2016-09-09

Try fixing gccgo builds

193. By Alberto Mardegan on 2016-09-09

Add g++ dep

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2016-10-12 07:28:11 +0000
@@ -0,0 +1,6 @@
+debian/*.log
+debian/*.substvars
+debian/account-polld-plugins-go/
+debian/files
+debian/*stamp
+obj-*/

=== added directory 'cmd/poll-caldav'
=== added file 'cmd/poll-caldav/main.go'
--- cmd/poll-caldav/main.go	1970-01-01 00:00:00 +0000
+++ cmd/poll-caldav/main.go	2016-10-12 07:28:11 +0000
@@ -0,0 +1,33 @@
+/*
+ Copyright 2016 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+	"launchpad.net/account-polld/gettext"
+	"launchpad.net/account-polld/plugins"
+	"launchpad.net/account-polld/plugins/caldav"
+)
+
+func main() {
+	// Initialize i18n
+	gettext.SetLocale(gettext.LC_ALL, "")
+	gettext.Textdomain("account-polld")
+	gettext.BindTextdomain("account-polld", "/usr/share/locale")
+
+	runner := plugins.NewPluginRunner(caldav.New())
+	runner.Run()
+}

=== added directory 'cmd/poll-dekko'
=== added file 'cmd/poll-dekko/main.go'
--- cmd/poll-dekko/main.go	1970-01-01 00:00:00 +0000
+++ cmd/poll-dekko/main.go	2016-10-12 07:28:11 +0000
@@ -0,0 +1,48 @@
+/*
+ Copyright 2016 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+	"sync"
+
+	"launchpad.net/account-polld/gettext"
+	"launchpad.net/account-polld/plugins"
+	"launchpad.net/account-polld/plugins/dekko"
+	"launchpad.net/account-polld/qtcontact"
+)
+
+var mainLoopOnce sync.Once
+
+func init() {
+	startMainLoop()
+}
+
+func startMainLoop() {
+	mainLoopOnce.Do(func() {
+		go qtcontact.MainLoopStart()
+	})
+}
+
+func main() {
+	// Initialize i18n
+	gettext.SetLocale(gettext.LC_ALL, "")
+	gettext.Textdomain("account-polld")
+	gettext.BindTextdomain("account-polld", "/usr/share/locale")
+
+	runner := plugins.NewPluginRunner(dekko.New())
+	runner.Run()
+}

=== added directory 'cmd/poll-gcalendar'
=== added file 'cmd/poll-gcalendar/main.go'
--- cmd/poll-gcalendar/main.go	1970-01-01 00:00:00 +0000
+++ cmd/poll-gcalendar/main.go	2016-10-12 07:28:11 +0000
@@ -0,0 +1,33 @@
+/*
+ Copyright 2016 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+	"launchpad.net/account-polld/gettext"
+	"launchpad.net/account-polld/plugins"
+	"launchpad.net/account-polld/plugins/gcalendar"
+)
+
+func main() {
+	// Initialize i18n
+	gettext.SetLocale(gettext.LC_ALL, "")
+	gettext.Textdomain("account-polld")
+	gettext.BindTextdomain("account-polld", "/usr/share/locale")
+
+	runner := plugins.NewPluginRunner(gcalendar.New())
+	runner.Run()
+}

=== modified file 'cmd/poll-gmail/main.go'
--- cmd/poll-gmail/main.go	2016-08-30 09:30:59 +0000
+++ cmd/poll-gmail/main.go	2016-10-12 07:28:11 +0000
@@ -1,5 +1,5 @@
 /*
- Copyright 2014 Canonical Ltd.
+ Copyright 2016 Canonical Ltd.
 
  This program is free software: you can redistribute it and/or modify it
  under the terms of the GNU General Public License version 3, as published

=== added directory 'cmd/poll-twitter'
=== added file 'cmd/poll-twitter/main.go'
--- cmd/poll-twitter/main.go	1970-01-01 00:00:00 +0000
+++ cmd/poll-twitter/main.go	2016-10-12 07:28:11 +0000
@@ -0,0 +1,33 @@
+/*
+ Copyright 2016 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+	"launchpad.net/account-polld/gettext"
+	"launchpad.net/account-polld/plugins"
+	"launchpad.net/account-polld/plugins/twitter"
+)
+
+func main() {
+	// Initialize i18n
+	gettext.SetLocale(gettext.LC_ALL, "")
+	gettext.Textdomain("account-polld")
+	gettext.BindTextdomain("account-polld", "/usr/share/locale")
+
+	runner := plugins.NewPluginRunner(twitter.New())
+	runner.Run()
+}

=== added file 'data/polld-caldav.json'
--- data/polld-caldav.json	1970-01-01 00:00:00 +0000
+++ data/polld-caldav.json	2016-10-12 07:28:11 +0000
@@ -0,0 +1,6 @@
+{
+  "exec": "/usr/bin/poll-caldav",
+  "app_id": "com.ubuntu.calendar_calendar",
+  "service_ids": [ "owncloud-caldav" ],
+  "needs_authentication_data": true
+}

=== added file 'data/polld-dekko.json'
--- data/polld-dekko.json	1970-01-01 00:00:00 +0000
+++ data/polld-dekko.json	2016-10-12 07:28:11 +0000
@@ -0,0 +1,5 @@
+{
+  "exec": "/usr/bin/poll-dekko",
+  "app_id": "dekko.dekkoproject_dekko",
+  "needs_authentication_data": true
+}

=== added file 'data/polld-gcalendar.json'
--- data/polld-gcalendar.json	1970-01-01 00:00:00 +0000
+++ data/polld-gcalendar.json	2016-10-12 07:28:11 +0000
@@ -0,0 +1,6 @@
+{
+  "exec": "/usr/bin/poll-gcalendar",
+  "app_id": "com.ubuntu.calendar_calendar",
+  "service_ids": [ "google-caldav" ],
+  "needs_authentication_data": true
+}

=== added file 'data/polld-gmail.json'
--- data/polld-gmail.json	1970-01-01 00:00:00 +0000
+++ data/polld-gmail.json	2016-10-12 07:28:11 +0000
@@ -0,0 +1,5 @@
+{
+  "exec": "/usr/bin/poll-gmail",
+  "app_id": "com.ubuntu.developer.webapps.webapp-gmail_webapp-gmail",
+  "needs_authentication_data": true
+}

=== added file 'data/polld-twitter.json'
--- data/polld-twitter.json	1970-01-01 00:00:00 +0000
+++ data/polld-twitter.json	2016-10-12 07:28:11 +0000
@@ -0,0 +1,5 @@
+{
+  "exec": "/usr/bin/poll-twitter",
+  "app_id": "com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter",
+  "needs_authentication_data": true
+}

=== added file 'debian/03_run-account-polld-hook'
--- debian/03_run-account-polld-hook	1970-01-01 00:00:00 +0000
+++ debian/03_run-account-polld-hook	2016-10-12 07:28:11 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -ex
+
+/usr/lib/account-polld/click-hook
+

=== added file 'debian/account-polld-plugins-go.migrations'
--- debian/account-polld-plugins-go.migrations	1970-01-01 00:00:00 +0000
+++ debian/account-polld-plugins-go.migrations	2016-10-12 07:28:11 +0000
@@ -0,0 +1,1 @@
+debian/03_run-account-polld-hook

=== modified file 'debian/control'
--- debian/control	2016-08-30 09:54:41 +0000
+++ debian/control	2016-10-12 07:28:11 +0000
@@ -4,17 +4,20 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-golang,
+               dh-migrations,
                dh-translations,
                golang-go,
+               golang-go-dbus-dev,
                golang-go-xdg-dev,
                golang-gocheck-dev,
+               pkg-config,
                qt5-default,
                qtbase5-dev,
                qtpim5-dev,
 Standards-Version: 3.9.5
-Homepage: https://launchpad.net/account-polld
-Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/account-polld/trunk/files
-Vcs-Bzr: lp:account-polld
+Homepage: https://launchpad.net/account-polld-plugins-go
+Vcs-Browser: http://bazaar.launchpad.net/~online-accounts/account-polld-plugins-go/trunk/files
+Vcs-Bzr: lp:account-polld-plugins-go
 
 Package: account-polld-plugins-go
 Architecture: any

=== modified file 'debian/rules'
--- debian/rules	2016-08-30 09:54:41 +0000
+++ debian/rules	2016-10-12 07:28:11 +0000
@@ -5,15 +5,32 @@
 export DH_GOPKG := launchpad.net/account-polld
 export DH_GOLANG_INSTALL_ALL := 1
 
+# Fix copied from https://bugs.launchpad.net/bugs/1431486
++DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el))
+  pkg_configs = Qt5Core Qt5Contacts
+  export CGO_CFLAGS := \
+    $(shell $(foreach pkg, $(pkg_configs), pkg-config --cflags $(pkg); ))
+  export CGO_CXXFLAGS := $(CGO_CFLAGS)
+  export CGO_LDFLAGS := \
+    $(shell $(foreach pkg, $(pkg_configs), pkg-config --libs $(pkg); ))
+  $(warning setting CGO_CFLAGS   = $(CGO_CFLAGS))
+  $(warning setting CGO_CXXFLAGS = $(CGO_CXXFLAGS))
+  $(warning setting CGO_LDFLAGS  = $(CGO_LDFLAGS))
+endif
+
 %:
 	dh $@ \
 		--buildsystem=golang \
 		--with=golang \
+		--with=migrations \
 		--with=translations \
 		--fail-missing
 
 override_dh_auto_install:
 	dh_auto_install -O--buildsystem=golang
+	rm ${CURDIR}/debian/account-polld-plugins-go/usr/bin/qtcontact-test
 	# all our libs are private
 	rm -r \
 		${CURDIR}/debian/account-polld-plugins-go/usr/share/gocode
@@ -22,11 +39,15 @@
 	for pofile in po/*.po; do \
 		pofilename="$${pofile##*/}"; \
 		langcode="$${pofilename%.*}"; \
-		localedir="debian/$$appname/usr/share/locale/$$langcode/LC_MESSAGES"; \
+		localedir="debian/account-polld-plugins-go/usr/share/locale/$$langcode/LC_MESSAGES"; \
 		mkdir -p $$localedir; \
 		mofile="$$localedir/$$appname.mo"; \
 		msgfmt -o $$mofile $$pofile; \
 	done
+	# manifest files
+	manifestdir="debian/account-polld-plugins-go/usr/share/account-polld/plugins"; \
+	mkdir -p "$$manifestdir"; \
+	cp data/polld-*.json "$$manifestdir"
 
 override_dh_strip:
 	echo "Skipping strip (LP: #1318027)"

=== modified file 'plugins/ipc.go'
--- plugins/ipc.go	2016-08-29 11:48:42 +0000
+++ plugins/ipc.go	2016-10-12 07:28:11 +0000
@@ -73,22 +73,22 @@
 		var data AuthData
 		data.ApplicationId = msg.ApplicationId
 		data.AccountId = msg.AccountId
-		if v, ok := msg.Auth["clientId"]; ok {
+		if v, ok := msg.Auth["ClientId"]; ok {
 			data.ClientId = v.(string)
 		}
-		if v, ok := msg.Auth["clientSecret"]; ok {
+		if v, ok := msg.Auth["ClientSecret"]; ok {
 			data.ClientSecret = v.(string)
 		}
-		if v, ok := msg.Auth["accessToken"]; ok {
+		if v, ok := msg.Auth["AccessToken"]; ok {
 			data.AccessToken = v.(string)
 		}
-		if v, ok := msg.Auth["tokenSecret"]; ok {
+		if v, ok := msg.Auth["TokenSecret"]; ok {
 			data.TokenSecret = v.(string)
 		}
-		if v, ok := msg.Auth["secret"]; ok {
+		if v, ok := msg.Auth["Secret"]; ok {
 			data.Secret = v.(string)
 		}
-		if v, ok := msg.Auth["userName"]; ok {
+		if v, ok := msg.Auth["UserName"]; ok {
 			data.UserName = v.(string)
 		}
 		w.C <- data

=== modified file 'plugins/plugins.go'
--- plugins/plugins.go	2016-08-29 10:51:12 +0000
+++ plugins/plugins.go	2016-10-12 07:28:11 +0000
@@ -28,10 +28,6 @@
 	"launchpad.net/go-xdg/v0"
 )
 
-func init() {
-	cmdName = filepath.Base(os.Args[0])
-}
-
 // Plugin is an interface which the plugins will adhere to for the poll
 // daemon to interact with.
 //
@@ -168,7 +164,7 @@
 // the web service reported that the authentication token has expired.
 var ErrTokenExpired = errors.New("Token expired")
 
-var cmdName string
+var cmdName = "account-polld"
 
 var XdgDataFind = xdg.Data.Find
 var XdgDataEnsure = xdg.Data.Ensure

=== modified file 'plugins/twitter/twitter.go'
--- plugins/twitter/twitter.go	2016-08-29 12:12:01 +0000
+++ plugins/twitter/twitter.go	2016-10-12 07:28:11 +0000
@@ -19,6 +19,7 @@
 import (
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 	"net/url"
 	"sort"
@@ -38,11 +39,16 @@
 	maxIndividualDirectMessages         = 2
 	consolidatedDirectMessageIndexStart = maxIndividualDirectMessages
 	twitterDispatchUrlBase              = "https://mobile.twitter.com"
+	pluginName                          = "twitter"
 )
 
+type twitterConfig struct {
+	LastMentionId       int64 `json:"lastMentionId"`
+	LastDirectMessageId int64 `json:"lastDirectMessageId"`
+}
+
 type twitterPlugin struct {
-	lastMentionId       int64
-	lastDirectMessageId int64
+	config twitterConfig
 }
 
 func New() plugins.Plugin {
@@ -102,7 +108,7 @@
 	if len(statuses) < 1 {
 		return nil, nil
 	}
-	p.lastMentionId = statuses[0].Id
+	p.config.LastMentionId = statuses[0].Id
 
 	pushMsg := make([]*plugins.PushMessage, len(statuses))
 	for i, s := range statuses {
@@ -162,7 +168,7 @@
 	if len(dms) < 1 {
 		return nil, nil
 	}
-	p.lastDirectMessageId = dms[0].Id
+	p.config.LastDirectMessageId = dms[0].Id
 
 	pushMsg := make([]*plugins.PushMessage, len(dms))
 	for i, m := range dms {
@@ -196,10 +202,28 @@
 	return plugins.NewStandardPushMessage(summary, body, action, "", epoch)
 }
 
+func (p *twitterPlugin) loadPersistentData(accountId uint) error {
+	err := plugins.FromPersist(pluginName, accountId, &p.config)
+	return err
+}
+
+func (p *twitterPlugin) savePersistentData(accountId uint) error {
+	err := plugins.Persist(pluginName, accountId, p.config)
+	if err != nil {
+		log.Print("twitter plugin ", accountId, ": failed to save state: ", err)
+	}
+	return err
+}
+
 func (p *twitterPlugin) Poll(authData *plugins.AuthData) (batches []*plugins.PushMessageBatch, err error) {
+	defer p.savePersistentData(authData.AccountId)
+	p.loadPersistentData(authData.AccountId)
+
 	url := "statuses/mentions_timeline.json"
-	if p.lastMentionId > 0 {
-		url = fmt.Sprintf("%s?since_id=%d", url, p.lastMentionId)
+	notifyMentions := false
+	if p.config.LastMentionId > 0 {
+		url = fmt.Sprintf("%s?since_id=%d", url, p.config.LastMentionId)
+		notifyMentions = true
 	}
 	resp, err := p.request(authData, url)
 	if err != nil {
@@ -211,8 +235,10 @@
 	}
 
 	url = "direct_messages.json"
-	if p.lastDirectMessageId > 0 {
-		url = fmt.Sprintf("%s?since_id=%d", url, p.lastDirectMessageId)
+	notifyMessages := false
+	if p.config.LastDirectMessageId > 0 {
+		url = fmt.Sprintf("%s?since_id=%d", url, p.config.LastDirectMessageId)
+		notifyMessages = true
 	}
 	resp, err = p.request(authData, url)
 	if err != nil {
@@ -222,11 +248,17 @@
 	if err != nil {
 		return
 	}
-	if statuses != nil && len(statuses.Messages) > 0 {
-		batches = append(batches, statuses)
+	// Don't send any notifications if this is the very first time we run:
+	// otherwise we would emit notifications for all the old messages too
+	if notifyMentions {
+		if statuses != nil && len(statuses.Messages) > 0 {
+			batches = append(batches, statuses)
+		}
 	}
-	if dms != nil && len(dms.Messages) > 0 {
-		batches = append(batches, dms)
+	if notifyMessages {
+		if dms != nil && len(dms.Messages) > 0 {
+			batches = append(batches, dms)
+		}
 	}
 	return
 }

=== modified file 'plugins/twitter/twitter_test.go'
--- plugins/twitter/twitter_test.go	2015-03-20 14:34:48 +0000
+++ plugins/twitter/twitter_test.go	2016-10-12 07:28:11 +0000
@@ -425,7 +425,7 @@
 	c.Check(messages[1].Notification.Card.Icon, Equals, "http://a0.twimg.com/profile_images/1305509670/chatMikeTwitter_normal.png")
 	c.Assert(len(messages[1].Notification.Card.Actions), Equals, 1)
 	c.Check(messages[1].Notification.Card.Actions[0], Equals, "https://mobile.twitter.com/mikedroid/statuses/242534402280783873")
-	c.Check(p.lastMentionId, Equals, int64(242613977966850048))
+	c.Check(p.config.LastMentionId, Equals, int64(242613977966850048))
 }
 
 func (s S) TestParseStatusesError(c *C) {
@@ -470,7 +470,7 @@
 	c.Check(messages[0].Notification.Card.Icon, Equals, "http://a0.twimg.com/profile_images/1751506047/dead_sexy_normal.JPG")
 	c.Assert(len(messages[0].Notification.Card.Actions), Equals, 1)
 	c.Check(messages[0].Notification.Card.Actions[0], Equals, "https://mobile.twitter.com/theSeanCook/messages")
-	c.Check(p.lastDirectMessageId, Equals, int64(240136858829479936))
+	c.Check(p.config.LastDirectMessageId, Equals, int64(240136858829479936))
 }
 
 func (s S) TestParseDirectMessagesError(c *C) {