Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / clicmd / special_phrases.py

diff --git a/nominatim/clicmd/special_phrases.py b/nominatim/clicmd/special_phrases.py
index a35a97423938da2cdecc8da13d875475c5026050..b20a41010680f020ffe6c4bfa9b63928be175c4f 100644 (file)
--- a/nominatim/clicmd/special_phrases.py
+++ b/nominatim/clicmd/special_phrases.py
@@ -1,14 +1,20 @@
 """
 """

-    Implementation of the 'import-special-phrases' command.
+    Implementation of the 'special-phrases' command.

 """
 import logging
 """
 import logging

-from nominatim.tools.special_phrases import SpecialPhrasesImporter
+from pathlib import Path
+from nominatim.errors import UsageError

 from nominatim.db.connection import connect
 from nominatim.db.connection import connect

+from nominatim.tools.special_phrases.sp_importer import SPImporter
+from nominatim.tools.special_phrases.sp_wiki_loader import SPWikiLoader
+from nominatim.tools.special_phrases.sp_csv_loader import SPCsvLoader

 
 LOG = logging.getLogger()
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 
 LOG = logging.getLogger()
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111

+# Using non-top-level imports to avoid eventually unused imports.
+# pylint: disable=E0012,C0415

 
 class ImportSpecialPhrases:
     """\
 
 class ImportSpecialPhrases:
     """\


@@ -17,15 +23,38 @@ class ImportSpecialPhrases:
     @staticmethod
     def add_args(parser):
         group = parser.add_argument_group('Input arguments')
     @staticmethod
     def add_args(parser):
         group = parser.add_argument_group('Input arguments')

-        group.add_argument('--from-wiki', action='store_true',
+        group.add_argument('--import-from-wiki', action='store_true',

                            help='Import special phrases from the OSM wiki to the database.')
                            help='Import special phrases from the OSM wiki to the database.')

+        group.add_argument('--import-from-csv', metavar='FILE',
+                           help='Import special phrases from a CSV file.')
+        group.add_argument('--no-replace', action='store_true',
+                           help='Keep the old phrases and only add the new ones.')

 
     @staticmethod
     def run(args):
 
     @staticmethod
     def run(args):

-        if args.from_wiki:
-            LOG.warning('Special phrases importation starting')
-            with connect(args.config.get_libpq_dsn()) as db_connection:
-                SpecialPhrasesImporter(
-                    args.config, args.phplib_dir, db_connection
-                ).import_from_wiki()
+        if args.import_from_wiki:
+            ImportSpecialPhrases.start_import(args, SPWikiLoader(args.config))
+
+        if args.import_from_csv:
+            if not Path(args.import_from_csv).is_file():
+                LOG.fatal("CSV file '%s' does not exist.", args.import_from_csv)
+                raise UsageError('Cannot access file.')
+
+            ImportSpecialPhrases.start_import(args, SPCsvLoader(args.import_from_csv))
+

         return 0
         return 0

+
+    @staticmethod
+    def start_import(args, loader):
+        """
+            Create the SPImporter object containing the right
+            sp loader and then start the import of special phrases.
+        """
+        from ..tokenizer import factory as tokenizer_factory
+
+        tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
+        should_replace = not args.no_replace
+        with connect(args.config.get_libpq_dsn()) as db_connection:
+            SPImporter(
+                args.config, args.phplib_dir, db_connection, loader
+            ).import_phrases(tokenizer, should_replace)