Changeset a438158 in flowtimer

Timestamp:

08/23/24 17:38:20 (9 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

guix

Children:

0ec1bff

Parents:

bd94da0

Message:

more steps towards a full schedule implementation with json representation

Location:

flowtimer

Files:

• Phase.py (modified) (1 diff)
• RecurringPhaseSequence.py (modified) (2 diffs)
• Schedule.py (modified) (5 diffs)
• configs/default.json (modified) (1 diff)
• main.py (modified) (3 diffs)

flowtimer/Phase.py

@@ -51 +51 @@
 
     def is_sequence(self):
-        return False 
+        return False
 
     def abort(self):

flowtimer/RecurringPhaseSequence.py

@@ -73 +73 @@
 
     def finished(self):
-        return (self.passes_left < 1) and (not self.upcoming_phases_in_pass())
+        return ((self.passes_left < 1) and
+                (not self.upcoming_phases_in_pass() and
+                 self.current_phase.finished()))
 
     def abort(self):
@@ -88 +90 @@
             return
         else:
+            print("Sequence finished")
             if self.passes_left == 0:
                 self.abort()

flowtimer/Schedule.py

@@ -1 +1 @@
 import json
+from flowtimer.Phase import Phase
+from flowtimer.RecurringPhaseSequence import RecurringPhaseSequence
 
 """
 I represent a Schedule consisting of blocks. Blocks can be a single phase or
-a sequence of phases. 
+a sequence of phases.
 """
 
@@ -9 +11 @@
 class Schedule:
 
-    def __init__(self, block_list):
-        assert block_list is not []
-        self.block_list = block_list
-        self.current_block = block_list[0]
+    def __init__(self, title, blocks):
+        assert blocks is not []
+        self.title = title
+        self.blocks = blocks
+        self.current_block = blocks[0]
         self.state = "initial"
+
+    @classmethod
+    def default_json_string(cls):
+        return json.dumps(
+            {"title": "Default",
+                "blocks": [
+                    {"type": "Phase",
+                     "title": "MorningHuddle",
+                     "initial_ticks": 900
+                     },
+                    {"type": "Sequence",
+                     "title": "AM",
+                     "sequence": [
+                         {
+                             "title": "Tasking",
+                             "initial_ticks": 120
+                         },
+                         {
+                             "title": "Working",
+                             "initial_ticks": 5400
+                         },
+                         {
+                             "title": "Syncing",
+                             "initial_ticks": 300
+                         },
+                         {
+                             "title": "Break",
+                             "initial_ticks": 600
+                         }
+                     ],
+                     "initial_repetitions": 2
+                     }
+                ]
+             }
+        )
+
+    @classmethod
+    def from_json(cls, a_json_string):
+        def custom_object_hook(d):
+            if 'title' in d and 'blocks' in d:
+                return Schedule(d['title'], d['blocks'])
+            if 'title' in d and 'initial_ticks' in d:
+                return Phase(d['title'], d['initial_ticks'])
+            if 'sequence' in d and 'initial_repetitions' in d:
+                return RecurringPhaseSequence(d["title"], d['sequence'], d['initial_repetitions'])
+            print("Wrong format")
+            return d
+        return json.loads(a_json_string, object_hook=custom_object_hook)
+
+    @classmethod
+    def default(cls):
+        return cls.from_json(cls.default_json_string())
 
     def to_json(self):
@@ -36 +91 @@
 
     def finished(self):
-        if (self.current_block.finished()) and (self.block_list[-1] == self.current_block):
+        if (self.current_block.finished()) and (self.blocks[-1] == self.current_block):
             self.state = "finished"
             return True
@@ -43 +98 @@
 
     def skip(self):
-        if self.current_block.is_sequence:
+        if self.current_block.is_sequence():
             self.current_block.skip()
-        else:
-            if self.current_block_is_final():
-                self.abort()
-            else:
-                index = self.block_list.index(self.current_block)
-                self.current_block = self.block_list[index+1]
+            print("Skip the next phase in sequence")
+            return
+        if self.current_block_is_final():
+            print("Time over")
+            self.abort()
+            return
+        print("Jump to next block")
+        index = self.blocks.index(self.current_block)
+        self.current_block = self.blocks[index+1]
+        return
 
     def total_ticks_left(self):
@@ -57 +116 @@
 
     def upcoming_blocks(self):
-        index = self.block_list.index(self.current_block)
-        if index < len(self.block_list):
-            return self.block_list[index+1:]
+        index = self.blocks.index(self.current_block)
+        if index < len(self.blocks):
+            return self.blocks[index+1:]
         return []
 
     def current_block_is_final(self):
-        index = self.block_list.index(self.current_block)
-        return index == (len(self.block_list) - 1)
+        index = self.blocks.index(self.current_block)
+        return index == (len(self.blocks) - 1)
 
-    def tick(self, duration):
+    def tick(self, ticks):
         if not self.finished():
-            self.current_block.tick(duration)
+            self.current_block.tick(ticks)
             if self.current_block.finished():
                 if self.current_block_is_final():

flowtimer/configs/default.json

@@ -1 +1 @@
 { "title": "Default",
-  "schedule": [
+  "blocks": [
       {"type": "Phase",
        "title": "MorningHuddle",

flowtimer/main.py

@@ -3 +3 @@
 from tkinter import filedialog
 from Schedule import Schedule
-from RecurringPhaseSequence import RecurringPhaseSequence
 from PIL import Image, ImageTk
 from pathlib import Path
@@ -162 +161 @@
     def skip(self):
         self.schedule.skip()
+        if self.schedule.finished():
+            print("finished")
 
     def toggle_tick(self):
@@ -207 +208 @@
 
     def change_config(self, json_string):
-        self.schedule = Schedule([RecurringPhaseSequence.from_json(json_string)])
+        self.schedule = Schedule.from_json(json_string)
 
     def load_config(self, file_name=Path(__file__).parent / 'configs' / 'default.json'):