author | Laurent Fasnacht <l@libres.ch> | 2011-09-01 11:15:13 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2011-09-01 21:47:33 (UTC) |
commit | 49b219a1b19f8d4ecf0fa4166f72e56bb5a84263 (patch) (unidiff) | |
tree | 91fa1477ae7c1a06db52ea56ebc7b46a4b53d8d9 | |
parent | e1dbd29b2dc1393d48df96af38ed24d30d764225 (diff) | |
download | iii-49b219a1b19f8d4ecf0fa4166f72e56bb5a84263.zip iii-49b219a1b19f8d4ecf0fa4166f72e56bb5a84263.tar.gz iii-49b219a1b19f8d4ecf0fa4166f72e56bb5a84263.tar.bz2 |
Added CRW and DNG extensions (Raw files by CHDK)
-rw-r--r-- | src/eyefiservice.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 77526b9..5167cf4 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -148,49 +148,49 @@ int eyefiService::UploadPhoto( | |||
148 | idigest.from_hex(idigestr); | 148 | idigest.from_hex(idigestr); |
149 | } | 149 | } |
150 | if( (*i).id && !strcmp((*i).id,"FILENAME") ) { | 150 | if( (*i).id && !strcmp((*i).id,"FILENAME") ) { |
151 | assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); | 151 | assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); |
152 | #ifdef III_SAVE_TARS | 152 | #ifdef III_SAVE_TARS |
153 | std::string tarfile = indir.get_file(filename); | 153 | std::string tarfile = indir.get_file(filename); |
154 | { | 154 | { |
155 | std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); | 155 | std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); |
156 | } | 156 | } |
157 | #endif | 157 | #endif |
158 | 158 | ||
159 | if(!tf.empty()) throw std::runtime_error("already seen tarball"); | 159 | if(!tf.empty()) throw std::runtime_error("already seen tarball"); |
160 | if(!digest.empty()) throw std::runtime_error("already have integrity digest"); | 160 | if(!digest.empty()) throw std::runtime_error("already have integrity digest"); |
161 | digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); | 161 | digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); |
162 | #ifndef NDEBUG | 162 | #ifndef NDEBUG |
163 | syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); | 163 | syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); |
164 | #endif | 164 | #endif |
165 | 165 | ||
166 | tarchive_t a((*i).ptr,(*i).size); | 166 | tarchive_t a((*i).ptr,(*i).size); |
167 | while(a.read_next_header()) { | 167 | while(a.read_next_header()) { |
168 | std::string f = indir.get_file(a.entry_pathname()); | 168 | std::string f = indir.get_file(a.entry_pathname()); |
169 | std::string::size_type fl = f.length(); | 169 | std::string::size_type fl = f.length(); |
170 | if(fl<4) continue; | 170 | if(fl<4) continue; |
171 | const char *s = f.c_str()+fl-4; | 171 | const char *s = f.c_str()+fl-4; |
172 | static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF" }; | 172 | static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW" }; |
173 | if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes), | 173 | if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes), |
174 | std::not1(std::bind1st(std::ptr_fun(strcasecmp),s))) | 174 | std::not1(std::bind1st(std::ptr_fun(strcasecmp),s))) |
175 | != suffixes+sizeof(suffixes)/sizeof(*suffixes)) | 175 | != suffixes+sizeof(suffixes)/sizeof(*suffixes)) |
176 | tf = f; | 176 | tf = f; |
177 | else if(!strcasecmp(s,".log")) | 177 | else if(!strcasecmp(s,".log")) |
178 | lf = f; | 178 | lf = f; |
179 | else continue; | 179 | else continue; |
180 | int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666); | 180 | int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666); |
181 | if(fd<0) | 181 | if(fd<0) |
182 | throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str())); | 182 | throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str())); |
183 | if(!a.read_data_into_fd(fd)) | 183 | if(!a.read_data_into_fd(fd)) |
184 | throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); | 184 | throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); |
185 | close(fd); | 185 | close(fd); |
186 | } | 186 | } |
187 | } | 187 | } |
188 | } | 188 | } |
189 | 189 | ||
190 | if(tf.empty()) throw std::runtime_error("haven't seen THE file"); | 190 | if(tf.empty()) throw std::runtime_error("haven't seen THE file"); |
191 | if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); | 191 | if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); |
192 | 192 | ||
193 | std::string::size_type ls = tf.rfind('/'); | 193 | std::string::size_type ls = tf.rfind('/'); |
194 | // XXX: actually, lack of '/' signifies error here | 194 | // XXX: actually, lack of '/' signifies error here |
195 | std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); | 195 | std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); |
196 | ls = lf.rfind('/'); | 196 | ls = lf.rfind('/'); |