Skip to content
This repository was archived by the owner on Oct 9, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mediamosa/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ def _login_challenge(self):
def _login_response(self, challenge):
"""Performs a login response to a particular challenge
"""
rand = hashlib.md5(str(random.random())).hexdigest()[:8]
digest = hashlib.sha1('%s:%s:%s' % (challenge, rand, self.secret))\
rand = hashlib.md5(str(random.random()).encode('utf-8')).hexdigest()[:8]
digest = hashlib.sha1(('%s:%s:%s' % (challenge, rand, self.secret)).encode('utf-8'))\
.hexdigest()
headers, items = self._post('/login',
{'dbus': 'DATA %s %s' % (rand, digest)})
Expand Down
4 changes: 4 additions & 0 deletions mediamosa/resources.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import datetime
import sys


class MediaMosaResource(object):

class STATE(object):
Expand Down Expand Up @@ -244,6 +245,9 @@ def next(self):
else:
raise StopIteration

def __next__(self):
return self.next()

def __len__(self):
"""Returns the total amount of assets, not simple the loaded ones.
"""
Expand Down