| author | Michael Krelin <hacker@klever.net> | 2011-05-24 20:27:01 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2011-05-24 21:30:57 (UTC) |
| commit | 09b6e86aaad70bc7488604b2e291d098a7de0eac (patch) (side-by-side diff) | |
| tree | 1f79c3eea40a555cc5f354563d55ee773f75a6c7 | |
| parent | f9b17f10f8f43da6998bbd1fb13d3a48c35ec653 (diff) | |
| download | iii-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>
| -rw-r--r-- | src/eyefiservice.cc | 26 |
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 @@ -131,3 +131,3 @@ int eyefiService::UploadPhoto( - std::string jf,lf; + std::string tf,lf; binary_t digest, idigest; @@ -157,3 +157,3 @@ int eyefiService::UploadPhoto( - 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"); @@ -170,4 +170,4 @@ int eyefiService::UploadPhoto( 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")) @@ -185,11 +185,11 @@ int eyefiService::UploadPhoto( - 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; @@ -197,6 +197,6 @@ int eyefiService::UploadPhoto( 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()); @@ -209,5 +209,5 @@ int eyefiService::UploadPhoto( 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()) ); |