Merge lp:~aisrael/charms/precise/musica/charm-proof into lp:charms/musica
- Precise Pangolin (12.04)
- charm-proof
- Merge into trunk
Proposed by
Adam Israel
Status: | Merged |
---|---|
Merge reported by: | Tim Van Steenburgh |
Merged at revision: | not available |
Proposed branch: | lp:~aisrael/charms/precise/musica/charm-proof |
Merge into: | lp:charms/musica |
Diff against target: |
328 lines (+308/-0) 3 files modified
README.md (+14/-0) icon.svg (+292/-0) metadata.yaml (+2/-0) |
To merge this branch: | bzr merge lp:~aisrael/charms/precise/musica/charm-proof |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Van Steenburgh (community) | Approve | ||
Review Queue (community) | automated testing | Needs Fixing | |
Review via email: mp+237756@code.launchpad.net |
Commit message
Description of the change
Add categories, placeholder icon and skeletal readme to satisfy charm proof
To post a comment you must log in.
Revision history for this message
Review Queue (review-queue) wrote : | # |
review:
Needs Fixing
(automated testing)
- 5. By Adam Israel
-
Add README and icon.svg in order to pass charm proof.
Revision history for this message
Adam Israel (aisrael) wrote : | # |
It looks like I forgot to add the README and icon originally, so I've fixed that. The charm deploys successfully, but the musica code itself looks to be broken, at least under trusty.
ubuntu@
PHP Parse error: syntax error, unexpected end of file in index.php on line 715
Errors parsing index.php
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote : | # |
LGTM, thanks Adam!
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'README.md' |
2 | --- README.md 1970-01-01 00:00:00 +0000 |
3 | +++ README.md 2014-10-30 15:15:20 +0000 |
4 | @@ -0,0 +1,14 @@ |
5 | +## Overview |
6 | + |
7 | +Musica is a web application for browsing and listening to your music. Songs are organized hierarchically in folders of Artists, and sub-folders of Albums. The PHP script presents an interface for navigating among artists and albums. It dynamically generates playlists, allows for downloading single songs, entire albums, and links to Wikipedia articles on artists and albums. |
8 | + |
9 | +# Usage |
10 | + |
11 | + juju deploy musica |
12 | + juju expose musica |
13 | + |
14 | +After a successful deployment, you can get the musica unit IP address with: |
15 | + |
16 | + juju status musica |
17 | + |
18 | +and then browse to http://ip-address/musica to configure the service. |
19 | |
20 | === added file 'icon.svg' |
21 | --- icon.svg 1970-01-01 00:00:00 +0000 |
22 | +++ icon.svg 2014-10-30 15:15:20 +0000 |
23 | @@ -0,0 +1,292 @@ |
24 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
25 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
26 | + |
27 | +<svg |
28 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
29 | + xmlns:cc="http://creativecommons.org/ns#" |
30 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
31 | + xmlns:svg="http://www.w3.org/2000/svg" |
32 | + xmlns="http://www.w3.org/2000/svg" |
33 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
34 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
35 | + width="96" |
36 | + height="96" |
37 | + id="svg6517" |
38 | + version="1.1" |
39 | + inkscape:version="0.48.4 r9939" |
40 | + sodipodi:docname="juju-icon-placeholder-m.svg"> |
41 | + <defs |
42 | + id="defs6519"> |
43 | + <linearGradient |
44 | + id="Background"> |
45 | + <stop |
46 | + id="stop4178" |
47 | + offset="0" |
48 | + style="stop-color:#b8b8b8;stop-opacity:1" /> |
49 | + <stop |
50 | + id="stop4180" |
51 | + offset="1" |
52 | + style="stop-color:#c9c9c9;stop-opacity:1" /> |
53 | + </linearGradient> |
54 | + <filter |
55 | + style="color-interpolation-filters:sRGB;" |
56 | + inkscape:label="Inner Shadow" |
57 | + id="filter1121"> |
58 | + <feFlood |
59 | + flood-opacity="0.59999999999999998" |
60 | + flood-color="rgb(0,0,0)" |
61 | + result="flood" |
62 | + id="feFlood1123" /> |
63 | + <feComposite |
64 | + in="flood" |
65 | + in2="SourceGraphic" |
66 | + operator="out" |
67 | + result="composite1" |
68 | + id="feComposite1125" /> |
69 | + <feGaussianBlur |
70 | + in="composite1" |
71 | + stdDeviation="1" |
72 | + result="blur" |
73 | + id="feGaussianBlur1127" /> |
74 | + <feOffset |
75 | + dx="0" |
76 | + dy="2" |
77 | + result="offset" |
78 | + id="feOffset1129" /> |
79 | + <feComposite |
80 | + in="offset" |
81 | + in2="SourceGraphic" |
82 | + operator="atop" |
83 | + result="composite2" |
84 | + id="feComposite1131" /> |
85 | + </filter> |
86 | + <filter |
87 | + style="color-interpolation-filters:sRGB;" |
88 | + inkscape:label="Drop Shadow" |
89 | + id="filter950"> |
90 | + <feFlood |
91 | + flood-opacity="0.25" |
92 | + flood-color="rgb(0,0,0)" |
93 | + result="flood" |
94 | + id="feFlood952" /> |
95 | + <feComposite |
96 | + in="flood" |
97 | + in2="SourceGraphic" |
98 | + operator="in" |
99 | + result="composite1" |
100 | + id="feComposite954" /> |
101 | + <feGaussianBlur |
102 | + in="composite1" |
103 | + stdDeviation="1" |
104 | + result="blur" |
105 | + id="feGaussianBlur956" /> |
106 | + <feOffset |
107 | + dx="0" |
108 | + dy="1" |
109 | + result="offset" |
110 | + id="feOffset958" /> |
111 | + <feComposite |
112 | + in="SourceGraphic" |
113 | + in2="offset" |
114 | + operator="over" |
115 | + result="composite2" |
116 | + id="feComposite960" /> |
117 | + <feBlend |
118 | + blend="normal" |
119 | + id="feBlend3895" |
120 | + in2="composite2" /> |
121 | + </filter> |
122 | + <clipPath |
123 | + clipPathUnits="userSpaceOnUse" |
124 | + id="clipPath873"> |
125 | + <g |
126 | + transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)" |
127 | + id="g875" |
128 | + inkscape:label="Layer 1" |
129 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"> |
130 | + <path |
131 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" |
132 | + d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z" |
133 | + id="path877" |
134 | + inkscape:connector-curvature="0" |
135 | + sodipodi:nodetypes="sssssssss" /> |
136 | + </g> |
137 | + </clipPath> |
138 | + <filter |
139 | + inkscape:collect="always" |
140 | + id="filter891" |
141 | + inkscape:label="Badge Shadow"> |
142 | + <feGaussianBlur |
143 | + inkscape:collect="always" |
144 | + stdDeviation="0.71999962" |
145 | + id="feGaussianBlur893" /> |
146 | + </filter> |
147 | + </defs> |
148 | + <sodipodi:namedview |
149 | + id="base" |
150 | + pagecolor="#ffffff" |
151 | + bordercolor="#666666" |
152 | + borderopacity="1.0" |
153 | + inkscape:pageopacity="0.0" |
154 | + inkscape:pageshadow="2" |
155 | + inkscape:zoom="8.1490724" |
156 | + inkscape:cx="6.3116087" |
157 | + inkscape:cy="46.975739" |
158 | + inkscape:document-units="px" |
159 | + inkscape:current-layer="layer3" |
160 | + showgrid="true" |
161 | + fit-margin-top="0" |
162 | + fit-margin-left="0" |
163 | + fit-margin-right="0" |
164 | + fit-margin-bottom="0" |
165 | + inkscape:window-width="1849" |
166 | + inkscape:window-height="1218" |
167 | + inkscape:window-x="123" |
168 | + inkscape:window-y="68" |
169 | + inkscape:window-maximized="0" |
170 | + showborder="true" |
171 | + showguides="true" |
172 | + inkscape:guide-bbox="true" |
173 | + inkscape:showpageshadow="false"> |
174 | + <inkscape:grid |
175 | + type="xygrid" |
176 | + id="grid821" /> |
177 | + <sodipodi:guide |
178 | + orientation="1,0" |
179 | + position="16,48" |
180 | + id="guide823" /> |
181 | + <sodipodi:guide |
182 | + orientation="0,1" |
183 | + position="64,80" |
184 | + id="guide825" /> |
185 | + <sodipodi:guide |
186 | + orientation="1,0" |
187 | + position="80,40" |
188 | + id="guide827" /> |
189 | + <sodipodi:guide |
190 | + orientation="0,1" |
191 | + position="64,16" |
192 | + id="guide829" /> |
193 | + </sodipodi:namedview> |
194 | + <metadata |
195 | + id="metadata6522"> |
196 | + <rdf:RDF> |
197 | + <cc:Work |
198 | + rdf:about=""> |
199 | + <dc:format>image/svg+xml</dc:format> |
200 | + <dc:type |
201 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
202 | + <dc:title /> |
203 | + </cc:Work> |
204 | + </rdf:RDF> |
205 | + </metadata> |
206 | + <g |
207 | + inkscape:label="BACKGROUND" |
208 | + inkscape:groupmode="layer" |
209 | + id="layer1" |
210 | + transform="translate(268,-635.29076)" |
211 | + style="display:inline"> |
212 | + <path |
213 | + style="fill:#333333;fill-opacity:0.93333334000000001;stroke:none;display:inline;filter:url(#filter1121);opacity:0.7" |
214 | + d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z" |
215 | + id="path6455" |
216 | + inkscape:connector-curvature="0" |
217 | + sodipodi:nodetypes="sssssssss" /> |
218 | + </g> |
219 | + <g |
220 | + inkscape:groupmode="layer" |
221 | + id="layer3" |
222 | + inkscape:label="PLACEHOLDER LETTER" |
223 | + style="display:inline"> |
224 | + <text |
225 | + xml:space="preserve" |
226 | + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter950);font-family:Sans" |
227 | + x="24.809601" |
228 | + y="62.952" |
229 | + id="text3891" |
230 | + sodipodi:linespacing="125%"><tspan |
231 | + sodipodi:role="line" |
232 | + id="tspan3893" |
233 | + x="24.809601" |
234 | + y="62.952" |
235 | + style="font-size:56px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium">m</tspan></text> |
236 | + <rect |
237 | + style="opacity:0.7;fill:none;stroke:none" |
238 | + id="rect3021" |
239 | + width="64" |
240 | + height="64" |
241 | + x="17.197599" |
242 | + y="16" /> |
243 | + </g> |
244 | + <g |
245 | + inkscape:groupmode="layer" |
246 | + id="layer2" |
247 | + inkscape:label="BADGE" |
248 | + style="display:none" |
249 | + sodipodi:insensitive="true"> |
250 | + <g |
251 | + style="display:inline" |
252 | + transform="translate(-340.00001,-581)" |
253 | + id="g4394" |
254 | + clip-path="none"> |
255 | + <g |
256 | + id="g855"> |
257 | + <g |
258 | + inkscape:groupmode="maskhelper" |
259 | + id="g870" |
260 | + clip-path="url(#clipPath873)" |
261 | + style="opacity:0.6;filter:url(#filter891)"> |
262 | + <path |
263 | + transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)" |
264 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
265 | + sodipodi:ry="12" |
266 | + sodipodi:rx="12" |
267 | + sodipodi:cy="552.36218" |
268 | + sodipodi:cx="252" |
269 | + id="path844" |
270 | + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
271 | + sodipodi:type="arc" /> |
272 | + </g> |
273 | + <g |
274 | + id="g862"> |
275 | + <path |
276 | + sodipodi:type="arc" |
277 | + style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
278 | + id="path4398" |
279 | + sodipodi:cx="252" |
280 | + sodipodi:cy="552.36218" |
281 | + sodipodi:rx="12" |
282 | + sodipodi:ry="12" |
283 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
284 | + transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" /> |
285 | + <path |
286 | + transform="matrix(1.25,0,0,1.25,33,-100.45273)" |
287 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
288 | + sodipodi:ry="12" |
289 | + sodipodi:rx="12" |
290 | + sodipodi:cy="552.36218" |
291 | + sodipodi:cx="252" |
292 | + id="path4400" |
293 | + style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
294 | + sodipodi:type="arc" /> |
295 | + <path |
296 | + sodipodi:type="star" |
297 | + style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
298 | + id="path4459" |
299 | + sodipodi:sides="5" |
300 | + sodipodi:cx="666.19574" |
301 | + sodipodi:cy="589.50385" |
302 | + sodipodi:r1="7.2431178" |
303 | + sodipodi:r2="4.3458705" |
304 | + sodipodi:arg1="1.0471976" |
305 | + sodipodi:arg2="1.6755161" |
306 | + inkscape:flatsided="false" |
307 | + inkscape:rounded="0.1" |
308 | + inkscape:randomized="0" |
309 | + d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z" |
310 | + transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" /> |
311 | + </g> |
312 | + </g> |
313 | + </g> |
314 | + </g> |
315 | +</svg> |
316 | |
317 | === modified file 'metadata.yaml' |
318 | --- metadata.yaml 2012-05-23 16:07:08 +0000 |
319 | +++ metadata.yaml 2014-10-30 15:15:20 +0000 |
320 | @@ -1,6 +1,8 @@ |
321 | name: musica |
322 | summary: "Musica is a web application for browsing and streaming a music library" |
323 | maintainer: Dustin Kirkland <dustin.kirkland@gmail.com> |
324 | +categories: |
325 | +- other |
326 | description: | |
327 | Musica is a web application for browsing and streaming a music |
328 | library, except that you own the filesystem serving the content. |
This items has failed automated testing! Results available here http:// reports. vapour. ws/charm- tests/charm- bundle- test-1268- results