Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0aad3bb71a | ||
|
|
0f74795159 | ||
|
|
3bfc74045f |
BIN
app/assets/javascripts/.memory.js.swp
Normal file
BIN
app/assets/javascripts/.memory.js.swp
Normal file
Binary file not shown.
@@ -15,3 +15,4 @@
|
||||
//= require editor
|
||||
//= require highlight
|
||||
//= require jquery-textcomplete
|
||||
//= require memory
|
||||
|
||||
26
app/assets/javascripts/memory.js
Normal file
26
app/assets/javascripts/memory.js
Normal file
@@ -0,0 +1,26 @@
|
||||
$(function() {
|
||||
$('td').focus(function() {
|
||||
if (this.id.split("-")[0] == "memory") {
|
||||
$(this).css("background-color", "lightblue")
|
||||
}
|
||||
});
|
||||
var data = [];
|
||||
$('td').keydown(function() {
|
||||
data.push(this.id, $(this).html().substr(0, 2)); //position, value
|
||||
})
|
||||
$('td').blur(function() {
|
||||
$(this).css("background", "none");
|
||||
if ((id_i = data.indexOf(this.id) != -1) && data[id_i+1] != $(this).html().substr(0, 2)) {
|
||||
$(this).css("color", "darkgreen");
|
||||
var int_id = this.id.split("-")[1]
|
||||
$.post("/memory/update_memory?project="+$(this).closest("table").data("project")+"&file="+Math.floor((int_id/2048)+1)+"&mem_id="+int_id%2048+"&value="+$(this).html().substr(0, 2));
|
||||
data.splice(id_i, 2);
|
||||
}
|
||||
});
|
||||
$('select').change(function() {
|
||||
$.get("/memory/table?project="+$(this).data("project")+"&file="+$(this).find("option:selected").text()+".hex")
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -1027,3 +1027,12 @@ nav.pagination {
|
||||
border-radius: 0.2em;
|
||||
text-shadow: none;
|
||||
}
|
||||
.memory-table {
|
||||
width: 980px;
|
||||
margin: auto;
|
||||
text-align: center;
|
||||
th, td {
|
||||
height: 20px;
|
||||
border: 1px solid black;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,16 @@ class BlogpostsController < ApplicationController
|
||||
end
|
||||
|
||||
def show
|
||||
@comment = Comment.new(blogpost: @post)
|
||||
@comments = @post.comments.page(params[:page])
|
||||
if @post
|
||||
@comment = Comment.new(blogpost: @post)
|
||||
@comments = @post.comments.page(params[:page])
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json {render json: @post.attributes.merge(replies: Comment.where(blogpost: @post).ids).to_json}
|
||||
end
|
||||
else
|
||||
respond_to {|format| format.json {render json: Comment.find_by(id: params[:id][1..-1]).try(:attributes).to_json}}
|
||||
end
|
||||
end
|
||||
|
||||
def new
|
||||
@@ -64,7 +72,9 @@ class BlogpostsController < ApplicationController
|
||||
|
||||
def set_post
|
||||
if params[:id]
|
||||
@post = Blogpost.find(params[:id])
|
||||
unless action_name == "show" && params[:id][0].downcase == "c"
|
||||
@post = Blogpost.find(params[:id])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -2,6 +2,12 @@ class CommentsController < ApplicationController
|
||||
|
||||
include MailerHelper
|
||||
|
||||
def show
|
||||
respond_to do |format|
|
||||
format.json {render json: @comment.attributes.to_json}
|
||||
end
|
||||
end
|
||||
|
||||
def edit
|
||||
@comment = Comment.find(params[:id])
|
||||
if mod? || @comment.author.is?(current_user)
|
||||
|
||||
54
app/controllers/memory_controller.rb
Normal file
54
app/controllers/memory_controller.rb
Normal file
@@ -0,0 +1,54 @@
|
||||
class MemoryController < ApplicationController
|
||||
|
||||
before_filter :logged_in
|
||||
|
||||
def index
|
||||
current_uuid = current_user.uuid.gsub("-", "")
|
||||
Dir.chdir("/etc/minecraft/redstoner/plugins/JavaUtils/memory/players/#{current_uuid}")
|
||||
psjson = JSON.parse(File.read("projects.json"))
|
||||
@projects = psjson["owns"] + psjson["read"] + psjson["write"]
|
||||
@project_names = @projects.collect{|p| (data = JSON.parse(File.read(File.expand_path("../..")+"/projects/#{p}/project.json")))["name"] + " | #{"own" if data["owner"] == current_uuid}#{"write" if data["write"].include? current_uuid}#{"read" if data["read"].include? current_uuid}"}
|
||||
|
||||
end
|
||||
|
||||
def list
|
||||
render :index
|
||||
end
|
||||
|
||||
def table
|
||||
Dir.chdir("/etc/minecraft/redstoner/plugins/JavaUtils/memory/projects/#{params[:project].gsub(/[^a-zA-Z0-9-]/,"")[0..35]}")
|
||||
@data = []
|
||||
Dir.glob('*').reverse.each do |f|
|
||||
File.open(Dir.pwd+"/#{f}") do |file|
|
||||
@data.concat(file.read.unpack("C*").map{|h| h.to_s(16)})
|
||||
unless (parse = JSON.parse((jf = File.open(Dir.pwd+"/project.json")).read))["read"].include? current_user.uuid.gsub("-","")
|
||||
@can_edit = true
|
||||
end
|
||||
@name = parse["name"]
|
||||
jf.close
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def update_memory
|
||||
Dir.chdir("/etc/minecraft/redstoner/plugins/JavaUtils/memory/projects/#{params[:project].gsub(/[^a-zA-Z0-9-]/,"")[0..35]}")
|
||||
unless params[:mem_id].to_i > JSON.parse(File.read("project.json"))["size"] || (/[^A-Fa-f0-9]/.match params[:value])
|
||||
new_text = ""
|
||||
File.open("#{params[:file]}.hex"){|f| new_text = f.read.unpack("C*").collect{|h| h.to_s(16)}}
|
||||
new_text[params[:mem_id].to_i] = params[:value]
|
||||
File.open("#{params[:file]}.hex", "w") do |f|
|
||||
f.write((new_text.collect{|h| h.to_s.to_i(16)}).pack("C*").force_encoding("UTF-8"))
|
||||
end
|
||||
render nothing: true
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def logged_in
|
||||
unless current_user
|
||||
flash[:alert] = "Please log in before viewing memory files."
|
||||
redirect_to home_statics_path
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -30,6 +30,10 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def show
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json {render json: @user.attributes.slice("id", "uuid", "ign", "name", "about", "donor", "confirmed", "last_seen", "created_at").to_json}
|
||||
end
|
||||
end
|
||||
|
||||
# SIGNUP
|
||||
|
||||
2
app/helpers/memory_helper.rb
Normal file
2
app/helpers/memory_helper.rb
Normal file
@@ -0,0 +1,2 @@
|
||||
module MemoryHelper
|
||||
end
|
||||
5
app/views/memory/index.html.erb
Normal file
5
app/views/memory/index.html.erb
Normal file
@@ -0,0 +1,5 @@
|
||||
<%= form_tag url_for(controller: "memory", action: "table"), method: :get do %>
|
||||
<%= select_tag "project", options_for_select(@projects.collect.with_index{|p, i| [@project_names[i], p]}) %>
|
||||
<br><br>
|
||||
<%= submit_tag "Load table", name: nil, class: "btn blue" %>
|
||||
<% end %>
|
||||
17
app/views/memory/table.html.erb
Normal file
17
app/views/memory/table.html.erb
Normal file
@@ -0,0 +1,17 @@
|
||||
<h1 style="text-align:center"><%= title @name + (" (read-only)" if !@can_edit).to_s %></h1>
|
||||
<table class="memory-table", data-project="<%=params[:project]%>">
|
||||
<tr>
|
||||
<% ["Address","0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F"].each do |i| %>
|
||||
<th><b><%=i%></b></th>
|
||||
<% end %>
|
||||
</tr>
|
||||
<% @data.in_groups_of(16).each_with_index do |row, rindex| %>
|
||||
<tr>
|
||||
<td><b><%=(rindex*16).to_s(16).upcase.rjust(6, "0")%></b></td>
|
||||
<% row.each_with_index do |hex, hindex| %>
|
||||
<td contenteditable="<%=!!@can_edit%>" id="memory-<%=(16*rindex)+hindex%>"><%=hex.to_s.upcase.rjust(2, "0")%></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
<% end %>
|
||||
</table>
|
||||
<br>
|
||||
@@ -10,7 +10,7 @@ default: &default
|
||||
development:
|
||||
<<: *default
|
||||
database: redstoner-web
|
||||
username: root
|
||||
username: web
|
||||
|
||||
production:
|
||||
<<: *default
|
||||
|
||||
@@ -29,6 +29,15 @@ Redstoner::Application.routes.draw do
|
||||
end
|
||||
end
|
||||
|
||||
resources :memory do
|
||||
collection do
|
||||
get 'list'
|
||||
get 'table'
|
||||
post 'update_memory'
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
resources :forumgroups, path: '/forums/groups'
|
||||
resources :forums, path: '/forums'
|
||||
resources :forumthreads, path: '/forums/threads' do
|
||||
|
||||
Reference in New Issue
Block a user