From 0aad3bb71afbb6419b90f499118f18676452b095 Mon Sep 17 00:00:00 2001 From: MrYummy Date: Tue, 4 Jul 2017 22:24:50 +0200 Subject: [PATCH] Added choice of project, r/w perms, and fixed up some css --- .../javascripts/.memory.js.swp} | Bin 12288 -> 12288 bytes app/assets/javascripts/memory.js | 7 ++++++ app/assets/stylesheets/style.css.scss | 4 ++- app/controllers/memory_controller.rb | 23 +++++++++--------- app/views/memory/index.html.erb | 5 ++-- app/views/memory/table.html.erb | 3 ++- config/database.yml | 4 +-- config/environments/development.rb | 2 +- db/seeds.rb | 2 +- 9 files changed, 31 insertions(+), 19 deletions(-) rename app/{controllers/.memory_controller.rb.swp => assets/javascripts/.memory.js.swp} (80%) diff --git a/app/controllers/.memory_controller.rb.swp b/app/assets/javascripts/.memory.js.swp similarity index 80% rename from app/controllers/.memory_controller.rb.swp rename to app/assets/javascripts/.memory.js.swp index 18f0137b426c6351c8c873b4a48fc23f06cb1437..964c946557c665c0d6fe8d4270cc119171ea5bc2 100644 GIT binary patch literal 12288 zcmYc?2=nw+FxN9-U|?VnU|{e#93J`A%#T4ufPta1G&i>rBu)T_q!yP1rxul^7KQoZ zQ>velpPQ;*l$ugplAo7agkb3<=jZAt78K|w78j?M6zgXtmL(P^7iAWd6zk`v=H?ew z>SYzo28Kc&28J9SsGUPF%toC&8UmvsFd71*Aut*O zqaiRF0;3@?8UmvsfIkEj6ciW~;6$yaHG_fzgj7&a(MwM)(NKae_0=y)Ov*{MFDS~- zN=+`YRnk_`D9Oky*3?T$EJ@T*f{H6?YAdOwW#*(JDM-uAOVLouFDS{(&$B8{%}Grz zNlj7G)GJA?DACZ=R?^Eztx(crP*70OP=`pXYw9IuB<7{3YNVCsC4=;7Xev}AIjt7# zXaxn3-Fn3ZIho0+8ks5anK}waU@w5Yq@q`lUyS7b(t?!4lGJ#}!euP}NY2SGP6cTI zdsGRJ$9xk@GW61N^7D%{G&1u_;xkk9jSNgIG_?&uzRyj~jn7Q6Rnmq?se+`mmDI`- zb4rmzC8H!aM?+JuxHPG_q)5X6U?ghsQDBeJB)YJpJA}KLBJH05sG%p3@l)U`B zRER57G}KE{)HU^za!QLZqZRBQaBLQo7H7cRrK5n)c54NF{et}BOi=pJQ2>W8BoTq_ z$xf|I$uG}Cw+a-rAbS*S6{2I2Q#&k4!E8kHj4nKMb28I2N|JI)Q^9FgK>-xFApfJq fkwL72t*wF*B)KU;k}oU_((;o_i&0&sg31K|koiZj literal 12288 zcmYc?2=nw+FxN9-U|?VnU|?Y343GS8>c^nU!N5>inwwh*5+{H|Qj1H1Q;W({i^6>I zDb>%&&rQ`YN=+#)${-g(GVC7fzc2c4S~@R7!85Z5Eu=C z(GVCRAy87l$WYI~z`z9cuPKyfM5CeHQED^O^Kw#)ixrYfi;7b7O5#h4Q;QfB6jD;tKt`mero?CFF)%176clBaC6=Uum@tPH zrRJri7AfTAmt(o zS_`%TNv{$lI$Sb~^pZ1DGK(~n^ixZc^>Z`xQj?1k(@GF)QS}RQO4Bp*iuJt`%MwFN zGIL-nQS}Ro^0QKtON#XofdUnZtyKbr94J~#3sMqGQsW^>0XaSq(S~3tC}gGSCFkT9 zLt++`9BrUL1Q~$Mfy&is zwXj5&nUe}hcOdtt=j118sB5W%++3DgRGg}pnwXq{oI1g-QLt5rh9o?YCfX)~lEkDO zY?;|AGcP5z0#*QI7MH*h2spVqKvPqEUSe))v4X7vOrRK%uM27vG(cgiV2d2B;P3)P zl?IrVT2YXgmjW)wG?eu8^!4 zGfe?xUo?o9TBH=KU~7v=1f`iNwaV2>;8F-lDTI$L)j&0XoQk9#%*CZ#36huLVWD8F zP*4m?rC=u&gB=VLfEc8p4Oanm2{?Emif{#-5;X9OVL1S-hq9!SlUNB_$gW%sFaAOP zhh`IGF$JVBElw>$%UBAKoCPXfAnAue0b29Kr)B1pq!uYy<>aTsDwE`##NuKFU-062 ZXZUh@1ses&f`XjP0|1IinkE1M diff --git a/app/assets/javascripts/memory.js b/app/assets/javascripts/memory.js index 4dac5a0..a614e91 100644 --- a/app/assets/javascripts/memory.js +++ b/app/assets/javascripts/memory.js @@ -1,10 +1,17 @@ $(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); diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss index e8f06ab..04bfee8 100644 --- a/app/assets/stylesheets/style.css.scss +++ b/app/assets/stylesheets/style.css.scss @@ -1028,9 +1028,11 @@ nav.pagination { text-shadow: none; } .memory-table { - width: 870px; + width: 980px; margin: auto; + text-align: center; th, td { + height: 20px; border: 1px solid black; } } diff --git a/app/controllers/memory_controller.rb b/app/controllers/memory_controller.rb index 6d5947e..3b988a8 100644 --- a/app/controllers/memory_controller.rb +++ b/app/controllers/memory_controller.rb @@ -16,30 +16,31 @@ class MemoryController < ApplicationController end def table - Dir.chdir("/etc/minecraft/redstoner/plugins/JavaUtils/memory/projects/#{params[:project]}") + 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)}) - if JSON.parse((jf = File.open(Dir.pwd+"/project.json")).read)["read"].include? current_user.uuid.gsub("-","") - @can_edit = false - else + 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]}") - 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")) + 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 - render nothing: true end private diff --git a/app/views/memory/index.html.erb b/app/views/memory/index.html.erb index 9348db0..6abcee0 100644 --- a/app/views/memory/index.html.erb +++ b/app/views/memory/index.html.erb @@ -1,4 +1,5 @@ -<%= form_tag "memory/table", method: :get do %> +<%= 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]}) %> - <%= submit_tag "View Table", name: nil %> +

+ <%= submit_tag "Load table", name: nil, class: "btn blue" %> <% end %> diff --git a/app/views/memory/table.html.erb b/app/views/memory/table.html.erb index 03f1ef2..2f24dc4 100644 --- a/app/views/memory/table.html.erb +++ b/app/views/memory/table.html.erb @@ -1,3 +1,4 @@ +

<%= title @name + (" (read-only)" if !@can_edit).to_s %>

<% ["Address","0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F"].each do |i| %> @@ -8,7 +9,7 @@ <% row.each_with_index do |hex, hindex| %> - + <% end %> <% end %> diff --git a/config/database.yml b/config/database.yml index f421bef..9888fe9 100644 --- a/config/database.yml +++ b/config/database.yml @@ -10,7 +10,7 @@ default: &default development: <<: *default database: redstoner-web - username: root + username: web production: <<: *default @@ -24,4 +24,4 @@ test: adapter: sqlite3 database: db/test.sqlite3 pool: 5 - timeout: 5000 \ No newline at end of file + timeout: 5000 diff --git a/config/environments/development.rb b/config/environments/development.rb index 06819fd..429866e 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -43,4 +43,4 @@ Redstoner::Application.configure do password: ENV["GMAIL_PASSWORD"], } -end \ No newline at end of file +end diff --git a/db/seeds.rb b/db/seeds.rb index 780ddb5..bc2dd6c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -38,4 +38,4 @@ User.create!( password: "123456789", # high seructity! password_confirmation: "123456789", role: Role.get(:superadmin) -) \ No newline at end of file +)
<%=(rindex*16).to_s(16).upcase.rjust(6, "0")%><%=hex.to_s.upcase.rjust(2, "0")%><%=hex.to_s.upcase.rjust(2, "0")%>