Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a46523e

Browse filesBrowse files
schworerschworer
committed
Merge pull request #20 from schworer/live-report
Add Reports API methods
2 parents 91fd3ec + 92a2af8 commit a46523e
Copy full SHA for a46523e

File tree

6 files changed

+177
-9
lines changed
Filter options

6 files changed

+177
-9
lines changed

‎test/fixtures/report_all.json

Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"total": {
3+
"live": {
4+
"encoded_hours": 5,
5+
"stream_hours": 5
6+
},
7+
"vod": {
8+
"encoded_minutes": 6,
9+
"billable_minutes": 8
10+
}
11+
},
12+
"statistics": {
13+
"live": {
14+
"length": 2
15+
}
16+
}
17+
}

‎test/fixtures/report_all_date.json

Copy file name to clipboard
+38Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"statistics": {
3+
"vod": [
4+
{
5+
"encoded_minutes": 5,
6+
"billable_minutes": 0,
7+
"grouping": null,
8+
"collected_on": "2013-05-13"
9+
}
10+
],
11+
"live": [
12+
{
13+
"total_billable_hours": 2,
14+
"stream_hours": 1,
15+
"billable_stream_hours": 0,
16+
"encoded_hours": 2,
17+
"grouping": null,
18+
"collected_on": "2013-05-13",
19+
"billable_encoded_hours": 0,
20+
"total_hours": 2
21+
}
22+
]
23+
},
24+
"total": {
25+
"vod": {
26+
"encoded_minutes": 5,
27+
"billable_minutes": 0
28+
},
29+
"live": {
30+
"total_billable_hours": 2,
31+
"stream_hours": 1,
32+
"billable_stream_hours": 0,
33+
"encoded_hours": 2,
34+
"billable_encoded_hours": 0,
35+
"total_hours": 2
36+
}
37+
}
38+
}

‎test/fixtures/report_live.json

Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"total": {
3+
"encoded_hours": 5,
4+
"stream_hours": 5
5+
},
6+
"statistics": {
7+
"length": 5
8+
}
9+
}

‎test/fixtures/report_vod.json

Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"total": {
3+
"encoded_minutes": 6,
4+
"billable_minutes": 8
5+
}
6+
}

‎test/test_reports.py

Copy file name to clipboard
+70Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
import unittest
2+
from mock import patch
3+
4+
from test_util import TEST_API_KEY, load_response
5+
from zencoder import Zencoder
6+
7+
import datetime
8+
9+
class TestReports(unittest.TestCase):
10+
def setUp(self):
11+
self.zen = Zencoder(api_key=TEST_API_KEY)
12+
13+
@patch("requests.Session.get")
14+
def test_reports_vod(self, get):
15+
get.return_value = load_response(200, 'fixtures/report_vod.json')
16+
17+
resp = self.zen.report.vod()
18+
19+
self.assertEquals(resp.code, 200)
20+
self.assertEquals(resp.body['total']['encoded_minutes'], 6)
21+
self.assertEquals(resp.body['total']['billable_minutes'], 8)
22+
23+
@patch("requests.Session.get")
24+
def test_reports_live(self, get):
25+
get.return_value = load_response(200, 'fixtures/report_live.json')
26+
27+
resp = self.zen.report.live()
28+
29+
self.assertEquals(resp.code, 200)
30+
self.assertEquals(resp.body['total']['stream_hours'], 5)
31+
self.assertEquals(resp.body['total']['encoded_hours'], 5)
32+
self.assertEquals(resp.body['statistics']['length'], 5)
33+
34+
@patch("requests.Session.get")
35+
def test_reports_all(self, get):
36+
get.return_value = load_response(200, 'fixtures/report_all.json')
37+
38+
resp = self.zen.report.all()
39+
40+
self.assertEquals(resp.code, 200)
41+
42+
self.assertEquals(resp.body['total']['live']['stream_hours'], 5)
43+
self.assertEquals(resp.body['total']['live']['encoded_hours'], 5)
44+
self.assertEquals(resp.body['total']['vod']['encoded_minutes'], 6)
45+
self.assertEquals(resp.body['total']['vod']['billable_minutes'], 8)
46+
self.assertEquals(resp.body['statistics']['live']['length'], 2)
47+
48+
@patch("requests.Session.get")
49+
def test_reports_all_date_filter(self, get):
50+
get.return_value = load_response(200, 'fixtures/report_all_date.json')
51+
52+
start = datetime.date(2013, 5, 13)
53+
end = datetime.date(2013, 5, 13)
54+
resp = self.zen.report.all(start_date=start, end_date=end)
55+
56+
self.assertEquals(resp.code, 200)
57+
58+
self.assertEquals(resp.body['statistics']['vod'][0]['encoded_minutes'], 5)
59+
self.assertEquals(resp.body['statistics']['vod'][0]['billable_minutes'], 0)
60+
self.assertEquals(resp.body['statistics']['live'][0]['stream_hours'], 1)
61+
self.assertEquals(resp.body['statistics']['live'][0]['total_hours'], 2)
62+
63+
self.assertEquals(resp.body['total']['vod']['encoded_minutes'], 5)
64+
self.assertEquals(resp.body['total']['vod']['billable_minutes'], 0)
65+
self.assertEquals(resp.body['total']['live']['stream_hours'], 1)
66+
self.assertEquals(resp.body['total']['live']['total_hours'], 2)
67+
68+
if __name__ == "__main__":
69+
unittest.main()
70+

‎zencoder/core.py

Copy file name to clipboardExpand all lines: zencoder/core.py
+37-9Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,21 @@ def __init__(self, *args, **kwargs):
340340
kwargs['resource_name'] = 'reports'
341341
super(Report, self).__init__(*args, **kwargs)
342342

343+
def __format(self, start_date=None, end_date=None, grouping=None):
344+
data = {'api_key': self.api_key}
345+
346+
date_format = '%Y-%m-%d'
347+
if start_date:
348+
data['from'] = start_date.strftime(date_format)
349+
350+
if end_date:
351+
data['to'] = end_date.strftime(date_format)
352+
353+
if grouping:
354+
data['grouping'] = grouping
355+
356+
return data
357+
343358
def minutes(self, start_date=None, end_date=None, grouping=None):
344359
"""
345360
Gets a detailed Report of encoded minutes and billable minutes for a
@@ -359,17 +374,30 @@ def minutes(self, start_date=None, end_date=None, grouping=None):
359374
yesterday)
360375
@param grouping: Minute usage for only one report grouping
361376
"""
362-
data = {'api_key': self.api_key}
363-
date_format = '%Y-%m-%d'
364-
if start_date:
365-
data['from'] = datetime.strftime(start_date, date_format)
366377

367-
if end_date:
368-
data['to'] = datetime.strftime(end_date, date_format)
369-
370-
if grouping:
371-
data['grouping'] = grouping
378+
data = self.__format(start_date, end_date)
372379

373380
url = self.base_url + '/minutes'
374381
return self.get(url, data=data)
375382

383+
def vod(self, start_date=None, end_date=None, grouping=None):
384+
""" Gets a report of VOD Usage """
385+
data = self.__format(start_date, end_date, grouping)
386+
387+
url = self.base_url + '/vod'
388+
return self.get(url, data=data)
389+
390+
def live(self, start_date=None, end_date=None, grouping=None):
391+
""" Gets a report of Live Usage """
392+
data = self.__format(start_date, end_date, grouping)
393+
394+
url = self.base_url + '/live'
395+
return self.get(url, data=data)
396+
397+
def all(self, start_date=None, end_date=None, grouping=None):
398+
""" Gets a report of both VOD and Live Usage """
399+
data = self.__format(start_date, end_date, grouping)
400+
401+
url = self.base_url + '/all'
402+
return self.get(url, data=data)
403+

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.