ed-api-client 0.1.4__tar.gz → 0.1.6__tar.gz

{ed_api_client-0.1.4 → ed_api_client-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ed-api-client
-Version: 0.1.4
+Version: 0.1.6
 Summary: A client for interacting with the Ed LMS
 License: MIT
 Author: David Milne

{ed_api_client-0.1.4 → ed_api_client-0.1.6}/ed_api_client/workspaces.py

@@ -8,29 +8,29 @@ import re
 
 from ed_api_client.websockets import File
 
-class StringSet: 
+class Selections(List[str]):
     def __init__(self):
-        self.strings = set()
+        super().__init__()
 
     def add(self, s: str):
 
-        if self.is_subsumed(s):
+        stripped_s = s.strip()
+
+        if self.is_subsumed(stripped_s):
             return
         
-        for candidate in list(self.strings):
-            if candidate in s.strip():
-                self.strings.remove(candidate)
-        
-        self.strings.add(s.strip())
+        for candidate in list(self):
+            if candidate in stripped_s:
+                self.remove(candidate)
+
+        self.add(stripped_s)
 
     def contains(self, s: str) -> bool:
-        return s.strip() in self.strings
-    
-    def is_subsumed(self, s: str) -> bool:
         stripped_s = s.strip()
         for candidate in self.strings:
-            if candidate in stripped_s:
+            if stripped_s in candidate :
                 return True
+            
         return False
     
     
@@ -449,7 +449,7 @@ class FileSummary(File):
     typing_time: datetime.timedelta = datetime.timedelta(0)
     prev_typing_time: datetime.datetime = None
 
-    selections: List[str] = field(default_factory=list)
+    selections: Selections = field(default_factory=list)
     external_pastes: List[str] = field(default_factory=list)
 
     pasted_proportion: float = 0
@@ -516,8 +516,7 @@ class WorkspaceSummary:
     total_typing_time: datetime.timedelta
 
     file_summaries: Dict[int, FileSummary]
-    selections: List[Selection] = field(default_factory=list)
-
+    
     def from_log(
         files: List[File],
         log: WorkspaceLog,
@@ -565,7 +564,7 @@ class WorkspaceSummary:
         for file in files:
             file_summaries[file.id] = FileSummary.from_file(file)
 
-        selected_content = StringSet()
+        selected_content = Selections()
 
         for selection in acceptable_selections:
             selected_content.add(selection)
@@ -587,7 +586,7 @@ class WorkspaceSummary:
                 selected_content.add(sel_text.strip())
                 sel_file = file_summaries.get(sel_file_id)
                 if sel_file is not None:
-                    sel_file.selections.append(sel_text.strip())
+                    sel_file.selections.add(sel_text.strip())
                     if '\n' in sel_text:
                         sel_file.multiline_selection_count += 1
 
@@ -691,7 +690,7 @@ class WorkspaceSummary:
                         )
 
                     if len(edit.value) > min_suspicious_paste_chars:
-                        if not selected_content.is_subsumed(edit.value):
+                        if not selected_content.contains(edit.value):
                             file.external_pastes.append(edit.value)
 
                     file._insert_positions.append(pos / max(len(file.content), 1))
@@ -714,10 +713,10 @@ class WorkspaceSummary:
         if pending_selection is not None:
             sel_text, sel_file_id = pending_selection[2], pending_selection[3]
             selected_content.add(sel_text.strip())
-            selections.append(Selection(*pending_selection))
-            if '\n' in sel_text:
-                sel_file = file_summaries.get(sel_file_id)
-                if sel_file is not None:
+            sel_file = file_summaries.get(sel_file_id)
+            if sel_file is not None:
+                sel_file.selections.append(sel_text.strip())
+                if '\n' in sel_text:
                     sel_file.multiline_selection_count += 1
 
         total_active_time = datetime.timedelta(0)
@@ -750,4 +749,4 @@ class WorkspaceSummary:
             if file._pending_deletion and '\n' in file._pending_deletion:
                 file.multiline_deletion_count += 1
 
-        return WorkspaceSummary(total_active_time, total_typing_time, file_summaries, selections)
+        return WorkspaceSummary(total_active_time, total_typing_time, file_summaries)

{ed_api_client-0.1.4 → ed_api_client-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ed-api-client"
-version = "0.1.4"
+version = "0.1.6"
 description = "A client for interacting with the Ed LMS"
 authors = ["David Milne <d.n.milne@gmail.com>"]
 license = "MIT"