| 64 |
|
} |
| 65 |
|
} |
| 66 |
|
|
| 67 |
< |
Syncify::Syncify(const ext::String& local, const ext::String& remote, const ext::String& pattern) : pattern(pattern) |
| 67 |
> |
Syncify::Syncify(const ext::String& local, const ext::String& remote, const ext::String& pattern) : pattern(pattern), transfering(true), transferers(etl::BindAll(&Syncify::transfer, this)) |
| 68 |
|
{ |
| 69 |
|
CheckError(::smbc_init(authenticate, debug ? 2 : 0)); |
| 70 |
|
|
| 71 |
+ |
transferers.Add(1); |
| 72 |
+ |
|
| 73 |
|
syncify(local, remote); |
| 74 |
+ |
|
| 75 |
+ |
transfering = false; |
| 76 |
|
} |
| 77 |
|
|
| 78 |
|
Syncify::~Syncify() |
| 79 |
|
{ |
| 80 |
+ |
transferers.Join(); |
| 81 |
+ |
|
| 82 |
+ |
api::Cout << ios::NewLine; |
| 83 |
+ |
|
| 84 |
|
::smbc_free_context(::smbc_set_context(NULL), 1); |
| 85 |
|
} |
| 86 |
|
|
| 104 |
|
|
| 105 |
|
if (!path.Exists()) |
| 106 |
|
{ |
| 107 |
< |
SambaReader samba(remote + "/" + entity->name); |
| 100 |
< |
api::FileWriter file(path.GetPath()); |
| 107 |
> |
api::Cout << "+" << entity->name << ios::Flush; |
| 108 |
|
|
| 109 |
< |
ios::ReadToWrite(samba, file); |
| 109 |
> |
ext::Buffer buffer(entity->name); |
| 110 |
> |
|
| 111 |
> |
buffer.SetSize(buffer.GetSize() * 3); |
| 112 |
> |
|
| 113 |
> |
::smbc_urlencode(buffer.Begin(), entity->name, buffer.GetSize()); |
| 114 |
> |
|
| 115 |
> |
_synchronized (transfersLock) |
| 116 |
> |
transfers.push(Transfer(path.GetPath(), remote + "/" + ext::String(buffer))); |
| 117 |
|
} |
| 118 |
+ |
else |
| 119 |
+ |
api::Cout << "-" << ios::Flush; |
| 120 |
|
} |
| 121 |
|
break; |
| 122 |
|
case SMBC_DIR: |
| 130 |
|
_foreach (const ext::RedBlackSet<ext::String>, directory, directories) |
| 131 |
|
syncify(local.GetChild(*directory), remote + "/" + *directory); |
| 132 |
|
} |
| 133 |
< |
catch (const Error& error) |
| 133 |
> |
catch (const Error& error) {} |
| 134 |
> |
} |
| 135 |
> |
|
| 136 |
> |
int Syncify::transfer() |
| 137 |
> |
{ |
| 138 |
> |
_synchronized (transfersLock) while (transfering || !transfers.empty()) if (!transfers.empty()) |
| 139 |
|
{ |
| 140 |
< |
api::Cerr << error.GetMessage() << remote << ios::NewLine; |
| 140 |
> |
Transfer transfer(transfers.front()); |
| 141 |
> |
|
| 142 |
> |
transfers.pop(); |
| 143 |
> |
|
| 144 |
> |
_desynchronized (transfersLock) |
| 145 |
> |
{ |
| 146 |
> |
{ |
| 147 |
> |
api::Path file(transfer.local); |
| 148 |
> |
ext::Stack<ext::String> stack; |
| 149 |
> |
|
| 150 |
> |
for (api::Path path(file.GetParent()); !path.Exists(); path = path.GetParent()) |
| 151 |
> |
stack.Push(path.GetPath()); |
| 152 |
> |
|
| 153 |
> |
while (!stack.IsEmpty()) |
| 154 |
> |
{ |
| 155 |
> |
try |
| 156 |
> |
{ |
| 157 |
> |
api::Posix::CheckError(::mkdir(stack.Top().NullTerminate(), 0755)); |
| 158 |
> |
} |
| 159 |
> |
catch (const api::Posix::Error&) {} |
| 160 |
> |
|
| 161 |
> |
stack.Pop(); |
| 162 |
> |
} |
| 163 |
> |
} |
| 164 |
> |
|
| 165 |
> |
try |
| 166 |
> |
{ |
| 167 |
> |
SambaReader samba(transfer.remote); |
| 168 |
> |
api::FileWriter file(transfer.local); |
| 169 |
> |
|
| 170 |
> |
ios::ReadToWrite(samba, file); |
| 171 |
> |
} |
| 172 |
> |
catch (const Error& error) |
| 173 |
> |
{ |
| 174 |
> |
api::Cerr << error << ios::NewLine; |
| 175 |
> |
} |
| 176 |
> |
} |
| 177 |
|
} |
| 178 |
+ |
else _desynchronized (transfersLock) |
| 179 |
+ |
{ |
| 180 |
+ |
::timespec wait = { 0, 1000000 }; |
| 181 |
+ |
|
| 182 |
+ |
::nanosleep(&wait, NULL); |
| 183 |
+ |
} |
| 184 |
+ |
|
| 185 |
+ |
return 0; |
| 186 |
|
} |
