1
=== modified file 'debian/changelog'
2
--- debian/changelog	2017-03-21 03:29:09 +0000
3
+++ debian/changelog	2017-03-30 13:56:23 +0000
4
@@ -1,3 +1,9 @@
5
1
ubuntu-app-launch (0.12) UNRELEASED; urgency=medium
6
2
7
3
  * Bump version for new AppID methods
8
4
9
5
 -- Michael Terry <mterry@ubuntu.com>  Tue, 28 Feb 2017 15:59:05 -0500
10
6
11
1
ubuntu-app-launch (0.11+17.04.20170321-0ubuntu1) zesty; urgency=medium
7
ubuntu-app-launch (0.11+17.04.20170321-0ubuntu1) zesty; urgency=medium
12
2
8
13
3
  [ Ted Gould ]
9
  [ Ted Gould ]
14
4
10
15
=== modified file 'libubuntu-app-launch/appid.h'
16
--- libubuntu-app-launch/appid.h	2016-08-24 21:52:19 +0000
17
+++ libubuntu-app-launch/appid.h	2017-03-30 13:56:23 +0000
18
@@ -1,5 +1,5 @@
19
1
/*
1
/*
21
2
 * Copyright © 2016 Canonical Ltd.
2
 * Copyright © 2016-2017 Canonical Ltd.
22
3
 *
3
 *
23
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
24
5
 * under the terms of the GNU General Public License version 3, as published
5
 * under the terms of the GNU General Public License version 3, as published
25
@@ -82,6 +82,16 @@
26
82
        anyting other than debug messages. */
82
        anyting other than debug messages. */
27
83
    operator std::string() const;
83
    operator std::string() const;
28
84
84
29
85
    /** Turn the structure into a string suitable for use in DBus paths.
30
86
        Turn this back into an AppID with parseDBusID(). This is otherwise not
31
87
        a valid AppID string. */
32
88
    std::string dbusID() const;
33
89
34
90
    /** Turn the structure into a string without any revision information.
35
91
        This is suitable for writing the AppID to disk. Turn this back into
36
92
        an AppID with find(). This is otherwise not a valid AppID string. */
37
93
    std::string persistentID() const;
38
94
39
85
    /** Empty constructor for an AppID. Makes coding with them easier, but generally
95
    /** Empty constructor for an AppID. Makes coding with them easier, but generally
40
86
        there is nothing useful about an empty AppID. */
96
        there is nothing useful about an empty AppID. */
41
87
    AppID();
97
    AppID();
42
@@ -98,6 +108,13 @@
43
98
    */
108
    */
44
99
    AppID(Package pkg, AppName app, Version ver);
109
    AppID(Package pkg, AppName app, Version ver);
45
100
110
46
111
    /** Parse a string from DBus and turn it into an AppID. This assumes that
47
112
        the string was originally produced by dbusID(), the result is otherwise
48
113
        undefined.
49
114
50
115
        \param dbusid String from a DBus path
51
116
    */
52
117
    static AppID parseDBusID(const std::string& dbusid);
53
101
    /** Parse a string and turn it into an AppID. This assumes that the string is
118
    /** Parse a string and turn it into an AppID. This assumes that the string is
54
102
        in the form: $(package)_$(app)_$(version) and will return an empty AppID
119
        in the form: $(package)_$(app)_$(version) and will return an empty AppID
55
103
        if not.
120
        if not.
56
@@ -106,7 +123,7 @@
57
106
    */
123
    */
58
107
    static AppID parse(const std::string& appid);
124
    static AppID parse(const std::string& appid);
59
108
    /** Find is a more tollerant version of parse(), it handles legacy applications,
125
    /** Find is a more tollerant version of parse(), it handles legacy applications,
61
109
        short AppIDs ($package_$app) and other forms of that are in common usage.
126
        persistent IDs and other forms of that are in common usage.
62
110
        It can be used, but is slower than parse() if you've got well formed data
127
        It can be used, but is slower than parse() if you've got well formed data
63
111
        already.
128
        already.
64
112
129
65
@@ -117,7 +134,7 @@
66
117
    */
134
    */
67
118
    static AppID find(const std::string& sappid);
135
    static AppID find(const std::string& sappid);
68
119
    /** Find is a more tollerant version of parse(), it handles legacy applications,
136
    /** Find is a more tollerant version of parse(), it handles legacy applications,
70
120
        short AppIDs ($package_$app) and other forms of that are in common usage.
137
        persistent IDs and other forms of that are in common usage.
71
121
        It can be used, but is slower than parse() if you've got well formed data
138
        It can be used, but is slower than parse() if you've got well formed data
72
122
        already.
139
        already.
73
123
140
74
124
141
75
=== modified file 'libubuntu-app-launch/application.cpp'
76
--- libubuntu-app-launch/application.cpp	2017-02-25 15:58:27 +0000
77
+++ libubuntu-app-launch/application.cpp	2017-03-30 13:56:23 +0000
78
@@ -28,7 +28,9 @@
79
28
#include "registry.h"
28
#include "registry.h"
80
29
29
81
30
#include <functional>
30
#include <functional>
82
31
#include <iomanip>
83
31
#include <iostream>
32
#include <iostream>
84
33
#include <locale>
85
32
#include <regex>
34
#include <regex>
86
33
35
87
34
namespace ubuntu
36
namespace ubuntu
88
@@ -153,6 +155,66 @@
89
153
    return package.value() + "_" + appname.value() + "_" + version.value();
155
    return package.value() + "_" + appname.value() + "_" + version.value();
90
154
}
156
}
91
155
157
92
158
std::string AppID::persistentID() const
93
159
{
94
160
    if (package.value().empty())
95
161
    {
96
162
        if (appname.value().empty())
97
163
        {
98
164
            return {};
99
165
        }
100
166
        else
101
167
        {
102
168
            return appname.value();
103
169
        }
104
170
    }
105
171
106
172
    return package.value() + "_" + appname.value();
107
173
}
108
174
109
175
std::string AppID::dbusID() const
110
176
{
111
177
    std::string bytes = operator std::string();
112
178
    std::string encoded;
113
179
114
180
    for (size_t i = 0; i < bytes.size(); ++i) {
115
181
        char chr = bytes[i];
116
182
117
183
        if (std::isalpha(chr, std::locale::classic()) ||
118
184
            (std::isdigit(chr, std::locale::classic()) && i != 0)) {
119
185
            encoded += chr;
120
186
        } else {
121
187
            std::ostringstream hex;
122
188
            hex << std::setw(2) << std::setfill('0') << std::hex;
123
189
            hex << int(chr);
124
190
            encoded += '_' + hex.str();
125
191
        }
126
192
    }
127
193
128
194
    return encoded;
129
195
}
130
196
131
197
AppID AppID::parseDBusID(const std::string& dbusid)
132
198
{
133
199
    std::string decoded;
134
200
135
201
    for (size_t i = 0; i < dbusid.size(); ++i) {
136
202
        char chr = dbusid[i];
137
203
138
204
        if (chr == '_' && i + 2 < dbusid.size()) {
139
205
            int result;
140
206
            std::istringstream hex(dbusid.substr(i + 1, 2));
141
207
            hex >> std::hex >> result;
142
208
            decoded += (char)result;
143
209
            i += 2;
144
210
        } else {
145
211
            decoded += chr;
146
212
        }
147
213
    }
148
214
149
215
    return parse(decoded);
150
216
}
151
217
152
156
bool operator==(const AppID& a, const AppID& b)
218
bool operator==(const AppID& a, const AppID& b)
153
157
{
219
{
154
158
    return a.package.value() == b.package.value() && a.appname.value() == b.appname.value() &&
220
    return a.package.value() == b.package.value() && a.appname.value() == b.appname.value() &&
155
159
221
156
=== modified file 'libubuntu-app-launch/helper.cpp'
157
--- libubuntu-app-launch/helper.cpp	2017-03-20 12:28:10 +0000
158
+++ libubuntu-app-launch/helper.cpp	2017-03-30 13:56:23 +0000
159
@@ -277,7 +277,7 @@
160
277
                    skel);
277
                    skel);
161
278
278
162
279
                /* Find a path to export on */
279
                /* Find a path to export on */
164
280
                auto dbusAppid = dbusSafe(std::string{appid});
280
                auto dbusAppid = appid.dbusID();
165
281
                std::string path;
281
                std::string path;
166
282
282
167
283
                while (path.empty())
283
                while (path.empty())
168
@@ -319,13 +319,6 @@
169
319
        timeout = timeoutin;
319
        timeout = timeoutin;
170
320
    }
320
    }
171
321
321
172
322
    static std::string dbusSafe(const std::string& in)
173
323
    {
174
324
        std::string out = in;
175
325
        std::transform(out.begin(), out.end(), out.begin(), [](char in) { return std::isalpha(in) ? in : '_'; });
176
326
        return out;
177
327
    }
178
328
179
329
    bool proxyCb(GDBusMethodInvocation* invocation)
322
    bool proxyCb(GDBusMethodInvocation* invocation)
180
330
    {
323
    {
181
331
        if (mirfd.get() == 0)
324
        if (mirfd.get() == 0)
182
332
325
183
=== modified file 'tests/libual-cpp-test.cc'
184
--- tests/libual-cpp-test.cc	2017-03-20 15:17:02 +0000
185
+++ tests/libual-cpp-test.cc	2017-03-30 13:56:23 +0000
186
@@ -586,6 +586,30 @@
187
586
    return;
586
    return;
188
587
}
587
}
189
588
588
190
589
TEST_F(LibUAL, DBusID)
191
590
{
192
591
    auto id = ubuntu::app_launch::AppID::parse("container-name_test_0.0");
193
592
    ASSERT_FALSE(id.empty());
194
593
    EXPECT_EQ("container_2dname_5ftest_5f0_2e0", id.dbusID());
195
594
    EXPECT_FALSE(ubuntu::app_launch::AppID::valid(id.dbusID()));
196
595
197
596
    auto parsed = ubuntu::app_launch::AppID::parseDBusID(id.dbusID());
198
597
    ASSERT_FALSE(parsed.empty());
199
598
    EXPECT_EQ(id, parsed);
200
599
}
201
600
202
601
TEST_F(LibUAL, PersistentID)
203
602
{
204
603
    auto id = ubuntu::app_launch::AppID::parse("container-name_test_0.0");
205
604
    ASSERT_FALSE(id.empty());
206
605
    EXPECT_EQ("container-name_test", id.persistentID());
207
606
    EXPECT_FALSE(ubuntu::app_launch::AppID::valid(id.persistentID()));
208
607
209
608
    auto found = ubuntu::app_launch::AppID::find(registry, id.persistentID());
210
609
    ASSERT_FALSE(found.empty());
211
610
    EXPECT_EQ(id, found);
212
611
}
213
612
214
589
TEST_F(LibUAL, ApplicationList)
613
TEST_F(LibUAL, ApplicationList)
215
590
{
614
{
216
591
    SnapdMock snapd{LOCAL_SNAPD_TEST_SOCKET, {u8Package, interfaces, u8Package}};
615
    SnapdMock snapd{LOCAL_SNAPD_TEST_SOCKET, {u8Package, interfaces, u8Package}};
Status:	Merged
Approved by:	Ted Gould on 2017-04-04
Approved revision:	302
Merged at revision:	313
Proposed branch:	lp:~mterry/ubuntu-app-launch/persistentid
Merge into:	lp:ubuntu-app-launch
Diff against target:	216 lines (+113/-11) 5 files modified debian/changelog (+6/-0) libubuntu-app-launch/appid.h (+20/-3) libubuntu-app-launch/application.cpp (+62/-0) libubuntu-app-launch/helper.cpp (+1/-8) tests/libual-cpp-test.cc (+24/-0)
To merge this branch:	bzr merge lp:~mterry/ubuntu-app-launch/persistentid
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ted Gould (community)		2017-03-01	Approve on 2017-04-04
unity-api-1-bot	continuous-integration		Needs Fixing on 2017-03-30
Review via email: mp+318682@code.launchpad.net