Mirrors/Sequenzia
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #149

Browse Source
This commit is contained in:
Renzo 2016-07-30 00:12:19 -05:00
parent 87d622468f
commit 536a1f907b
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/models/BatchUpload.php
View File

@ -2,7 +2,7 @@
class BatchUpload extends Rails\ActiveRecord\Base class BatchUpload extends Rails\ActiveRecord\Base
{ {
public $data; public $data;
/** /**
* Flag to know the upload is 100% finished. * Flag to know the upload is 100% finished.
*/ */
@ -18,15 +18,10 @@ class BatchUpload extends Rails\ActiveRecord\Base
$this->save(); $this->save();
} }
}); });
# Ugly: set the current user ID to the one set in the batch, so history entries # Ugly: set the current user ID to the one set in the batch, so history entries
# will be created as that user. # will be created as that user.
// $old_thread_user = Thread::current["danbooru-user"]; User::set_current_user(User::find($this->user_id));
// $old_thread_user_id = Thread::current["danbooru-user_id"];
// $old_ip_addr = Thread::current["danbooru-ip_addr"];
// Thread::current["danbooru-user"] = User::find_by_id(self.user_id)
// Thread::current["danbooru-user_id"] = $this->user_id
// Thread::current["danbooru-ip_addr"] = $this->ip
$this->active = true; $this->active = true;
$this->save(); $this->save();
@ -46,14 +41,12 @@ class BatchUpload extends Rails\ActiveRecord\Base
$this->data->success = true; $this->data->success = true;
$this->data->post_id = $post->id; $this->data->post_id = $post->id;
} elseif ($post->errors()->on('md5')) { } elseif ($post->errors()->on('md5')) {
// $p = $post->errors();
$p = Post::where(['md5' => $post->md5])->first(); $p = Post::where(['md5' => $post->md5])->first();
$this->data->success = false; $this->data->success = false;
$this->data->error = "Post already exists"; $this->data->error = "Post already exists";
$this->data->post_id = $p->id; $this->data->post_id = $p->id;
} else { } else {
// p $post.errors
$this->data->success = false; $this->data->success = false;
$this->data->error = $post->errors()->fullMessages(", "); $this->data->error = $post->errors()->fullMessages(", ");
} }
@ -65,15 +58,12 @@ class BatchUpload extends Rails\ActiveRecord\Base
} }
$this->active = false; $this->active = false;
$this->save(); $this->save();
$this->finished = true; $this->finished = true;
// Thread::current["danbooru-user"] = old_thread_user
// Thread::current["danbooru-user_id"] = old_thread_user_id
// Thread::current["danbooru-ip_addr"] = old_ip_addr
} }
protected function associations() protected function associations()
{ {
return [ return [
@ -87,12 +77,12 @@ class BatchUpload extends Rails\ActiveRecord\Base
{ {
$this->data = json_decode($this->data_as_json) ?: new stdClass(); $this->data = json_decode($this->data_as_json) ?: new stdClass();
} }
protected function encode_data() protected function encode_data()
{ {
$this->data_as_json = json_encode($this->data); $this->data_as_json = json_encode($this->data);
} }
// protected function data_setter($hoge) // protected function data_setter($hoge)
// { // {
// $this->data_as_json = json_encode($hoge); // $this->data_as_json = json_encode($hoge);
@ -106,4 +96,4 @@ class BatchUpload extends Rails\ActiveRecord\Base
] ]
]; ];
} }
} }