summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-05-24 20:27:01 (UTC)
committer Michael Krelin <hacker@klever.net>2011-05-24 21:30:57 (UTC)
commit09b6e86aaad70bc7488604b2e291d098a7de0eac (patch) (side-by-side diff)
tree1f79c3eea40a555cc5f354563d55ee773f75a6c7
parentf9b17f10f8f43da6998bbd1fb13d3a48c35ec653 (diff)
downloadiii-09b6e86aaad70bc7488604b2e291d098a7de0eac.zip
iii-09b6e86aaad70bc7488604b2e291d098a7de0eac.tar.gz
iii-09b6e86aaad70bc7488604b2e291d098a7de0eac.tar.bz2
don't whine there's no jpeg if there was avi
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 4ca2777..d7f0f04 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -120,25 +120,25 @@ int eyefiService::UploadPhoto(
"UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld,"
" filesignature=%s, encryption=%s, flags=%04X",
macaddress.c_str(), fileid, filename.c_str(), filesize,
filesignature.c_str(), encryption.c_str(), flags );
#endif
eyekinfig_t eyekinfig(macaddress);
umask(eyekinfig.get_umask());
std::string td = eyekinfig.get_targetdir();
tmpdir_t indir(td+"/.incoming.XXXXXX");
- std::string jf,lf;
+ std::string tf,lf;
binary_t digest, idigest;
for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) {
#ifndef NDEBUG
syslog(LOG_DEBUG,
" MIME attachment with id=%s, type=%s, size=%ld",
(*i).id, (*i).type, (long)(*i).size );
#endif
if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) {
std::string idigestr((*i).ptr,(*i).size);
#ifndef NDEBUG
@@ -146,78 +146,78 @@ int eyefiService::UploadPhoto(
#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(!jf.empty()) throw std::runtime_error("already seen tarball");
+ 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;
- if(!strcasecmp(s,".JPG"))
- jf = f;
+ if(!(strcasecmp(s,".JPG") && strcasecmp(s,".AVI")))
+ 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(jf.empty()) throw std::runtime_error("haven't seen jpeg file");
+ 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 = jf.rfind('/');
+ std::string::size_type ls = tf.rfind('/');
// XXX: actually, lack of '/' signifies error here
- std::string jbn = (ls==std::string::npos)?jf:jf.substr(ls+1);
+ 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 tjf,tlf;
+ 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";
- tjf = (const char*)gnu::autosprintf(fmt,td.c_str(),jbn.c_str(),i);
+ 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(jf.c_str(),tjf.c_str())) && (lf.empty()) || !link(lf.c_str(),tlf.c_str()) ) {
- unlink(jf.c_str());
+ if( (!link(tf.c_str(),ttf.c_str())) && (lf.empty()) || !link(lf.c_str(),tlf.c_str()) ) {
+ unlink(tf.c_str());
if(!lf.empty()) unlink(lf.c_str());
success=true;
break;
}
}
std::string cmd = eyekinfig.get_on_upload_photo();
if(success && !cmd.empty()) {
if(detached_child()) {
- putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",jbn.c_str()) );
+ putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) );
putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
- putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",tjf.c_str()) );
+ putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) );
if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) );
char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
execv("/bin/sh",argv);
syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
_exit(-1);
}
}
r.success = true;
return SOAP_OK;
}