Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: experimental/webtry/webtry.go

Issue 242613005: iframe (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « experimental/webtry/templates/workspace.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: experimental/webtry/webtry.go
diff --git a/experimental/webtry/webtry.go b/experimental/webtry/webtry.go
index b1e10133a64a9d36ceb16c621d34860a1d6ac38a..f985f2507ad27e5a3eb02c22d12f09f915192614 100644
--- a/experimental/webtry/webtry.go
+++ b/experimental/webtry/webtry.go
@@ -46,6 +46,9 @@ var (
// indexTemplate is the main index.html page we serve.
indexTemplate *htemplate.Template = nil
+ // iframeTemplate is the main index.html page we serve.
+ iframeTemplate *htemplate.Template = nil
+
// recentTemplate is a list of recent images.
recentTemplate *htemplate.Template = nil
@@ -58,6 +61,9 @@ var (
// directLink is the regex that matches URLs paths that are direct links.
directLink = regexp.MustCompile("^/c/([a-f0-9]+)$")
+ // iframeLink is the regex that matches URLs paths that are links to iframes.
+ iframeLink = regexp.MustCompile("^/iframe/([a-f0-9]+)$")
+
// imageLink is the regex that matches URLs paths that are direct links to PNGs.
imageLink = regexp.MustCompile("^/i/([a-f0-9]+.png)$")
@@ -109,6 +115,7 @@ func LineNumbers(c string) string {
}
func init() {
+ rand.Seed(time.Now().UnixNano())
mtklein 2014/04/18 16:43:55 Goes with the other CL?
jcgregorio 2014/04/18 17:00:11 Yeah, caught this in this CL. Since their both goi
mtklein 2014/04/18 17:03:01 SGTM
// Change the current working directory to the directory of the executable.
var err error
@@ -122,7 +129,6 @@ func init() {
if err != nil {
panic(err)
}
- // Convert index.html into a template, which is expanded with the code.
indexTemplate, err = htemplate.ParseFiles(
filepath.Join(cwd, "templates/index.html"),
filepath.Join(cwd, "templates/titlebar.html"),
@@ -130,6 +136,12 @@ func init() {
if err != nil {
panic(err)
}
+ iframeTemplate, err = htemplate.ParseFiles(
+ filepath.Join(cwd, "templates/iframe.html"),
+ )
+ if err != nil {
+ panic(err)
+ }
recentTemplate, err = htemplate.ParseFiles(
filepath.Join(cwd, "templates/recent.html"),
filepath.Join(cwd, "templates/titlebar.html"),
@@ -205,6 +217,7 @@ func init() {
// userCode is used in template expansion.
type userCode struct {
UserCode string
+ Hash string
}
// expandToFile expands the template and writes the result to the file.
@@ -454,6 +467,35 @@ type TryRequest struct {
Name string `json:"name"`
}
+// iframeHandler handles the GET and POST of the main page.
+func iframeHandler(w http.ResponseWriter, r *http.Request) {
+ log.Printf("IFrame Handler: %q\n", r.URL.Path)
+ if r.Method != "GET" {
+ http.NotFound(w, r)
+ return
+ }
+ match := iframeLink.FindStringSubmatch(r.URL.Path)
+ if len(match) != 2 {
+ http.NotFound(w, r)
+ return
+ }
+ hash := match[1]
+ if db == nil {
+ http.NotFound(w, r)
+ return
+ }
+ var code string
+ // Load 'code' with the code found in the database.
+ if err := db.QueryRow("SELECT code FROM webtry WHERE hash=?", hash).Scan(&code); err != nil {
+ http.NotFound(w, r)
+ return
+ }
+ // Expand the template.
+ if err := iframeTemplate.Execute(w, userCode{UserCode: code, Hash: hash}); err != nil {
+ log.Printf("ERROR: Failed to expand template: %q\n", err)
+ }
+}
+
// mainHandler handles the GET and POST of the main page.
func mainHandler(w http.ResponseWriter, r *http.Request) {
log.Printf("Main Handler: %q\n", r.URL.Path)
@@ -558,6 +600,7 @@ func main() {
http.HandleFunc("/i/", imageHandler)
http.HandleFunc("/w/", workspaceHandler)
http.HandleFunc("/recent/", recentHandler)
+ http.HandleFunc("/iframe/", iframeHandler)
http.HandleFunc("/css/", cssHandler)
http.HandleFunc("/js/", jsHandler)
http.HandleFunc("/", mainHandler)
« no previous file with comments | « experimental/webtry/templates/workspace.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698