From adfde5dae0f3e94f19744957cb6ad94adf0607ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Cocula?= <rcocula@gmail.com>
Date: Thu, 15 Dec 2016 21:47:18 +0100
Subject: [PATCH] New GettingStarted controller

---
 .../controller/GettingStartedController.java  | 61 +++++++++++++++++++
 .../player/controller/MultiController.java    | 13 ----
 .../src/main/resources/libresonic-servlet.xml |  1 -
 3 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java

diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java
new file mode 100644
index 00000000..673966c7
--- /dev/null
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java
@@ -0,0 +1,61 @@
+/*
+ This file is part of Libresonic.
+
+ Libresonic is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Libresonic is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
+ */
+package org.libresonic.player.controller;
+
+import org.libresonic.player.domain.AvatarScheme;
+import org.libresonic.player.domain.User;
+import org.libresonic.player.domain.UserSettings;
+import org.libresonic.player.service.SecurityService;
+import org.libresonic.player.service.SettingsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/gettingStarted")
+public class GettingStartedController {
+
+    @Autowired
+    private SettingsService settingsService;
+
+    @RequestMapping(method = RequestMethod.GET)
+    public ModelAndView gettingStarted(HttpServletRequest request) {
+        ControllerUtils.updatePortAndContextPath(request,settingsService);
+
+        if (request.getParameter("hide") != null) {
+            settingsService.setGettingStartedEnabled(false);
+            settingsService.save();
+            return new ModelAndView(new RedirectView("home.view"));
+        }
+
+        Map<String, Object> map = new HashMap<>();;
+        map.put("runningAsRoot", "root".equals(System.getProperty("user.name")));
+        return new ModelAndView("gettingStarted", "model", map);
+    }
+
+}
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
index e472eb94..896c9e13 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
@@ -188,19 +188,6 @@ public class MultiController extends MultiActionController {
         return new ModelAndView("notFound");
     }
 
-    public ModelAndView gettingStarted(HttpServletRequest request, HttpServletResponse response) {
-        ControllerUtils.updatePortAndContextPath(request,settingsService);
-
-        if (request.getParameter("hide") != null) {
-            settingsService.setGettingStartedEnabled(false);
-            settingsService.save();
-            return new ModelAndView(new RedirectView("home.view"));
-        }
-
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("runningAsRoot", "root".equals(System.getProperty("user.name")));
-        return new ModelAndView("gettingStarted", "model", map);
-    }
 
 
     public ModelAndView exportPlaylist(HttpServletRequest request, HttpServletResponse response) throws Exception {
diff --git a/libresonic-main/src/main/resources/libresonic-servlet.xml b/libresonic-main/src/main/resources/libresonic-servlet.xml
index 7f1cfe91..d056d2e7 100644
--- a/libresonic-main/src/main/resources/libresonic-servlet.xml
+++ b/libresonic-main/src/main/resources/libresonic-servlet.xml
@@ -312,7 +312,6 @@
                 <prop key="/recover.view">multiController</prop>
                 <prop key="/accessDenied.view">multiController</prop>
                 <prop key="/notFound.view">multiController</prop>
-                <prop key="/gettingStarted.view">multiController</prop>
                 <prop key="/index.view">multiController</prop>
                 <prop key="/videoPlayer.view">videoPlayerController</prop>
                 <prop key="/starred.view">starredController</prop>