Skip to content

Files are packed in sorted mode #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aenima1891 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Files are packed in sorted mode #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,21 +202,29 @@ int addFiles(const char* dirname, const char* subPath)

// Open directory
if ((dir = opendir (dirPath.c_str())) != NULL) {
std::vector<std::string> files;

// Read files from directory.
while ((ent = readdir (dir)) != NULL) {
while ((ent = readdir(dir)) != NULL) {
files.push_back(ent->d_name);
}

// sort files -> same behaviour on all platforms
std::sort(files.begin(), files.end());

for (const auto &file : files) {
// Process the file

// Ignore dir itself.
if ((strcmp(ent->d_name, ".") == 0) || (strcmp(ent->d_name, "..") == 0)) {
if ((strcmp(file.c_str(), ".") == 0) || (strcmp(file.c_str(), "..") == 0)) {
continue;
}

if (!s_addAllFiles) {
bool skip = false;
size_t ignored_file_names_count = sizeof(ignored_file_names) / sizeof(ignored_file_names[0]);
for (size_t i = 0; i < ignored_file_names_count; ++i) {
if (strcmp(ent->d_name, ignored_file_names[i]) == 0) {
std::cerr << "skipping " << ent->d_name << std::endl;
if (strcmp(file.c_str(), ignored_file_names[i]) == 0) {
std::cerr << "skipping " << file << std::endl;
skip = true;
break;
}
Expand All @@ -227,7 +235,7 @@ int addFiles(const char* dirname, const char* subPath)
}

std::string fullpath = dirPath;
fullpath += ent->d_name;
fullpath += file;
struct stat path_stat;
stat (fullpath.c_str(), &path_stat);

Expand All @@ -236,23 +244,23 @@ int addFiles(const char* dirname, const char* subPath)
if (S_ISDIR(path_stat.st_mode)) {
// Prepare new sub path.
std::string newSubPath = subPath;
newSubPath += ent->d_name;
newSubPath += file;
newSubPath += "/";

if (addFiles(dirname, newSubPath.c_str()) != 0) {
std::cerr << "Error for adding content from " << ent->d_name << "!" << std::endl;
std::cerr << "Error for adding content from " << file << "!" << std::endl;
}

continue;
} else {
std::cerr << "skipping " << ent->d_name << std::endl;
std::cerr << "skipping " << file << std::endl;
continue;
}
}

// Filepath with dirname as root folder.
std::string filepath = subPath;
filepath += ent->d_name;
filepath += file;
std::cout << filepath << std::endl;

// Add File to image.
Expand Down