diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -60,7 +60,12 @@ ## 0.6.0.0 -- 2020-01-10 -* Sixth version. Added a possibility to create not a full set of the -Ukrainian sounds representations, but only for the those non-silent ones -that are specified by the third command line parameter. +* Sixth version. Added a possibility to create not a full set of +the Ukrainian sounds representations, but only for the those +non-silent ones that are specified by the third command line parameter. + +## 0.6.1.0 -- 2020-01-10 + +* Sixth version revised A. Fixed issues with wrongly located information messages, +non-parsed third command line argument. Added a new module ReplaceP. Some minor improvements. diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2019-2020 OleksandrZhabenko +Copyright (c) 2019 OleksandrZhabenko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/Main.hs b/Main.hs --- a/Main.hs +++ b/Main.hs @@ -22,8 +22,9 @@ import Processing_mmsyn7ukr import System.Environment (getArgs) import System.Info (os) -import qualified Data.Vector as V import CaseBi (getBFst') +import qualified Data.Vector as V +import ReplaceP -- | Function responds for general program execution. It starts with CAUTION to be responsible for usage and to -- use it personally in some important cases (see README). Then the program guides you through the creating your Ukrainian \"voice\". @@ -119,9 +120,9 @@ else concat . drop 1 . take 1 $ args a2 = if null . drop 2 . take 3 $ args then [] - else read (show . drop 2 . take 3 $ args)::[String] - if null a2 - then do + else concat . drop 2 . take 3 $ args + if null a2 + then do paths <- mapM getDataFileName ["A.wav", "B.wav", "C.wav", "D.wav", "E.wav", "F.wav", "G.wav", "H.wav", "I.wav", "J.wav", "K.wav", "L.wav", "M.wav", "N.wav", "O.wav", "P.wav", "Q.wav", "R.wav", "S.wav", "T.wav", "U.wav", "V.wav", "W.wav", "X.wav", "Y.wav", "Z.wav", "a.wav", "b.wav", "c.wav", @@ -134,12 +135,15 @@ putStrLn "" putStrLn "Your voice sound files are now created in the current directory! Use in a secure way! Remember the initial CAUTION! " putStrLn "" - else do - let wws = map (getBFst' ("0.wav", V.fromList . zip ["а","б","в","г","д","дж","дз","е","ж","з","и","й","к","л","м","н","о","п","р","с", + else do + putStrLn "" + let rrs = show . head $ [[a2]] + list0 = read (replaceP rrs)::[String] + wws = map (getBFst' ("0.wav", V.fromList . zip ["а","б","в","г","д","дж","дз","е","ж","з","и","й","к","л","м","н","о","п","р","с", "сь","т","у","ф","х","ц","ць","ч","ш","ь","і","ґ"] $ ["A.wav", "B.wav", "C.wav", "D.wav", "E.wav", "F.wav", "G.wav", "H.wav", "I.wav", "J.wav", "K.wav", "L.wav", "M.wav", "N.wav", "O.wav", "P.wav", "Q.wav", "R.wav", "S.wav", "T.wav", "U.wav", "V.wav", "W.wav", "X.wav", "Y.wav", "Z.wav", "a.wav", "b.wav", "c.wav", - "d.wav", "e.wav", "f.wav"])) a2 + "d.wav", "e.wav", "f.wav"])) list0 paths <- mapM getDataFileName wws copiedFs <- mapM getDataFileName ["-.wav", "0.wav", "1.wav"] mapM_ (produceSound (a0, a1)) paths @@ -149,4 +153,3 @@ putStrLn "" putStrLn "Your voice sound files are now created in the current directory! Use in a secure way! Remember the initial CAUTION! " putStrLn "" - diff --git a/Processing_mmsyn7ukr.hs b/Processing_mmsyn7ukr.hs --- a/Processing_mmsyn7ukr.hs +++ b/Processing_mmsyn7ukr.hs @@ -52,10 +52,12 @@ ; playA file ; putStrLn "The sound duration is: " ; produceSound2 (file, file1) (actsctrl, noiseLim) soundUkr -; return () }) (putStrLn "Something went unexpectedly, please, repeat the precedure agein, be attentive to the data you provide as input! " >> - putStr "The needed files were NOT created, because the sound was not at the moment of recording! The process will be restarted " >> - putStrLn "for the sound. Please, produce a sound during the first 3 seconds (after 0.5 second delay) or specify greater ratio!" >> cleanTemp >> - produceSound (actsctrl, noiseLim) file) +; return () }) (do + putStrLn "Something went unexpectedly, please, repeat the precedure agein, be attentive to the data you provide as input! " + putStr "The needed files were NOT created (may be the sound was not at the moment of recording)! The process will be restarted " + putStrLn "for the sound. Please, produce a sound during the first 3 seconds (after 0.5 second delay) or specify greater ratio!" + cleanTemp + produceSound (actsctrl, noiseLim) file) -- | Function 'produceSound3' is used internally in the 'produceSound2' function. @@ -117,20 +119,20 @@ produceSound2 :: (FilePath, FilePath) -> (String, String) -> String -> IO () produceSound2 (file, file1) (actsctrl, noiseLim) soundUkr = do { duration0 <- durationA file - ; longerK0 <- tempS soundUkr ; (_, Just hout, _, _) <- createProcess (proc (fromJust . showE $ "soxi") ["-D", file]) { std_out = CreatePipe } ; x3 <- hGetContents hout ; putStrLn $ showCoef (showFFloat (Just 6) duration0 $ show 0) ; putStrLn "" ; putStrLn "It means that to produce more than 3 seconds of recording, you must specify at least " - ; putStrLn $ " ; " ++ show (3.0/(7*duration0)) ++ " as a next step ratio being prompt " - ; putStrLn " ; OR " - ; putStrLn $ " ; " ++ show (1.0/(7*duration0)) ++ " per one second but not less than the previous number." + ; putStrLn $ " " ++ show (3.0/(7*duration0)) ++ " as a next step ratio being prompt " + ; putStrLn " OR " + ; putStrLn $ " " ++ show (1.0/(7*duration0)) ++ " per one second but not less than the previous number." ; putStrLn $ "For example for 10 seconds record, please, specify " ++ show (10.0/(7*duration0)) ++ " as a next step ratio." + ; longerK0 <- tempS soundUkr ; let longerK = (read x3::Double)*longerK0 ; putStrLn "Please, wait for 0.5 second and pronounce the sound representation for the " ; putStrLn "" - ; putStrLn $ " ; ; ; ; ; ; ; ; ; ; \"" ++ (if soundUkr /= "ь" then map toUpper soundUkr else soundUkr) ++ "\"" + ; putStrLn $ " \"" ++ (if soundUkr /= "ь" then map toUpper soundUkr else soundUkr) ++ "\"" ; putStrLn "" ; putStrLn " sound or whatever you would like to be substituted instead (be sensible, please)! " ; if (compare (7*longerK) 3.0 == LT) @@ -182,17 +184,17 @@ ; putStrLn $ showCoef (showFFloat (Just 6) duration0 $ show 0) ; putStrLn "" ; putStrLn "It means that to produce more than 3 seconds of recording, you must specify at least " -; putStrLn $ "; " ++ show (3.0/(7*duration0)) ++ " as a next step ratio being prompt " -; putStrLn "; OR " -; putStrLn $ "; " ++ show (1.0/(7*duration0)) ++ " per one second but not less than the previous number." +; putStrLn $ " " ++ show (3.0/(7*duration0)) ++ " as a next step ratio being prompt " +; putStrLn " OR " +; putStrLn $ " " ++ show (1.0/(7*duration0)) ++ " per one second but not less than the previous number." ; putStrLn $ "For example for 10 seconds record, please, specify " ++ show (10.0/(7*duration0)) ++ " as a next step ratio." -; longerK0 <- tempS soundUkr ; (_, Just hout, _, _) <- createProcess (proc (fromJust . showE $ "soxi") ["-D", file]) { std_out = CreatePipe } ; x3 <- hGetContents hout +; longerK0 <- tempS soundUkr ; let longerK = (read x3::Double)*longerK0 ; putStrLn "Please, wait for 0.5 second and pronounce the sound representation for the " ; putStrLn "" -; putStrLn $ "; ; ; ; ; ; ; ; ; ; \"" ++ (if soundUkr /= "ь" then map toUpper soundUkr else soundUkr) ++ "\"" +; putStrLn $ " \"" ++ (if soundUkr /= "ь" then map toUpper soundUkr else soundUkr) ++ "\"" ; putStrLn "" ; putStrLn "sound or whatever you would like to be substituted instead (be sensible, please)! " ; if (compare (7*longerK) 3.0 == LT) @@ -240,3 +242,18 @@ cleanTemp = do filenames <- getDirectoryContents =<< getCurrentDirectory let rems = filter (\x -> head x `elem` (['2'..'9'] ++ "_" ++ "x")) filenames in mapM_ removeFile rems + +-- | Function is used internally to parse a given third command line argument as a @[String]@ representing the Ukrainian sounds, which will be produced. +replaceP :: String -> String +replaceP (x:y:z:u:v:xs) | x == '[' && y == '\"' && z == '[' && u == '\\' && v == '\\' = "[\"\\" ++ replaceP xs + | x == ',' && y == '\\' && z == '\\' = "\",\"\\" ++ replaceP (u:v:xs) + | x == ']' && y == '\"' && z == ']' = "\"]" ++ replaceP (u:v:xs) + | otherwise = x:replaceP (y:z:u:v:xs) +replaceP (x:y:z:u:xs) | x == ',' && y == '\\' && z == '\\' = "\",\"\\" ++ replaceP (u:xs) + | x == ']' && y == '\"' && z == ']' = "\"]" ++ replaceP (u:xs) + | otherwise = x:replaceP (y:z:u:xs) +replaceP (x:y:z:xs) | x == ',' && y == '\\' && z == '\\' = "\",\"\\" ++ replaceP xs + | x == ']' && y == '\"' && z == ']' = "\"]" ++ replaceP xs + | otherwise = x:replaceP (y:z:xs) +replaceP xs = xs + diff --git a/README b/README --- a/README +++ b/README @@ -118,6 +118,9 @@ will not be trimmed for the first command line argument greater of 1, is 0.04; -If you specified as a third command line argument as a list of String's, -then the program produces only those non-silent Ukrainian sounds -representations that are in the list. The list must be sorted. +If you specify the third command line argument, it must be a list +of Strings that can be obtained by executing the mmsyn7s program +(https://hackage.haskell.org/package/mmsyn7s). The program will create +just that non-silent representations for the Ukrainian sounds, +which are given. The list must be sorted. + diff --git a/ReplaceP.hs b/ReplaceP.hs new file mode 100644 --- /dev/null +++ b/ReplaceP.hs @@ -0,0 +1,28 @@ +-- | +-- Module : Main +-- Copyright : (c) OleksandrZhabenko 2019-2020 +-- License : MIT +-- +-- Maintainer : olexandr543@yahoo.com +-- +-- A program and a library that can be used as a simple +-- basic interface to some SoX functionality or for producing +-- the approximately Ukrainian speech with your own recorded +-- voice (actually it produces needed sound representations). +-- + +module ReplaceP where + +-- | Function is used internally to parse a given third command line argument as a @[String]@ representing the Ukrainian sounds, which will be produced. +replaceP :: String -> String +replaceP (x:y:z:u:v:xs) | x == '[' && y == '\"' && z == '[' && u == '\\' && v == '\\' = "[\"\\" ++ replaceP xs + | x == ',' && y == '\\' && z == '\\' = "\",\"\\" ++ replaceP (u:v:xs) + | x == ']' && y == '\"' && z == ']' = "\"]" ++ replaceP (u:v:xs) + | otherwise = x:replaceP (y:z:u:v:xs) +replaceP (x:y:z:u:xs) | x == ',' && y == '\\' && z == '\\' = "\",\"\\" ++ replaceP (u:xs) + | x == ']' && y == '\"' && z == ']' = "\"]" ++ replaceP (u:xs) + | otherwise = x:replaceP (y:z:u:xs) +replaceP (x:y:z:xs) | x == ',' && y == '\\' && z == '\\' = "\",\"\\" ++ replaceP xs + | x == ']' && y == '\"' && z == ']' = "\"]" ++ replaceP xs + | otherwise = x:replaceP (y:z:xs) +replaceP xs = xs diff --git a/mmsyn7ukr.cabal b/mmsyn7ukr.cabal --- a/mmsyn7ukr.cabal +++ b/mmsyn7ukr.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: mmsyn7ukr -version: 0.6.0.0 +version: 0.6.1.0 synopsis: A simple basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h description: A program and a library that can be used as a simple basic interface to some SoX functionality or to produce your voice in Ukrainian (if you pronounce the sounds properly) represented by the separate sounds or something special like soft sign. homepage: https://hackage.haskell.org/package/mmsyn7ukr @@ -17,7 +17,7 @@ cabal-version: >=1.10 library - exposed-modules: SoXBasics, Processing_mmsyn7ukr, Main + exposed-modules: SoXBasics, Processing_mmsyn7ukr, Main, ReplaceP -- other-modules: -- other-extensions: build-depends: base >=4.7 && <4.14, process >=1.4 && <1.8, vector >=0.11 && <0.14, bytestring >=0.10 && < 0.12, mmsyn2 >=0.1.7 && <1, directory >=1.2.5 && <1.4, mmsyn6ukr >=0.6.2 && <1, mmsyn3 >=0.1.4 && <1