Add support for importing YAML files

Author: ad-si

tasklite-core/source/Cli.hs

@@ -161,6 +161,7 @@ import ImportExport (
   importEml,
   importFile,
   importJson,
+  importYaml,
   ingestDir,
   ingestFile,
  )
@@ -297,6 +298,7 @@ data Command
   | ImportFile FilePath
   | ImportDir FilePath
   | ImportJson
+  | ImportYaml
   | ImportEml
   | IngestFile FilePath
   | IngestDir FilePath
@@ -840,26 +842,29 @@ commandParser conf =
 
     <> command "import" (toParserInfo (ImportFile <$> strArgument
         (metavar "FILEPATH" <> help "Path to import file"))
-        "Import a .json or .eml file containing one task")
+        "Import a .json, .yaml, or .eml file containing one task")
 
     <> command "importdir" (toParserInfo (ImportDir <$> strArgument
         (metavar "DIRECTORY_PATH" <> help "Path to directory"))
-        "Import all .json and .eml files in a directory")
+        "Import all .json, .yaml, and .eml files in a directory")
 
     <> command "importjson" (toParserInfo (pure ImportJson)
         "Import one JSON object from stdin")
 
+    <> command "importyaml" (toParserInfo (pure ImportYaml)
+        "Import one YAML object from stdin")
+
     <> command "importeml" (toParserInfo (pure ImportEml)
         "Import one email from stdin")
 
     <> command "ingest" (toParserInfo (IngestFile <$> strArgument
         (metavar "FILEPATH" <> help "Path to file"))
-        ("Ingest a .json or .eml file containing one task "
+        ("Ingest a .json, .yaml, or .eml file containing one task "
           <> "(import, open in editor, delete the original file)"))
 
     <> command "ingestdir" (toParserInfo (IngestDir <$> strArgument
         (metavar "DIRECTORY_PATH" <> help "Path to directory"))
-        "Ingest all .json and .eml files in a directory")
+        "Ingest all .json, .yaml, and .eml files in a directory")
 
     <> command "csv" (toParserInfo (pure Csv)
         "Show tasks in CSV format")
@@ -1220,6 +1225,7 @@ executeCLiCommand conf now connection progName args availableLinesMb = do
         ImportFile filePath -> importFile conf connection filePath
         ImportDir filePath -> importDir conf connection filePath
         ImportJson -> importJson conf connection
+        ImportYaml -> importYaml conf connection
         ImportEml -> importEml conf connection
         IngestFile filePath -> ingestFile conf connection filePath
         IngestDir filePath -> ingestDir conf connection filePath

tasklite-core/source/ImportExport.hs

@@ -179,6 +179,22 @@ importJson _ connection = do
       insertImportTask connection importTaskNorm
 
 
+decodeAndInsertYaml :: Connection -> BSL.LazyByteString -> IO (Doc AnsiStyle)
+decodeAndInsertYaml conn content = do
+  case content & BSL.toStrict & Yaml.decodeEither' of
+    Left error ->
+      die $ T.pack $ Yaml.prettyPrintParseException error
+    Right importTaskRec -> do
+      importTaskNorm <- importTaskRec & setMissingFields
+      insertImportTask conn importTaskNorm
+
+
+importYaml :: Config -> Connection -> IO (Doc AnsiStyle)
+importYaml _ conn = do
+  content <- BSL.getContents
+  decodeAndInsertYaml conn content
+
+
 importEml :: Config -> Connection -> IO (Doc AnsiStyle)
 importEml _ connection = do
   content <- BSL.getContents
@@ -301,6 +317,8 @@ importFile _ conn filePath = do
               Right importTaskRec -> do
                 importTaskNorm <- importTaskRec & setMissingFields
                 insertImportTask conn importTaskNorm
+          ".yaml" -> decodeAndInsertYaml conn content
+          ".yml" -> decodeAndInsertYaml conn content
           ".eml" ->
             case Parsec.parse Email.message filePath content of
               Left error -> die $ show error
@@ -314,6 +332,8 @@ importFile _ conn filePath = do
 filterImportable :: FilePath -> Bool
 filterImportable filePath =
   (".json" `isExtensionOf` filePath)
+    || (".yaml" `isExtensionOf` filePath)
+    || (".yml" `isExtensionOf` filePath)
     || (".eml" `isExtensionOf` filePath)
 
 
@@ -330,6 +350,22 @@ importDir conf connection dirPath = do
 
 ingestFile :: Config -> Connection -> FilePath -> IO (Doc AnsiStyle)
 ingestFile conf connection filePath = do
+  let ingestYaml content = do
+        let decodeResult = Yaml.decodeEither' (BSL.toStrict content)
+        case decodeResult of
+          Left error ->
+            die $ T.pack $ Yaml.prettyPrintParseException error
+          Right importTaskRec -> do
+            importTaskNorm <- importTaskRec & setMissingFields
+            sequence
+              [ insertImportTask connection importTaskNorm
+              , editTaskByTask
+                  conf
+                  OpenEditor
+                  connection
+                  importTaskNorm.task
+              ]
+
   catchAll
     ( do
         content <- BSL.readFile filePath
@@ -349,6 +385,8 @@ ingestFile conf connection filePath = do
                       connection
                       importTaskNorm.task
                   ]
+          ".yaml" -> ingestYaml content
+          ".yml" -> ingestYaml content
           ".eml" ->
             case Parsec.parse Email.message filePath content of
               Left error -> die $ show error