Skip to content

Commit f9df8fc

Browse files
committed
update for get_id_list
api4 wouldn't work
1 parent 1b54a94 commit f9df8fc

1 file changed

Lines changed: 36 additions & 18 deletions

File tree

src/ampache.py

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,6 @@ def set_format(self, myformat: str):
7272
print('AMPACHE_API set to ' + myformat)
7373
self.AMPACHE_API = myformat
7474

75-
def set_version(self, myversion: str):
76-
""" set_version
77-
78-
Allow forcing a default API version
79-
80-
api3 = '390001'
81-
api4 = '443000'
82-
api5 = '5.5.6'
83-
api6 = '6.6.0'
84-
85-
INPUTS
86-
* myversion = (string) '6.6.0'|'390001'
87-
"""
88-
if self.AMPACHE_DEBUG:
89-
print('AMPACHE_VERSION set to ' + myversion)
90-
self.AMPACHE_VERSION = myversion
91-
9275
def set_debug(self, mybool: bool):
9376
""" set_debug
9477
@@ -114,6 +97,23 @@ def set_debug_path(self, path_string: str):
11497
"""
11598
self.DOCS_PATH = path_string
11699

100+
def set_version(self, myversion: str):
101+
""" set_version
102+
103+
Allow forcing a default API version
104+
105+
api3 = '390001'
106+
api4 = '443000'
107+
api5 = '5.5.6'
108+
api6 = '6.6.0'
109+
110+
INPUTS
111+
* myversion = (string) '6.6.0'|'390001'
112+
"""
113+
if self.AMPACHE_DEBUG:
114+
print('AMPACHE_VERSION set to ' + myversion)
115+
self.AMPACHE_VERSION = myversion
116+
117117
def set_user(self, myuser: str):
118118
""" set_user
119119
@@ -122,6 +122,8 @@ def set_user(self, myuser: str):
122122
INPUTS
123123
* myuser = (string) ''
124124
"""
125+
if self.AMPACHE_DEBUG:
126+
print('AMPACHE_USER set to ' + myuser)
125127
self.AMPACHE_USER = myuser
126128

127129
def set_key(self, mykey: str):
@@ -132,6 +134,8 @@ def set_key(self, mykey: str):
132134
INPUTS
133135
* mykey = (string) ''
134136
"""
137+
if self.AMPACHE_DEBUG:
138+
print('AMPACHE_KEY set to ' + mykey)
135139
self.AMPACHE_KEY = mykey
136140

137141
def set_url(self, myurl: str):
@@ -142,6 +146,8 @@ def set_url(self, myurl: str):
142146
INPUTS
143147
* myurl = (string) ''
144148
"""
149+
if self.AMPACHE_DEBUG:
150+
print('AMPACHE_URL set to ' + myurl)
145151
self.AMPACHE_URL = myurl
146152

147153
def set_config_path(self, path: str):
@@ -299,7 +305,19 @@ def get_id_list(self, data, attribute: str):
299305
except (KeyError, TypeError):
300306
id_list.append(data['id'])
301307
except (KeyError, TypeError):
302-
pass
308+
try:
309+
if data[0]['id']:
310+
for data_object in data:
311+
try:
312+
id_list.append(data_object[0]['id'])
313+
except (KeyError, TypeError):
314+
id_list.append(data_object['id'])
315+
try:
316+
id_list.append(data[0]['id'])
317+
except (KeyError, TypeError):
318+
id_list.append(data['id'])
319+
except (KeyError, TypeError):
320+
pass
303321

304322
return id_list
305323

0 commit comments

Comments
 (0)