Merge pull request #33 from xendke/manual-rotation

owulveryck · Jul 20, 2022 · 8fe2e35 · 8fe2e35
2 parents 6a18aff + 437d742
commit 8fe2e35
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 10 deletions.
diff --git a/client/index.go b/client/index.go
@@ -27,10 +27,38 @@ html, body {
   max-height: 100%;
   max-width: 100%;
 }
+.orientation {
+  position: absolute;
+  top: 10px;
+  left: 10px;
+}
+.orientation button {
+  background-color: #04AA6D;
+  color: white;
+  padding: 12px 20px;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  width: 100%;
+  margin-bottom: 10px;
+}
 </style>
   </head>
   <body>
     <div class="container center">
+    {{ if not .AutoRotate }}
+    <div class="orientation">
+      <iframe name="dummyframe" id="dummyframe" style="display: none;"></iframe>
+      <form action="/orientation" method="GET" target="dummyframe">
+        <input type="hidden" name="orientation" value="portrait" />
+        <button>portrait</button>
+      </form>
+      <form action="/orientation" method="GET" target="dummyframe">
+        <input type="hidden" name="orientation" value="landscape" />
+        <button>landscape</button>
+      </form>
+    </div>
+    {{end}}
     <a href="/screenshot" download>
       <img src="/video">
       </a>

diff --git a/client/main.go b/client/main.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"compress/zlib"
+	"html/template"
 	"context"
-	"fmt"
 	"log"
 	"net/http"
 
@@ -37,7 +37,12 @@ func main() {
 
 	mux := http.NewServeMux()
 	mux.HandleFunc("/", func(w http.ResponseWriter, _ *http.Request) {
-		fmt.Fprint(w, index)
+		t := template.Must(template.New("index").Parse(index))
+		err := t.Execute(w, c)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 	})
 	mux.HandleFunc("/favicon.ico", faviconHandler)
 	mux.HandleFunc("/screenshot", g.GetScreenshot)

diff --git a/internal/client/orientation.go b/internal/client/orientation.go
@@ -48,14 +48,13 @@ type rotation struct {
 }
 
 func (r *rotation) rotate(img *image.Gray) {
-	if !r.isActive {
-		return
-	}
-	switch {
-	case (isPortraitLeft(img.Pix) || isPortraitRight(img.Pix)) && r.orientation != portrait:
-		r.orientation = portrait
-	case (isLandscapeLeft(img.Pix) || isLandscapeRight(img.Pix)) && r.orientation != landscape:
-		r.orientation = landscape
+	if r.isActive {
+		switch {
+		case (isPortraitLeft(img.Pix) || isPortraitRight(img.Pix)) && r.orientation != portrait:
+			r.orientation = portrait
+		case (isLandscapeLeft(img.Pix) || isLandscapeRight(img.Pix)) && r.orientation != landscape:
+			r.orientation = landscape
+		}
 	}
 	if r.orientation == portrait {
 		rotate(img)