diff --git a/dictionary.py b/dictionary.py index 7d98bad..5faeda8 100644 --- a/dictionary.py +++ b/dictionary.py @@ -15,8 +15,6 @@ extra_words = pathlib.Path(__file__, '..', 'extra_words.txt') def do_operation(obj, bound_method, *args, **kwargs): bound_method(*args, **kwargs) - import time - time.sleep(60) return obj @@ -37,9 +35,15 @@ class Dictionary: self._word_frequency = self.future.result() return self._word_frequency - def filter(self, wordlist): + def filter(self, wordlist, excludes=None): """Finds words that are in the dictionary""" - return set(filter(wordlist, lambda word: word in self.word_frequency)) + if excludes is None: + + def filter_func(word): return word in self.word_frequency + else: + def filter_func( + word): return word not in excludes and word in self.word_frequency + return set(filter(filter_func, wordlist)) DEFAULT = Dictionary(default_load_future) diff --git a/word_remove_dialog.py b/word_remove_dialog.py index 3ccbf34..81b9436 100644 --- a/word_remove_dialog.py +++ b/word_remove_dialog.py @@ -55,7 +55,8 @@ class RemoveWordsActivity(npyscreen.NPSAppManaged): self.starting_values = starting_values def onStart(self): - self.addForm('MAIN', AddRemoveForm, name="Exclude Words") + self.addForm('MAIN', AddRemoveForm, + name="Exclude Words", columns=30, lines=24) def get_results(self): form = self.getForm('MAIN') @@ -65,6 +66,12 @@ class RemoveWordsActivity(npyscreen.NPSAppManaged): if __name__ == "__main__": - values = list(range(1, 10+1)) + values = [ + 'hello', + 'return', + 'butt', + 'fuck', + 'abcdefghijklmnopqrstuvwxyz' + ] app = RemoveWordsActivity(values) app.run()