File tree Expand file tree Collapse file tree 1 file changed +24
-2
lines changed Expand file tree Collapse file tree 1 file changed +24
-2
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,8 @@ package window
3
3
import (
4
4
"errors"
5
5
"fmt"
6
+ "net/url"
7
+ "path/filepath"
6
8
"time"
7
9
8
10
"github.com/miketheprogrammer/go-thrust/lib/bindings/session"
@@ -27,9 +29,29 @@ type Window struct {
27
29
SendChannel * connection.In `json:"-"`
28
30
}
29
31
30
- func NewWindow (url string , sess * session.Session ) * Window {
32
+ func checkUrl (s string ) (string , error ) {
33
+ u , err := url .Parse (s )
34
+ if err != nil {
35
+ return s , err
36
+ }
37
+ if u .Scheme == "" {
38
+ p , err := filepath .Abs (s )
39
+ if err != nil {
40
+ return p , err
41
+ }
42
+ u = & url.URL {
43
+ Scheme : "file" ,
44
+ Path : p ,
45
+ }
46
+ }
47
+ return u .String (), err
48
+ }
49
+
50
+ func NewWindow (s string , sess * session.Session ) * Window {
51
+ u , _ := checkUrl (s )
52
+
31
53
w := Window {}
32
- w .Url = url
54
+ w .Url = u
33
55
if len (w .Url ) == 0 {
34
56
w .Url = "http://google.com"
35
57
}
You can’t perform that action at this time.
0 commit comments