Log: Migrated log to libshared

- Then updated libshared commit

src/CMakeLists.txt

@@ -10,7 +10,6 @@ set (timew_SRCS Database.cpp   Database.h
                 Grammar.cpp    Grammar.h
                 Interval.cpp   Interval.h
                 Lexer.cpp      Lexer.h
-                Log.cpp        Log.h
                 LR0.cpp        LR0.h
                 Rules.cpp      Rules.h
                 init.cpp
@@ -23,6 +22,7 @@ set (libshared_SRCS libshared/src/Args.cpp          libshared/src/Args.h
                     libshared/src/Duration.cpp      libshared/src/Duration.h
                     libshared/src/FS.cpp            libshared/src/FS.h
                     libshared/src/JSON.cpp          libshared/src/JSON.h
+                    libshared/src/Log.cpp           libshared/src/Log.h
                     libshared/src/Msg.cpp           libshared/src/Msg.h
                     libshared/src/Pig.cpp           libshared/src/Pig.h
                     libshared/src/RX.cpp            libshared/src/RX.h

src/Log.cpp

@@ -1,111 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <Log.h>
-#include <shared.h>
-#include <format.h>
-
-////////////////////////////////////////////////////////////////////////////////
-void Log::file (const std::string& name)
-{
-  _name = name;
-  _file = File (_name);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Log::ignore (const std::string& category)
-{
-  _ignore.insert (category);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void Log::write (const std::string& category, const std::string& line)
-{
-  // Determine if this category is in the ignore list.
-  if (_ignore.find (category) != _ignore.end ())
-    return;
-
-  if (line != "")
-  {
-    // If line contains newlines, split it into separate lines and log each one.
-    if (line.find ("\n") != std::string::npos)
-    {
-      for (const auto& single : split (line, '\n'))
-        write (category, single);
-
-      return;
-    }
-
-    // Single line.
-    if (line == _prior)
-    {
-      ++_repetition;
-    }
-    else
-    {
-      _prior = line;
-
-      // Catch up by writing out the backlog.
-      if (_name != "" && _backlog.size ())
-      {
-        for (const auto& line : _backlog)
-          _file.append (line); 
-
-        _backlog.clear ();
-      }
-
-      if (_repetition)
-      {
-        std::string message = Datetime ().toISO ()
-                            + " " + PACKAGE_VERSION
-                            + " " + category
-                            + " " + format ("(Repeated {1} times)", _repetition)
-                            + "\n";
-
-        if (_name != "")
-          _file.append (message);
-        else
-          _backlog.push_back (message);
-
-        _repetition = 0;
-      }
-
-      std::string message = Datetime ().toISO ()
-                          + " " + PACKAGE_VERSION
-                          + " " + category
-                          + " " + line
-                          + "\n";
-
-      if (_name != "")
-        _file.append (message);
-      else
-        _backlog.push_back (message);
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////

src/Log.h

@@ -1,57 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef INCLUDED_LOG
-#define INCLUDED_LOG
-
-#include <FS.h>
-#include <Datetime.h>
-#include <vector>
-#include <set>
-#include <string>
-#include <stdio.h>
-
-class Log
-{
-public:
-  Log () = default;
-  ~Log () = default;
-
-  void file (const std::string&);
-  void ignore (const std::string&);
-  void write (const std::string&, const std::string&);
-
-private:
-  std::string               _name       {};
-  std::vector <std::string> _backlog    {};
-  File                      _file       {};
-  std::string               _prior      {"none"};
-  int                       _repetition {0};
-  std::set <std::string>    _ignore     {};
-};
-
-#endif
-

src/libshared

@@ -1 +1 @@
-Subproject commit aa6d53773eee0865615775ecbea710d48dabde13
+Subproject commit 1f26c5e035c507f23e74e7e24c749662c21ba44f