(FIX): Resolved the naming issues.
When this was merged, it seemed to produce a miss matched result. The names were not migrated. But now they have been.
This commit is contained in:
parent
152c4e8e04
commit
d26dd1b5a2
@ -2,66 +2,67 @@
|
|||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <stdexcept> // for std::invalid_argument
|
#include <stdexcept> // for std::invalid_argument
|
||||||
|
|
||||||
//implement hashmap for the code
|
// implement hashmap for the code
|
||||||
CLI::CLI(int argc, char** argv){
|
CLI::CLI(int argc, char **argv) {
|
||||||
try{
|
try {
|
||||||
if (arc < 2) {
|
if (argc < 2) {
|
||||||
throw std::invalid_argument("Error: No input file provided.\n
|
throw std::invalid_argument(
|
||||||
Usage: <program> <input_file>");
|
"Error: No input file provided.\nUsage: <program> <input_file>");
|
||||||
}
|
}
|
||||||
//sets program info
|
// sets program info
|
||||||
programName = argv[0];
|
programName = argv[0];
|
||||||
inputFile = argv[1]
|
inputFile = argv[1];
|
||||||
|
|
||||||
//checks that file has correct file extension
|
// checks that file has correct file extension
|
||||||
if(!(CLI::IsMarkupFile(inputFile))) {
|
if (!(CLI::IsMarkupFile(inputFile))) {
|
||||||
throw std::invalid_argument("Error: Invalid file extension. Expected a '.md' (Markdown) file.");
|
throw std::invalid_argument(
|
||||||
}
|
"Error: Invalid file extension. Expected a '.md' (Markdown) file.");
|
||||||
//stores remaining arguments
|
|
||||||
for (int i = 1; i < argc; i++){
|
|
||||||
args.push_back(argv[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (const std::invalid_argument& e) {
|
|
||||||
std::cerr << e.what() << "\n";
|
|
||||||
PrintHelp();
|
|
||||||
std::exit(EXIT_FAILURE);
|
|
||||||
}
|
}
|
||||||
|
// stores remaining arguments
|
||||||
|
for (int i = 1; i < argc; i++) {
|
||||||
|
args.push_back(argv[i]);
|
||||||
}
|
}
|
||||||
|
} catch (const std::invalid_argument &e) {
|
||||||
bool CLI::IsMarkupFile(const std::string& filename) {
|
std::cerr << e.what() << "\n";
|
||||||
//markdown file extension
|
PrintHelp();
|
||||||
const std::string requiredExtension = ".md";
|
std::exit(EXIT_FAILURE);
|
||||||
//checks to see if it can even include extension
|
}
|
||||||
if (filename.size() <= requiredExtension.size()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
// Extracts the last N characters of the filename (where N is the length of the required extension)
|
|
||||||
// and checks if they match the required file extension (e.g., ".md").
|
|
||||||
//
|
|
||||||
// Example:
|
|
||||||
// filename = "notes.md"
|
|
||||||
// requiredExtension = ".md"
|
|
||||||
// filename.substr(filename.size() - requiredExtension.size()) == ".md" → true
|
|
||||||
//
|
|
||||||
// Reference: https://en.cppreference.com/w/cpp/string/basic_string/substr
|
|
||||||
return filename.substr(filename.size() - requiredExtension.size()) == requiredExtension;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CLI::IsMarkupFile(const std::string &filename) {
|
||||||
//place to run commands but IDK IF WE SHOULD USE A HASMAP or how we are going to get each method to run
|
// markdown file extension
|
||||||
void CLI::RunCommands(){
|
const std::string requiredExtension = ".md";
|
||||||
for (int i = 0; i < args.size(); i++){
|
// checks to see if it can even include extension
|
||||||
|
if (filename.size() <= requiredExtension.size()) {
|
||||||
}
|
return false;
|
||||||
|
}
|
||||||
|
// Extracts the last N characters of the filename (where N is the length of
|
||||||
|
// the required extension) and checks if they match the required file
|
||||||
|
// extension (e.g., ".md").
|
||||||
|
//
|
||||||
|
// Example:
|
||||||
|
// filename = "notes.md"
|
||||||
|
// requiredExtension = ".md"
|
||||||
|
// filename.substr(filename.size() - requiredExtension.size()) == ".md" →
|
||||||
|
// true
|
||||||
|
//
|
||||||
|
// Reference: https://en.cppreference.com/w/cpp/string/basic_string/substr
|
||||||
|
return filename.substr(filename.size() - requiredExtension.size()) ==
|
||||||
|
requiredExtension;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CLI::PrintHelp() const{
|
// place to run commands but IDK IF WE SHOULD USE A HASMAP or how we are going
|
||||||
std::cout << "Usage:\n"
|
// to get each method to run
|
||||||
<< " " << programName << " <input_file> REQUIRED\n"
|
void CLI::RunCommands() {
|
||||||
<< "Flags:\n"
|
for (int i = 0; i < args.size(); i++) {
|
||||||
<< " --o, --output <outputFile>, optional output filename\n"
|
}
|
||||||
<< " --w, --watch, enables watchdog\n"
|
|
||||||
<< " --s, --stop, stops watchdog\n";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CLI::PrintHelp() const {
|
||||||
|
std::cout << "Usage:\n"
|
||||||
|
<< " " << programName << " <input_file> REQUIRED\n"
|
||||||
|
<< "Flags:\n"
|
||||||
|
<< " --o, --output <outputFile>, optional output filename\n"
|
||||||
|
<< " --w, --watch, enables watchdog\n"
|
||||||
|
<< " --s, --stop, stops watchdog\n";
|
||||||
|
}
|
||||||
|
|||||||
208
lib/watchDog.cpp
208
lib/watchDog.cpp
@ -1,123 +1,121 @@
|
|||||||
#include "watchdog.h"
|
#include "watchDog.h"
|
||||||
|
|
||||||
namespace fs = std::filesystem; //makes it easier to read
|
namespace fs = std::filesystem; // makes it easier to read
|
||||||
void WatchDog::start()
|
|
||||||
{
|
|
||||||
//checks if file exist
|
|
||||||
if(!fs::exists(path))
|
|
||||||
{
|
|
||||||
//returns and sets parameters to false if file doesnt exist
|
|
||||||
watching = false;
|
|
||||||
hasInitialTime = false;
|
|
||||||
std::cout << "WatchDog: File does not exists: " << path << std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//grabs intial write time
|
|
||||||
lastWriteTime = fs::last_write_time(path);
|
|
||||||
watching = true;
|
|
||||||
hasInitialTime = true;
|
|
||||||
std::cout << "WatchDog: Started" << std::endl;
|
|
||||||
}
|
|
||||||
void WatchDog::stop(){
|
|
||||||
watching = false;
|
|
||||||
}
|
|
||||||
bool WatchDog::checkFile(){
|
|
||||||
//If not watching returns false
|
|
||||||
if (!watching) return false;
|
|
||||||
|
|
||||||
//Checking if file was deleted
|
void Watchdog::Start() {
|
||||||
if(!fs::exists(path))
|
// checks if file exist
|
||||||
{
|
if (!fs::exists(path)) {
|
||||||
if (hasInitialTime) {
|
// returns and sets parameters to false if file doesnt exist
|
||||||
std::cout << "WatchDog: File was delete: " << path << std::endl;
|
this->watching = false;
|
||||||
hasInitialTime = false;
|
this->has_initial_time = false;
|
||||||
return true;
|
std::cout << "Watchdog: File does not exists: " << path << std::endl;
|
||||||
}
|
return;
|
||||||
return false;
|
}
|
||||||
|
// grabs intial write time
|
||||||
|
this->last_write_time = fs::last_write_time(path);
|
||||||
|
this->watching = true;
|
||||||
|
this->has_initial_time = true;
|
||||||
|
std::cout << "Watchdog: Started" << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Watchdog::CheckFile() {
|
||||||
|
// If not watching returns false
|
||||||
|
if (!watching)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Checking if file was deleted
|
||||||
|
if (!fs::exists(path)) {
|
||||||
|
if (this->has_initial_time) {
|
||||||
|
std::cout << "Watchdog: File was delete: " << path << std::endl;
|
||||||
|
this->has_initial_time = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Built in function with file system to check last write tim
|
// Built in function with file system to check last write tim
|
||||||
fs::file_time_type currentWriteTime = fs::last_write_time(path);
|
fs::file_time_type currentWriteTime = fs::last_write_time(path);
|
||||||
|
|
||||||
//File was just created
|
// File was just created
|
||||||
if(!hasInitialTime)
|
if (!this->has_initial_time) {
|
||||||
{
|
this->last_write_time = currentWriteTime;
|
||||||
lastWriteTime = currentWriteTime;
|
this->has_initial_time = true;
|
||||||
hasInitialTime = true;
|
std::cout << "Watchdog: File created: " << path << std::endl;
|
||||||
std::cout << "WatchDog: File created: " << path << std::endl;
|
return true;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//File modified
|
// File modified
|
||||||
if (currentWriteTime != lastWriteTime)
|
if (currentWriteTime != this->last_write_time) {
|
||||||
{
|
this->last_write_time = currentWriteTime;
|
||||||
lastWriteTime = currentWriteTime;
|
std::cout << "Watchdog: File modifed at "
|
||||||
std::cout << "WatchDog: File modifed at "
|
<< TimePointToString(this->last_write_time) << std::endl;
|
||||||
<< timePointToString(lastWriteTime) << std::endl;
|
return true;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
} catch (const fs::filesystem_error &e) {
|
||||||
} catch (const fs::filesystem_error& e) {
|
// File deleted, inaccessible, or path invalid
|
||||||
// File deleted, inaccessible, or path invalid
|
if (this->has_initial_time) {
|
||||||
if (hasInitialTime) {
|
std::cout << "Watchdog: File deleted or inaccessible: " << path
|
||||||
std::cout << "WatchDog: File deleted or inaccessible: " << path << std::endl;
|
<< std::endl;
|
||||||
hasInitialTime = false;
|
this->has_initial_time = false;
|
||||||
return true;
|
return true;
|
||||||
}
|
|
||||||
return false;
|
|
||||||
|
|
||||||
} catch (const std::exception& e) {
|
|
||||||
std::cerr << "WatchDog: Unexpected error checking file: " << e.what() << std::endl;
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// No change
|
|
||||||
return false;
|
return false;
|
||||||
|
} catch (const std::exception &e) {
|
||||||
|
std::cerr << "Watchdog: Unexpected error checking file: " << e.what()
|
||||||
|
<< std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// No change
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string Watchdog::TimePointToString(const fs::file_time_type& timePoint){
|
std::string Watchdog::TimePointToString(const fs::file_time_type &timePoint) {
|
||||||
/**
|
/**
|
||||||
* Step 1: timePoint
|
* Step 1: timePoint
|
||||||
* - This is the last write time of the file, returned by std::filesystem.
|
* - This is the last write time of the file, returned by std::filesystem.
|
||||||
* - Its clock is platform-dependent (filesystem clock).
|
* - Its clock is platform-dependent (filesystem clock).
|
||||||
*
|
*
|
||||||
* Step 2: fs::file_time_type::clock::now()
|
* Step 2: fs::file_time_type::clock::now()
|
||||||
* - Current time according to the filesystem clock.
|
* - Current time according to the filesystem clock.
|
||||||
*
|
*
|
||||||
* Step 3: std::chrono::system_clock::now()
|
* Step 3: std::chrono::system_clock::now()
|
||||||
* - Current time according to the system clock (standard C++ clock).
|
* - Current time according to the system clock (standard C++ clock).
|
||||||
*
|
*
|
||||||
* Conversion formula:
|
* Conversion formula:
|
||||||
* timePoint - fs::file_time_type::clock::now() + std::chrono::system_clock::now()
|
* timePoint - fs::file_time_type::clock::now() +
|
||||||
*
|
* std::chrono::system_clock::now()
|
||||||
* Explanation:
|
*
|
||||||
* a) timePoint - fs::file_time_type::clock::now()
|
* Explanation:
|
||||||
* - Calculates the duration between the file's last write time and "now"
|
* a) timePoint - fs::file_time_type::clock::now()
|
||||||
* according to the filesystem clock.
|
* - Calculates the duration between the file's last write time and "now"
|
||||||
* b) + std::chrono::system_clock::now()
|
* according to the filesystem clock.
|
||||||
* - Shifts that duration to align with the system clock timeline.
|
* b) + std::chrono::system_clock::now()
|
||||||
* c) std::chrono::time_point_cast<std::chrono::system_clock::duration>(...)
|
* - Shifts that duration to align with the system clock timeline.
|
||||||
* - Ensures the resulting time_point uses the correct duration type
|
* c) std::chrono::time_point_cast<std::chrono::system_clock::duration>(...)
|
||||||
* for std::chrono::system_clock.
|
* - Ensures the resulting time_point uses the correct duration type
|
||||||
*
|
* for std::chrono::system_clock.
|
||||||
* Result:
|
*
|
||||||
* - systemTime is a std::chrono::system_clock::time_point representing
|
* Result:
|
||||||
* the same instant as timePoint, but compatible with system_clock.
|
* - systemTime is a std::chrono::system_clock::time_point representing
|
||||||
*/
|
* the same instant as timePoint, but compatible with system_clock.
|
||||||
std::chrono::system_clock::time_point systemTimePoint =
|
*/
|
||||||
std::chrono::time_point_cast<std::chrono::system_clock::duration>(
|
std::chrono::system_clock::time_point systemTimePoint =
|
||||||
timePoint - fs::file_time_type::clock::now() + std::chrono::system_clock::now()
|
std::chrono::time_point_cast<std::chrono::system_clock::duration>(
|
||||||
);
|
timePoint - fs::file_time_type::clock::now() +
|
||||||
|
std::chrono::system_clock::now());
|
||||||
|
|
||||||
//Converts to seconds
|
// Converts to seconds
|
||||||
std::time_t timeInSeconds = std::chrono::system_clock::to_time_t(systemTimePoint);
|
std::time_t timeInSeconds =
|
||||||
|
std::chrono::system_clock::to_time_t(systemTimePoint);
|
||||||
|
|
||||||
//Converts to local time, built in function
|
// Converts to local time, built in function
|
||||||
std::tm localTime = *std::localtime(&timeInSeconds);
|
std::tm localTime = *std::localtime(&timeInSeconds);
|
||||||
|
|
||||||
// Format the time into a string using strftime
|
// Format the time into a string using strftime
|
||||||
char buffer[20];
|
char buffer[20];
|
||||||
std::strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &localTime);
|
std::strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &localTime);
|
||||||
|
|
||||||
return std::string(buffer);
|
return std::string(buffer);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user