jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use overwrite semantics for remote file distributor

Browse Source
This commit is contained in:
r888888888
2016-02-02 16:59:14 -08:00
parent 3d9b7f797a
commit 48aa4cc3d6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/logical/remote_file_manager.rb
View File

@@ -18,8 +18,9 @@ class RemoteFileManager
ftp.rename!(temp_path, path) ftp.rename!(temp_path, path)
rescue Net::SFTP::StatusException rescue Net::SFTP::StatusException
# this typically means the file already exists # this typically means the file already exists
# so just clean up # so delete and try renaming again
ftp.remove(temp_path) ftp.remove!(path)
ftp.rename!(temp_path, path)
end end
end end
end end

2
app/views/posts/partials/index/_missed_search_count.html.erb
View File

@@ -1,7 +1,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var tags = $("#tags").val(); var tags = $("#tags").val();
if (Danbooru.get_url_parameter("ms") === "1" && tags && tags.length > 0 && $(".post-preview").size() < 10) { if (Danbooru.get_url_parameter("ms") === "1" && tags && tags.length > 0 && $(".post-preview").size() === 0) {
$.post("<%= Danbooru.config.report_server %>/missed_searches", { $.post("<%= Danbooru.config.report_server %>/missed_searches", {
session_id: "<%= session_id %>", session_id: "<%= session_id %>",
tags: $("#tags").val(), tags: $("#tags").val(),