better stopword file detection

Author: clovis

python/philologic/Config.py

@@ -318,7 +318,8 @@
         "comment": "\n".join(
             [
                 "# The stopwords variable defines a file path containing a list of words (one word per line) used for filtering out words",
-                "# in the collocation report. The file must be located in the defined path. If the file is not found,",
+                "# in the collocation report. If only a filename is provided, it will look for the file in the /data directory.",
+                "# The file must be located in the defined path. If the file is not found,",
                 "# no option for using a stopword list will be displayed in collocation searches.",
             ]
         ),

python/philologic/loadtime/Loader.py

@@ -15,7 +15,7 @@
 from json import dump
 import csv
 
-import lxml
+import lxml.etree
 import regex as re
 from black import FileMode, format_str
 from multiprocess import Pool
@@ -142,7 +142,7 @@ def __init__(self, **loader_options):
             already_configured_values = {}
             for attribute in dir(config_obj):
                 if not attribute.startswith("__") and not isinstance(
-                    getattr(config_obj, attribute), collections.Callable
+                    getattr(config_obj, attribute), collections.abc.Callable
                 ):
                     already_configured_values[attribute] = getattr(config_obj, attribute)
             with open(load_config_path, "a") as load_config_copy:

python/philologic/runtime/reports/collocation.py

@@ -126,10 +126,14 @@ def extract_bytes(hit):
 def build_filter_list(request, config):
     """set up filtering with stopwords or most frequent terms."""
     if config.stopwords and request.colloc_filter_choice == "stopwords":
-        if os.path.isabs(config.stopwords):
+        if config.stopwords and "/" not in config.stopwords:
+            filter_file = os.path.join(config.db_path, "data", config.stopwords)
+        elif os.path.isabs(config.stopwords):
             filter_file = config.stopwords
         else:
             return ["stopwords list not found"]
+        if not os.path.exists(filter_file):
+            return ["stopwords list not found"]
         filter_num = float("inf")
     else:
         filter_file = config.db_path + "/data/frequencies/word_frequencies"

www/app/src/components/TextNavigation.vue

@@ -1098,7 +1098,7 @@ body {
     vertical-align: 0.3em;
     font-size: 0.7em;
     background-color: $button-color;
-    color: #fff;
+    color: #fff !important;
     padding: 0 0.2rem;
     border-radius: 50%;
 }