]> git.sesse.net Git - casparcg/blobdiff - common/env.cpp
[flash] Moved template host copying to flash module startup instead from env setup...
[casparcg] / common / env.cpp
index 8e07f287b4e48cf782d7ac65c5a02f6cc0c7e9e6..f422fb0c032c43dc82f3e36902743c85c85b467c 100644 (file)
 #include "except.h"
 #include "log.h"
 #include "string.h"
+#include "os/filesystem.h"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/thread/once.hpp>
 
 #include <functional>
 #include <iostream>
+#include <fstream>
 
 namespace caspar { namespace env {
-       
+
+std::wstring initial;
 std::wstring media;
 std::wstring log;
 std::wstring ftemplate;
@@ -57,54 +61,18 @@ void configure(const std::wstring& filename)
 {
        try
        {
-               auto initialPath = boost::filesystem3::initial_path().wstring();
-       
-               std::wifstream file(initialPath + L"\\" + filename);
+               initial = boost::filesystem::initial_path().wstring();
+
+               boost::filesystem::wifstream file(initial + L"/" + filename);
                boost::property_tree::read_xml(file, pt, boost::property_tree::xml_parser::trim_whitespace | boost::property_tree::xml_parser::no_comments);
 
                auto paths      = pt.get_child(L"configuration.paths");
-               media           = paths.get(L"media-path", initialPath + L"\\media\\");
-               log                     = paths.get(L"log-path", initialPath + L"\\log\\");
-               ftemplate       = boost::filesystem3::complete(paths.get(L"template-path", initialPath + L"\\template\\")).wstring();           
-               data            = paths.get(L"data-path", initialPath + L"\\data\\");
-               font            = paths.get(L"font-path", initialPath + L"\\fonts\\");
-               thumbnails      = paths.get(L"thumbnails-path", initialPath + L"\\data\\");
-
-               //Make sure that all paths have a trailing backslash
-               if(media.at(media.length()-1) != L'\\')
-                       media.append(L"\\");
-               if(log.at(log.length()-1) != L'\\')
-                       log.append(L"\\");
-               if(ftemplate.at(ftemplate.length()-1) != L'\\')
-                       ftemplate.append(L"\\");
-               if(data.at(data.length()-1) != L'\\')
-                       data.append(L"\\");
-               if(font.at(font.length()-1) != L'\\')
-                       font.append(L"\\");
-               if(thumbnails.at(thumbnails.length()-1) != L'\\')
-                       thumbnails.append(L"\\");
-
-               try
-               {
-                       for(auto it = boost::filesystem::directory_iterator(initialPath); it != boost::filesystem::directory_iterator(); ++it)
-                       {
-                               if(it->path().wstring().find(L".fth") != std::wstring::npos)                    
-                               {
-                                       auto from_path = *it;
-                                       auto to_path = boost::filesystem::path(ftemplate + L"/" + it->path().wstring());
-                               
-                                       if(boost::filesystem::exists(to_path))
-                                               boost::filesystem::remove(to_path);
-
-                                       boost::filesystem::copy_file(from_path, to_path);
-                               }       
-                       }
-               }
-               catch(...)
-               {
-                       CASPAR_LOG_CURRENT_EXCEPTION();
-                       CASPAR_LOG(error) << L"Failed to copy template-hosts from initial-path to template-path.";
-               }
+               media           = paths.get(L"media-path", initial + L"/media/");
+               log                     = paths.get(L"log-path", initial + L"/log/");
+               ftemplate       = boost::filesystem::complete(paths.get(L"template-path", initial + L"/template/")).wstring();
+               data            = paths.get(L"data-path", initial + L"/data/");
+               font            = paths.get(L"font-path", initial + L"/font/");
+               thumbnails      = paths.get(L"thumbnail-path", initial + L"/thumbnail/");
        }
        catch(...)
        {
@@ -114,36 +82,55 @@ void configure(const std::wstring& filename)
 
        try
        {
-               try
-               {
-                       auto log_path = boost::filesystem::path(log);
-                       if(!boost::filesystem::exists(log_path))
-                               boost::filesystem::create_directories(log_path);
-               }
-               catch(...)
-               {
+               auto found_media_path = find_case_insensitive(media);
+               if (found_media_path)
+                       media = *found_media_path;
+               else
+                       boost::filesystem::create_directories(media);
+
+               auto found_template_path = find_case_insensitive(ftemplate);
+               if (found_template_path)
+                       ftemplate = *found_template_path;
+               else
+                       boost::filesystem::create_directories(ftemplate);
+
+               auto found_data_path = find_case_insensitive(data);
+               if (found_data_path)
+                       data = *found_data_path;
+               else
+                       boost::filesystem::create_directories(data);
+
+               auto found_font_path = find_case_insensitive(font);
+               if (found_font_path)
+                       font = *found_font_path;
+               else
+                       boost::filesystem::create_directories(font);
+
+               auto found_thumbnails_path = find_case_insensitive(thumbnails);
+               if (found_thumbnails_path)
+                       thumbnails = *found_thumbnails_path;
+               else
+                       boost::filesystem::create_directories(thumbnails);
+
+               auto found_log_path = find_case_insensitive(log);
+               if (found_log_path)
+                       log = *found_log_path;
+               else if (!boost::filesystem::create_directories(log))
                        log = L"./";
-               }
-
-               auto media_path = boost::filesystem::path(media);
-               if(!boost::filesystem::exists(media_path))
-                       boost::filesystem::create_directories(media_path);
-                               
-               auto template_path = boost::filesystem::path(ftemplate);
-               if(!boost::filesystem::exists(template_path))
-                       boost::filesystem::create_directories(template_path);
-               
-               auto data_path = boost::filesystem::path(data);
-               if(!boost::filesystem::exists(data_path))
-                       boost::filesystem::create_directories(data_path);
-
-               auto font_path = boost::filesystem::path(font);
-               if(!boost::filesystem::exists(font_path))
-                       boost::filesystem::create_directories(font_path);
-
-               auto thumbnails_path = boost::filesystem::path(thumbnails);
-               if(!boost::filesystem::exists(thumbnails_path))
-                       boost::filesystem::create_directories(thumbnails_path);
+
+               //Make sure that all paths have a trailing slash
+               if(media.at(media.length()-1) != L'/')
+                       media.append(L"/");
+               if(log.at(log.length()-1) != L'/')
+                       log.append(L"/");
+               if(ftemplate.at(ftemplate.length()-1) != L'/')
+                       ftemplate.append(L"/");
+               if(data.at(data.length()-1) != L'/')
+                       data.append(L"/");
+               if(font.at(font.length()-1) != L'/')
+                       font.append(L"/");
+               if(thumbnails.at(thumbnails.length()-1) != L'/')
+                       thumbnails.append(L"/");
        }
        catch(...)
        {
@@ -151,7 +138,13 @@ void configure(const std::wstring& filename)
                CASPAR_LOG(error) << L"Failed to create configured directories.";
        }
 }
-       
+
+const std::wstring& initial_folder()
+{
+       check_is_configured();
+       return initial;
+}
+
 const std::wstring& media_folder()
 {
        check_is_configured();
@@ -194,10 +187,10 @@ const std::wstring& thumbnails_folder()
 const std::wstring& version()
 {
        static std::wstring ver = u16(
-                       EXPAND_AND_QUOTE(CASPAR_GEN)    "." 
-                       EXPAND_AND_QUOTE(CASPAR_MAYOR)  "." 
-                       EXPAND_AND_QUOTE(CASPAR_MINOR)  "." 
-                       CASPAR_REV      " " 
+                       EXPAND_AND_QUOTE(CASPAR_GEN)    "."
+                       EXPAND_AND_QUOTE(CASPAR_MAYOR)  "."
+                       EXPAND_AND_QUOTE(CASPAR_MINOR)  "."
+                       CASPAR_REV      " "
                        CASPAR_TAG);
        return ver;
 }
@@ -208,9 +201,4 @@ const boost::property_tree::wptree& properties()
        return pt;
 }
 
-std::wstring system_font_folder()
-{
-       return L"C:\\windows\\Fonts\\";
-}
-
-}}
\ No newline at end of file
+}}