made nsm Windows compatible

nifty-site-manager · May 13, 2019 · 8c3fddf · 8c3fddf
1 parent d2c7aa5
commit 8c3fddf
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/DateTimeInfo.h b/DateTimeInfo.h
@@ -2,9 +2,11 @@
 #define DATE_TIME_INFO_H_
 
 #include <cstdio>
+#include <cstdlib>
 #include <iostream>
 #include <string>
 #include <sstream>
+#include <time.h>
 
 //information about date and time
 /*

diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ install:
 	chmod 755 nsm
 	sudo mv nsm /usr/local/bin
 
-auto-highlighting:
+linux-gedit-highlighting:
 	chmod 644 html.lang
 	sudo mv html.lang /usr/share/gtksourceview-3.0/language-specs/html.lang
 
@@ -54,3 +54,6 @@ linux-install:
 clean:
 	rm -f $(objects)
 
+clean-all:
+	rm -f $(objects) nsm
+
diff --git a/Path.cpp b/Path.cpp
@@ -89,7 +89,11 @@ bool Path::ensurePathExists() const
     {
         cDir += dDeque[d];
         //std::cout << "making sure " << cDir << " exists " << std::endl;
-        mkdir(cDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+        #ifdef _WIN32
+            _mkdir(cDir.c_str()); //windows specific
+        #else //unix
+            mkdir(cDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); //unix/linux/osx specific
+        #endif // _WIN32
     }
 
     if(file.length())

diff --git a/Path.h b/Path.h
@@ -7,6 +7,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <time.h>
+
+#ifdef _WIN32
+    #include <direct.h>
+#endif
 
 #include "Directory.h"
 #include "Filename.h"

diff --git a/nsm.cpp b/nsm.cpp
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
 
     if(cmd == "commands")
     {
-        std::cout << " --------- available commands --------------------------------------" << std::endl;
+        std::cout << "+--------- available commands --------------------------------------+" << std::endl;
         std::cout << "| nsm commands      | lists all nsm commands                        |" << std::endl;
         std::cout << "| nsm config        | lists config settings                         |" << std::endl;
         std::cout << "| nsm init          | input: initialise managing a site             |" << std::endl;
@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
         std::cout << "| nsm build-all     | builds all tracked pages                      |" << std::endl;
         std::cout << "| nsm new-title     | input: page-name new-title                    |" << std::endl;
         std::cout << "| nsm new-template  | input: page-name template-path                |" << std::endl;
-        std::cout << " -------------------------------------------------------------------" << std::endl;
+        std::cout << "+-------------------------------------------------------------------+" << std::endl;
 
         return 0;
     }
@@ -77,11 +77,17 @@ int main(int argc, char* argv[])
     {
         //ensures nsm is not managing a site from this directory or one of the ancestor directories
         std::string parentDir = "../",
-            rootDir = "/",
+            rootDir = "C:\\",
             owd = get_pwd(),
             pwd = get_pwd(),
             prevPwd;
 
+        #ifdef _WIN32
+            rootDir = "C:\\";
+        #else  //unix
+            rootDir = "/";
+        #endif // _WIN32
+
         if(std::ifstream(".siteinfo/pages.list") || std::ifstream(".siteinfo/nsm.config"))
         {
             std::cout << "nsm is already managing a site in " << owd << " (or an accessible ancestor directories)" << std::endl;
@@ -127,6 +133,10 @@ int main(int argc, char* argv[])
             //adds read and write permissions to pages list file
             chmod(pagesListPath.str().c_str(), 0666);
 
+            #ifdef _WIN32
+                system("attrib +h .siteinfo");
+            #endif // _WIN32
+
             std::ofstream ofs(".siteinfo/nsm.config");
             ofs << "contentDir content/" << std::endl;
             ofs << "contentExt .content" << std::endl;
@@ -160,6 +170,10 @@ int main(int argc, char* argv[])
             //adds read and write permissions to pages list file
             chmod(pagesListPath.str().c_str(), 0666);
 
+            #ifdef _WIN32
+                system("attrib +h .siteinfo");
+            #endif // _WIN32
+
             std::ofstream ofs(".siteinfo/nsm.config");
             ofs << "contentDir content/" << std::endl;
             ofs << "contentExt .content" << std::endl;
@@ -538,6 +552,10 @@ int main(int argc, char* argv[])
             //adds read and write permissions to pages list file
             chmod(pagesListPath.str().c_str(), 0666);
 
+            #ifdef _WIN32
+                system("attrib +h .siteinfo");
+            #endif // _WIN32
+
             std::ofstream ofs(".siteinfo/nsm.config");
             ofs << "contentDir content/" << std::endl;
             ofs << "contentExt .content" << std::endl;
@@ -1069,6 +1087,10 @@ int main(int argc, char* argv[])
             //adds read and write permissions to pages list file
             chmod(pagesListPath.str().c_str(), 0666);
 
+            #ifdef _WIN32
+                system("attrib +h .siteinfo");
+            #endif // _WIN32
+
             std::ofstream ofs(".siteinfo/nsm.config");
             ofs << "contentDir content/" << std::endl;
             ofs << "contentExt .content" << std::endl;