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
=== modified file 'common.go'
--- common.go 2014-05-20 09:17:21 +0000
+++ common.go 2014-07-17 11:59:16 +0000
@@ -146,11 +146,11 @@
146 return value, nil146 return value, nil
147}147}
148148
149func connectToSignal(conn *dbus.Connection, path dbus.ObjectPath, signal string) (watch, error) {149func connectToSignal(conn *dbus.Connection, path dbus.ObjectPath, sender, dbusInterface, signal string) (watch, error) {
150 sw, err := conn.WatchSignal(&dbus.MatchRule{150 sw, err := conn.WatchSignal(&dbus.MatchRule{
151 Type: dbus.TypeSignal,151 Type: dbus.TypeSignal,
152 Sender: DOWNLOAD_SERVICE,152 Sender: sender,
153 Interface: DOWNLOAD_INTERFACE,153 Interface: dbusInterface,
154 Member: signal,154 Member: signal,
155 Path: path})155 Path: path})
156 w := newWatchWrapper(sw)156 w := newWatchWrapper(sw)
157157
=== modified file 'downloader.go'
--- downloader.go 2014-05-20 09:17:21 +0000
+++ downloader.go 2014-07-17 11:59:16 +0000
@@ -116,43 +116,43 @@
116func newFileDownload(conn *dbus.Connection, path dbus.ObjectPath) (*FileDownload, error) {116func newFileDownload(conn *dbus.Connection, path dbus.ObjectPath) (*FileDownload, error) {
117 proxy := conn.Object(DOWNLOAD_SERVICE, path)117 proxy := conn.Object(DOWNLOAD_SERVICE, path)
118 started_ch := make(chan bool)118 started_ch := make(chan bool)
119 started_w, err := connectToSignal(conn, path, "started")119 started_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "started")
120 if err != nil {120 if err != nil {
121 return nil, err121 return nil, err
122 }122 }
123123
124 paused_ch := make(chan bool)124 paused_ch := make(chan bool)
125 paused_w, err := connectToSignal(conn, path, "paused")125 paused_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "paused")
126 if err != nil {126 if err != nil {
127 return nil, err127 return nil, err
128 }128 }
129129
130 resumed_ch := make(chan bool)130 resumed_ch := make(chan bool)
131 resumed_w, err := connectToSignal(conn, path, "resumed")131 resumed_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "resumed")
132 if err != nil {132 if err != nil {
133 return nil, err133 return nil, err
134 }134 }
135135
136 canceled_ch := make(chan bool)136 canceled_ch := make(chan bool)
137 canceled_w, err := connectToSignal(conn, path, "canceled")137 canceled_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "canceled")
138 if err != nil {138 if err != nil {
139 return nil, err139 return nil, err
140 }140 }
141141
142 finished_ch := make(chan string)142 finished_ch := make(chan string)
143 finished_w, err := connectToSignal(conn, path, "finished")143 finished_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "finished")
144 if err != nil {144 if err != nil {
145 return nil, err145 return nil, err
146 }146 }
147147
148 errors_ch := make(chan error)148 errors_ch := make(chan error)
149 errors_w, err := connectToSignal(conn, path, "error")149 errors_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "error")
150 if err != nil {150 if err != nil {
151 return nil, err151 return nil, err
152 }152 }
153153
154 progress_ch := make(chan Progress)154 progress_ch := make(chan Progress)
155 progress_w, err := connectToSignal(conn, path, "progress")155 progress_w, err := connectToSignal(conn, path, DOWNLOAD_SERVICE, DOWNLOAD_INTERFACE, "progress")
156 if err != nil {156 if err != nil {
157 return nil, err157 return nil, err
158 }158 }
159159
=== modified file 'uploader.go'
--- uploader.go 2014-06-30 14:28:47 +0000
+++ uploader.go 2014-07-17 11:59:16 +0000
@@ -88,31 +88,31 @@
88func newFileUpload(conn *dbus.Connection, path dbus.ObjectPath) (*FileUpload, error) {88func newFileUpload(conn *dbus.Connection, path dbus.ObjectPath) (*FileUpload, error) {
89 proxy := conn.Object(UPLOAD_SERVICE, path)89 proxy := conn.Object(UPLOAD_SERVICE, path)
90 started_ch := make(chan bool)90 started_ch := make(chan bool)
91 started_w, err := connectToSignal(conn, path, "started")91 started_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "started")
92 if err != nil {92 if err != nil {
93 return nil, err93 return nil, err
94 }94 }
9595
96 canceled_ch := make(chan bool)96 canceled_ch := make(chan bool)
97 canceled_w, err := connectToSignal(conn, path, "canceled")97 canceled_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "canceled")
98 if err != nil {98 if err != nil {
99 return nil, err99 return nil, err
100 }100 }
101101
102 finished_ch := make(chan string)102 finished_ch := make(chan string)
103 finished_w, err := connectToSignal(conn, path, "finished")103 finished_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "finished")
104 if err != nil {104 if err != nil {
105 return nil, err105 return nil, err
106 }106 }
107107
108 errors_ch := make(chan error)108 errors_ch := make(chan error)
109 errors_w, err := connectToSignal(conn, path, "error")109 errors_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "error")
110 if err != nil {110 if err != nil {
111 return nil, err111 return nil, err
112 }112 }
113113
114 progress_ch := make(chan Progress)114 progress_ch := make(chan Progress)
115 progress_w, err := connectToSignal(conn, path, "progress")115 progress_w, err := connectToSignal(conn, path, UPLOAD_SERVICE, UPLOAD_INTERFACE, "progress")
116 if err != nil {116 if err != nil {
117 return nil, err117 return nil, err
118 }118 }

Subscribers

People subscribed via source and target branches