Skip to content

Commit 140285d

Browse files
committed
add listMusicPackages api
1 parent f2c224a commit 140285d

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

api.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,23 @@ def restoreSettings():
173173
Config.get()
174174
return "ok"
175175

176+
176177
def updateFromPackage():
177178
os.system('sudo bash /home/pi/clean-update.sh')
178179
file_to_upload = connexion.request.files['file_to_upload']
179180
file_to_upload.save(os.path.join('/home/pi/', 'update.tar'))
180181
os.system('sudo reboot')
181182
return 200
182183

183-
def updatePackages():
184+
def listMusicPackages():
185+
"""
186+
list available music packages
187+
"""
188+
musicPkg = MusicPackageManager.get_instance()
189+
response = musicPkg.listPackages()
190+
return json.dumps(response)
191+
192+
def updateMusicPackages():
184193
"""
185194
Add a musical package an save the list of available packages on disk
186195
also add sounds and directory
@@ -196,9 +205,9 @@ def updatePackages():
196205
if response == 1:
197206
return 200
198207
elif response == 2:
199-
return 2
208+
return 400
200209
elif response == 3:
201-
return 3
210+
return 400
202211

203212

204213
## Programs

musicPackages.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ def __init__(self):
111111
if p not in self.packages:
112112
self.packages[p] = mp
113113

114+
def listPackages(self):
115+
return self.packages
116+
114117
def updatePackages(self):
115118
newdict = { 'packages': {} }
116119
for element in self.packages:

v2.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
swagger: "2.0"
22
info:
3-
version: "0.2"
3+
version: "0.3"
44
title: OpenAPI 2.0 definition of Coderbot API v2
55

66
consumes:
@@ -74,9 +74,17 @@ paths:
7474
description: "ok"
7575
400:
7676
description: "Failed to save the activity"
77+
/listMusicPackages:
78+
get:
79+
operationId: "api.listMusicPackages"
80+
summary: "List Music Packages"
81+
responses:
82+
200:
83+
description: "ok"
7784
/updateFromPackage:
7885
post:
7986
operationId: "api.updateFromPackage"
87+
summary: "Update CoderBot from package"
8088
consumes:
8189
- multipart/form-data
8290
parameters:

0 commit comments

Comments
 (0)