Merge pull request #24 from nebulabroadcast/develop

6.0.2

README.md

@@ -2,7 +2,7 @@ Firefly
 =======
 
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/nebulabroadcast/firefly?style=for-the-badge)
-![Maintenance](https://img.shields.io/maintenance/yes/2023?style=for-the-badge)
+![Maintenance](https://img.shields.io/maintenance/yes/2024?style=for-the-badge)
 ![Last commit](https://img.shields.io/github/last-commit/nebulabroadcast/firefly?style=for-the-badge)
 ![Python version](https://img.shields.io/badge/python-3.10-blue?style=for-the-badge)
 

firefly/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "6.0.1"
+__version__ = "6.0.2"
 
 from firefly.config import config
 from firefly.settings import Settings

firefly/modules/scheduler/calendar.py

@@ -183,7 +183,7 @@ def drawBlock(self, qp, event, end):
 
         TEXT_SIZE = 9
         base_t = self.ts2pos(event["start"])
-        base_h = self.min_size * (event["duration"] / 60)
+        base_h = self.min_size * (event.duration / 60)
         evt_h = self.ts2pos(end) - base_t
 
         if event["color"]:
@@ -223,7 +223,7 @@ def draw_dragging(self, qp):
         if type(self.calendar.dragging) == Asset:
             exp_dur = suggested_duration(self.calendar.dragging.duration)
         elif type(self.calendar.dragging) == Event:
-            exp_dur = self.calendar.dragging["duration"]
+            exp_dur = self.calendar.dragging.duration
         else:
             return
 
@@ -251,7 +251,7 @@ def mouseMoveEvent(self, e):
 
             if end >= ts > event["start"] >= self.start_time:
                 self.cursor_event = event
-                diff = event["start"] + event["duration"] - end
+                diff = event["start"] + event.duration - end
                 if diff < 0:
                     diff = "Remaining: " + s2tc(abs(diff))
                 else:
@@ -274,8 +274,8 @@ def mouseMoveEvent(self, e):
             return
 
         self.calendar.drag_offset = ts - event["start"]
-        if self.calendar.drag_offset > event["duration"]:
-            self.calendar.drag_offset = event["duration"]
+        if self.calendar.drag_offset > event.duration:
+            self.calendar.drag_offset = event.duration
 
         encodedData = json.dumps([event.meta])
         mimeData = QMimeData()
@@ -375,7 +375,7 @@ def dropEvent(self, evt):
         elif type(self.calendar.dragging) == Asset:
             for event in self.calendar.events:
                 if event["start"] == drop_ts:
-                    if event["duration"]:
+                    if event.duration:
                         ret = QMessageBox.question(
                             self,
                             "Overwrite",
@@ -427,7 +427,7 @@ def dropEvent(self, evt):
                 ret = QMessageBox.question(
                     self,
                     "Move event",
-                    f"Do you really want to move {self.cursor_event}?"
+                    f"Do you really want to move {event}?"
                     f"\n\nFrom: {format_time(event['start'])}"
                     f"\nTo: {format_time(drop_ts)}",
                     QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,

firefly/objects/event.py

@@ -4,3 +4,7 @@
 class Event(BaseObject):
     object_type_id = 3
     required = ["start", "id_channel"]
+
+    @property
+    def duration(self):
+        return self.meta.get("duration", 0) or 0