separated write_to_todolist_file in model

Author: Snaiel

model/model.py

@@ -96,79 +96,21 @@ def write_to_todolist_file(self, **kwargs):
                 - create_task
                 - create_section
                 - rename_task
-                - delete_element
                 - clear_checked
                 - clear_ all_checked
                 - clear_all
         '''
-        if 'state' not in kwargs:
-            kwargs['state'] = False
 
-        with open(join(self.script_directory, 'data', f"{kwargs['list_name']}.json"), 'r+') as json_file:
-            json_data = json.load(json_file)
-            json_file.seek(0)
-
-            # print(kwargs['action'])
-
-            if 'create' in kwargs['action']: # value: the name of the element
-                element = [kwargs['value'], kwargs['state']] if 'task' in kwargs['action'] else [[kwargs['value'], kwargs['state']], []]
-                current_element = json_data['data'] # the root list
-
-                for i in range(len(kwargs['indices']) - 1, -1, -1):
-                    if i == 0:
-                        break
-                    else:
-                        if isinstance(current_element[kwargs['indices'][i]][0], str):
-                            continue
-                        else:
-                            current_element = current_element[kwargs['indices'][i]][1]
-
-                current_element.insert(kwargs['indices'][i], element)
-            else:
-                # print(kwargs['action'], kwargs['indices'])
-                if kwargs['action'] == 'delete_element' and len(kwargs['indices']) == 1:
-                    json_data['data'].pop(kwargs['indices'][0])
-                else:
-                    # current_element = json_data['data'][kwargs['indices'][-1]]
-                    current_element = json_data['data'] if len(kwargs['indices']) == 0 else json_data['data'][kwargs['indices'][-1]]
-
-                    for i in range(len(kwargs['indices'])-1):
-                        if isinstance(current_element[0], list):
-                            current_element = current_element[1]
-
-                        # print(kwargs['action'], current_element, kwargs['indices'], list(reversed(kwargs['indices'][:-1])), i)
-                        if kwargs['action'] == 'delete_element' and i == len(kwargs['indices']) - 2:
-                            current_element.pop(list(reversed(kwargs['indices'][:-1]))[i])
-                            break
-
-                        current_element = current_element[list(reversed(kwargs['indices'][:-1]))[i]]
-
-                    if kwargs['action'] == 'toggle_task':
-                        current_element[1] = kwargs['value']
-                    elif kwargs['action'] == 'toggle_section':
-                        current_element[0][1] = kwargs['value']
-                    elif kwargs['action'] == 'rename_task':
-                        current_element[0] = kwargs['value']
-                    elif kwargs['action'] == 'rename_section':
-                        current_element[0][0] = kwargs['value']
-                    elif kwargs['action'] == 'clear_all':
-                        print('CLEARRRR')
-                        current_element[1] = []
-                    elif kwargs['action'] in ('clear_checked', 'clear_all_checked'):
-                        print('clear brotha', current_element, kwargs['indices'])
-                        new_element = self.clear_checked(current_element, True if kwargs['action'] == 'clear_all_checked' else False)
-                        if len(kwargs['indices']) == 0:
-                            print('clear the entire list')
-                            current_element.clear()
-                            current_element.extend(new_element)
-                            print(current_element)
-                        else:
-                            current_element[1].clear()
-                            current_element[1].extend(new_element)
-
-
-            json.dump(json_data, json_file, indent=4)
-            json_file.truncate()
+        if 'create' in kwargs['action']:
+            self.create_element(**kwargs)
+        elif 'toggle' in kwargs['action']:
+            self.toggle_element(**kwargs)
+        elif 'rename' in kwargs['action']:
+            self.rename_element(**kwargs)
+        elif 'clear' in kwargs['action']:
+            self.clear(**kwargs)
+        elif kwargs['action'] == 'delete_element':
+            self.delete_element(**kwargs)
 
     def change_focus(self, list_name):
         self.app_data['focused'] = list_name
@@ -195,31 +137,45 @@ def move_list(self, the_list, direction):
                 data.insert(index_of_list + direction, data.pop(index_of_list))
                 break
 
-    def clear(self, focused_list, indices=[], clear_type='All'):
+    def clear(self, list_name, indices=[], action='clear_all'):
         '''
-            Deletes tasks based on the clear_type:
-            - Checked: delete tasks in the same area
-            - All Checked: delete all checked tasks in same section and sub sections
-            - All: delete every element within it
+            Deletes tasks in the list or a section based on the action:
+            - clear_checked: delete tasks in the same area
+            - clear_all_checked: delete all checked tasks in same section and sub sections
+            - clear_all: delete every element within it
         '''
 
-        if clear_type == 'Checked':
-            self.write_to_todolist_file(list_name=focused_list, indices=indices, action='clear_checked')
-        elif clear_type == 'All Checked':
-            self.write_to_todolist_file(list_name=focused_list, indices=indices, action='clear_all_checked')
-        elif clear_type == 'All':
-            if not indices:
-                with open(join(self.script_directory, 'data', f'{focused_list}.json'), 'w') as json_file:
-                    json.dump({"data": []}, json_file, indent=4)
-            else:
-                self.write_to_todolist_file(list_name=focused_list, indices=indices, action='clear_all')
+        with open(join(self.script_directory, 'data', f"{list_name}.json"), 'r+') as json_file:
+            json_data = json.load(json_file)
+            json_file.seek(0)
+
+            current_element = json_data['data'] if len(indices) == 0 else json_data['data'][indices[0]]
+
+            
+            for i in indices[1:]:
+                if isinstance(current_element[0], list):
+                    current_element = current_element[1]
+                current_element = current_element[i]
+
+            if action == 'clear_all':
+                current_element[1] = []
+            elif action in ('clear_checked', 'clear_all_checked'):
+                new_element = self.clear_checked(current_element[1], True if action == 'clear_all_checked' else False)
+                if len(indices) == 0:
+                    current_element.clear()
+                    current_element.extend(new_element)
+                else:
+                    current_element[1].clear()
+                    current_element[1].extend(new_element)
+
+            json.dump(json_data, json_file, indent=4)
+            json_file.truncate()
 
-    def clear_checked(self, the_parent, clear_all_checked):
+    def clear_checked(self, the_parent: list, clear_all_checked: bool):
         '''
             loops through parent and deletes 'tasks' that are checked
         '''
         new_parent = []
-        print(the_parent, "WOWWWW")
         for element in the_parent:
             print(element)
             if isinstance(element[1], list):
@@ -228,10 +184,8 @@ def clear_checked(self, the_parent, clear_all_checked):
                 new_parent.append(element)
             elif element[1] == False:
                 new_parent.append(element)
-        print(new_parent, "NEWWW")
         return new_parent
 
-
     def rename_list(self, old_name, new_name):
         '''
         Assumes that the new file does not exist, creates the new file and places the old data into it, deleting the old json file.
@@ -256,6 +210,95 @@ def delete_list(self, list_name):
                 self.data.remove(todolist)
         remove(join(self.script_directory, 'data', f'{list_name}.json'))
 
+    def create_element(self, action, list_name, indices, value, state = None):
+        with open(join(self.script_directory, 'data', f"{list_name}.json"), 'r+') as json_file:
+            json_data = json.load(json_file)
+            json_file.seek(0)
+
+            if state is None:
+                state = False
+
+            element = [value, state] if 'task' in action else [[value, state], []]
+            current_element = json_data['data'] # the root list
+
+            for i in indices[:-1]:
+                if i == 0:
+                    break
+                else:
+                    if isinstance(current_element[i][0], str):
+                        continue
+                    else:
+                        current_element = current_element[i][1]
+
+            current_element.insert(indices[-1], element)
+
+            json.dump(json_data, json_file, indent=4)
+            json_file.truncate()
+
+    def toggle_element(self, action, list_name, indices, value):
+        with open(join(self.script_directory, 'data', f"{list_name}.json"), 'r+') as json_file:
+            json_data = json.load(json_file)
+            json_file.seek(0)
+
+            current_element = json_data['data'] if len(indices) == 0 else json_data['data'][indices[0]]
+
+            for i in indices[1:]:
+                if isinstance(current_element[0], list):
+                    current_element = current_element[1]
+                current_element = current_element[i]
+
+            if 'task' in action:
+                current_element[1] = value
+            elif 'section' in action:
+                current_element[0][1] = value
+
+            json.dump(json_data, json_file, indent=4)
+            json_file.truncate()
+
+    def rename_element(self, action, list_name, indices, value):
+        with open(join(self.script_directory, 'data', f"{list_name}.json"), 'r+') as json_file:
+            json_data = json.load(json_file)
+            json_file.seek(0)
+
+            current_element = json_data['data'] if len(indices) == 0 else json_data['data'][indices[0]]
+
+            for i in indices[1:]:
+                if isinstance(current_element[0], list):
+                    current_element = current_element[1]
+                current_element = current_element[i]
+
+            if 'task' in action:
+                current_element[0] = value
+            elif 'section' in action:
+                current_element[0][0] = value
+
+            json.dump(json_data, json_file, indent=4)
+            json_file.truncate()
+
+    def delete_element(self, action, list_name, indices):
+        with open(join(self.script_directory, 'data', f"{list_name}.json"), 'r+') as json_file:
+            json_data = json.load(json_file)
+            json_file.seek(0)
+
+            if len(indices) == 1:
+                json_data['data'].pop(indices[0])
+            else:
+                current_element = json_data['data'] if len(indices) == 0 else json_data['data'][indices[0]]
+                indices.pop(0)
+
+                for i in range(len(indices)):
+                    if isinstance(current_element[0], list):
+                        current_element = current_element[1]
+
+                    if i == len(indices) - 1:
+                        current_element.pop(indices[i])
+                        break
+
+                    current_element = current_element[indices[i]]
+            
+            json.dump(json_data, json_file, indent=4)
+            json_file.truncate()
+
     def close_event(self, focused):
         self.app_data['focused'] = focused
         self.app_data['order'] = [i['name'] for i in self.data]

view/view.py

@@ -3,7 +3,7 @@
 from PyQt5.QtCore import Qt, pyqtSlot
 from PyQt5.QtWidgets import QMainWindow, QMessageBox, QVBoxLayout, QHBoxLayout, QWidget, QPushButton, QComboBox, QInputDialog
 from view.preferencesDialog import PreferencesDialog
-from view.widgets.list import List
+import view.widgets.list as list
 from model.model import Model
 from os.path import join, dirname, realpath
 from sys import argv
@@ -16,6 +16,8 @@ def __init__(self, model):
         self.setWindowIcon(QIcon(join(dirname(realpath(argv[0])), "icon.png")))
         self.model = model # type: Model
 
+        self.focused_list: list.List = None
+
         self._init_ui()
         self.import_data()
 
@@ -82,9 +84,9 @@ def _createMenu(self):
         list_menu.addAction("&Rename", lambda: self.rename_list())
         list_menu.addAction("&Delete", lambda: self.delete_list())
         clear_menu = self.menu_edit.addMenu('Clear')
-        clear_menu.addAction("Checked", lambda: self.clear_list(action='Checked'))
-        clear_menu.addAction("All Checked", lambda: self.clear_list(action='All Checked'))
-        clear_menu.addAction("All", lambda: self.clear_list(action='All'))
+        clear_menu.addAction("Checked", lambda: self.clear_list(action='clear_checked'))
+        clear_menu.addAction("All Checked", lambda: self.clear_list(action='clear_all_checked'))
+        clear_menu.addAction("All", lambda: self.clear_list(action='clear_all'))
 
     def _createComboBox(self):
         self.combo = QComboBox()
@@ -139,7 +141,7 @@ def add_combo_items(self, items, focused):
         self.combo.setCurrentText(focused)
 
     def add_list(self, todolist, focused):
-        self.scrollAreaRowLayout.addWidget(List(todolist['name'], True if todolist['name'] == focused else False, todolist['data'], self))
+        self.scrollAreaRowLayout.addWidget(list.List(todolist['name'], True if todolist['name'] == focused else False, todolist['data'], self))
 
     def set_focused_list(self, focused):
         '''
@@ -220,20 +222,21 @@ def move_list(self, **kwargs):
     def clear_list(self, **kwargs):
         '''
         deletes elements of the list given, depending on the action type, defaults to the focused list
-
-            - Checked
-            - All Checked
-            - All
+            - clear_checked
+            - clear_all_checked
+            - clear_all
         '''
+
         if 'the_list' not in kwargs and self.focused_list is None:
             return
+
         if 'action' not in kwargs:
-            kwargs['action'] == 'All'
+            kwargs['action'] == 'clear_all'
 
         messages = {
-            'Checked': "Do you want to clear the checked tasks in the base level of the list?",
-            'All Checked': "Do you want to clear the checked tasks within the entire list?",
-            'All': f"Do you want to clear the contents of the {'selected' if 'the_list' in kwargs else 'focused'} list?"
+            'clear_checked': "Do you want to clear the checked tasks in the base level of the list?",
+            'clear_all_checked': "Do you want to clear the checked tasks within the entire list?",
+            'clear_all': f"Do you want to clear the contents of the {'selected' if 'the_list' in kwargs else 'focused'} list?"
         }
 
         dialog = QMessageBox(self)
@@ -242,14 +245,21 @@ def clear_list(self, **kwargs):
         dialog.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
         dialog.setDefaultButton(QMessageBox.Yes)
         answer = dialog.exec()
+
+        model_data = {
+            'action': kwargs['action']
+        }
+
         if answer == QMessageBox.Yes:
             if 'the_list' in kwargs:
                 self.get_list(kwargs['the_list']).clear_list(kwargs['action'])
-                self.model.clear(kwargs['the_list'], kwargs['action'])
+                model_data['list_name'] = kwargs['the_list']
                 self.preferencesDialog.update_list_widget(self.model.get_list_names(), kwargs['the_list'])
             else:
                 self.focused_list.clear_list(kwargs['action'])
-                self.model.clear(self.focused_list.list_name, clear_type=kwargs['action'])
+                model_data['list_name'] = self.focused_list.list_name
+
+            self.send_changed_data(model_data)
 
     def rename_list(self, **kwargs):
         '''

view/widgets/list.py

@@ -97,13 +97,13 @@ def create_element(self, **kwargs):
 
         # If element is created by the user, write to file
         if kwargs['imported'] == False:
-            sending_data = {
+            model_data = {
                 'indices': element.get_index_location(),
                 'value': element_name,
                 'state': state,
                 'action': f'create_{type_of_element.lower()}'
             }
-            self.root.send_changed_data(sending_data)
+            self.root.send_changed_data(model_data)
 
         if 'section_data' in kwargs:
             for sub_element in kwargs['section_data']:
@@ -137,17 +137,17 @@ def clear_list(self, action):
         print(self.theWidget.children())
 
         for element in self.theWidget.children()[1:]:
-            if action == 'Checked':
+            if action == 'clear_checked':
                 if isinstance(element, task.Task) and element.isChecked():
                     layout.removeWidget(element)
                     element.deleteLater()
-            elif action == 'All Checked':
+            elif action == 'clear_all_checked':
                 if isinstance(element, task.Task) and element.isChecked():
                     layout.removeWidget(element)
                     element.deleteLater()
                 elif isinstance(element, section.Section):
-                    element.clear_contents('All Checked', True)
-            elif action == 'All' and element:
+                    element.clear_contents('clear_all_checked', True)
+            elif action == 'clear_all' and element:
                 layout.removeWidget(element)
                 element.deleteLater()