(incomplete) re-jigger the sampling interface

3 files changed, 19 insertions, 16 deletions

diff --git a/lib/sampling/README.md b/lib/sampling/README.md
index 731f1d1..bde84cd 100644
--- a/lib/sampling/README.md
+++ b/lib/sampling/README.md
@@ -9,6 +9,12 @@ interface:
    Returns whether or not this sampling method works with the
    specified game.
 
+ - `can_get?(User, String setting_name) => Fixnum`
+
+   Returns whether or nat this sampling method can get a specifed
+   statistic; 0 means 'false', positive integers mean 'true', where
+   higher numbers are higher priority.
+
  - `uses_remote?() => Boolean`
 
    Return whether or not this sampling method requires remote IDs for
@@ -22,15 +28,10 @@ interface:
    When given an object from `RemoteUsername#value`, give back a
    human-readable/editable name to display.
 
- - `sampling_start(Match)`
+ - `sampling_start(Match, Array[]={:user=>User,:stat=>String})`
 
    Fetch the statistics for a match.
 
- - `sampling_done?(Match) => Boolean`
-
-   Returns whether or not statistics have been completely collected
-   yet.
-
  - `render_user_interaction(Match, User) => String`
 
    Returns HTML to render on a page.
diff --git a/lib/sampling/manual.rb b/lib/sampling/manual.rb
index a1bf9a5..b5c97c4 100644
--- a/lib/sampling/manual.rb
+++ b/lib/sampling/manual.rb
@@ -4,6 +4,10 @@ module Sampling
 			return true
 		end
 
+		def can_get?(user, setting_name)
+			return 1
+		end
+
 		def self.uses_remote?
 			return false
 		end
@@ -16,16 +20,18 @@ module Sampling
 			raise "This sampling method doesn't use remote usernames."
 		end
 
-		def self.sampling_start(match)
-			# TODO
-		end
-
-		def self.sampling_done?(match)
-			# TODO
+		def self.sampling_start(match, statistics)
+			# do nothing
 		end
 
 		def self.render_user_interaction(match, user)
 			# TODO
+
+			require 'erb'
+			erb_filename = File.join(__FILE__.sub(/\.rb$/, '.svg.erb'))
+			erb = ERB.new(File.read(erb_filename))
+			erb.filename = erb_filename
+			return erb.result.html_safe
 		end
 
 		def self.handle_user_interaction(match, user, sampling_params)
diff --git a/lib/sampling/peer_review.rb b/lib/sampling/peer_review.rb
index 9f1833d..cbbd2f9 100644
--- a/lib/sampling/peer_review.rb
+++ b/lib/sampling/peer_review.rb
@@ -20,10 +20,6 @@ module Sampling
 			# do nothing
 		end
 
-		def self.sampling_done?(match)
-			return get_feedbacks_missing(match).empty?
-		end
-
 		def self.render_user_interaction(match, user)
 			@user = user
 			@team = get_team(match)