udm

Merge lp:~mandel/udm/fix-progress into lp:udm

  1. fix-progress
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~mandel/udm/fix-progress
Merge into: lp:udm
Diff against target: 114 lines (+15/-15)
3 files modified
common.go (+3/-3)
downloader.go (+7/-7)
uploader.go (+5/-5)
To merge this branch: bzr merge lp:~mandel/udm/fix-progress
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
Review via email: mp+227181@code.launchpad.net

Commit message

Ensure that the upload signals are connected to the correct interface.

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common.go'
2--- common.go 2014-05-20 09:17:21 +0000
3+++ common.go 2014-07-17 11:59:16 +0000
4@@ -146,11 +146,11 @@
5 return value, nil
6 }
7
8-func connectToSignal(conn *dbus.Connection, path dbus.ObjectPath, signal string) (watch, error) {
9+func connectToSignal(conn *dbus.Connection, path dbus.ObjectPath, sender, dbusInterface, signal string) (watch, error) {
10 sw, err := conn.WatchSignal(&dbus.MatchRule{
11 Type: dbus.TypeSignal,
12- Sender: DOWNLOAD_SERVICE,
13- Interface: DOWNLOAD_INTERFACE,
14+ Sender: sender,
15+ Interface: dbusInterface,
16 Member: signal,
17 Path: path})
18 w := newWatchWrapper(sw)
19
20=== modified file 'downloader.go'
21--- downloader.go 2014-05-20 09:17:21 +0000
22+++ downloader.go 2014-07-17 11:59:16 +0000
23@@ -116,43 +116,43 @@
24 func newFileDownload(conn *dbus.Connection, path dbus.ObjectPath) (*FileDownload, error) {
25 proxy := conn.Object(DOWNLOAD_SERVICE, path)
26 started_ch := make(chan bool)
27- started_w, err := connectToSignal(conn, path, "started")
28+ started_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "started")
29 if err != nil {
30 return nil, err
31 }
32
33 paused_ch := make(chan bool)
34- paused_w, err := connectToSignal(conn, path, "paused")
35+ paused_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "paused")
36 if err != nil {
37 return nil, err
38 }
39
40 resumed_ch := make(chan bool)
41- resumed_w, err := connectToSignal(conn, path, "resumed")
42+ resumed_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "resumed")
43 if err != nil {
44 return nil, err
45 }
46
47 canceled_ch := make(chan bool)
48- canceled_w, err := connectToSignal(conn, path, "canceled")
49+ canceled_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "canceled")
50 if err != nil {
51 return nil, err
52 }
53
54 finished_ch := make(chan string)
55- finished_w, err := connectToSignal(conn, path, "finished")
56+ finished_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "finished")
57 if err != nil {
58 return nil, err
59 }
60
61 errors_ch := make(chan error)
62- errors_w, err := connectToSignal(conn, path, "error")
63+ errors_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "error")
64 if err != nil {
65 return nil, err
66 }
67
68 progress_ch := make(chan Progress)
69- progress_w, err := connectToSignal(conn, path, "progress")
70+ progress_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "progress")
71 if err != nil {
72 return nil, err
73 }
74
75=== modified file 'uploader.go'
76--- uploader.go 2014-06-30 14:28:47 +0000
77+++ uploader.go 2014-07-17 11:59:16 +0000
78@@ -88,31 +88,31 @@
79 func newFileUpload(conn *dbus.Connection, path dbus.ObjectPath) (*FileUpload, error) {
80 proxy := conn.Object(UPLOAD_SERVICE, path)
81 started_ch := make(chan bool)
82- started_w, err := connectToSignal(conn, path, "started")
83+ started_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "started")
84 if err != nil {
85 return nil, err
86 }
87
88 canceled_ch := make(chan bool)
89- canceled_w, err := connectToSignal(conn, path, "canceled")
90+ canceled_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "canceled")
91 if err != nil {
92 return nil, err
93 }
94
95 finished_ch := make(chan string)
96- finished_w, err := connectToSignal(conn, path, "finished")
97+ finished_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "finished")
98 if err != nil {
99 return nil, err
100 }
101
102 errors_ch := make(chan error)
103- errors_w, err := connectToSignal(conn, path, "error")
104+ errors_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "error")
105 if err != nil {
106 return nil, err
107 }
108
109 progress_ch := make(chan Progress)
110- progress_w, err := connectToSignal(conn, path, "progress")
111+ progress_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "progress")
112 if err != nil {
113 return nil, err
114 }

Subscribers

People subscribed via source and target branches