adrido/minetest-mapper-cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use c++17 filesystem as alternative to dirent

Browse Source
This commit is contained in:
adrido 2018-10-29 16:48:00 +01:00
parent 1d71b081d2
commit a6135beeef
3 changed files with 59 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Minetestmapper/CMakeLists.txt
View File

@ -3,7 +3,7 @@
# #
cmake_minimum_required (VERSION 3.8) cmake_minimum_required (VERSION 3.8)
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 17)
set(sources set(sources
PixelAttributes.cpp PixelAttributes.cpp

116
Minetestmapper/PlayerAttributes.cpp
View File

@ -1,25 +1,36 @@
/* #if __cplusplus >= 201703L || _MSVC_LANG >= 201703L
* ===================================================================== #if __has_include(<filesystem>)
* Version: 1.0 #define HAVE_FILESYSTEM
* Created: 01.09.2012 14:38:05 #endif
* Author: Miroslav Bendík #endif
* Company: LinuxOS.sk
* =====================================================================
*/
#ifdef HAVE_FILESYSTEM
#include <filesystem>
namespace fs = std::filesystem;
#else
#include <dirent.h> #include <dirent.h>
//#include <experimental/filesystem> #endif // HAVE_FILESYSTEM
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include "PlayerAttributes.h" #include "PlayerAttributes.h"
using namespace std; using namespace std;
//namespace fs = std::experimental::filesystem::v1;
PlayerAttributes::PlayerAttributes(const std::string &sourceDirectory) PlayerAttributes::PlayerAttributes(const std::string &sourceDirectory)
{ {
string playersPath = sourceDirectory + "players"; const string playersPath = sourceDirectory + "players";
#ifdef HAVE_FILESYSTEM
for (const auto &dirEntry : fs::directory_iterator(playersPath)) {
cout << dirEntry << std::endl;
//dirEntry.path().filename();
extractPlayer(dirEntry.path().string());
}
#else
DIR *dir; DIR *dir;
dir = opendir(playersPath.c_str()); dir = opendir(playersPath.c_str());
if (dir == NULL) { if (dir == NULL) {
@ -32,63 +43,42 @@ PlayerAttributes::PlayerAttributes(const std::string &sourceDirectory)
continue; continue;
} }
string path = playersPath + '/' + ent->d_name; const string path = playersPath + '/' + ent->d_name;
ifstream in; extractPlayer(path);
in.open(path.c_str(), ifstream::in);
string buffer;
string name;
string position;
while (getline(in, buffer)) {
if (buffer.find("name = ") == 0) {
name = buffer.substr(7);
}
else if (buffer.find("position = ") == 0) {
position = buffer.substr(12, buffer.length() - 13);
}
}
char comma;
Player player;
istringstream positionStream(position, istringstream::in);
positionStream >> player.x;
positionStream >> comma;
positionStream >> player.y;
positionStream >> comma;
positionStream >> player.z;
player.name = name;
m_players.push_back(player);
} }
closedir(dir); closedir(dir);
//for (auto& dirEntry : fs::directory_iterator(playersPath)) { #endif // HAVE_FILESYSTEM
// cout << dirEntry << std::endl;
// //dirEntry.path().filename();
// ifstream in;
// in.open(dirEntry.path().string(), ifstream::in); }
// string buffer;
// string name;
// string position;
// while (getline(in, buffer)) {
// if (buffer.find("name = ") == 0) {
// name = buffer.substr(7);
// }
// else if (buffer.find("position = ") == 0) {
// position = buffer.substr(12, buffer.length() - 13);
// }
// }
// char comma;
// Player player;
// istringstream positionStream(position, istringstream::in);
// positionStream >> player.x;
// positionStream >> comma;
// positionStream >> player.y;
// positionStream >> comma;
// positionStream >> player.z;
// player.name = name;
// m_players.push_back(player); void PlayerAttributes::extractPlayer(const std::string &path)
//} {
ifstream in;
in.open(path, ifstream::in);
string buffer;
string name;
string position;
while (getline(in, buffer)) {
if (buffer.find("name = ") == 0) {
name = buffer.substr(7);
}
else if (buffer.find("position = ") == 0) {
position = buffer.substr(12, buffer.length() - 13);
}
}
char comma;
Player player;
istringstream positionStream(position, istringstream::in);
positionStream >> player.x;
positionStream >> comma;
positionStream >> player.y;
positionStream >> comma;
positionStream >> player.z;
player.name = name;
m_players.push_back(player);
} }
PlayerAttributes::Players::iterator PlayerAttributes::begin() PlayerAttributes::Players::iterator PlayerAttributes::begin()

20
Minetestmapper/PlayerAttributes.h
View File

@ -1,14 +1,4 @@
/* #pragma once
* =====================================================================
* Version: 1.0
* Created: 01.09.2012 14:38:08
* Author: Miroslav Bendík
* Company: LinuxOS.sk
* =====================================================================
*/
#ifndef PLAYERATTRIBUTES_H_D7THWFVV
#define PLAYERATTRIBUTES_H_D7THWFVV
#include <list> #include <list>
#include <string> #include <string>
@ -19,7 +9,7 @@ struct Player
double x; double x;
double y; double y;
double z; double z;
}; /* ----- end of struct Player ----- */ };
class PlayerAttributes class PlayerAttributes
{ {
@ -27,12 +17,12 @@ public:
typedef std::list<Player> Players; typedef std::list<Player> Players;
PlayerAttributes(const std::string &sourceDirectory); PlayerAttributes(const std::string &sourceDirectory);
Players::iterator begin(); Players::iterator begin();
Players::iterator end(); Players::iterator end();
private: private:
Players m_players; Players m_players;
}; /* ----- end of class PlayerAttributes ----- */ void extractPlayer(const std::string &path);
};
#endif /* end of include guard: PLAYERATTRIBUTES_H_D7THWFVV */