From 25bcac2b94742a5a90f91335a46079bb61ba2cda Mon Sep 17 00:00:00 2001
From: Lamisator <marius.kloeck@rub.de>
Date: Sat, 5 Aug 2017 00:30:29 +0200
Subject: [PATCH] Optimizations

---
 src/editorUI.py | 64 +++++++++++++++++++++++++++++++++++++++++++++----
 src/main.py     |  2 +-
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/editorUI.py b/src/editorUI.py
index da9d3cb..9b29660 100644
--- a/src/editorUI.py
+++ b/src/editorUI.py
@@ -1,6 +1,8 @@
 import urwid
 from lineWalker import LineWalker
 import uuid
+from time import sleep
+
 
 
 class EditorUI(object):
@@ -11,13 +13,13 @@ class EditorUI(object):
 
         self.filename = filename
 
-        self.footer = urwid.AttrWrap(urwid.Text("<Alt + s> Save as |  <Alt + q> Close"), "standard")
+        self.default_footer = urwid.AttrWrap(urwid.Text("<Alt + s> Save as |  <Alt + q> Close"), "standard")
 
         self.walker = LineWalker(filename)
         self.content = urwid.ListBox(self.walker)
 
         self.central_frame = urwid.Frame(self.content)
-        self.central_frame.set_footer(self.footer)
+        self.central_frame.set_footer(self.default_footer)
         
         
 
@@ -35,13 +37,45 @@ class EditorUI(object):
 
         elif key == "meta s":
             self.save(self.filename)
+    
+        elif key == "delete":
+            # delete at end of line
+            self.walker.combine_focus_with_next()
+        elif key == "backspace":
+            # backspace at beginning of line
+            self.walker.combine_focus_with_prev()
+        elif key == "enter":
+            # start new line
+            self.walker.split_focus()
+            # move the cursor to the new line and reset pref_col
+            self.loop.process_input(["down", "home"])
+        elif key == "right":
+            w, pos = self.walker.get_focus()
+            w, pos = self.walker.get_next(pos)
+            if w:
+                self.listbox.set_focus(pos, 'above')
+                self.loop.process_input(["home"])
+        elif key == "left":
+            w, pos = self.walker.get_focus()
+            w, pos = self.walker.get_prev(pos)
+            if w:
+                self.listbox.set_focus(pos, 'below')
+                self.loop.process_input(["end"])
+        else:
+            return
 
-
+        return True
+    
     def save(self, save_filename):
         walker = self.walker
-
         lines = []
 
+        for edit in walker.lines:
+            if edit.original_text.expandtabs() == edit.edit_text:
+                lines.append(edit.original_text)
+            else:
+                lines.append(re_tab(edit.edit_text))
+
         while walker.file is not None:
             lines.append(walker.read_next_line())
 
@@ -52,3 +86,25 @@ class EditorUI(object):
         for line in lines:
             file_handle.write(line)
             prefix = "\n"
+
+        self.central_frame.footer = urwid.AttrWrap(urwid.Text(save_filename + " saved."), "warning")
+        self.loop.draw_screen()
+        sleep(2)
+        self.central_frame.footer = self.default_footer
+
+def re_tab(s):
+    """Return a tabbed string from an expanded one."""
+    l = []
+    p = 0
+    for i in range(8, len(s), 8):
+        if s[i-2:i] == "  ":
+            # collapse two or more spaces into a tab
+            l.append( s[p:i].rstrip() + "\t" )
+            p = i
+
+    if p == 0:
+        return s
+    else:
+        l.append(s[p:])
+        return "".join(l)
+
diff --git a/src/main.py b/src/main.py
index 5a620e3..8429a6d 100755
--- a/src/main.py
+++ b/src/main.py
@@ -3,5 +3,5 @@
 import editorUI
 from uuid import uuid4
 
-ui=editorUI.EditorUI(str(uuid4()) + ".txt")
+ui=editorUI.EditorUI("quicknotes/" + str(uuid4()) + ".txt")
 ui.main()