Restructure project into keep_cli directory

Author: kiwiz

.pylintrc

@@ -0,0 +1,4 @@
+[BASIC]
+good-names=logger
+[MESSAGES CONTROL]
+disable=line-too-long,bad-continuation,too-many-instance-attributes,invalid-name,too-many-lines

keep

@@ -2,14 +2,13 @@
 import sys
 import os
 import argparse
-import application
 import yaml
 import keyring
 import getpass
 import gkeepapi
 import urwid
-import constants
 import logging
+from keep_cli import application, constants
 from uuid import getnode as get_mac
 
 logger = logging.getLogger('keep-cli')

widget/__init__.py renamed to keep_cli/__init__.py

@@ -3,13 +3,13 @@
 import logging
 import json
 import gkeepapi
-import widget.status
-import widget.grid
-import widget.kanban
-import widget.search
-import widget.views
-import widget.help
-import query
+from .widget import status
+from .widget import grid
+from .widget import kanban
+from .widget import search
+from .widget import views
+from .widget import help
+from . import query
 
 class Application(urwid.Frame):
     """
@@ -23,7 +23,7 @@ def __init__(self, keep: gkeepapi.Keep, config: dict, config_dir: str, offline:
         self.w_overlay = None
         self.stack = []
 
-        self.w_status = widget.status.Status(self)
+        self.w_status = status.Status(self)
 
         self.load()
 
@@ -89,13 +89,13 @@ def keypress(self, size, key):
             self.refresh()
             key = None
         elif key == '/':
-            self.overlay(widget.search.Search(self))
+            self.overlay(search.Search(self))
             key = None
         elif key == '?':
-            self.overlay(widget.help.Help(self))
+            self.overlay(help.Help(self))
             key = None
         elif key == 'g':
-            self.overlay(widget.views.Views(self))
+            self.overlay(views.Views(self))
             key = None
         elif key == 'esc':
             if self.w_overlay is not None:
@@ -142,11 +142,11 @@ def hydrateView(self, key: str) -> query.Query:
 
         if _type == 'kanban':
             raw_queries = view.get('queries') or []
-            return widget.kanban.KanBan(
+            return kanban.KanBan(
                 self,
                 [query.Query.fromConfig(self.keep, raw_query) for raw_query in raw_queries]
             )
 
         raw_query = view.get('query') or {}
         q = query.Query.fromConfig(self.keep, raw_query)
-        return widget.grid.Grid(self, q)
+        return grid.Grid(self, q)

application.py renamed to keep_cli/application.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import urwid
 import urwid_readline
-import constants
 import gkeepapi
-import widget.labels
+from . import labels
+from .. import constants
 import logging
 
 from typing import List
@@ -153,7 +153,7 @@ def __init__(self, app: 'application.Application', note: gkeepapi.node.TopLevelN
         self.w_title = urwid_readline.ReadlineEdit(wrap=urwid.CLIP)
         self.w_text = urwid_readline.ReadlineEdit(multiline=True)
         self.w_list = Items()
-        self.w_labels = widget.labels.Labels()
+        self.w_labels = labels.Labels()
 
         self.w_state = urwid.Text(u'', align=urwid.RIGHT)
         self.w_footer = urwid.Text(u'', align=urwid.RIGHT)
@@ -190,7 +190,7 @@ def _updateContent(self):
 
         w_body = None
         if isinstance(self.note, gkeepapi.node.List):
-            self.w_list.refresh(self.note.children)
+            self.w_list.refresh(self.note.items)
             w_body = (self.w_list, self.w_content.options())
         else:
             self.w_text.set_edit_text(self.note.text)

constants.py renamed to keep_cli/constants.py

@@ -1,10 +1,9 @@
 import urwid
 import logging
 import gkeepapi
-import widget.note
-import widget.edit
-import application
-import query
+from . import note
+from . import edit
+from .. import query
 
 class Grid(urwid.Filler):
     def __init__(self, app: 'application.Application', q: query.Query):
@@ -20,7 +19,7 @@ def __init__(self, app: 'application.Application', q: query.Query):
 
     def refresh(self, keep: gkeepapi.Keep):
         self.w_grid.contents = [
-            (urwid.BoxAdapter(widget.note.Note(n), self.size[1]), self.w_grid.options()) for n in self.query.filter(keep)
+            (urwid.BoxAdapter(note.Note(n), self.size[1]), self.w_grid.options()) for n in self.query.filter(keep)
         ]
         if self.w_grid.contents:
             self.w_grid.focus_position = 0
@@ -39,17 +38,17 @@ def keypress(self, size, key):
             key = 'right'
         elif key == 'c':
             note = self.application.keep.createNote()
-            w_edit = widget.edit.Edit(self.application, note)
+            w_edit = edit.Edit(self.application, note)
             self.application.push(w_edit)
             key = None
         elif key == 'C':
             note = self.application.keep.createList()
-            w_edit = widget.edit.Edit(self.application, note)
+            w_edit = edit.Edit(self.application, note)
             self.application.push(w_edit)
             key = None
         elif key == 'enter':
             if self.w_grid.focus is not None:
-                w_edit = widget.edit.Edit(self.application, self.w_grid.focus.note)
+                w_edit = edit.Edit(self.application, self.w_grid.focus.note)
                 self.application.push(w_edit)
             key = None
         if self.w_grid.focus is not None:

query.py renamed to keep_cli/query.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import urwid
-import widget.util
+from . import util
 
 from typing import Union
 
@@ -36,7 +36,7 @@ def __init__(self, key: Union[str, tuple], doc: str):
             urwid.Text(', '.join(key) if isinstance(key, tuple) else key),
         ], dividechars=1)
 
-class Help(widget.util.Border):
+class Help(util.Border):
     def __init__(self, app: 'application.Application'):
         self.application = app
 

keep_cli/widget/__init__.py

@@ -1,8 +1,9 @@
 import urwid
-import constants
 import gkeepapi
-import query
-import widget.note
+from . import note
+from .. import query
+from .. import constants
+
 from typing import List
 
 class NoteList(urwid.Frame):
@@ -17,7 +18,7 @@ def __init__(self, q: query.Query):
 
     def refresh(self, keep: gkeepapi.Keep):
         self.w_list.body[:] = [
-            urwid.BoxAdapter(widget.note.Note(n), 10) for n in self.query.filter(keep)
+            urwid.BoxAdapter(note.Note(n), 10) for n in self.query.filter(keep)
         ]
 
 class KanBan(urwid.Columns):

widget/edit.py renamed to keep_cli/widget/edit.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import urwid
-import constants
 import gkeepapi
-import widget.labels
+from . import labels
+from .. import constants
 import logging
 
 class Note(urwid.AttrMap):
@@ -13,7 +13,7 @@ def __init__(self, note: gkeepapi.node.TopLevelNode):
 
         self.w_title = urwid.Text(u'', wrap=urwid.CLIP)
         self.w_text = urwid.Text(u'')
-        self.w_labels = widget.labels.Labels()
+        self.w_labels = labels.Labels()
 
         self.w_state = urwid.Text(u'', align=urwid.RIGHT)
         self.w_header = urwid.AttrMap(self.w_state, None)

widget/grid.py renamed to keep_cli/widget/grid.py

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 import urwid
-import constants
 import gkeepapi
 import logging
-import widget.labels
-import widget.edit
-import widget.util
+from . import labels
+from . import edit
+from . import util
+from .. import constants
 
 from typing import List
 
-class Search(widget.util.Border):
+class Search(util.Border):
     def __init__(self, app: 'application.Application'):
         self.application = app
 
@@ -20,8 +20,8 @@ def __init__(self, app: 'application.Application'):
         self.w_note = urwid.CheckBox('Note', state=True)
         self.w_list = urwid.CheckBox('List', state=True)
 
-        self.w_labels = widget.labels.Labels()
-        self.w_colors = widget.edit.Colors()
+        self.w_labels = labels.Labels()
+        self.w_colors = edit.Colors()
 
         self.w_labels.setLabels(app.keep.labels(), gkeepapi.node.ColorValue.White)
 

widget/help.py renamed to keep_cli/widget/help.py

@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 import urwid
-import widget.util
+from . import util
 
 from typing import Union
 
-class Views(widget.util.Border):
+class Views(util.Border):
     def __init__(self, app: 'application.Application'):
         self.application = app
 
         views = app.config.get('views')
         super(Views, self).__init__(urwid.Pile([
             urwid.Text(('buTEXT', 'Views'), align=urwid.CENTER),
             urwid.Divider(),
-            urwid.Pile([urwid.Text(('TEXT', view.get('name', key))) for key, view in views.items()]),
+            urwid.Pile([urwid.Button(('TEXT', view.get('name', key))) for key, view in views.items()]),
         ]))
 
     def selectable(self):