Skip to content

Commit

Permalink
Fixup. Format code with Black
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Apr 12, 2024
1 parent aeddda2 commit 11e14b6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 33 deletions.
11 changes: 6 additions & 5 deletions pod/meeting/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ class MeetingSessionLogAdmin(admin.ModelAdmin):
Args:
admin (ModelAdmin): admin model
"""

list_display = (
"meeting",
"creation_date",
Expand All @@ -215,8 +216,7 @@ def decrypt_mods_as_json(self, obj):
"""Decrypt moderators value to json and show it pretty."""
if not obj:
return _("Mode insert, nothing to display")
moderators = '<pre>{}</pre>'.format(
obj.moderators.replace(' ', '&nbsp;'))
moderators = "<pre>{}</pre>".format(obj.moderators.replace(" ", "&nbsp;"))
return SafeText(moderators)

decrypt_mods_as_json.short_description = _("Moderators")
Expand All @@ -226,8 +226,7 @@ def decrypt_viewers_as_json(self, obj):
"""Decrypt viewers value to json and show it pretty."""
if not obj:
return _("Mode insert, nothing to display")
viewers = '<pre>{}</pre>'.format(
obj.viewers.replace(' ', '&nbsp;'))
viewers = "<pre>{}</pre>".format(obj.viewers.replace(" ", "&nbsp;"))
return SafeText(viewers)

decrypt_viewers_as_json.short_description = _("Viewers")
Expand All @@ -239,7 +238,7 @@ def decrypt_viewers_as_json(self, obj):
"creation_date",
"creator",
"decrypt_mods_as_json",
"decrypt_viewers_as_json"
"decrypt_viewers_as_json",
)

def has_add_permission(self, request):
Expand All @@ -257,6 +256,7 @@ class LivestreamAdmin(admin.ModelAdmin):
Args:
admin (ModelAdmin): admin model
"""

list_display = (
"id",
"meeting",
Expand All @@ -283,6 +283,7 @@ class LiveGatewayAdmin(admin.ModelAdmin):
Args:
admin (ModelAdmin): admin model
"""

list_display = (
"id",
"rtmp_stream_url",
Expand Down
28 changes: 11 additions & 17 deletions pod/meeting/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1086,48 +1086,42 @@ class MeetingSessionLog(models.Model):
An object is created each time that session of meeting is created.
It store all moderators and viewers connected during the session.
"""

meeting = models.ForeignKey(
Meeting, editable=False, verbose_name=_('meeting'), on_delete=models.CASCADE
Meeting, editable=False, verbose_name=_("meeting"), on_delete=models.CASCADE
)
creation_date = models.DateTimeField(editable=False, auto_now_add=True)
creator = models.ForeignKey(
User, editable=False, verbose_name=_('creator'), on_delete=models.CASCADE
User, editable=False, verbose_name=_("creator"), on_delete=models.CASCADE
)
moderators = models.TextField(editable=False, default=[])
viewers = models.TextField(editable=False, default=[])

def set_moderators(self, lst):
self.moderators = json.dumps(
lst,
sort_keys=True,
indent=1,
cls=DjangoJSONEncoder
)
self.moderators = json.dumps(lst, sort_keys=True, indent=1, cls=DjangoJSONEncoder)

def get_moderators(self):
return json.loads(self.moderators)

def set_viewers(self, lst):
self.viewers = json.dumps(
lst,
sort_keys=True,
indent=1,
cls=DjangoJSONEncoder
)
self.viewers = json.dumps(lst, sort_keys=True, indent=1, cls=DjangoJSONEncoder)

def get_viewers(self):
return json.loads(self.viewers)

def __str__(self):
return _("Session of the %(meeting_name)s meeting on %(creation_date)s") % {
'meeting_name': self.meeting.name,
'creation_date': self.creation_date,
"meeting_name": self.meeting.name,
"creation_date": self.creation_date,
}

class Meta:
verbose_name = _("Meeting session log")
verbose_name_plural = _("Meeting session logs")
ordering = ("meeting", "-creation_date",)
ordering = (
"meeting",
"-creation_date",
)
get_latest_by = "creation_date"


Expand Down
17 changes: 6 additions & 11 deletions pod/meeting/tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,7 @@ class MeetingSessionLogTestCase(TestCase):
Args:
TestCase (class): test case
"""

def setUp(self):
self.user = User.objects.create(username="pod")
self.meeting = Meeting.objects.create(id=1, name="test", owner=self.user)
Expand All @@ -844,7 +845,7 @@ def test_with_attributs(self):
meeting=self.meeting,
creator=self.user,
moderators=[[now, "moderator1"]],
viewers=[[now, "viewer1"]]
viewers=[[now, "viewer1"]],
)
self.assertEqual(msl.meeting, self.meeting)
self.assertEqual(msl.creator, self.user)
Expand All @@ -865,11 +866,8 @@ def test_change_attributs(self):
self.assertEqual(
msl.moderators,
json.dumps(
[[now, "moderator1"]],
sort_keys=True,
indent=1,
cls=DjangoJSONEncoder
)
[[now, "moderator1"]], sort_keys=True, indent=1, cls=DjangoJSONEncoder
),
)
viewers = sess.get_viewers()
viewers.append([now, "viewer1"])
Expand All @@ -879,11 +877,8 @@ def test_change_attributs(self):
self.assertEqual(
msl.viewers,
json.dumps(
[[now, "viewer1"]],
sort_keys=True,
indent=1,
cls=DjangoJSONEncoder
)
[[now, "viewer1"]], sort_keys=True, indent=1, cls=DjangoJSONEncoder
),
)

def test_delete_object(self):
Expand Down

0 comments on commit 11e14b6

Please sign in to comment.