Refactor the smarts into the api classes.

The object classes are now simple wrappers.
Improve parameter testing, by passing foo="bar" where possible.
This commit is contained in:
sneakypete81 2013-09-10 17:45:53 +01:00
parent 7a7b43afc7
commit 86ba0914c8
18 changed files with 307 additions and 316 deletions

View file

@ -1,7 +1,7 @@
"""
api_activity.py : Trovebox Activity API Classes
"""
from trovebox import http
import json
from trovebox.errors import TroveboxError
from trovebox.objects.activity import Activity
from .api_base import ApiBase
@ -19,7 +19,7 @@ class ApiActivities(ApiBase):
filter_string = self._build_filter_string(filters)
activities = self._client.get("/activities/%slist.json" % filter_string,
**kwds)["result"]
activities = http.result_to_list(activities)
activities = self._result_to_list(activities)
return [Activity(self._client, activity) for activity in activities]
def purge(self, **kwds):
@ -42,7 +42,11 @@ class ApiActivity(ApiBase):
Requests all properties of an activity.
Returns the requested activity object.
"""
if not isinstance(activity, Activity):
activity = Activity(self._client, {"id": activity})
activity.view(**kwds)
return activity
result = self._client.get("/activity/%s/view.json" %
self._extract_id(activity),
**kwds)["result"]
# TBD: Why is the result enclosed/encoded like this?
result = result["0"]
result["data"] = json.loads(result["data"])
return Activity(self._client, result)