Merge pull request #40 from jessedp:fix-editor

Fix-editor

Author: jessedp

ph5lt/allowlists.py

@@ -96,7 +96,8 @@ def add(cur):
         )
 
     if len(import_list) == 0:
-        utils.die("No valid urls found, try again")
+        utils.warn("No valid urls found, try again")
+        return False
 
     if not prompts.confirm(f"Add {len(import_list)} white lists?"):
         return False

ph5lt/banner.py

@@ -4,7 +4,7 @@
 
 from ph5lt import utils
 
-__version__ = "0.6.1"
+__version__ = "0.6.2"
 
 
 def display():

ph5lt/blocklists.py

@@ -99,7 +99,8 @@ def add(cur):
         import_list = utils.process_lines(import_list, "Pasted content")
 
     if len(import_list) == 0:
-        utils.die("No valid urls found, try again")
+        utils.warn("No valid urls found, try again")
+        return False
 
     if not prompts.confirm(f"Add {len(import_list)} block lists?"):
         return False

ph5lt/prompts.py

@@ -3,7 +3,6 @@
 import sqlite3
 from InquirerPy import prompt
 from InquirerPy.separator import Separator
-from prompt_toolkit.validation import ValidationError, Validator
 
 from ph5lt import constants
 from ph5lt import utils
@@ -30,16 +29,6 @@ def check_db(path):
     return True
 
 
-class ValidateEditor(Validator):
-    """Class to validator "editor" types since that's broken in current PyInquirer"""
-
-    def validate(self, document):
-        if document.text and len(document.text.split("\n")) <= 1:
-            raise ValidationError(
-                message="Must be at least 1 line", cursor_position=len(document.text)
-            )
-
-
 def key_prompt(questions):
     """prompt wrapper to handle ctrl+c"""
     resp = prompt(questions)
@@ -223,11 +212,10 @@ def ask_paste():
     questions = [
         {
             "name": "content",
-            "type": "editor",
-            "message": "Opening editor",
-            # lambda text: len(text.split('\n')) >= 1 or 'Must be at least 1 line',
-            "validate": ValidateEditor,
-            "eargs": {"editor": "default", "ext": ".tmp"},
+            "type": "input",
+            "message": "Please Paste your of URLS, then:",
+            "multiline": True,
+            "instruction": "ESC + Enter to continue",
         }
     ]
     result = key_prompt(questions)