entmemberfunktioned
This commit is contained in:
parent
1ab8812486
commit
b181c1906b
|
@ -19,7 +19,7 @@ class DynamicObjects
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::string _cleanpath (const char * const path);
|
std::string _cleanpath (const char * const path);
|
||||||
std::vector<Sicccobject> m_themap;
|
std::vector<Sicccobject> m_thevec;
|
||||||
const Routerin * m_merouterin;
|
const Routerin * m_merouterin;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -8,7 +8,7 @@ std::string DynamicObjects::render_object_list(){
|
||||||
<ul id="down">
|
<ul id="down">
|
||||||
)FOO";
|
)FOO";
|
||||||
|
|
||||||
for (auto& it : this->m_themap){
|
for (auto& it : this->m_thevec){
|
||||||
output += u8"<li>\n";
|
output += u8"<li>\n";
|
||||||
output += u8"<a href=\"" + m_merouterin->get_baseurl() + it.get_path() + u8"\">"; //we could include baseurl here?
|
output += u8"<a href=\"" + m_merouterin->get_baseurl() + it.get_path() + u8"\">"; //we could include baseurl here?
|
||||||
output += it.get_filename();
|
output += it.get_filename();
|
||||||
|
@ -30,8 +30,7 @@ std::string DynamicObjects::render_object_list(){
|
||||||
DynamicObjects::DynamicObjects(Routerin * merouterin) :
|
DynamicObjects::DynamicObjects(Routerin * merouterin) :
|
||||||
m_merouterin(merouterin)
|
m_merouterin(merouterin)
|
||||||
{
|
{
|
||||||
|
m_thevec = SicccPersister::read_sicccdir(*merouterin);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,10 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
class SicccPersister
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
static json_t * load_json(const std::string &s)
|
static json_t * load_json(const std::string &s)
|
||||||
{
|
{
|
||||||
assert(!s.empty());
|
assert(!s.empty());
|
||||||
|
@ -99,8 +103,28 @@ static std::string get_json_string_representation(const json_t *j)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
class SicccPersister
|
static std::vector<Sicccobject>
|
||||||
|
read_sicccdir(const Routerin &merouter = *Routerin::get_instance())
|
||||||
{
|
{
|
||||||
|
DIR *dir = nullptr;
|
||||||
|
struct dirent *entry = nullptr;
|
||||||
|
std::vector<Sicccobject> v;
|
||||||
|
json_error_t *error = nullptr;
|
||||||
|
if ((dir = opendir(merouter.get_persist_path().c_str())) == NULL) {
|
||||||
|
std::cerr << "Error could not open directory" << std::endl;
|
||||||
|
return v; // should throw exception instea1d
|
||||||
|
}
|
||||||
|
while ((entry = readdir(dir)) != NULL) {
|
||||||
|
if (std::strstr(entry->d_name, ".json") == NULL)
|
||||||
|
continue;
|
||||||
|
json_t *tmp = json_load_file(entry->d_name, JSON_DECODE_ANY, error);
|
||||||
|
assert(tmp);
|
||||||
|
Sicccobject so(tmp);
|
||||||
|
v.push_back(so);
|
||||||
|
}
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SicccPersister(const Routerin & merouter = *Routerin::get_instance()) :
|
SicccPersister(const Routerin & merouter = *Routerin::get_instance()) :
|
||||||
merouter(merouter)
|
merouter(merouter)
|
||||||
|
@ -131,7 +155,7 @@ class SicccPersister
|
||||||
|
|
||||||
int write_sicccfile(const Sicccobject&);
|
int write_sicccfile(const Sicccobject&);
|
||||||
int write_sicccfile();
|
int write_sicccfile();
|
||||||
std::vector<Sicccobject> read_sicccdir();
|
/* std::vector<Sicccobject> read_sicccdir(); */
|
||||||
Sicccobject read_json(const std::string&);
|
Sicccobject read_json(const std::string&);
|
||||||
Sicccobject read_json() { return read_json(json_file_name); }
|
Sicccobject read_json() { return read_json(json_file_name); }
|
||||||
|
|
||||||
|
|
|
@ -30,24 +30,3 @@ SicccPersister::read_json(const std::string &s)
|
||||||
return Sicccobject(root);
|
return Sicccobject(root);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<Sicccobject>
|
|
||||||
SicccPersister::read_sicccdir()
|
|
||||||
{
|
|
||||||
DIR *dir = nullptr;
|
|
||||||
struct dirent *entry = nullptr;
|
|
||||||
std::vector<Sicccobject> v;
|
|
||||||
json_error_t *error = nullptr;
|
|
||||||
if ((dir = opendir(merouter.get_persist_path().c_str())) == NULL) {
|
|
||||||
std::cerr << "Error could not open directory" << std::endl;
|
|
||||||
return v; // should throw exception instea1d
|
|
||||||
}
|
|
||||||
while ((entry = readdir(dir)) != NULL) {
|
|
||||||
if (std::strstr(entry->d_name, ".json") == NULL)
|
|
||||||
continue;
|
|
||||||
json_t *tmp = json_load_file(entry->d_name, JSON_DECODE_ANY, error);
|
|
||||||
assert(tmp);
|
|
||||||
Sicccobject so(tmp);
|
|
||||||
v.push_back(so);
|
|
||||||
}
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
|
|
|
@ -9,15 +9,15 @@ Sicccobject::Sicccobject(const json_t *j)
|
||||||
assert(j);
|
assert(j);
|
||||||
json_t *val;
|
json_t *val;
|
||||||
val = json_object_get(j, "filename");
|
val = json_object_get(j, "filename");
|
||||||
filename = get_string_from_json(val);
|
filename = SicccPersister::get_string_from_json(val);
|
||||||
val = json_object_get(j, "filetype");
|
val = json_object_get(j, "filetype");
|
||||||
filetype = get_string_from_json(val);
|
filetype = SicccPersister::get_string_from_json(val);
|
||||||
val = json_object_get(j, "path");
|
val = json_object_get(j, "path");
|
||||||
path = get_string_from_json(val);
|
path = SicccPersister::get_string_from_json(val);
|
||||||
val = json_object_get(j, "size");
|
val = json_object_get(j, "size");
|
||||||
size = get_integer_from_json(val);
|
size = SicccPersister::get_integer_from_json(val);
|
||||||
val = json_object_get(j, "upload_time");
|
val = json_object_get(j, "upload_time");
|
||||||
upload_date = get_time_from_json(val);
|
upload_date = SicccPersister::get_time_from_json(val);
|
||||||
json_decref(val);
|
json_decref(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue