| -rw-r--r-- | src/eyefiservice.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 9350386..5c4e308 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc @@ -140,65 +140,66 @@ int eyefiService::UploadPhoto( (*i).id, (*i).type, (long)(*i).size ); #endif if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) { std::string idigestr((*i).ptr,(*i).size); #ifndef NDEBUG syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str()); #endif idigest.from_hex(idigestr); } if( (*i).id && !strcmp((*i).id,"FILENAME") ) { assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); #ifdef III_SAVE_TARS std::string tarfile = indir.get_file(filename); { std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); } #endif if(!tf.empty()) throw std::runtime_error("already seen tarball"); if(!digest.empty()) throw std::runtime_error("already have integrity digest"); digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); #ifndef NDEBUG syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); #endif tarchive_t a((*i).ptr,(*i).size); 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" }; + 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; else continue; int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666); if(fd<0) throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str())); if(!a.read_data_into_fd(fd)) throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); close(fd); } } } if(tf.empty()) throw std::runtime_error("haven't seen THE file"); if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); std::string::size_type ls = tf.rfind('/'); // XXX: actually, lack of '/' signifies error here std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); ls = lf.rfind('/'); std::string lbn = (ls==std::string::npos)?lf:lf.substr(ls+1); std::string ttf,tlf; bool success = false; for(int i=0;i<32767;++i) { const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s"; ttf = (const char*)gnu::autosprintf(fmt,td.c_str(),tbn.c_str(),i); if(!lf.empty()) tlf = (const char*)gnu::autosprintf(fmt,td.c_str(),lbn.c_str(),i); if( (!link(tf.c_str(),ttf.c_str())) && (lf.empty()) || !link(lf.c_str(),tlf.c_str()) ) { |