s/SUBSONIC/LIBRESONIC

Signed-off-by: Bernardus Jansen <bernardus@bajansen.nl>

libresonic-main/src/main/java/org/libresonic/player/Logger.java

@@ -29,7 +29,7 @@ import java.text.*;
 import java.util.*;
 
 /**
- * Logger implementation which logs to SUBSONIC_HOME/libresonic.log.
+ * Logger implementation which logs to LIBRESONIC_HOME/libresonic.log.
  * <br/>
  * Note: Third party logging libraries (such as log4j and Commons logging) are intentionally not
  * used. These libraries causes a lot of headache when deploying to some application servers

libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java

@@ -163,7 +163,7 @@ public class StreamController implements Controller {
                     response.setContentType(StringUtil.getMimeType("ts")); // HLS is always MPEG TS.
                 } else {
                     String transcodedSuffix = transcodingService.getSuffix(player, file, preferredTargetFormat);
-                    boolean sonos = SonosHelper.SUBSONIC_CLIENT_ID.equals(player.getClientId());
+                    boolean sonos = SonosHelper.LIBRESONIC_CLIENT_ID.equals(player.getClientId());
                     response.setContentType(StringUtil.getMimeType(transcodedSuffix, sonos));
                     setContentDuration(response, file);
                 }

libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java

@@ -124,7 +124,7 @@ public class PlayQueueInputStream extends InputStream {
             mediaFileService.incrementPlayCount(file);
 
             // Don't scrobble REST players (except Sonos)
-            if (player.getClientId() == null || player.getClientId().equals(SonosHelper.SUBSONIC_CLIENT_ID)) {
+            if (player.getClientId() == null || player.getClientId().equals(SonosHelper.LIBRESONIC_CLIENT_ID)) {
                 audioScrobblerService.register(file, player.getUsername(), false, null);
             }
 
@@ -149,7 +149,7 @@ public class PlayQueueInputStream extends InputStream {
             }
         } finally {
             // Don't scrobble REST players (except Sonos)
-            if (player.getClientId() == null || player.getClientId().equals(SonosHelper.SUBSONIC_CLIENT_ID)) {
+            if (player.getClientId() == null || player.getClientId().equals(SonosHelper.LIBRESONIC_CLIENT_ID)) {
                 audioScrobblerService.register(currentFile, player.getUsername(), true, null);
             }
             currentInputStream = null;

libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java

@@ -76,8 +76,8 @@ import org.libresonic.player.util.Util;
 public class SettingsService {
 
     // Libresonic home directory.
-    private static final File SUBSONIC_HOME_WINDOWS = new File("c:/libresonic");
-    private static final File SUBSONIC_HOME_OTHER = new File("/var/libresonic");
+    private static final File LIBRESONIC_HOME_WINDOWS = new File("c:/libresonic");
+    private static final File LIBRESONIC_HOME_OTHER = new File("/var/libresonic");
 
     // Number of free trial days.
     public static final long TRIAL_DAYS = 30L;
@@ -341,7 +341,7 @@ public class SettingsService {
             home = new File(overrideHome);
         } else {
             boolean isWindows = System.getProperty("os.name", "Windows").toLowerCase().startsWith("windows");
-            home = isWindows ? SUBSONIC_HOME_WINDOWS : SUBSONIC_HOME_OTHER;
+            home = isWindows ? LIBRESONIC_HOME_WINDOWS : LIBRESONIC_HOME_OTHER;
         }
 
         // Attempt to create home directory if it doesn't exist.

libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java

@@ -246,8 +246,8 @@ public class VersionService {
         }
 
         BufferedReader reader = new BufferedReader(new StringReader(content));
-        Pattern finalPattern = Pattern.compile("SUBSONIC_FULL_VERSION_BEGIN(.*)SUBSONIC_FULL_VERSION_END");
-        Pattern betaPattern = Pattern.compile("SUBSONIC_BETA_VERSION_BEGIN(.*)SUBSONIC_BETA_VERSION_END");
+        Pattern finalPattern = Pattern.compile("LIBRESONIC_FULL_VERSION_BEGIN(.*)LIBRESONIC_FULL_VERSION_END");
+        Pattern betaPattern = Pattern.compile("LIBRESONIC_BETA_VERSION_BEGIN(.*)LIBRESONIC_BETA_VERSION_END");
 
         try {
             String line = reader.readLine();

libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosHelper.java

@@ -78,7 +78,7 @@ import org.libresonic.player.util.Util;
  */
 public class SonosHelper {
 
-    public static final String SUBSONIC_CLIENT_ID = "sonos";
+    public static final String LIBRESONIC_CLIENT_ID = "sonos";
 
     private MediaFileService mediaFileService;
     private PlaylistService playlistService;
@@ -674,17 +674,17 @@ public class SonosHelper {
     }
 
     private Player createPlayerIfNecessary(String username) {
-        List<Player> players = playerService.getPlayersForUserAndClientId(username, SUBSONIC_CLIENT_ID);
+        List<Player> players = playerService.getPlayersForUserAndClientId(username, LIBRESONIC_CLIENT_ID);
 
         // If not found, create it.
         if (players.isEmpty()) {
             Player player = new Player();
             player.setUsername(username);
-            player.setClientId(SUBSONIC_CLIENT_ID);
+            player.setClientId(LIBRESONIC_CLIENT_ID);
             player.setName("Sonos");
             player.setTechnology(PlayerTechnology.EXTERNAL_WITH_PLAYLIST);
             playerService.createPlayer(player);
-            players = playerService.getPlayersForUserAndClientId(username, SUBSONIC_CLIENT_ID);
+            players = playerService.getPlayersForUserAndClientId(username, LIBRESONIC_CLIENT_ID);
         }
 
         return players.get(0);

libresonic-main/src/test/java/net/sourceforge/libresonic/service/SettingsServiceTestCase.java

@@ -33,19 +33,19 @@ import junit.framework.TestCase;
  */
 public class SettingsServiceTestCase extends TestCase {
 
-    private static final File SUBSONIC_HOME = new File("/tmp/libresonic");
+    private static final File LIBRESONIC_HOME = new File("/tmp/libresonic");
 
     private SettingsService settingsService;
 
     @Override
     protected void setUp() throws Exception {
-        System.setProperty("libresonic.home", SUBSONIC_HOME.getPath());
-        new File(SUBSONIC_HOME, "libresonic.properties").delete();
+        System.setProperty("libresonic.home", LIBRESONIC_HOME.getPath());
+        new File(LIBRESONIC_HOME, "libresonic.properties").delete();
         settingsService = new SettingsService();
     }
 
     public void testLibresonicHome() {
-        assertEquals("Wrong Libresonic home.", SUBSONIC_HOME, SettingsService.getLibresonicHome());
+        assertEquals("Wrong Libresonic home.", LIBRESONIC_HOME, SettingsService.getLibresonicHome());
     }
 
     public void testDefaultValues() {