diff --git a/jfapi.go b/jfapi.go
index 9b979ee..2e952c0 100644
--- a/jfapi.go
+++ b/jfapi.go
@@ -43,10 +43,10 @@ type Jellyfin struct {
noFail bool
}
-func (jf *Jellyfin) timeoutHandler() {
+func timeoutHandler(name, addr string, noFail bool) {
if r := recover(); r != nil {
- out := fmt.Sprintf("Failed to authenticate with Jellyfin @ %s: Timed out", jf.server)
- if jf.noFail {
+ out := fmt.Sprintf("Failed to authenticate with %s @ %s: Timed out", name, addr)
+ if noFail {
log.Printf(out)
} else {
log.Fatalf(out)
@@ -78,7 +78,7 @@ func newJellyfin(server, client, version, device, deviceId string) (*Jellyfin, e
infoUrl := fmt.Sprintf("%s/System/Info/Public", server)
req, _ := http.NewRequest("GET", infoUrl, nil)
resp, err := jf.httpClient.Do(req)
- defer jf.timeoutHandler()
+ defer timeoutHandler("Jellyfin", jf.server, jf.noFail)
if err == nil {
data, _ := ioutil.ReadAll(resp.Body)
json.Unmarshal(data, &jf.serverInfo)
@@ -106,7 +106,7 @@ func (jf *Jellyfin) authenticate(username, password string) (map[string]interfac
// loginParams, _ := json.Marshal(jf.loginParams)
url := fmt.Sprintf("%s/Users/authenticatebyname", jf.server)
req, err := http.NewRequest("POST", url, buffer)
- defer jf.timeoutHandler()
+ defer timeoutHandler("Jellyfin", jf.server, jf.noFail)
if err != nil {
return nil, 0, err
}
@@ -148,7 +148,7 @@ func (jf *Jellyfin) _getReader(url string, params map[string]string) (io.Reader,
req.Header.Add(name, value)
}
resp, err := jf.httpClient.Do(req)
- defer jf.timeoutHandler()
+ defer timeoutHandler("Jellyfin", jf.server, jf.noFail)
if err != nil || resp.StatusCode != 200 {
if resp.StatusCode == 401 && jf.authenticated {
jf.authenticated = false
@@ -180,7 +180,7 @@ func (jf *Jellyfin) _post(url string, data map[string]interface{}, response bool
req.Header.Add(name, value)
}
resp, err := jf.httpClient.Do(req)
- defer jf.timeoutHandler()
+ defer timeoutHandler("Jellyfin", jf.server, jf.noFail)
if err != nil || resp.StatusCode != 200 {
if resp.StatusCode == 401 && jf.authenticated {
jf.authenticated = false
diff --git a/main.go b/main.go
index d80f4d7..de7f771 100644
--- a/main.go
+++ b/main.go
@@ -45,6 +45,7 @@ type appContext struct {
invalidTokens []string
jf *Jellyfin
authJf *Jellyfin
+ ombi *Ombi
datePattern string
timePattern string
storage Storage
@@ -225,17 +226,32 @@ func main() {
app.debug.Println("Loading storage")
- app.storage.invite_path = filepath.Join(app.data_path, "invites.json")
+ // app.storage.invite_path = filepath.Join(app.data_path, "invites.json")
+ app.storage.invite_path = app.config.Section("files").Key("invites").String()
app.storage.loadInvites()
- app.storage.emails_path = filepath.Join(app.data_path, "emails.json")
+ // app.storage.emails_path = filepath.Join(app.data_path, "emails.json")
+ app.storage.emails_path = app.config.Section("files").Key("emails").String()
app.storage.loadEmails()
- app.storage.policy_path = filepath.Join(app.data_path, "user_template.json")
+ // app.storage.policy_path = filepath.Join(app.data_path, "user_template.json")
+ app.storage.policy_path = app.config.Section("files").Key("user_template").String()
app.storage.loadPolicy()
- app.storage.configuration_path = filepath.Join(app.data_path, "user_configuration.json")
+ // app.storage.configuration_path = filepath.Join(app.data_path, "user_configuration.json")
+ app.storage.policy_path = app.config.Section("files").Key("user_configuration").String()
app.storage.loadConfiguration()
- app.storage.displayprefs_path = filepath.Join(app.data_path, "user_displayprefs.json")
+ // app.storage.displayprefs_path = filepath.Join(app.data_path, "user_displayprefs.json")
+ app.storage.displayprefs_path = app.config.Section("files").Key("user_displayprefs").String()
app.storage.loadDisplayprefs()
+ if app.config.Section("ombi").Key("enabled").MustBool(false) {
+ app.storage.ombi_path = app.config.Section("files").Key("ombi_template").String()
+ app.storage.loadOmbiTemplate()
+ app.ombi = newOmbi(
+ app.config.Section("ombi").Key("server").String(),
+ app.config.Section("ombi").Key("api_key").String(),
+ true,
+ )
+ }
+
app.configBase_path = filepath.Join(app.local_path, "config-base.json")
config_base, _ := ioutil.ReadFile(app.configBase_path)
json.Unmarshal(config_base, &app.configBase)
@@ -340,6 +356,10 @@ func main() {
api.POST("/setDefaults", app.SetDefaults)
api.GET("/getConfig", app.GetConfig)
api.POST("/modifyConfig", app.ModifyConfig)
+ if app.config.Section("ombi").Key("enabled").MustBool(false) {
+ api.GET("/getOmbiUsers", app.OmbiUsers)
+ api.POST("/setOmbiDefaults", app.SetOmbiDefaults)
+ }
app.info.Printf("Starting router @ %s", address)
} else {
router.GET("/", func(gc *gin.Context) {
diff --git a/ombi.go b/ombi.go
new file mode 100644
index 0000000..ece2e6d
--- /dev/null
+++ b/ombi.go
@@ -0,0 +1,167 @@
+package main
+
+import (
+ "bytes"
+ "compress/gzip"
+ "encoding/json"
+ "fmt"
+ "io"
+ "net/http"
+ "strings"
+ "time"
+)
+
+type Ombi struct {
+ server, key string
+ header map[string]string
+ httpClient *http.Client
+ noFail bool
+}
+
+func newOmbi(server, key string, noFail bool) *Ombi {
+ return &Ombi{
+ server: server,
+ key: key,
+ noFail: noFail,
+ httpClient: &http.Client{
+ Timeout: 10 * time.Second,
+ },
+ header: map[string]string{
+ "ApiKey": key,
+ },
+ }
+}
+
+func (ombi *Ombi) _getReader(url string, params map[string]string) (string, int, error) {
+ if ombi.key == "" {
+ return "", 401, fmt.Errorf("No API key provided")
+ }
+ var req *http.Request
+ if params != nil {
+ jsonParams, _ := json.Marshal(params)
+ req, _ = http.NewRequest("GET", url, bytes.NewBuffer(jsonParams))
+ } else {
+ req, _ = http.NewRequest("GET", url, nil)
+ }
+ for name, value := range ombi.header {
+ req.Header.Add(name, value)
+ }
+ resp, err := ombi.httpClient.Do(req)
+ defer timeoutHandler("Ombi", ombi.server, ombi.noFail)
+ if err != nil || resp.StatusCode != 200 {
+ if resp.StatusCode == 401 {
+ return "", 401, fmt.Errorf("Invalid API Key")
+ }
+ return "", resp.StatusCode, err
+ }
+ defer resp.Body.Close()
+ var data io.Reader
+ switch resp.Header.Get("Content-Encoding") {
+ case "gzip":
+ data, _ = gzip.NewReader(resp.Body)
+ default:
+ data = resp.Body
+ }
+ buf := new(strings.Builder)
+ _, err = io.Copy(buf, data)
+ if err != nil {
+ return "", 500, err
+ }
+ return buf.String(), resp.StatusCode, nil
+}
+
+func (ombi *Ombi) _post(url string, data map[string]interface{}, response bool) (string, int, error) {
+ responseText := ""
+ params, _ := json.Marshal(data)
+ req, _ := http.NewRequest("POST", url, bytes.NewBuffer(params))
+ req.Header.Add("Content-Type", "application/json")
+ for name, value := range ombi.header {
+ req.Header.Add(name, value)
+ }
+ resp, err := ombi.httpClient.Do(req)
+ defer timeoutHandler("Ombi", ombi.server, ombi.noFail)
+ if err != nil || !(resp.StatusCode == 200 || resp.StatusCode == 201) {
+ if resp.StatusCode == 401 {
+ return "", 401, fmt.Errorf("Invalid API Key")
+ }
+ return responseText, resp.StatusCode, err
+ }
+ if response {
+ defer resp.Body.Close()
+ var out io.Reader
+ switch resp.Header.Get("Content-Encoding") {
+ case "gzip":
+ out, _ = gzip.NewReader(resp.Body)
+ default:
+ out = resp.Body
+ }
+ buf := new(strings.Builder)
+ _, err = io.Copy(buf, out)
+ if err != nil {
+ return "", 500, err
+ }
+ responseText = buf.String()
+ }
+ return responseText, resp.StatusCode, nil
+}
+
+func (ombi *Ombi) userByID(id string) (result map[string]interface{}, code int, err error) {
+ resp, code, err := ombi._getReader(fmt.Sprintf("%s/api/v1/Identity/User/%s", ombi.server, id), nil)
+ json.Unmarshal([]byte(resp), &result)
+ return
+}
+
+func (ombi *Ombi) getUsers() (result []map[string]interface{}, code int, err error) {
+ resp, code, err := ombi._getReader(fmt.Sprintf("%s/api/v1/Identity/Users", ombi.server), nil)
+ json.Unmarshal([]byte(resp), &result)
+ return
+}
+
+// Strip these from a user when saving as a template.
+// We also need to strip userQualityProfiles{"id", "userId"}
+var stripFromOmbi = []string{
+ "alias",
+ "emailAddress",
+ "hasLoggedIn",
+ "id",
+ "lastLoggedIn",
+ "password",
+ "userName",
+}
+
+func (ombi *Ombi) templateByID(id string) (result map[string]interface{}, code int, err error) {
+ result, code, err = ombi.userByID(id)
+ if err != nil || code != 200 {
+ return
+ }
+ for _, key := range stripFromOmbi {
+ if _, ok := result[key]; ok {
+ delete(result, key)
+ }
+ }
+ if qp, ok := result["userQualityProfiles"].(map[string]interface{}); ok {
+ delete(qp, "id")
+ delete(qp, "userId")
+ result["userQualityProfiles"] = qp
+ }
+ return
+}
+
+func (ombi *Ombi) newUser(username, password, email string, template map[string]interface{}) ([]string, int, error) {
+ url := fmt.Sprintf("%s/api/v1/Identity", ombi.server)
+ user := template
+ user["userName"] = username
+ user["password"] = password
+ user["emailAddress"] = email
+ resp, code, err := ombi._post(url, user, true)
+ var data map[string]interface{}
+ json.Unmarshal([]byte(resp), &data)
+ if err != nil || code != 200 {
+ var lst []string
+ if data["errors"] != nil {
+ lst = data["errors"].([]string)
+ }
+ return lst, code, err
+ }
+ return nil, code, err
+}
diff --git a/storage.go b/storage.go
index 27bc654..1af4cc9 100644
--- a/storage.go
+++ b/storage.go
@@ -7,10 +7,10 @@ import (
)
type Storage struct {
- timePattern string
- invite_path, emails_path, policy_path, configuration_path, displayprefs_path string
- invites Invites
- emails, policy, configuration, displayprefs map[string]interface{}
+ timePattern string
+ invite_path, emails_path, policy_path, configuration_path, displayprefs_path, ombi_path string
+ invites Invites
+ emails, policy, configuration, displayprefs, ombi_template map[string]interface{}
}
// timePattern: %Y-%m-%dT%H:%M:%S.%f
@@ -67,6 +67,14 @@ func (st *Storage) storeDisplayprefs() error {
return storeJSON(st.displayprefs_path, st.displayprefs)
}
+func (st *Storage) loadOmbiTemplate() error {
+ return loadJSON(st.ombi_path, &st.ombi_template)
+}
+
+func (st *Storage) storeOmbiTemplate() error {
+ return storeJSON(st.ombi_path, st.ombi_template)
+}
+
func loadJSON(path string, obj interface{}) error {
var file []byte
var err error
diff --git a/views.go b/views.go
index 22a10ad..a184fda 100644
--- a/views.go
+++ b/views.go
@@ -10,6 +10,7 @@ func (app *appContext) AdminPage(gc *gin.Context) {
bs5 := app.config.Section("ui").Key("bs5").MustBool(false)
emailEnabled, _ := app.config.Section("invite_emails").Key("enabled").Bool()
notificationsEnabled, _ := app.config.Section("notifications").Key("enabled").Bool()
+ ombiEnabled := app.config.Section("ombi").Key("enabled").MustBool(false)
gc.HTML(http.StatusOK, "admin.html", gin.H{
"bs5": bs5,
"cssFile": app.cssFile,
@@ -18,6 +19,7 @@ func (app *appContext) AdminPage(gc *gin.Context) {
"notifications": notificationsEnabled,
"version": VERSION,
"commit": COMMIT,
+ "ombiEnabled": ombiEnabled,
})
}