fixed html regexp
parent
62308eed08
commit
8c9c5d732d
17
banana.go
17
banana.go
|
@ -69,12 +69,9 @@ https://www.esoui.com/downloads/info1146-LibCustomMenu.html
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ESOUI_PREFIX = regexp.MustCompile(`https://www.esoui.com/downloads/info[0-9]+\-`)
|
ESOUI_NAME = regexp.MustCompile(`(?:https://www.esoui.com/downloads/info[0-9]+\-)([A-Za-z]+)(?:\.html)`)
|
||||||
ESOUI_DOWNLOAD = regexp.MustCompile(`https://cdn.esoui.com/downloads/file[^"]*`)
|
ESOUI_VERSION = regexp.MustCompile(`(?:<div\s+id="version">Version:\s+)(.*)(?:</div>)`)
|
||||||
ESOUI_VERSION_HTML = regexp.MustCompile(`<div\s+id="version">Version:\s+[^<]+`)
|
LIVE_VERSION = regexp.MustCompile(`(?:##\s+Version:\s+)(.*)`)
|
||||||
ESOUI_VERSION_SPLIT = regexp.MustCompile(`<div\s+id="version">Version:\s+`)
|
|
||||||
LIVE_VERSION = regexp.MustCompile(`##\s+Version:\s+.*`)
|
|
||||||
LIVE_VERSION_SPLIT = regexp.MustCompile(`##\s+Version:\s+`)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func eso_live_path_get() string {
|
func eso_live_path_get() string {
|
||||||
|
@ -142,6 +139,9 @@ type EsoUI struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func esoui_init(addon_url string) (EsoUI, error) {
|
func esoui_init(addon_url string) (EsoUI, error) {
|
||||||
|
addon_name := ESOUI_NAME.FindStringSubmatch(addon_url)[1]
|
||||||
|
dowload_uri := strings.Replace(addon_url, "info", "download", -1)
|
||||||
|
|
||||||
response, error := http.Get(addon_url)
|
response, error := http.Get(addon_url)
|
||||||
if error != nil {
|
if error != nil {
|
||||||
return EsoUI{}, error
|
return EsoUI{}, error
|
||||||
|
@ -157,10 +157,7 @@ func esoui_init(addon_url string) (EsoUI, error) {
|
||||||
return EsoUI{}, error
|
return EsoUI{}, error
|
||||||
}
|
}
|
||||||
|
|
||||||
addon_name := string(ESOUI_PREFIX.Find([]byte(addon_url)))
|
version := ESOUI_VERSION.FindStringSubmatch(string(body))[1]
|
||||||
dowload_uri := string(ESOUI_DOWNLOAD.Find(body))
|
|
||||||
version_html := string(ESOUI_VERSION_HTML.Find(body))
|
|
||||||
version := string(ESOUI_VERSION_SPLIT.Find([]byte(version_html)))
|
|
||||||
|
|
||||||
return EsoUI{addon_name, version, dowload_uri}, nil
|
return EsoUI{addon_name, version, dowload_uri}, nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue