author | Michael Krelin <hacker@klever.net> | 2009-04-04 23:28:48 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-04-05 00:40:46 (UTC) |
commit | 6b71fd1e4edd46b7caf47135740c961d5d4f051c (patch) (unidiff) | |
tree | 03dbdfb8fdbdf1c823af1a5bd32611d736f5ddf1 | |
parent | aadaa8b5d7eda23e72dbded9d6437b40358353f3 (diff) | |
download | iii-6b71fd1e4edd46b7caf47135740c961d5d4f051c.zip iii-6b71fd1e4edd46b7caf47135740c961d5d4f051c.tar.gz iii-6b71fd1e4edd46b7caf47135740c961d5d4f051c.tar.bz2 |
make upload directory if it doesn't exist
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiservice.cc | 1 | ||||
-rw-r--r-- | src/eyetil.cc | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 30c06fa..97cb33b 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -99,49 +99,48 @@ int eyefiService::MarkLastPhotoInRoll( | |||
99 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); | 99 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); |
100 | _exit(-1); | 100 | _exit(-1); |
101 | } | 101 | } |
102 | } | 102 | } |
103 | return SOAP_OK; | 103 | return SOAP_OK; |
104 | } | 104 | } |
105 | 105 | ||
106 | int eyefiService::UploadPhoto( | 106 | int eyefiService::UploadPhoto( |
107 | int fileid, std::string macaddress, | 107 | int fileid, std::string macaddress, |
108 | std::string filename, long filesize, std::string filesignature, | 108 | std::string filename, long filesize, std::string filesignature, |
109 | std::string encryption, int flags, | 109 | std::string encryption, int flags, |
110 | struct rns__UploadPhotoResponse& r ) { | 110 | struct rns__UploadPhotoResponse& r ) { |
111 | #ifndef NDEBUG | 111 | #ifndef NDEBUG |
112 | syslog(LOG_DEBUG, | 112 | syslog(LOG_DEBUG, |
113 | "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," | 113 | "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," |
114 | " filesignature=%s, encryption=%s, flags=%04X", | 114 | " filesignature=%s, encryption=%s, flags=%04X", |
115 | macaddress.c_str(), fileid, filename.c_str(), filesize, | 115 | macaddress.c_str(), fileid, filename.c_str(), filesize, |
116 | filesignature.c_str(), encryption.c_str(), flags ); | 116 | filesignature.c_str(), encryption.c_str(), flags ); |
117 | #endif | 117 | #endif |
118 | eyekinfig_t eyekinfig(macaddress); | 118 | eyekinfig_t eyekinfig(macaddress); |
119 | 119 | ||
120 | umask(eyekinfig.get_umask()); | 120 | umask(eyekinfig.get_umask()); |
121 | 121 | ||
122 | std::string td = eyekinfig.get_targetdir(); | 122 | std::string td = eyekinfig.get_targetdir(); |
123 | /* TODO: try to create, if needed */ | ||
124 | tmpdir_t indir(td+"/.incoming.XXXXXX"); | 123 | tmpdir_t indir(td+"/.incoming.XXXXXX"); |
125 | 124 | ||
126 | for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { | 125 | for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { |
127 | #ifndef NDEBUG | 126 | #ifndef NDEBUG |
128 | syslog(LOG_DEBUG, | 127 | syslog(LOG_DEBUG, |
129 | " MIME attachment with id=%s, type=%s, size=%ld", | 128 | " MIME attachment with id=%s, type=%s, size=%ld", |
130 | (*i).id, (*i).type, (long)(*i).size ); | 129 | (*i).id, (*i).type, (long)(*i).size ); |
131 | #endif | 130 | #endif |
132 | 131 | ||
133 | #ifndef NDEBUG | 132 | #ifndef NDEBUG |
134 | if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) { | 133 | if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) { |
135 | std::string idigest((*i).ptr,(*i).size); | 134 | std::string idigest((*i).ptr,(*i).size); |
136 | syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigest.c_str()); | 135 | syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigest.c_str()); |
137 | } | 136 | } |
138 | #endif | 137 | #endif |
139 | if( (*i).id && !strcmp((*i).id,"FILENAME") ) { | 138 | if( (*i).id && !strcmp((*i).id,"FILENAME") ) { |
140 | assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); | 139 | assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); |
141 | #ifdef III_SAVE_TARS | 140 | #ifdef III_SAVE_TARS |
142 | std::string tarfile = indir.get_file(filename); | 141 | std::string tarfile = indir.get_file(filename); |
143 | { | 142 | { |
144 | std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); | 143 | std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); |
145 | } | 144 | } |
146 | #endif | 145 | #endif |
147 | tarchive_t a((*i).ptr,(*i).size); | 146 | tarchive_t a((*i).ptr,(*i).size); |
diff --git a/src/eyetil.cc b/src/eyetil.cc index d00c2ee..2fbd687 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc | |||
@@ -1,25 +1,26 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <sys/stat.h> | ||
2 | #include <syslog.h> | 3 | #include <syslog.h> |
3 | #include <iostream> | 4 | #include <iostream> |
4 | #include <cassert> | 5 | #include <cassert> |
5 | #include <stdexcept> | 6 | #include <stdexcept> |
6 | #include <openssl/md5.h> | 7 | #include <openssl/md5.h> |
7 | #include "eyetil.h" | 8 | #include "eyetil.h" |
8 | 9 | ||
9 | binary_t& binary_t::from_hex(const std::string& h) { | 10 | binary_t& binary_t::from_hex(const std::string& h) { |
10 | /* TODO: algorithmize */ | 11 | /* TODO: algorithmize */ |
11 | std::string::size_type hs = h.length(); | 12 | std::string::size_type hs = h.length(); |
12 | if(hs&1) | 13 | if(hs&1) |
13 | throw std::runtime_error("odd number of characters in hexadecimal number"); | 14 | throw std::runtime_error("odd number of characters in hexadecimal number"); |
14 | int rvs = hs>>1; | 15 | int rvs = hs>>1; |
15 | resize(rvs); | 16 | resize(rvs); |
16 | const unsigned char *hp = (const unsigned char*)h.data(); | 17 | const unsigned char *hp = (const unsigned char*)h.data(); |
17 | iterator oi=begin(); | 18 | iterator oi=begin(); |
18 | char t[3] = { 0,0,0 }; | 19 | char t[3] = { 0,0,0 }; |
19 | for(int i=0;i<rvs;++i) { | 20 | for(int i=0;i<rvs;++i) { |
20 | t[0]=*(hp++); t[1]=*(hp++); | 21 | t[0]=*(hp++); t[1]=*(hp++); |
21 | *(oi++) = strtol(t,0,16); | 22 | *(oi++) = strtol(t,0,16); |
22 | } | 23 | } |
23 | return *this; | 24 | return *this; |
24 | } | 25 | } |
25 | 26 | ||
@@ -30,49 +31,64 @@ binary_t& binary_t::from_data(const void *d,size_t s) { | |||
30 | return *this; | 31 | return *this; |
31 | } | 32 | } |
32 | 33 | ||
33 | std::string binary_t::hex() const { | 34 | std::string binary_t::hex() const { |
34 | std::string rv; | 35 | std::string rv; |
35 | rv.reserve((size()<<1)+1); | 36 | rv.reserve((size()<<1)+1); |
36 | char t[3] = {0,0,0}; | 37 | char t[3] = {0,0,0}; |
37 | for(const_iterator i=begin(),ie=end();i!=ie;++i) { | 38 | for(const_iterator i=begin(),ie=end();i!=ie;++i) { |
38 | int rc = snprintf(t,sizeof(t),"%02x",*i); | 39 | int rc = snprintf(t,sizeof(t),"%02x",*i); |
39 | assert(rc<sizeof(t)); | 40 | assert(rc<sizeof(t)); |
40 | rv += t; | 41 | rv += t; |
41 | } | 42 | } |
42 | return rv; | 43 | return rv; |
43 | } | 44 | } |
44 | 45 | ||
45 | binary_t binary_t::md5() const { | 46 | binary_t binary_t::md5() const { |
46 | binary_t rv(MD5_DIGEST_LENGTH); | 47 | binary_t rv(MD5_DIGEST_LENGTH); |
47 | if(!MD5( | 48 | if(!MD5( |
48 | (const unsigned char*)&(front()),size(), | 49 | (const unsigned char*)&(front()),size(), |
49 | (unsigned char*)&(rv.front()) )) | 50 | (unsigned char*)&(rv.front()) )) |
50 | throw std::runtime_error("failed to md5()"); | 51 | throw std::runtime_error("failed to md5()"); |
51 | return rv; | 52 | return rv; |
52 | } | 53 | } |
53 | 54 | ||
55 | static void make_path_for_template(const std::string& p,mode_t m) { | ||
56 | struct stat st; | ||
57 | std::string pp; | ||
58 | for(std::string::size_type sl=p.find('/',1); | ||
59 | sl!=std::string::npos; | ||
60 | sl=p.find('/',sl+1)) { | ||
61 | if(stat( (pp=p.substr(0,sl)).c_str() ,&st) | ||
62 | || !S_ISDIR(st.st_mode)) { | ||
63 | if(mkdir(pp.c_str(),m)) | ||
64 | throw std::runtime_error("failed to mkdir()"); | ||
65 | } | ||
66 | } | ||
67 | } | ||
68 | |||
54 | tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) { | 69 | tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) { |
70 | make_path_for_template(dt,0777); | ||
55 | if(!mkdtemp((char*)dir.data())) | 71 | if(!mkdtemp((char*)dir.data())) |
56 | throw std::runtime_error("failed to mkdtmp()"); | 72 | throw std::runtime_error("failed to mkdtmp()"); |
57 | } | 73 | } |
58 | tmpdir_t::~tmpdir_t() { | 74 | tmpdir_t::~tmpdir_t() { |
59 | assert(!dir.empty()); | 75 | assert(!dir.empty()); |
60 | if(rmdir(dir.c_str())) { | 76 | if(rmdir(dir.c_str())) { |
61 | syslog(LOG_WARNING,"Failed to remove '%s' directory",dir.c_str()); | 77 | syslog(LOG_WARNING,"Failed to remove '%s' directory",dir.c_str()); |
62 | } | 78 | } |
63 | } | 79 | } |
64 | 80 | ||
65 | std::string tmpdir_t::get_file(const std::string& f) { | 81 | std::string tmpdir_t::get_file(const std::string& f) { |
66 | std::string::size_type ls = f.rfind('/'); | 82 | std::string::size_type ls = f.rfind('/'); |
67 | return dir+'/'+( | 83 | return dir+'/'+( |
68 | (ls==std::string::npos) | 84 | (ls==std::string::npos) |
69 | ? f | 85 | ? f |
70 | : f.substr(ls+1) | 86 | : f.substr(ls+1) |
71 | ); | 87 | ); |
72 | } | 88 | } |
73 | 89 | ||
74 | tarchive_t::tarchive_t(void *p,size_t s) : a(archive_read_new()), e(0) { | 90 | tarchive_t::tarchive_t(void *p,size_t s) : a(archive_read_new()), e(0) { |
75 | if(!a) throw std::runtime_error("failed to archive_read_new()"); | 91 | if(!a) throw std::runtime_error("failed to archive_read_new()"); |
76 | if(archive_read_support_format_tar(a)) { | 92 | if(archive_read_support_format_tar(a)) { |
77 | archive_read_finish(a); | 93 | archive_read_finish(a); |
78 | throw std::runtime_error("failed to archive_read_support_format_tar()"); | 94 | throw std::runtime_error("failed to archive_read_support_format_tar()"); |