summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 276977a..d9318ed 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -129,2 +129,8 @@ int eyefiService::UploadPhoto(
#endif
+ std::string::size_type fnl=filename.length();
+ if(fnl<sizeof(".tar") || strncmp(filename.c_str()+fnl-sizeof(".tar")+sizeof(""),".tar",sizeof(".tar")))
+ throw std::runtime_error(gnu::autosprintf("honestly, I expected the tarball coming here, not '%s'",filename.c_str()));
+ std::string the_file(filename,0,fnl-sizeof(".tar")+sizeof(""));
+ std::string the_log = the_file+".log";
+
eyekinfig_t eyekinfig(macaddress);
@@ -171,14 +177,5 @@ int eyefiService::UploadPhoto(
while(a.read_next_header()) {
- std::string f = indir.get_file(a.entry_pathname());
- std::string::size_type fl = f.length();
- if(fl<4) continue;
- const char *s = f.c_str()+fl-4;
- static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW",
- ".RW2",".CR2" };
- if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes),
- std::not1(std::bind1st(std::ptr_fun(strcasecmp),s)))
- != suffixes+sizeof(suffixes)/sizeof(*suffixes))
- tf = f;
- else if(!strcasecmp(s,".log"))
- lf = f;
+ std::string ep = a.entry_pathname(), f = indir.get_file(ep);
+ if(ep==the_file) tf = f;
+ else if(ep==the_log) lf = f;
else continue;